Update xpuyopuyo to 0.9.1. Changes from version 0.3.8:

   *  AI code reverted to the 0.2 codebase.
   *  Fixed bug in tournament mode regarding AI selection.
   *  Added --insanity command-line option.
   *  Updated theme 3dRokz.
   *  Made configure more friendly to stow and related programs.
   *  Uses join face when puyo is joined.
   *  New theme: smileys (Brett Smith)
   *  Sound support added
   *  Music added -- still waiting on sound effects
   *  Updates to how hostname is obtained
   *  Fixed compilation error when --disable-network specified.
   *  Counting error on closed shapes fixed:  This bug manifested itself
      when mintomatch == 5 and a square cluster was formed -- the square
      cluster was counted as 7 connected puyos, hence a match.  Oops.
      (thanks to Nick Cabatoff for spotting)

7 files changed, 87 insertions, 8 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index c73a537dc9d..7b3ceba4b02 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2000/05/29 16:40:55 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/11 20:01:19 jlam Exp $
 
-DISTNAME=		xpuyopuyo-0.3.8
+DISTNAME=		xpuyopuyo-0.9.1
 CATEGORIES=		games x11
 MASTER_SITES=		http://chaos2.org/xpuyopuyo/ \
 			http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
@@ -8,11 +8,25 @@ MASTER_SITES=		http://chaos2.org/xpuyopuyo/ \
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		libmikmod>=3.1.9:../../audio/libmikmod
 DEPENDS+=		xpm-*:../../graphics/xpm
 
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-gnome
+USE_X11BASE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-gnome	# install desktop and pixmap files
+CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
+
+GNOME_CONFIG=		${WRKDIR}/gnome-config
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
+	${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \
+		> ${GNOME_CONFIG}
+	${CHMOD} +x ${GNOME_CONFIG}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpuyopuyo/files/gnome-config b/games/xpuyopuyo/files/gnome-config
new file mode 100644
index 00000000000..d75bcb9d7f9
--- /dev/null
+++ b/games/xpuyopuyo/files/gnome-config
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $NetBSD: gnome-config,v 1.1 2000/08/11 20:01:20 jlam Exp $
+
+case $1 in
+--datadir)
+	echo @PREFIX@/share
+	;;
+esac
diff --git a/games/xpuyopuyo/files/md5 b/games/xpuyopuyo/files/md5
index 429c9ddf91b..be4d999e448 100644
--- a/games/xpuyopuyo/files/md5
+++ b/games/xpuyopuyo/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/05/29 16:40:57 jlam Exp $
+$NetBSD: md5,v 1.3 2000/08/11 20:01:20 jlam Exp $
 
-MD5 (xpuyopuyo-0.3.8.tar.gz) = 3b5333d49f17944538018b3197a3e906
+MD5 (xpuyopuyo-0.9.1.tar.gz) = 3bae5b98fa9e076722d53054ac6f3807
diff --git a/games/xpuyopuyo/files/patch-sum b/games/xpuyopuyo/files/patch-sum
new file mode 100644
index 00000000000..59fce3f55e7
--- /dev/null
+++ b/games/xpuyopuyo/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.3 2000/08/11 20:01:21 jlam Exp $
+
+MD5 (patch-aa) = b593295d69ba3beae1b0d749adcdd706
+MD5 (patch-ab) = 16ab0e74076745b36e56539bcfaaab8a
diff --git a/games/xpuyopuyo/patches/patch-aa b/games/xpuyopuyo/patches/patch-aa
new file mode 100644
index 00000000000..932b713918a
--- /dev/null
+++ b/games/xpuyopuyo/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2000/08/11 20:01:21 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)
diff --git a/games/xpuyopuyo/patches/patch-ab b/games/xpuyopuyo/patches/patch-ab
new file mode 100644
index 00000000000..90a633a67d2
--- /dev/null
+++ b/games/xpuyopuyo/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2000/08/11 20:01:22 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 @@
+ 
+ 
+ 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/pkg/PLIST b/games/xpuyopuyo/pkg/PLIST
index 45011d4bd30..5d3e6e3e586 100644
--- a/games/xpuyopuyo/pkg/PLIST
+++ b/games/xpuyopuyo/pkg/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2000/05/29 16:41:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/08/11 20:01:22 jlam Exp $
 bin/xpuyopuyo
 man/man6/xpuyopuyo.6
+share/gnome/apps/Games/xpuyopuyo.desktop
+share/pixmaps/xpuyopuyo.xpm
 share/xpuyopuyo/copying.txt
+share/xpuyopuyo/sounds/game.xm
+share/xpuyopuyo/sounds/gameover.xm
+share/xpuyopuyo/sounds/prelude.xm
 share/xpuyopuyo/themes/3dRokz/img_0.xpm
 share/xpuyopuyo/themes/3dRokz/img_0j.xpm
 share/xpuyopuyo/themes/3dRokz/img_1.xpm
@@ -95,8 +100,29 @@ share/xpuyopuyo/themes/default/img_tile_top.xpm
 share/xpuyopuyo/themes/default/img_title.xpm
 share/xpuyopuyo/themes/default/img_top.xpm
 share/xpuyopuyo/themes/default/img_trans.xpm
+share/xpuyopuyo/themes/smileys/img_0.xpm
+share/xpuyopuyo/themes/smileys/img_0j.xpm
+share/xpuyopuyo/themes/smileys/img_1.xpm
+share/xpuyopuyo/themes/smileys/img_1j.xpm
+share/xpuyopuyo/themes/smileys/img_2.xpm
+share/xpuyopuyo/themes/smileys/img_2j.xpm
+share/xpuyopuyo/themes/smileys/img_3.xpm
+share/xpuyopuyo/themes/smileys/img_3j.xpm
+share/xpuyopuyo/themes/smileys/img_4.xpm
+share/xpuyopuyo/themes/smileys/img_4j.xpm
+share/xpuyopuyo/themes/smileys/img_5.xpm
+share/xpuyopuyo/themes/smileys/img_5j.xpm
+share/xpuyopuyo/themes/smileys/img_expl.xpm
+share/xpuyopuyo/themes/smileys/img_ind.xpm
+share/xpuyopuyo/themes/smileys/img_rock.xpm
+share/xpuyopuyo/themes/smileys/img_rockbig.xpm
+share/xpuyopuyo/themes/smileys/img_rockdemon.xpm
 share/xpuyopuyo/xpuyopuyo.txt
+@dirrm share/xpuyopuyo/themes/smileys
 @dirrm share/xpuyopuyo/themes/default
 @dirrm share/xpuyopuyo/themes/3dRokz
 @dirrm share/xpuyopuyo/themes
+@dirrm share/xpuyopuyo/sounds
 @dirrm share/xpuyopuyo
+@unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
+@unexec rmdir -p %D/share/gnome/apps/Games 2>/dev/null || true