From f68e9b2336c72e7584c3ed55e46d5dd9ccd0d5bb Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Wed, 23 Aug 2000 23:59:25 +0000
Subject: make sure the path to the libmikmod header is indicated.  Fixes
 recently noted compile problems.

---
 games/xpuyopuyo/Makefile         |  4 +++-
 games/xpuyopuyo/files/patch-sum  |  3 ++-
 games/xpuyopuyo/patches/patch-ac | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 games/xpuyopuyo/patches/patch-ac

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 4949f591ef5..65869627cf3 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:26 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:59:25 dmcmahill Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 CATEGORIES=		games x11
@@ -12,6 +12,7 @@ BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		libmikmod>=3.1.9:../../audio/libmikmod
 
+USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_XPM=		YES
 USE_LIBTOOL=		YES
@@ -24,6 +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
 	${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \
 		> ${GNOME_CONFIG}
diff --git a/games/xpuyopuyo/files/patch-sum b/games/xpuyopuyo/files/patch-sum
index 59fce3f55e7..95790e1d7d6 100644
--- a/games/xpuyopuyo/files/patch-sum
+++ b/games/xpuyopuyo/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/08/11 20:01:21 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/23 23:59:26 dmcmahill Exp $
 
 MD5 (patch-aa) = b593295d69ba3beae1b0d749adcdd706
 MD5 (patch-ab) = 16ab0e74076745b36e56539bcfaaab8a
+MD5 (patch-ac) = d5e4f793e9fafc3a892b9e5f037a60f7
diff --git a/games/xpuyopuyo/patches/patch-ac b/games/xpuyopuyo/patches/patch-ac
new file mode 100644
index 00000000000..bbad2f36fcb
--- /dev/null
+++ b/games/xpuyopuyo/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.3 2000/08/23 23:59:27 dmcmahill 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 @@
+ #
+ 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
+ 
-- 
cgit v1.2.3