Update port to 0.1.4

Add sound support

PR:		15141
Submitted by:	Maintainer

7 files changed, 43 insertions, 15 deletions

diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 8bef550e09c8..7b7bd2ec6363 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:   gracer
-# Version required:    0.1.3
+# Version required:    0.1.4
 # Date created:        Fri Jul 30 20:50:16 MET DST 1999
 # Whom:                nox@jelal.kn-bremen.de
 #
 # $FreeBSD$
 #
 
-DISTNAME= 	gracer-0.1.3
+DISTNAME= 	gracer-0.1.4
 CATEGORIES=	games
 MASTER_SITES=	http://arch.comp.kyutech.ac.jp/~matsu/my_products/gtk/race/
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 
+BUILD_DEPENDS=	${X11BASE}/lib/libsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
 		gif.5:${PORTSDIR}/graphics/giflib \
 		png.3:${PORTSDIR}/graphics/png \
@@ -24,5 +25,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			  -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_GMAKE=	yes
+# for plib (sound):
+NEW_GCC=	yes
+CONFIGURE_ARGS+= --with-plib=${X11BASE}
 
 .include <bsd.port.mk>
diff --git a/games/gracer/distinfo b/games/gracer/distinfo
index 90c2823789d2..29249bba4e54 100644
--- a/games/gracer/distinfo
+++ b/games/gracer/distinfo
@@ -1 +1 @@
-MD5 (gracer-0.1.3.tar.gz) = 484ff502f483d81f5504768ebb302c62
+MD5 (gracer-0.1.4.tar.gz) = 22e1639a0e54f117cf8e6dde97753587
diff --git a/games/gracer/files/patch-aa b/games/gracer/files/patch-aa
index 411b1947be9d..4de465a15269 100644
--- a/games/gracer/files/patch-aa
+++ b/games/gracer/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu Oct 21 21:58:10 1999
-+++ configure.in	Wed Nov  3 16:51:22 1999
-@@ -236,7 +236,7 @@
+--- configure.in.orig	Wed Nov 24 04:33:25 1999
++++ configure.in	Mon Dec 27 18:07:12 1999
+@@ -237,7 +237,7 @@
    tcl_prefix=$with_tcl)
  
  for tcl_prefix in $tcl_prefix $exec_prefix /usr/local /usr NONE; do
@@ -9,7 +9,7 @@
      break;
    fi
  done
-@@ -245,18 +245,18 @@
+@@ -246,18 +246,18 @@
    AC_MSG_ERROR([could't find tclConfig.sh])
  fi
  
@@ -27,7 +27,7 @@
  fi
  
 -TCL_CFLAGS="-I$TCL_SRC_DIR"
-+TCL_CFLAGS="-I$tcl_prefix/lib/tcl8.2"
++TCL_CFLAGS="-I$tcl_prefix/include/tcl8.2"
  TCL_LDFLAGS="$TCL_LIB_SPEC"
  AC_SUBST(TCL_CFLAGS)
  AC_SUBST(TCL_LDFLAGS)
diff --git a/games/gracer/files/patch-ab b/games/gracer/files/patch-ab
new file mode 100644
index 000000000000..5ab4d5b7db50
--- /dev/null
+++ b/games/gracer/files/patch-ab
@@ -0,0 +1,23 @@
+Index: src/sound.cxx
+@@ -30,6 +30,21 @@
+ int Sound_Init (Tcl_Interp *interp)
+ {
+   sched = new slScheduler (8000);
++  /*
++   * check for sound working, otherwise we get a segfault in
++   * sched->addSampleEnvelope below if /dev/dsp is not configured
++   */
++  if (sched->not_working()) {
++#if 0
++    /* XXX this gets a few
++     * `gracer in free(): warning: junk pointer, too high to make sense.'
++     * don't ask me why.  So we'll just leak memory, it should only
++     * be allocated once per process...
++     */
++    delete sched;
++#endif
++    sched = NULL;
++  }
+   if (sched) {
+     sched->setSafetyMargin (0.2);
+   }
diff --git a/games/gracer/pkg-comment b/games/gracer/pkg-comment
index 654c51b686c2..77ccfba98c3e 100644
--- a/games/gracer/pkg-comment
+++ b/games/gracer/pkg-comment
@@ -1 +1 @@
-A 3D motor sports simulator
+A 3D motor sport simulator
diff --git a/games/gracer/pkg-descr b/games/gracer/pkg-descr
index a36d1710b9db..1d1ecfaec9b7 100644
--- a/games/gracer/pkg-descr
+++ b/games/gracer/pkg-descr
@@ -1,14 +1,11 @@
-GRacer is a 3D motor sports simulator. It's state of the art physical
+GRacer is a 3D motor sport simulator. It's state of the art physical
 simulation engine creates realistic behavior including drift, wheel
 spin, and even accel turn.
 
-This release includes 2 type of vehicles: Formula Car (FR) and
-Rally Car (4WD). It will support GP500 motorcycle near future.
-
 Current Feature
 ---------------
-  - 2 vehicles and one course
-  - game is playable, but never finish
+  - 4 vehicles and one course
+  - game is playable
 
  ( network play is not implemented in this release )
 
diff --git a/games/gracer/pkg-plist b/games/gracer/pkg-plist
index f08d49fe328d..1e52f992df7b 100644
--- a/games/gracer/pkg-plist
+++ b/games/gracer/pkg-plist
@@ -16,10 +16,14 @@ share/gracer/scenes/sky.grs
 share/gracer/scenes/sky.jpg
 share/gracer/scripts/cache.tcl
 share/gracer/scripts/glut.tcl
+share/gracer/scripts/hiscore.tcl
 share/gracer/scripts/gr.tcl
 share/gracer/scripts/init.tcl
+share/gracer/scripts/postinit.tcl
+share/gracer/scripts/timestamp.tcl
 share/gracer/scripts/ui.tcl
 share/gracer/sounds/exhaust.au
+share/gracer/sounds/slip.au
 share/gracer/vehicles/cart.grv
 share/gracer/vehicles/cart/cart.grs
 share/gracer/vehicles/cart/engine.dat