Deploy USE_GNOMENG infrastructure

PR:		42301
Submitted by:	Edwin Groothuis <edwin@mavetju.org>

23 files changed, 56 insertions, 32 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 19b4faea9402..c4357c8566a5 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	spcoltri@omcl.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 3d6a37d8c615..89ed590c036b 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jim@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 MAKE_ENV=	FREEBSD_CFLAGS="${CFLAGS}"
 
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index b57d60be98c7..a80486f4beb6 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -29,7 +29,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 7ddbedd3f8dd..1ee60f208a92 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	petef@FreeBSD.org
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index b50d4064c9c4..5ac8eac77f2d 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -18,8 +18,8 @@ MAINTAINER=	petef@FreeBSD.org
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_X_PREFIX=	yes
 
 INSTALL_TARGET=	install install-man
diff --git a/games/freeciv-gtk/Makefile b/games/freeciv-gtk/Makefile
index 50ee5c631803..73c4bfe50026 100644
--- a/games/freeciv-gtk/Makefile
+++ b/games/freeciv-gtk/Makefile
@@ -8,6 +8,7 @@
 PKGNAMESUFFIX=	-gtk
 MASTERDIR=	${.CURDIR}/../freeciv
 
-WITH_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index 281f79a3e117..4c628676885d 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -18,15 +18,17 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_XPM=	yes
 USE_BZIP2=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_IMLIB=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOMENG+=	imlib
+PKGNAMESUFFIX=	-imlib
 .else
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 281f79a3e117..4c628676885d 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -18,15 +18,17 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_XPM=	yes
 USE_BZIP2=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_IMLIB=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOMENG+=	imlib
+PKGNAMESUFFIX=	-imlib
 .else
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
diff --git a/games/garith/Makefile b/games/garith/Makefile
index 068956596fce..057ef40a0c6e 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WRKSRC=		${WRKDIR}/garith
 
 do-install:
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index f90d69541e9d..0ab72ca750b9 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
 		autoconf213:${PORTSDIR}/devel/autoconf213
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_MESA=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/groundhog/Makefile b/games/groundhog/Makefile
index 343b316d88b1..576bd85209df 100644
--- a/games/groundhog/Makefile
+++ b/games/groundhog/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	edwin@mavetju.org
 LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20		\
 		glib-2.0.0:${PORTSDIR}/devel/glib20
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index 33d749ecee91..08f89dc69a41 100644
--- a/games/gtkabale/Makefile
+++ b/games/gtkabale/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.seindal.dk/pub/rene/
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 19438405ff9c..ad7667f9ece6 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	http://gtkballs.antex.ru/dist/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/hex/Makefile b/games/hex/Makefile
index 460ba74a9b64..5cef07b6738a 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	http://www.earth.li/projectpurple/files/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 MAKE_ENV=	GRAPHICPATH="${GRAPHICPATH}" LEVELPATH="${LEVELPATH}"
 
 GRAPHICPATH=	${PREFIX}/share/hex/graphics
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index e875fa47fe13..128dc69aff84 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	mj-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 MAKE_ENV=	CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" \
 		DESTDIR="${PREFIX}/" INSTMANFLAGS="${INSTALL_MAN}" \
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 65c56328ce08..5c0778d69cd5 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -14,7 +14,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	kris@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 ALL_TARGET=	# empty
 
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 5e928e123b6b..e7d463bb9312 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.lysator.liu.se/realtimebattle/Download/
 MAINTAINER=	draj@oceanfree.net
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-debug
 
diff --git a/games/virt/Makefile b/games/virt/Makefile
index 792ea2f53d5d..5a98731bdabc 100644
--- a/games/virt/Makefile
+++ b/games/virt/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://vampiro.rshb.com.ru/pub/warez/virt/ \
 
 MAINTAINER=	lg@rrf.ru
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAN6=		virt.6
 MANCOMPRESSED=	no
 
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index 2784db2202c7..e1da38daf53c 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	clive@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 7a5df2bd775f..caa34a8adcf5 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	yinjieh@csie.nctu.edu.tw
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GTK=	yes
 USE_AUTOCONF=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 
 MAN6=		xpuyopuyo.6
@@ -30,8 +30,9 @@ LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
 .endif
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--without-gnome
 .endif
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 7e30557fa1db..287750cee99f 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 MAN6=		xqf.6
 
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 95a3ab653b13..7c1a693650b0 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk
@@ -27,8 +27,9 @@ MAN6=		xscorch.6
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=	--without-gnome
 .endif
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index ae2f8685f291..c9de604c7b31 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	http://koala.ilog.fr/ftp/pub/games/znibbles/
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
 USE_MOTIF=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif \
 		--disable-motif