Do not install fr locale file -- it is not a translation, and made trouble

in 2.1 bulk builds.
While here:
Use REPLACE_PERL instead of handcrafted code.
Get rid of automake build dependency by adding the corresponding patches.
Remove bogus patch.

10 files changed, 88 insertions, 53 deletions

diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index fd178516cd9..0a3ff59d211 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2006/02/17 23:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2006/02/28 17:45:55 wiz Exp $
 #
 
 DISTNAME=		xracer-0.96.9
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games x11
 MASTER_SITES=		http://xracer.annexia.org/files/
 
@@ -10,35 +10,26 @@ MAINTAINER=		bsieker@freenet.de
 HOMEPAGE=		http://xracer.annexia.org/
 COMMENT=		XRacer is a clone of the popular Psygnosis game Wipeout
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		automake14 gmake perl:run
+USE_TOOLS+=		gmake perl:run
 PERL5_PACKLIST=		auto/XRacer/.packlist
 
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
+# disabled by patch-an, since the only existing translation is empty
+# and made trouble in 2.1 bulk builds
+#BUILD_USES_MSGFMT=	yes
+#USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/XRacer
-
-pre-configure:
-	cd ${WRKSRC} && automake --gnu && autoconf
+REPLACE_PERL+=		tools/blender2track/xracer-blender2track.pl \
+			tools/mktube/xracer-mktube.pl \
+			tools/mktrack/xracer-mktrack.pl \
+			tools/mktrackscenery/xracer-mktrackscenery.pl \
+			tools/mkcraft/xracer-mkcraft.pl \
+			tools/mkmeshnotex/xracer-mkmeshnotex.pl
 
 post-configure: do-makemaker-configure
 
-pre-patch:
-.for perlfile in blender2track/xracer-blender2track.pl \
-		mktube/xracer-mktube.pl \
-		mktrack/xracer-mktrack.pl \
-		mktrackscenery/xracer-mktrackscenery.pl \
-		mkcraft/xracer-mkcraft.pl \
-		mkmeshnotex/xracer-mkmeshnotex.pl
-	@${CP} ${WRKSRC}/tools/${perlfile} ${WRKSRC}/tools/${perlfile}.BAK
-	@${SED} 's!/usr/bin/perl!${PERL5}!g' \
-		< ${WRKSRC}/tools/${perlfile}.BAK > ${WRKSRC}/tools/${perlfile}
-	@${RM} ${WRKSRC}/tools/${perlfile}.BAK
-.endfor
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/games/xracer/PLIST b/games/xracer/PLIST
index c6c44009ea4..e3252b2d467 100644
--- a/games/xracer/PLIST
+++ b/games/xracer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/02/17 23:26:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/02/28 17:45:55 wiz Exp $
 bin/xracer
 bin/xracer-blender2track.pl
 bin/xracer-blenderexport.py
@@ -14,7 +14,6 @@ share/doc/xracer-0.96.9/README.txt
 share/doc/xracer-0.96.9/faq.html
 share/doc/xracer-0.96.9/faq.txt
 share/doc/xracer-0.96.9/index.html
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xracer.mo
 share/xracer/.xracer-data-directory
 share/xracer/backdrops/mountains4-alpha.jpg
 share/xracer/backdrops/mountains4.jpg
diff --git a/games/xracer/distinfo b/games/xracer/distinfo
index d36d9bb5444..793ae7ed78a 100644
--- a/games/xracer/distinfo
+++ b/games/xracer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/02/17 23:26:29 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/02/28 17:45:55 wiz Exp $
 
 SHA1 (xracer-0.96.9.tar.gz) = 8c7a4f0be46ee83bbb588f6c5834340f519a3059
 RMD160 (xracer-0.96.9.tar.gz) = 1e9611dd55b1a3f0bf681a7051fcbb37bec47a6e
