Make this compile again.

5 files changed, 30 insertions, 33 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 2d8ab3de1ed..6b1529c0509 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/25 02:21:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/25 06:22:27 jlam Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 CATEGORIES=		games x11
@@ -8,7 +8,6 @@ MASTER_SITES=		http://chaos2.org/xpuyopuyo/ \
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 BUILD_DEPENDS+=		automake:../../devel/automake
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		libmikmod>=3.1.9:../../audio/libmikmod
@@ -26,8 +25,7 @@ CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
 GNOME_CONFIG=		${WRKDIR}/gnome-config
 
 pre-configure:
-	${RM} -f ${WRKSRC}/pgtk/Makefile ${WRKSRC}/pgtk/Makefile.in
-	cd ${WRKSRC} && autoreconf
+	cd ${WRKSRC} && autoheader && automake --gnu && autoreconf --force
 	${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \
 		> ${GNOME_CONFIG}
 	${CHMOD} +x ${GNOME_CONFIG}
diff --git a/games/xpuyopuyo/files/patch-sum b/games/xpuyopuyo/files/patch-sum
index 95790e1d7d6..6d5c192e39c 100644
--- a/games/xpuyopuyo/files/patch-sum
+++ b/games/xpuyopuyo/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/08/23 23:59:26 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/25 06:22:28 jlam Exp $
 
-MD5 (patch-aa) = b593295d69ba3beae1b0d749adcdd706
-MD5 (patch-ab) = 16ab0e74076745b36e56539bcfaaab8a
-MD5 (patch-ac) = d5e4f793e9fafc3a892b9e5f037a60f7
+MD5 (patch-aa) = 06d472279a6cf9e3940d2e7b2786a316
+MD5 (patch-ab) = ecd28cea9410208cd2be3a8988ecb859
+MD5 (patch-ac) = 0cc34e748b2840b4a1b3ad4a20190e05
diff --git a/games/xpuyopuyo/patches/patch-aa b/games/xpuyopuyo/patches/patch-aa
index 932b713918a..5db109b7cfe 100644
--- a/games/xpuyopuyo/patches/patch-aa
+++ b/games/xpuyopuyo/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2000/08/11 20:01:21 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/08/25 06:22:28 jlam Exp $
 
---- pgame/Makefile.in.orig	Sun Aug  6 18:41:02 2000
-+++ pgame/Makefile.in	Fri Aug 11 15:02:10 2000
-@@ -139,7 +139,7 @@
- libxpp_game_a_OBJECTS =  pconfig.o pfield.o pgame.o phighscore.o pinfo.o \
- pmanip.o ppiece.o pplayer.o ptournament.o
- AR = ar
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ $(LIBMIKMOD_CFLAGS)
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+--- configure.in.orig	Tue Aug  1 13:19:42 2000
++++ configure.in
+@@ -7,7 +7,7 @@
+ 
+ 
+ dnl Watch out for problems with prefix, datadir
+-if test "x$prefix" = "xNONE"; then 
++if test "x$prefix" != "xNONE"; then 
+    myprefix="$prefix"
+ else 
+    myprefix="$ac_default_prefix"
diff --git a/games/xpuyopuyo/patches/patch-ab b/games/xpuyopuyo/patches/patch-ab
index 90a633a67d2..50d072dc360 100644
--- a/games/xpuyopuyo/patches/patch-ab
+++ b/games/xpuyopuyo/patches/patch-ab
@@ -1,13 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2000/08/11 20:01:22 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2000/08/25 06:22:28 jlam Exp $
 
---- configure.in.orig	Tue Aug  1 13:19:42 2000
-+++ configure.in	Fri Aug 11 14:59:54 2000
-@@ -7,7 +7,7 @@
+--- pgame/Makefile.am.orig	Mon Jul 31 04:13:59 2000
++++ pgame/Makefile.am
+@@ -45,4 +45,4 @@
+ 	pwindow.h	
  
  
- dnl Watch out for problems with prefix, datadir
--if test "x$prefix" = "xNONE"; then 
-+if test "x$prefix" != "xNONE"; then 
-    myprefix="$prefix"
- else 
-    myprefix="$ac_default_prefix"
+-INCLUDES   =  -I../putil -I../pai -I../pnet -I../psound
++INCLUDES   =  $(LIBMIKMOD_CFLAGS) -I../putil -I../pai -I../pnet -I../psound
diff --git a/games/xpuyopuyo/patches/patch-ac b/games/xpuyopuyo/patches/patch-ac
index bbad2f36fcb..4bf486afd93 100644
--- a/games/xpuyopuyo/patches/patch-ac
+++ b/games/xpuyopuyo/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2000/08/23 23:59:27 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2000/08/25 06:22:28 jlam Exp $
 
 --- pgtk/Makefile.am.orig	Tue Aug  1 13:04:51 2000
-+++ pgtk/Makefile.am	Wed Aug 23 15:16:03 2000
-@@ -18,5 +18,5 @@
++++ pgtk/Makefile.am
+@@ -17,7 +17,7 @@
+ # GTK support
  #
  if GTK
 -INCLUDES		=  $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound
 +INCLUDES		=  $(LIBMIKMOD_CFLAGS) $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound
  endif
  
+