USE_LIBTOOL instead of PKGLIBTOOL.

Remove unneeded dependency on mpeg-lib.
Add dependency on gettext.
Clean up Makefile logic.

7 files changed, 45 insertions, 72 deletions

diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 10bcff3889d..f131567439b 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:26 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/21 08:12:37 jlam Exp $
 #
 
-DISTNAME=	xracer-0.96.9
-CATEGORIES=	games x11
-MASTER_SITES=	http://xracer.annexia.org/files/
+DISTNAME=		xracer-0.96.9
+CATEGORIES=		games x11
+MASTER_SITES=		http://xracer.annexia.org/files/
 
-MAINTAINER=	bsieker@freenet.de
-HOMEPAGE=	http://xracer.annexia.org/
+MAINTAINER=		bsieker@freenet.de
+HOMEPAGE=		http://xracer.annexia.org/
 
-DEPENDS+=	perl-*:../../lang/perl5
-DEPENDS+=	Mesa-*:../../graphics/Mesa
-DEPENDS+=	mpeg-*:../../graphics/mpeg-lib
-DEPENDS+=	jpeg>=6:../../graphics/jpeg
+DEPENDS+=		Mesa-*:../../graphics/Mesa
+DEPENDS+=		jpeg-*:../../graphics/jpeg
+DEPENDS+=		gettext-0.10.*:../../devel/gettext
 
-USE_X11=	YES
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl"
+USE_X11=		# defined
+USE_GMAKE=		# defined
+USE_PERL5=		# defined
+PERL=			${LOCALBASE}/bin/perl
 
-USE_PKGLIBTOOL=    YES
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+CPPFLAGS+=		-I${LOCALBASE}/include
+CPPFLAGS+=		-I${X11BASE}/include
 
 pre-patch:
 .for perlfile in blender2track/xracer-blender2track.pl \
@@ -30,8 +34,8 @@ pre-patch:
 		mkcraft/xracer-mkcraft.pl \
 		mkmeshnotex/xracer-mkmeshnotex.pl
 	@${CP} ${WRKSRC}/tools/${perlfile} ${WRKSRC}/tools/${perlfile}.BAK
-	@${SED} 's!/usr/bin/perl!${LOCALBASE}/bin/perl!g' \
-	  < ${WRKSRC}/tools/${perlfile}.BAK > ${WRKSRC}/tools/${perlfile}
+	@${SED} 's!/usr/bin/perl!${PERL}!g' \
+		< ${WRKSRC}/tools/${perlfile}.BAK > ${WRKSRC}/tools/${perlfile}
 	@${RM} ${WRKSRC}/tools/${perlfile}.BAK
 .endfor
 
diff --git a/games/xracer/files/patch-sum b/games/xracer/files/patch-sum
index e13791bd34f..b817ce8bd58 100644
--- a/games/xracer/files/patch-sum
+++ b/games/xracer/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/21 08:12:39 jlam Exp $
 
 MD5 (patch-aa) = 976919708921233417614776473f1730
-MD5 (patch-ab) = 137415385fafd8592817aec1f936851b
+MD5 (patch-ab) = feb75664e18e2e02552b56b92201e6f9
 MD5 (patch-ac) = 79d5a29ba5f61c62621f289a77210194
-MD5 (patch-ad) = 9066317ea9db7a297353aaee0eab3005
-MD5 (patch-ae) = 744b64bb6e6e88486924aebf8c7ed4de
 MD5 (patch-af) = 99a98cf5f75b44db40c0d900858db4d7
 MD5 (patch-ag) = 4c9b3729b78b7bbfab6eee6c32babd54
 MD5 (patch-ah) = 8157b88c8f166e8671a5841040385b0c
+MD5 (patch-ai) = 91f75bf770857a1c4342f649d1fc58cf
diff --git a/games/xracer/patches/patch-ab b/games/xracer/patches/patch-ab
index 33db7dee8a3..41f64d8934e 100644
--- a/games/xracer/patches/patch-ab
+++ b/games/xracer/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/06/21 08:12:39 jlam Exp $
 
 --- src/Makefile.in.orig	Mon Mar 20 22:13:03 2000
 +++ src/Makefile.in	Sat May 27 05:43:16 2000
@@ -11,14 +11,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
  
  EXTRA_DIST	= arch_posix.c \
  		  joystick_linux.c joystick_freebsd.c joystick_generic.c \
-@@ -202,8 +202,8 @@
- track.o utils.o video.o ws.o
- xracer_DEPENDENCIES =  mpeg/libmpeg.a
- xracer_LDFLAGS = 
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
diff --git a/games/xracer/patches/patch-ad b/games/xracer/patches/patch-ad
deleted file mode 100644
index 914673d9911..00000000000
--- a/games/xracer/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
-
---- tracks/simple2/Makefile.in.orig	Sat May 27 05:48:08 2000
-+++ tracks/simple2/Makefile.in	Sat May 27 05:48:29 2000
-@@ -169,8 +169,8 @@
- obj_SnowMountain.lo obj_SnowMountain01.lo obj_SnowMountain02.lo \
- obj_SnowMountain03.lo obj_StartGantry.lo obj_StartGantryLegs.lo \
- backdrop.lo control.lo flare.lo sky.lo
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
diff --git a/games/xracer/patches/patch-ae b/games/xracer/patches/patch-ae
deleted file mode 100644
index da058672ec2..00000000000
--- a/games/xracer/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $
-
---- craft/simple/Makefile.in.orig	Sat May 27 05:48:46 2000
-+++ craft/simple/Makefile.in	Sat May 27 05:49:11 2000
-@@ -153,8 +153,8 @@
- X_PRE_LIBS = @X_PRE_LIBS@
- libcraftsimple_la_LIBADD = 
- libcraftsimple_la_OBJECTS =  control.lo craft.lo
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
diff --git a/games/xracer/patches/patch-ai b/games/xracer/patches/patch-ai
new file mode 100644
index 00000000000..4cfa0a1333f
--- /dev/null
+++ b/games/xracer/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2000/06/21 08:12:49 jlam Exp $
+
+--- po/Makefile.in.in.orig	Sun Mar 19 08:37:08 2000
++++ po/Makefile.in.in	Wed Jun 21 04:02:31 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/games/xracer/pkg/PLIST b/games/xracer/pkg/PLIST
index ac61ccd28c7..9d5cbbfdde7 100644
--- a/games/xracer/pkg/PLIST
+++ b/games/xracer/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/05/29 12:50:30 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/06/21 08:12:53 jlam Exp $
 bin/xracer
 bin/xracer-blenderexport.py
 bin/xracer-blender2track.pl
@@ -8,14 +8,12 @@ bin/xracer-mktrackscenery.pl
 bin/xracer-mkcraft.pl
 bin/xracer-mkmeshnotex.pl
 man/man6/xracer.6
-share/xracer/tracks/libtracksimple2.so.0.0
-share/xracer/tracks/libtracksimple2.so.0
-share/xracer/tracks/libtracksimple2.so
 share/xracer/tracks/libtracksimple2.a
-share/xracer/craft/libcraftsimple.so.0.0
-share/xracer/craft/libcraftsimple.so.0
-share/xracer/craft/libcraftsimple.so
+share/xracer/tracks/libtracksimple2.la
+share/xracer/tracks/libtracksimple2.so.0.0
 share/xracer/craft/libcraftsimple.a
+share/xracer/craft/libcraftsimple.la
+share/xracer/craft/libcraftsimple.so.0.0
 share/xracer/backdrops/mountains4-alpha.jpg
 share/xracer/backdrops/mountains4.jpg
 share/xracer/fonts/crillee14.jpg