From c9e10073f43b2c43f8c075c932d0803228ea4b3f Mon Sep 17 00:00:00 2001 From: mycroft Date: Mon, 27 Nov 2000 21:20:06 +0000 Subject: Make this work with current automake. --- games/xracer/Makefile | 7 ++++++- games/xracer/files/patch-sum | 9 +++++---- games/xracer/patches/patch-ab | 12 ++++++------ games/xracer/patches/patch-ag | 10 +++++----- games/xracer/patches/patch-ah | 12 ++++++------ games/xracer/patches/patch-al | 29 +++++++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 games/xracer/patches/patch-al (limited to 'games') diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 94feaf64deb..b4594c6bbe5 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/10/15 12:06:35 rh Exp $ +# $NetBSD: Makefile,v 1.7 2000/11/27 21:20:06 mycroft Exp $ # DISTNAME= xracer-0.96.9 @@ -8,6 +8,8 @@ MASTER_SITES= http://xracer.annexia.org/files/ MAINTAINER= bsieker@freenet.de HOMEPAGE= http://xracer.annexia.org/ +BUILD_DEPENDS+= autoreconf:../../devel/autoconf +BUILD_DEPENDS+= automake:../../devel/automake DEPENDS+= jpeg-*:../../graphics/jpeg DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext @@ -26,6 +28,9 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${X11BASE}/include +pre-configure: + cd ${WRKSRC} && autoconf && automake --gnu --no-force + pre-patch: .for perlfile in blender2track/xracer-blender2track.pl \ mktube/xracer-mktube.pl \ diff --git a/games/xracer/files/patch-sum b/games/xracer/files/patch-sum index 957318b121f..aacd20cc87d 100644 --- a/games/xracer/files/patch-sum +++ b/games/xracer/files/patch-sum @@ -1,13 +1,14 @@ -$NetBSD: patch-sum,v 1.4 2000/11/27 20:26:27 mycroft Exp $ +$NetBSD: patch-sum,v 1.5 2000/11/27 21:20:06 mycroft Exp $ MD5 (patch-aa) = 976919708921233417614776473f1730 -MD5 (patch-ab) = feb75664e18e2e02552b56b92201e6f9 +MD5 (patch-ab) = e7ed4bc52d16b65b83ca1f183b3abea2 MD5 (patch-ac) = 79d5a29ba5f61c62621f289a77210194 MD5 (patch-ad) = 1ff544aa01e702a4bfdd08424832c553 MD5 (patch-ae) = c61153ac40f94e5fdc331b13b38f100f MD5 (patch-af) = 99a98cf5f75b44db40c0d900858db4d7 -MD5 (patch-ag) = 4c9b3729b78b7bbfab6eee6c32babd54 -MD5 (patch-ah) = 8157b88c8f166e8671a5841040385b0c +MD5 (patch-ag) = 9fbbc81c23bf29f65502776b67b8a4e7 +MD5 (patch-ah) = 653f47115651ba5ad08f3b50c7a42854 MD5 (patch-ai) = 91f75bf770857a1c4342f649d1fc58cf MD5 (patch-aj) = 3aeebf548a2c1794c507d69b90af8033 MD5 (patch-ak) = 97147177f8baf9dfdfe12de2c510aeee +MD5 (patch-al) = fb021e792f4a89d57eb16d40c8832dc8 diff --git a/games/xracer/patches/patch-ab b/games/xracer/patches/patch-ab index 41f64d8934e..5618646d686 100644 --- a/games/xracer/patches/patch-ab +++ b/games/xracer/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.2 2000/06/21 08:12:39 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2000/11/27 21:20:07 mycroft Exp $ ---- src/Makefile.in.orig Mon Mar 20 22:13:03 2000 -+++ src/Makefile.in Sat May 27 05:43:16 2000 -@@ -175,7 +175,7 @@ - video.c \ - ws.c +--- src/Makefile.am.orig Sun Mar 19 14:47:10 2000 ++++ src/Makefile.am Mon Nov 27 20:40:21 2000 +@@ -91,7 +91,7 @@ + ws.c: @ARCH_WS@ + cp $< $@ -xracer_LDADD = mpeg/libmpeg.a +xracer_LDADD = mpeg/libmpeg.a -lintl diff --git a/games/xracer/patches/patch-ag b/games/xracer/patches/patch-ag index 936d52fdd49..acb4f2e2fd2 100644 --- a/games/xracer/patches/patch-ag +++ b/games/xracer/patches/patch-ag @@ -1,9 +1,9 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $ +$NetBSD: patch-ag,v 1.2 2000/11/27 21:20:07 mycroft Exp $ ---- doc/Makefile.in.orig Mon Mar 20 22:13:22 2000 -+++ doc/Makefile.in Mon May 29 08:17:43 2000 -@@ -119,7 +119,7 @@ - man_MANS = xracer.6 +--- doc/Makefile.am.orig Mon Dec 27 15:53:58 1999 ++++ doc/Makefile.am Mon Nov 27 20:40:34 2000 +@@ -26,7 +26,7 @@ + lynx -dump -width=72 -nolist $< > $@ # Install documentation in the /usr/doc/xracer-n.n.n/ directory. -docdir = $(prefix)/doc/@PACKAGE@-@VERSION@ diff --git a/games/xracer/patches/patch-ah b/games/xracer/patches/patch-ah index 5f5e0ada3ae..4e13038d92c 100644 --- a/games/xracer/patches/patch-ah +++ b/games/xracer/patches/patch-ah @@ -1,13 +1,13 @@ -$NetBSD: patch-ah,v 1.1.1.1 2000/05/29 06:36:01 rh Exp $ +$NetBSD: patch-ah,v 1.2 2000/11/27 21:20:07 mycroft Exp $ ---- Makefile.in.orig Mon Mar 20 22:13:01 2000 -+++ Makefile.in Mon May 29 08:27:40 2000 -@@ -122,7 +122,7 @@ +--- Makefile.am.orig Sun Mar 19 14:19:42 2000 ++++ Makefile.am Mon Nov 27 20:40:55 2000 +@@ -22,7 +22,7 @@ EXTRA_DIST = Reconf Release.in xracer.spec -docdir = $(prefix)/doc/@PACKAGE@-@VERSION@ +docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ doc_DATA = AUTHORS - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + dist-hook: diff --git a/games/xracer/patches/patch-al b/games/xracer/patches/patch-al new file mode 100644 index 00000000000..ac2ad46b817 --- /dev/null +++ b/games/xracer/patches/patch-al @@ -0,0 +1,29 @@ +$NetBSD: patch-al,v 1.1 2000/11/27 21:20:07 mycroft Exp $ + +--- aclocal.m4.orig Mon Nov 27 20:29:22 2000 ++++ aclocal.m4 Mon Nov 27 20:30:29 2000 +@@ -20,8 +20,7 @@ + dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + + AC_DEFUN(AM_INIT_AUTOMAKE, +-[AC_REQUIRE([AM_PROG_INSTALL]) +-PACKAGE=[$1] ++[PACKAGE=[$1] + AC_SUBST(PACKAGE) + VERSION=[$2] + AC_SUBST(VERSION) +@@ -43,14 +42,6 @@ + AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) + AC_REQUIRE([AC_PROG_MAKE_SET])]) + +- +-# serial 1 +- +-AC_DEFUN(AM_PROG_INSTALL, +-[AC_REQUIRE([AC_PROG_INSTALL]) +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +-AC_SUBST(INSTALL_SCRIPT)dnl +-]) + + # + # Check to make sure that the build environment is sane. -- cgit v1.2.3