6 files changed, 162 insertions, 176 deletions

diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 3ec6ceae93a4..990f86aa46ab 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -5,23 +5,30 @@
 # $FreeBSD$
 #
 
-PORTNAME=		tuxkart
-PORTVERSION=		0.0.3
-CATEGORIES=		games
-MASTER_SITES=		http://tuxkart.sourceforge.net/dist/
+PORTNAME=	tuxkart
+PORTVERSION=	0.0.6
+CATEGORIES=	games
+MASTER_SITES=	http://tuxkart.sourceforge.net/dist/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=		${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
-				  -I${X11BASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-USE_NEWGCC=		yes
-CONFIGURE_ARGS+=	--with-plib=${X11BASE} --bindir=${PREFIX}/bin
-USE_X_PREFIX=		yes
-USE_MESA=		yes
+USE_X_PREFIX=	yes
+USE_NEWGCC=	yes
+USE_MESA=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--with-plib=${X11BASE}
+
+post-patch:
+	@${PERL} -pi -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|datadir/games|datadir|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(prefix\)/games|\@bindir\@|g ; \
+		 s|\$$\(datadir\)/games|\$$\(datadir\)|g'
 
 .include <bsd.port.mk>
diff --git a/games/tuxkart/distinfo b/games/tuxkart/distinfo
index e7e2557536be..b59b41aa9685 100644
--- a/games/tuxkart/distinfo
+++ b/games/tuxkart/distinfo
@@ -1 +1 @@
-MD5 (tuxkart-0.0.3.tar.gz) = 719fd6dbf17379a0d6c57a1b9b1c4703
+MD5 (tuxkart-0.0.6.tar.gz) = 93e6af044c740ffe33cd47941eb94c38
diff --git a/games/tuxkart/files/patch-Makefile.in b/games/tuxkart/files/patch-Makefile.in
deleted file mode 100644
index 228ed5c5e5c1..000000000000
--- a/games/tuxkart/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	Fri Jun  8 16:43:19 2001
-+++ Makefile.in	Fri Jun  8 16:43:25 2001
-@@ -66,7 +66,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--SUBDIRS = src wavs images models data mods fonts doc contrib
-+SUBDIRS = src wavs images models data mods fonts contrib
- 
- EXTRA_DIST = README CHANGES LICENSE acsite.m4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games/tuxkart/files/patch-configure b/games/tuxkart/files/patch-configure
deleted file mode 100644
index 4354b46f5445..000000000000
--- a/games/tuxkart/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	Fri Jun  8 15:45:14 2001
-+++ configure	Fri Jun  8 15:45:20 2001
-@@ -2237,7 +2237,7 @@
- fi
- 
- 
--  x_suffix="$X_LIBS $X_PRE_LIBS -lpthread -lX11 -lXi -lXext -lXmu $X_EXTRA_LIBS -lm"
-+  x_suffix="$X_LIBS $X_PRE_LIBS -pthread -lX11 -lXi -lXext -lXmu $X_EXTRA_LIBS -lm"
- 
-   
-   echo $ac_n "checking for glNewList in -lGL""... $ac_c" 1>&6
diff --git a/games/tuxkart/files/patch-src::Makefile.in b/games/tuxkart/files/patch-src::Makefile.in
deleted file mode 100644
index 16a9cf00a97a..000000000000
--- a/games/tuxkart/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.old	Fri Jun  8 17:02:37 2001
-+++ src/Makefile.in	Fri Jun  8 17:02:50 2001
-@@ -66,7 +66,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--bindir = $(prefix)/games
-+bindir = @bindir@
- 
- bin_PROGRAMS = tuxkart
- 
diff --git a/games/tuxkart/pkg-plist b/games/tuxkart/pkg-plist
index f466e2bfb443..faa271507913 100644
--- a/games/tuxkart/pkg-plist
+++ b/games/tuxkart/pkg-plist
@@ -1,128 +1,140 @@
 bin/tuxkart
-share/games/tuxkart/data/levels.dat
-share/games/tuxkart/data/bsodcastle.loc
-share/games/tuxkart/data/geekopeak.loc
-share/games/tuxkart/data/gownsbow.loc
-share/games/tuxkart/data/tuxtrack.loc
-share/games/tuxkart/data/bsodcastle.drv
-share/games/tuxkart/data/geekopeak.drv
-share/games/tuxkart/data/gownsbow.drv
-share/games/tuxkart/data/tuxtrack.drv
-share/games/tuxkart/fonts/haeberli.txf
-share/games/tuxkart/fonts/sorority.txf
-share/games/tuxkart/images/Gown_beak.rgb
-share/games/tuxkart/images/Gown_body.rgb
-share/games/tuxkart/images/Penguin_beak.rgb
-share/games/tuxkart/images/Penguin_body.rgb
-share/games/tuxkart/images/Penguin_foot.rgb
-share/games/tuxkart/images/Penguin_orig.rgb
-share/games/tuxkart/images/Tuxclouds.rgb
-share/games/tuxkart/images/aarmco.rgb
-share/games/tuxkart/images/adverts.rgb
-share/games/tuxkart/images/bow.rgb
-share/games/tuxkart/images/brick.rgb
-share/games/tuxkart/images/bsod_icon.rgb
-share/games/tuxkart/images/butterfly.rgb
-share/games/tuxkart/images/bzzt.rgb
-share/games/tuxkart/images/candy_stripe.rgb
-share/games/tuxkart/images/concrete.rgb
-share/games/tuxkart/images/dirt.rgb
-share/games/tuxkart/images/dirtwall.rgb
-share/games/tuxkart/images/embossed_herring.rgb
-share/games/tuxkart/images/explode.rgb
-share/games/tuxkart/images/explode2.rgb
-share/games/tuxkart/images/flamemissile.rgb
-share/games/tuxkart/images/flames.rgb
-share/games/tuxkart/images/floor.rgb
-share/games/tuxkart/images/fuzzy.rgb
-share/games/tuxkart/images/geeko_icon.rgb
-share/games/tuxkart/images/gown_icon.rgb
-share/games/tuxkart/images/grass.rgb
-share/games/tuxkart/images/herring.rgb
-share/games/tuxkart/images/herringbones.rgb
-share/games/tuxkart/images/icecreamtruck.rgb
-share/games/tuxkart/images/lava.rgb
-share/games/tuxkart/images/lava2.rgb
-share/games/tuxkart/images/lscales.rgb
-share/games/tuxkart/images/magnet.rgb
-share/games/tuxkart/images/metalgrid.rgb
-share/games/tuxkart/images/missile.rgb
-share/games/tuxkart/images/pebbles.rgb
-share/games/tuxkart/images/players.rgb
-share/games/tuxkart/images/railing.rgb
-share/games/tuxkart/images/railroadtrack.rgb
-share/games/tuxkart/images/rainbow.rgb
-share/games/tuxkart/images/roadway.rgb
-share/games/tuxkart/images/spark.rgb
-share/games/tuxkart/images/speedometor.rgb
-share/games/tuxkart/images/stonewall.rgb
-share/games/tuxkart/images/tinytux.rgb
-share/games/tuxkart/images/title_screen.rgb
-share/games/tuxkart/images/title_screen_small.rgb
-share/games/tuxkart/images/tux_icon.rgb
-share/games/tuxkart/images/wheel.rgb
-share/games/tuxkart/images/wood.rgb
-share/games/tuxkart/images/zipper.rgb
-share/games/tuxkart/models/anvil.ac
-share/games/tuxkart/models/bsod.ac
-share/games/tuxkart/models/bsodcastle.ac
-share/games/tuxkart/models/bsodkart.ac
-share/games/tuxkart/models/explode.ac
-share/games/tuxkart/models/flamemissile.ac
-share/games/tuxkart/models/geeko.ac
-share/games/tuxkart/models/geekokart.ac
-share/games/tuxkart/models/geekopeak.ac
-share/games/tuxkart/models/gownkart.ac
-share/games/tuxkart/models/gownsbow.ac
-share/games/tuxkart/models/icecreamtruck.ac
-share/games/tuxkart/models/kart.ac
-share/games/tuxkart/models/magnet.ac
-share/games/tuxkart/models/magnetbzzt.ac
-share/games/tuxkart/models/missile.ac
-share/games/tuxkart/models/multisign.ac
-share/games/tuxkart/models/parachute.ac
-share/games/tuxkart/models/plibsign.ac
-share/games/tuxkart/models/roadblock.ac
-share/games/tuxkart/models/roadcone.ac
-share/games/tuxkart/models/spark.ac
-share/games/tuxkart/models/spark2.ac
-share/games/tuxkart/models/susesign.ac
-share/games/tuxkart/models/tinytux.ac
-share/games/tuxkart/models/tinytux_magnet.ac
-share/games/tuxkart/models/track.ac
-share/games/tuxkart/models/track1a.ac
-share/games/tuxkart/models/track1b.ac
-share/games/tuxkart/models/track1c.ac
-share/games/tuxkart/models/track1d.ac
-share/games/tuxkart/models/track1e.ac
-share/games/tuxkart/models/track1f.ac
-share/games/tuxkart/models/track1g.ac
-share/games/tuxkart/models/track1h.ac
-share/games/tuxkart/models/truck1.ac
-share/games/tuxkart/models/tuxkart.ac
-share/games/tuxkart/models/tuxkart_logo.ac
-share/games/tuxkart/models/tuxsign.ac
-share/games/tuxkart/models/vasign.ac
-share/games/tuxkart/models/zipper.ac
-share/games/tuxkart/mods/mfarmer.mod
-share/games/tuxkart/wavs/barf.wav
-share/games/tuxkart/wavs/boing.wav
-share/games/tuxkart/wavs/bonk.wav
-share/games/tuxkart/wavs/burp.wav
-share/games/tuxkart/wavs/bzzt.wav
-share/games/tuxkart/wavs/explosion.wav
-share/games/tuxkart/wavs/horn.wav
-share/games/tuxkart/wavs/laser.wav
-share/games/tuxkart/wavs/loser.wav
-share/games/tuxkart/wavs/ow.wav
-share/games/tuxkart/wavs/shoomf.wav
-share/games/tuxkart/wavs/ugh.wav
-share/games/tuxkart/wavs/wee.wav
-@dirrm share/games/tuxkart/wavs
-@dirrm share/games/tuxkart/mods
-@dirrm share/games/tuxkart/models
-@dirrm share/games/tuxkart/images
-@dirrm share/games/tuxkart/fonts
-@dirrm share/games/tuxkart/data
-@dirrm share/games/tuxkart
-@unexec rmdir %D/share/games 2>/dev/null || true
+share/tuxkart/data/bs.drv
+share/tuxkart/data/bsodcastle.drv
+share/tuxkart/data/bsodcastle.loc
+share/tuxkart/data/geekopeak.drv
+share/tuxkart/data/geekopeak.loc
+share/tuxkart/data/gownsbow.drv
+share/tuxkart/data/gownsbow.loc
+share/tuxkart/data/levels.dat
+share/tuxkart/data/sandtrack.drv
+share/tuxkart/data/sandtrack.loc
+share/tuxkart/data/tuxtrack.drv
+share/tuxkart/data/tuxtrack.loc
+share/tuxkart/fonts/haeberli.txf
+share/tuxkart/fonts/sorority.txf
+share/tuxkart/images/Gown_beak.rgb
+share/tuxkart/images/Gown_body.rgb
+share/tuxkart/images/Penguin_beak.rgb
+share/tuxkart/images/Penguin_body.rgb
+share/tuxkart/images/Penguin_foot.rgb
+share/tuxkart/images/Penguin_orig.rgb
+share/tuxkart/images/Tuxclouds.rgb
+share/tuxkart/images/aarmco.rgb
+share/tuxkart/images/adverts.rgb
+share/tuxkart/images/bow.rgb
+share/tuxkart/images/brick.rgb
+share/tuxkart/images/bsod_icon.rgb
+share/tuxkart/images/butterfly.rgb
+share/tuxkart/images/bzzt.rgb
+share/tuxkart/images/candy_stripe.rgb
+share/tuxkart/images/concrete.rgb
+share/tuxkart/images/dirt.rgb
+share/tuxkart/images/dirtwall.rgb
+share/tuxkart/images/egypt.rgb
+share/tuxkart/images/embossed_herring.rgb
+share/tuxkart/images/explode.rgb
+share/tuxkart/images/explode2.rgb
+share/tuxkart/images/flamemissile.rgb
+share/tuxkart/images/flames.rgb
+share/tuxkart/images/floor.rgb
+share/tuxkart/images/fuzzy.rgb
+share/tuxkart/images/fuzzy_sand.rgb
+share/tuxkart/images/geeko_icon.rgb
+share/tuxkart/images/gown_icon.rgb
+share/tuxkart/images/grass.rgb
+share/tuxkart/images/herring.rgb
+share/tuxkart/images/herringbones.rgb
+share/tuxkart/images/icecreamtruck.rgb
+share/tuxkart/images/lava.rgb
+share/tuxkart/images/lava2.rgb
+share/tuxkart/images/lscales.rgb
+share/tuxkart/images/magnet.rgb
+share/tuxkart/images/metalgrid.rgb
+share/tuxkart/images/missile.rgb
+share/tuxkart/images/pebbles.rgb
+share/tuxkart/images/players.rgb
+share/tuxkart/images/pyramidwall.rgb
+share/tuxkart/images/railing.rgb
+share/tuxkart/images/railroadtrack.rgb
+share/tuxkart/images/rainbow.rgb
+share/tuxkart/images/roadway.rgb
+share/tuxkart/images/sand.rgb
+share/tuxkart/images/spark.rgb
+share/tuxkart/images/speedometor.rgb
+share/tuxkart/images/stonewall.rgb
+share/tuxkart/images/tinytux.rgb
+share/tuxkart/images/title_screen.rgb
+share/tuxkart/images/title_screen_small.rgb
+share/tuxkart/images/tux_icon.rgb
+share/tuxkart/images/wheel.rgb
+share/tuxkart/images/wood.rgb
+share/tuxkart/images/zipper.rgb
+share/tuxkart/models/anvil.ac
+share/tuxkart/models/bsod.ac
+share/tuxkart/models/bsodcastle.ac
+share/tuxkart/models/bsodkart.ac
+share/tuxkart/models/car9.ac
+share/tuxkart/models/explode.ac
+share/tuxkart/models/flamemissile.ac
+share/tuxkart/models/geeko.ac
+share/tuxkart/models/geekokart.ac
+share/tuxkart/models/geekopeak.ac
+share/tuxkart/models/gownkart.ac
+share/tuxkart/models/gownsbow.ac
+share/tuxkart/models/icecreamtruck.ac
+share/tuxkart/models/icefield.ac
+share/tuxkart/models/kart.ac
+share/tuxkart/models/magnet.ac
+share/tuxkart/models/magnetbzzt.ac
+share/tuxkart/models/missile.ac
+share/tuxkart/models/multisign.ac
+share/tuxkart/models/parachute.ac
+share/tuxkart/models/plibsign.ac
+share/tuxkart/models/roadblock.ac
+share/tuxkart/models/roadcone.ac
+share/tuxkart/models/sandpyramid.ac
+share/tuxkart/models/spark.ac
+share/tuxkart/models/spark2.ac
+share/tuxkart/models/susesign.ac
+share/tuxkart/models/tinytux.ac
+share/tuxkart/models/tinytux_magnet.ac
+share/tuxkart/models/track.ac
+share/tuxkart/models/track1a.ac
+share/tuxkart/models/track1b.ac
+share/tuxkart/models/track1c.ac
+share/tuxkart/models/track1d.ac
+share/tuxkart/models/track1e.ac
+share/tuxkart/models/track1f.ac
+share/tuxkart/models/track1g.ac
+share/tuxkart/models/track1h.ac
+share/tuxkart/models/truck1.ac
+share/tuxkart/models/tuxkart.ac
+share/tuxkart/models/tuxkart_logo.ac
+share/tuxkart/models/tuxsign.ac
+share/tuxkart/models/vasign.ac
+share/tuxkart/models/zipper.ac
+share/tuxkart/mods/tk2.mod
+share/tuxkart/mods/tk5a.mod
+share/tuxkart/mods/tk7.mod
+share/tuxkart/mods/tuxr.mod
+share/tuxkart/wavs/barf.wav
+share/tuxkart/wavs/boing.wav
+share/tuxkart/wavs/bonk.wav
+share/tuxkart/wavs/burp.wav
+share/tuxkart/wavs/bzzt.wav
+share/tuxkart/wavs/explosion.wav
+share/tuxkart/wavs/horn.wav
+share/tuxkart/wavs/laser.wav
+share/tuxkart/wavs/loser.wav
+share/tuxkart/wavs/ow.wav
+share/tuxkart/wavs/shoomf.wav
+share/tuxkart/wavs/ugh.wav
+share/tuxkart/wavs/wee.wav
+@dirrm share/tuxkart/wavs
+@dirrm share/tuxkart/mods
+@dirrm share/tuxkart/models
+@dirrm share/tuxkart/images
+@dirrm share/tuxkart/fonts
+@dirrm share/tuxkart/data
+@dirrm share/tuxkart