3 files changed, 22 insertions, 36 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index c55315051ec6..0c2147cadbce 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,33 +1,38 @@
 # New ports collection makefile for:	xpuyopuyo
-# Version required:	0.1.1
+# Version required:	0.2.3
 # Date created:		19 Sep 1999
 # Whom:			Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpuyopuyo-0.1.1
+DISTNAME=	xpuyopuyo-0.2.3
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		gnomeui.2:${PORTSDIR}/x11/gnomelibs
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}"
+CONFIGURE_ARG=	--with-gnome
 USE_GMAKE=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xpuyopuyo ${PREFIX}/bin
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/xpuyopuyo
 .for i in AUTHORS COPYING ChangeLog INSTALL NEWS README TESTED TODO
 	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/xpuyopuyo
 .endfor
 	@${MKDIR} ${PREFIX}/share/xpuyopuyo/img
-	@${INSTALL_DATA} ${WRKSRC}/img/* ${PREFIX}/share/xpuyopuyo/img
+	@${INSTALL_DATA} ${WRKSRC}/img/*.xpm ${PREFIX}/share/xpuyopuyo/img
 
 .include <bsd.port.mk>
diff --git a/games/xpuyopuyo/distinfo b/games/xpuyopuyo/distinfo
index eab76b9ac8b0..232be15a82dd 100644
--- a/games/xpuyopuyo/distinfo
+++ b/games/xpuyopuyo/distinfo
@@ -1 +1 @@
-MD5 (xpuyopuyo-0.1.1.tar.gz) = 84c26c1d2c7e58d64ebac185eadd92c9
+MD5 (xpuyopuyo-0.2.3.tar.gz) = 19f19aa1ebe10b4d703a6ea3110515ff
diff --git a/games/xpuyopuyo/files/patch-aa b/games/xpuyopuyo/files/patch-aa
index 50786cee8c93..eb38585389f7 100644
--- a/games/xpuyopuyo/files/patch-aa
+++ b/games/xpuyopuyo/files/patch-aa
@@ -1,31 +1,12 @@
-Only in .: Makefile
-diff -ru /tmp/xpuyopuyo-0.1.1/Makefile.in ./Makefile.in
---- /tmp/xpuyopuyo-0.1.1/Makefile.in	Sun Sep 19 07:34:55 1999
-+++ ./Makefile.in	Sun Sep 19 19:54:09 1999
-@@ -119,8 +119,8 @@
- pfield.o pmanip.o ppiece.o pplayer.o pwindow.o pgame.o
- xpuyopuyo_DEPENDENCIES = 
+diff -ru /tmp/xpuyopuyo-0.2.3/Makefile.in ./Makefile.in
+--- /tmp/xpuyopuyo-0.2.3/Makefile.in	Sat Sep 25 18:11:27 1999
++++ ./Makefile.in	Fri Oct  8 10:34:51 1999
+@@ -135,7 +135,7 @@
+ @GTK_FALSE@xpuyopuyo_DEPENDENCIES =  libxpuyopuyo.a
+ @GTK_TRUE@xpuyopuyo_DEPENDENCIES =  libxpuyopuyo.a
  xpuyopuyo_LDFLAGS = 
 -CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 +CFLAGS += @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
- LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in config.sub \
-Only in .: config.cache
-Only in .: config.h
-Only in .: config.log
-Only in .: config.status
-Only in .: getopt.o
-Only in .: getopt1.o
-Only in .: pai.o
-Only in .: pfield.o
-Only in .: pgame.o
-Only in .: pimg.o
-Only in .: pmanip.o
-Only in .: ppiece.o
-Only in .: pplayer.o
-Only in .: pwindow.o
-Only in .: xpuyopuyo
-Only in .: xpuyopuyo.o
+ 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)