Implement WANT_GNOME.

4 files changed, 152 insertions, 154 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 8a0b4a30ca55..133b0af6ca7f 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -13,47 +13,33 @@ MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-.if defined(WITH_MUSIC)
-LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
-.endif
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GTK=	yes
+WANT_GNOME=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--with-gnome=${X11BASE}
+MAN6=		xpuyopuyo.6
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MIKMOD) || (exists(${LOCALBASE}/lib/libmikmod.a) && \
+	!defined(WITHOUT_MIKMOD))
+LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
+.endif
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
 .else
 CONFIGURE_ARGS+=--without-gnome
 .endif
+
 .if defined(WITH_ROTATE_FIXED)
 CONFIGURE_ARGS+=--enable-rotate-fixed
 .endif
 .if defined(WITH_AIBREED)
 CONFIGURE_ARGS+=--enable-aibreed
 .endif
-.if defined(WITH_MUSIC)
-CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
-.endif
-
-MAN6=		xpuyopuyo.6
-
-.if defined(WITH_GNOME)
-PLIST=		${WRKDIR}/PLIST
-
-pre-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST}
-	@${ECHO} share/gnome/apps/Games/xpuyopuyo.desktop >> ${PLIST}
-	@${ECHO} share/gnome/pixmaps/xpuyopuyo.xpm >> ${PLIST}
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/xpuyopuyo/files/patch-aa b/games/xpuyopuyo/files/patch-aa
index eb38585389f7..e16f8929f03a 100644
--- a/games/xpuyopuyo/files/patch-aa
+++ b/games/xpuyopuyo/files/patch-aa
@@ -1,6 +1,5 @@
-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
+--- Makefile.in.orig	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
diff --git a/games/xpuyopuyo/files/patch-ac b/games/xpuyopuyo/files/patch-ac
new file mode 100644
index 000000000000..673c154369a3
--- /dev/null
+++ b/games/xpuyopuyo/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.in.orig	Mon Jun 26 00:35:33 2000
++++ configure.in	Sun Oct  1 13:56:50 2000
+@@ -145,7 +145,7 @@
+    GNOME_PIXMAPS=""
+ else
+    GNOME=1
+-   GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games/
++   GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/apps/Games/
+    GNOME_PIXMAPS=`$GNOME_CONFIG --datadir`/pixmaps/
+    echo "GNOME features enabled"
+    echo "GNOME desktop directory:  $GNOME_DESKTOP"
diff --git a/games/xpuyopuyo/pkg-plist b/games/xpuyopuyo/pkg-plist
index 1d7b70bcab84..93af6c93f19d 100644
--- a/games/xpuyopuyo/pkg-plist
+++ b/games/xpuyopuyo/pkg-plist
@@ -1,122 +1,124 @@
 bin/xpuyopuyo