@@ -11,10 +11,13 @@ SHA1 (patch-ae) = f14f54d246370382255c2ebe4e907d9110f95a5e
 SHA1 (patch-af) = 05122f93b7f9ed1481a8d20696f75c35356db8a4
 SHA1 (patch-ag) = 129497c5e5b041b32c545493ea97afe9db996e33
 SHA1 (patch-ah) = b97883d599ac070385883e1356ac53382f15fbaa
-SHA1 (patch-ai) = 45f738256ebf52bdbca420d8e40dcd3177901824
 SHA1 (patch-aj) = 020d915445d310e3f744afe0179e70cafebbf84e
 SHA1 (patch-ak) = baa49f9b0f6cd161aab8a97c3234577654c191a4
-SHA1 (patch-al) = 1407348cca46fe22e4ab46e4416fc3a89e18a070
+SHA1 (patch-al) = cc441eb5150f8f709a6ad2a9fca0d1c12b8fb420
 SHA1 (patch-am) = 0d48fe70e1685df586d5369fb74caf439f6b3de0
-SHA1 (patch-an) = 48b3f48f4adaa6ed77453199eabefd8b4033b04d
+SHA1 (patch-an) = 3d2d4183ad578af11b478ccd943cb113424893c0
 SHA1 (patch-ao) = f2bc14651fd4f2137ea7e144701c90e5fb3a6689
+SHA1 (patch-ap) = 491cf858882cedc2fce86503240b6ccb63e72c77
+SHA1 (patch-aq) = 90dd0c5a669439b47ca489117b9efa19c656f40a
+SHA1 (patch-ar) = be958b29fdf3fdb82df9b0cc6f1c152371c7a858
+SHA1 (patch-as) = 5f22c78bec9b9fab9feb2cae73afc251f4367066
diff --git a/games/xracer/patches/patch-ai b/games/xracer/patches/patch-ai
deleted file mode 100644
index 4cfa0a1333f..00000000000
--- a/games/xracer/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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/patches/patch-al b/games/xracer/patches/patch-al
index ac2ad46b817..09317bf680d 100644
--- a/games/xracer/patches/patch-al
+++ b/games/xracer/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2000/11/27 21:20:07 mycroft Exp $
+$NetBSD: patch-al,v 1.2 2006/02/28 17:45:55 wiz Exp $
 
---- aclocal.m4.orig	Mon Nov 27 20:29:22 2000
-+++ aclocal.m4	Mon Nov 27 20:30:29 2000
-@@ -20,8 +20,7 @@
+--- aclocal.m4.orig	2000-03-20 21:10:53.000000000 +0000
++++ aclocal.m4
+@@ -20,8 +20,7 @@ dnl Usage:
  dnl AM_INIT_AUTOMAKE(package,version, [no-define])
  
  AC_DEFUN(AM_INIT_AUTOMAKE,
@@ -12,11 +12,10 @@ $NetBSD: patch-al,v 1.1 2000/11/27 21:20:07 mycroft Exp $
  AC_SUBST(PACKAGE)
  VERSION=[$2]
  AC_SUBST(VERSION)
-@@ -43,14 +42,6 @@
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+@@ -44,14 +43,6 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $mis
  AC_REQUIRE([AC_PROG_MAKE_SET])])
  
--
+ 
 -# serial 1
 -
 -AC_DEFUN(AM_PROG_INSTALL,
@@ -24,6 +23,7 @@ $NetBSD: patch-al,v 1.1 2000/11/27 21:20:07 mycroft Exp $
 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 -AC_SUBST(INSTALL_SCRIPT)dnl
 -])
- 
+-
  #
  # Check to make sure that the build environment is sane.
+ #
diff --git a/games/xracer/patches/patch-an b/games/xracer/patches/patch-an
index a050e9a0f40..6a2f4a1e81a 100644
--- a/games/xracer/patches/patch-an
+++ b/games/xracer/patches/patch-an
@@ -1,8 +1,13 @@
-$NetBSD: patch-an,v 1.1 2002/03/10 09:45:13 jmc Exp $
+$NetBSD: patch-an,v 1.2 2006/02/28 17:45:55 wiz Exp $
 
