USE_LIBTOOL instead of PKGLIBTOOL.

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

4 files changed, 14 insertions, 42 deletions

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