-share/xpuyopuyo/sounds/game.xm
-share/xpuyopuyo/sounds/gameover.xm
-share/xpuyopuyo/sounds/prelude.xm
-share/xpuyopuyo/themes/default/img_0.xpm
-share/xpuyopuyo/themes/default/img_0j.xpm
-share/xpuyopuyo/themes/default/img_1.xpm
-share/xpuyopuyo/themes/default/img_1j.xpm
-share/xpuyopuyo/themes/default/img_2.xpm
-share/xpuyopuyo/themes/default/img_2j.xpm
-share/xpuyopuyo/themes/default/img_3.xpm
-share/xpuyopuyo/themes/default/img_3j.xpm
-share/xpuyopuyo/themes/default/img_4.xpm
-share/xpuyopuyo/themes/default/img_4j.xpm
-share/xpuyopuyo/themes/default/img_5.xpm
-share/xpuyopuyo/themes/default/img_5j.xpm
-share/xpuyopuyo/themes/default/img_clear.xpm
-share/xpuyopuyo/themes/default/img_clearb.xpm
-share/xpuyopuyo/themes/default/img_expl.xpm
-share/xpuyopuyo/themes/default/img_gameover.xpm
-share/xpuyopuyo/themes/default/img_ind.xpm
-share/xpuyopuyo/themes/default/img_num0.xpm
-share/xpuyopuyo/themes/default/img_num1.xpm
-share/xpuyopuyo/themes/default/img_num2.xpm
-share/xpuyopuyo/themes/default/img_num3.xpm
-share/xpuyopuyo/themes/default/img_num4.xpm
-share/xpuyopuyo/themes/default/img_num5.xpm
-share/xpuyopuyo/themes/default/img_num6.xpm
-share/xpuyopuyo/themes/default/img_num7.xpm
-share/xpuyopuyo/themes/default/img_num8.xpm
-share/xpuyopuyo/themes/default/img_num9.xpm
-share/xpuyopuyo/themes/default/img_paused.xpm
-share/xpuyopuyo/themes/default/img_rock.xpm
-share/xpuyopuyo/themes/default/img_rockbig.xpm
-share/xpuyopuyo/themes/default/img_rockdemon.xpm
-share/xpuyopuyo/themes/default/img_side.xpm
-share/xpuyopuyo/themes/default/img_tile_bottom1.xpm
-share/xpuyopuyo/themes/default/img_tile_bottom2.xpm
-share/xpuyopuyo/themes/default/img_tile_bottom3.xpm
-share/xpuyopuyo/themes/default/img_tile_left.xpm
-share/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
-share/xpuyopuyo/themes/default/img_tile_lefttop.xpm
-share/xpuyopuyo/themes/default/img_tile_ltrans.xpm
-share/xpuyopuyo/themes/default/img_tile_right.xpm
-share/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
-share/xpuyopuyo/themes/default/img_tile_righttop.xpm
-share/xpuyopuyo/themes/default/img_tile_rtrans.xpm
-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/3dRokz/img_0.xpm
-share/xpuyopuyo/themes/3dRokz/img_0j.xpm
-share/xpuyopuyo/themes/3dRokz/img_1.xpm
-share/xpuyopuyo/themes/3dRokz/img_1j.xpm
-share/xpuyopuyo/themes/3dRokz/img_2.xpm
-share/xpuyopuyo/themes/3dRokz/img_2j.xpm
-share/xpuyopuyo/themes/3dRokz/img_3.xpm
-share/xpuyopuyo/themes/3dRokz/img_3j.xpm
-share/xpuyopuyo/themes/3dRokz/img_4.xpm
-share/xpuyopuyo/themes/3dRokz/img_4j.xpm
-share/xpuyopuyo/themes/3dRokz/img_5.xpm
-share/xpuyopuyo/themes/3dRokz/img_5j.xpm
-share/xpuyopuyo/themes/3dRokz/img_clear.xpm
-share/xpuyopuyo/themes/3dRokz/img_clearb.xpm
-share/xpuyopuyo/themes/3dRokz/img_expl.xpm
-share/xpuyopuyo/themes/3dRokz/img_gameover.xpm
-share/xpuyopuyo/themes/3dRokz/img_ind.xpm
-share/xpuyopuyo/themes/3dRokz/img_num0.xpm
-share/xpuyopuyo/themes/3dRokz/img_num1.xpm
-share/xpuyopuyo/themes/3dRokz/img_num2.xpm
-share/xpuyopuyo/themes/3dRokz/img_num3.xpm
-share/xpuyopuyo/themes/3dRokz/img_num4.xpm
-share/xpuyopuyo/themes/3dRokz/img_num5.xpm
-share/xpuyopuyo/themes/3dRokz/img_num6.xpm
-share/xpuyopuyo/themes/3dRokz/img_num7.xpm
-share/xpuyopuyo/themes/3dRokz/img_num8.xpm
-share/xpuyopuyo/themes/3dRokz/img_num9.xpm
-share/xpuyopuyo/themes/3dRokz/img_rock.xpm
-share/xpuyopuyo/themes/3dRokz/img_rockbig.xpm
-share/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm
-share/xpuyopuyo/themes/3dRokz/img_side.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_left.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_right.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm
-share/xpuyopuyo/themes/3dRokz/img_tile_top.xpm
-share/xpuyopuyo/themes/3dRokz/img_title.xpm
-share/xpuyopuyo/themes/3dRokz/img_top.xpm
-share/xpuyopuyo/themes/3dRokz/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
-share/xpuyopuyo/copying.txt
-@dirrm share/xpuyopuyo/themes/smileys
-@dirrm share/xpuyopuyo/themes/3dRokz
-@dirrm share/xpuyopuyo/themes/default
-@dirrm share/xpuyopuyo/themes
-@dirrm share/xpuyopuyo/sounds
-@dirrm share/xpuyopuyo
+%%GNOME:%%share/gnome/apps/Games/xpuyopuyo.desktop
+%%GNOME:%%share/gnome/pixmaps/xpuyopuyo.xpm
+%%DATADIR%%/xpuyopuyo/copying.txt
+%%DATADIR%%/xpuyopuyo/sounds/game.xm
+%%DATADIR%%/xpuyopuyo/sounds/gameover.xm
+%%DATADIR%%/xpuyopuyo/sounds/prelude.xm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_right.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_title.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_trans.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_paused.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_lefttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_ltrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_right.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_righttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rtrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_title.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt
+@dirrm %%DATADIR%%/xpuyopuyo/themes/smileys
+@dirrm %%DATADIR%%/xpuyopuyo/themes/default
+@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz
+@dirrm %%DATADIR%%/xpuyopuyo/themes
+@dirrm %%DATADIR%%/xpuyopuyo/sounds
+@dirrm %%DATADIR%%/xpuyopuyo