Implement USE_GTK, part 1.

13 files changed, 40 insertions, 69 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index d0d4920c3f80..ccde934e36bc 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -12,12 +12,17 @@ MASTER_SITES=	ftp://autoinst.acs.uci.edu/pub/go/
 
 MAINTAINER=	spcoltri@omcl.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GNU_CONFIGURE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 2d340707a9f4..3d6a37d8c615 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -5,35 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=		corewars
-PORTVERSION=		0.9.12
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	corewars
+PORTVERSION=	0.9.12
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		jim@FreeBSD.org
+MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
+MAKE_ENV=	FREEBSD_CFLAGS="${CFLAGS}"
 
-GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=		${LOCALBASE}/bin/glib12-config
-
-USE_X_PREFIX=		yes
-GNU_CONFIGURE=		yes
-
-CONFIGURE_ENV=		GTK_CONFIG="${GTK_CONFIG}" \
-			GLIB_CONFIG="${GLIB_CONFIG}"
-MAKE_ENV=		FREEBSD_CFLAGS="${CFLAGS}"
-
-MAN6=			corewars.6
+MAN6=		corewars.6
 
 post-install:
-	@strip ${PREFIX}/bin/corewars
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/corewars."
-	@${ECHO} "===>   Please read it before playing."
+	@${ECHO_MSG} "===>   Installing README in ${PREFIX}/share/doc/corewars."
+	@${ECHO_MSG} "===>   Please read it before playing."
 	@${MKDIR} ${PREFIX}/share/doc/corewars && ${CHMOD} a+rx ${PREFIX}/share/doc/corewars
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/garith/Makefile b/games/garith/Makefile
index c2587f991497..068956596fce 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -12,13 +12,9 @@ MASTER_SITES=	http://www.cnm-vra.com/micah/garith/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
 WRKSRC=		${WRKDIR}/garith
 
 do-install:
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index ff5ff422c6c9..9d692b94e5e0 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -14,11 +14,8 @@ MASTER_SITE_SUBDIR=	games/strategy
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_GTK=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 MAN6=		gtkballs.6
 
 do-install:
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 7704dd8611c7..aef04d914bc9 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kris@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 
 ALL_TARGET=	# empty
 
@@ -45,4 +44,5 @@ do-install:
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/$i ${X11BASE}/share/doc/mindguard
 .endfor
+
 .include <bsd.port.mk>
diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-aa
index 53fdc5a311d7..2c37e8732b71 100644
--- a/games/mindguard/files/patch-aa
+++ b/games/mindguard/files/patch-aa
@@ -9,7 +9,7 @@
  
  mindguard: mindguard.c 
 -	$(CC) `gtk-config --cflags`  mindguard.c -o mindguard `gtk-config --libs`
-+	$(CC) -DX11BASE=\"${X11BASE}\" `${X11BASE}/bin/gtk12-config --cflags`  ${CFLAGS} mindguard.c -o mindguard `${X11BASE}/bin/gtk12-config --libs`
++	$(CC) -DX11BASE=\"${X11BASE}\" `${GTK_CONFIG} --cflags`  ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs`
  
  clean:
  	rm -f mindguard
diff --git a/games/nethack-gtk/Makefile b/games/nethack-gtk/Makefile
index c864c289b064..bb11be093323 100644
--- a/games/nethack-gtk/Makefile
+++ b/games/nethack-gtk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.jnethack.org/pub/jnethack/ \
 		ftp://ftp.uu.net/systems/gnu/nethack/
-PKGNAMEPREFIX=	gtk-
+PKGNAMESUFFIX=	-gtk
 DISTNAME=	${PORTNAME}-3.2.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${GTK_PATCH}
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz
@@ -21,9 +21,8 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_XPM=	yes
+USE_GTK=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack-gtk/files/src-Makefile.diff b/games/nethack-gtk/files/src-Makefile.diff
index 438801a22ac7..1d3ff896188d 100644
--- a/games/nethack-gtk/files/src-Makefile.diff
+++ b/games/nethack-gtk/files/src-Makefile.diff
@@ -6,8 +6,8 @@
  
 -CFLAGS = -O -I../include -I/usr/X11R6/include `gtk-config --cflags`
 -LFLAGS = -O -L/usr/X11R6/lib `gtk-config --libs`
-+CFLAGS = -O -I../include -I/usr/X11R6/include `gtk12-config --cflags`
-+LFLAGS = -O -L/usr/X11R6/lib `gtk12-config --libs`
++CFLAGS = -O -I../include -I/usr/X11R6/include `${GTK_CONFIG} --cflags`
++LFLAGS = -O -L/usr/X11R6/lib `${GTK_CONFIG} --libs`
  
  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
  # combination of windowing systems.  Also set windowing systems in config.h.
diff --git a/games/nethack32-gtk/Makefile b/games/nethack32-gtk/Makefile
index c864c289b064..bb11be093323 100644
--- a/games/nethack32-gtk/Makefile
+++ b/games/nethack32-gtk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.jnethack.org/pub/jnethack/ \
 		ftp://ftp.uu.net/systems/gnu/nethack/
-PKGNAMEPREFIX=	gtk-
+PKGNAMESUFFIX=	-gtk
 DISTNAME=	${PORTNAME}-3.2.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${GTK_PATCH}
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz
@@ -21,9 +21,8 @@ PATCHFILES=	nh-3.2.2-3.2.3.diff \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_XPM=	yes
+USE_GTK=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
diff --git a/games/nethack32-gtk/files/src-Makefile.diff b/games/nethack32-gtk/files/src-Makefile.diff
index 438801a22ac7..1d3ff896188d 100644
--- a/games/nethack32-gtk/files/src-Makefile.diff
+++ b/games/nethack32-gtk/files/src-Makefile.diff
@@ -6,8 +6,8 @@
  
 -CFLAGS = -O -I../include -I/usr/X11R6/include `gtk-config --cflags`
 -LFLAGS = -O -L/usr/X11R6/lib `gtk-config --libs`
-+CFLAGS = -O -I../include -I/usr/X11R6/include `gtk12-config --cflags`
-+LFLAGS = -O -L/usr/X11R6/lib `gtk12-config --libs`
++CFLAGS = -O -I../include -I/usr/X11R6/include `${GTK_CONFIG} --cflags`
++LFLAGS = -O -L/usr/X11R6/lib `${GTK_CONFIG} --libs`
  
  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
  # combination of windowing systems.  Also set windowing systems in config.h.
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 0fc454b55af7..3b27ed65c5db 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -12,12 +12,9 @@ MASTER_SITES=	http://www.lysator.liu.se/realtimebattle/Download/
 
 MAINTAINER=	draj@oceanfree.net
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-debug
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index a9829c89b9b3..529ac2d8c653 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -13,11 +13,8 @@ MASTER_SITES=	ftp://ftp.linuxgames.com/xqf/
 MAINTAINER=	steve@farrell.org
 
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
 
 .include <bsd.port.mk>
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 92db22fdfd16..03e59ac2de91 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -12,23 +12,12 @@ MASTER_SITES=	ftp://koala.inria.fr/pub/games/znibbles/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 REQUIRES_MOTIF=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif \
 		--disable-motif
 
 MAN6=	nibbles.6 znibbles.6 gznibbles.6 znibblesX.6
 
-post-install:
-	@strip ${PREFIX}/bin/nibbles
-	@strip ${PREFIX}/bin/znibblesX
-	@strip ${PREFIX}/bin/gznibbles
-
 .include <bsd.port.mk>