---- Makefile.in.orig	Sun Mar 10 09:43:38 2002
-+++ Makefile.in	Sun Mar 10 09:43:55 2002
-@@ -122,7 +122,7 @@
+--- Makefile.in.orig	2000-03-20 21:13:01.000000000 +0000
++++ Makefile.in
+@@ -118,11 +118,11 @@ l = @l@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS		= include src XRacer tools tracks craft data doc intl po # test
++SUBDIRS		= include src XRacer tools tracks craft data doc intl # po test
  
  EXTRA_DIST	= Reconf Release.in xracer.spec
  
diff --git a/games/xracer/patches/patch-ap b/games/xracer/patches/patch-ap
new file mode 100644
index 00000000000..eb4cab26825
--- /dev/null
+++ b/games/xracer/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2006/02/28 17:45:55 wiz Exp $
+
+--- craft/simple/Makefile.in.orig	2000-03-20 21:13:14.000000000 +0000
++++ craft/simple/Makefile.in
+@@ -131,7 +131,7 @@ MKCRAFT		= $(TOOLSDIR)/mkcraft/xracer-mk
+ libcraftsimple_la_SOURCES = common.h control.c craft.c
+ 
+ # Make sure that the ``craft'' symbol is exported.
+-libcraftsimple_la_LDFLAGS =
++libcraftsimple_la_LDFLAGS = -module -avoid-version
+ 
+ EXTRA_DIST	= simplecraft1.blend simplecraft1.wrl
+ 
diff --git a/games/xracer/patches/patch-aq b/games/xracer/patches/patch-aq
new file mode 100644
index 00000000000..a2054cf92a4
--- /dev/null
+++ b/games/xracer/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/02/28 17:45:55 wiz Exp $
+
+--- src/Makefile.in.orig	2000-03-20 21:13:03.000000000 +0000
++++ src/Makefile.in
+@@ -175,7 +175,7 @@ xracer_SOURCES	= arch.c \
+ 		  video.c \
+ 		  ws.c
+ 
+-xracer_LDADD	= mpeg/libmpeg.a
++xracer_LDADD	= mpeg/libmpeg.a -lintl
+ 
+ EXTRA_DIST	= arch_posix.c \
+ 		  joystick_linux.c joystick_freebsd.c joystick_generic.c \
diff --git a/games/xracer/patches/patch-ar b/games/xracer/patches/patch-ar
new file mode 100644
index 00000000000..b6e0b2ef508
--- /dev/null
+++ b/games/xracer/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/02/28 17:45:55 wiz Exp $
+
+--- tracks/simple2/Makefile.in.orig	2000-03-20 21:13:12.000000000 +0000
++++ tracks/simple2/Makefile.in
+@@ -147,6 +147,8 @@ libtracksimple2_la_SOURCES = $(TRACKSOUR
+ 			     flare.c \
+ 			     sky.c
+ 
++libtracksimple2_la_LDFLAGS = -module -avoid-version
++
+ EXTRA_DIST	= $(wildcard *.blend)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
diff --git a/games/xracer/patches/patch-as b/games/xracer/patches/patch-as
new file mode 100644
index 00000000000..ce3b3c45b97
--- /dev/null
+++ b/games/xracer/patches/patch-as
@@ -0,0 +1,11 @@
+$NetBSD: patch-as,v 1.1 2006/02/28 17:45:55 wiz Exp $
+
+--- configure.orig	2000-03-20 21:10:59.000000000 +0000
++++ configure
+@@ -5775,6 +5873,5 @@ rm -fr confdefs* $ac_clean_files
+ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ 
+ 
+-(cd XRacer && perl Makefile.PL PREFIX=$prefix)
+ 
+ if test -f Release; then chmod 0755 Release; fi