Implement USE_GTK, part 2.

5 files changed, 16 insertions, 41 deletions

diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 6250f9edbe99..f78ba9b931a1 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -19,26 +19,21 @@ DISTFILES+=	easton.tar.gz mhc.tar.gz
 
 MAINTAINER=	patseal@hyperhost.net
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
-MAKE_ENV=	GTK_CONFIG=${GTK_CONFIG}
-PLIST=      ${WRKDIR}/PLIST
+USE_GTK=	yes
+PLIST=		${WRKDIR}/PLIST
 
-DATAFILES= ${WRKDIR}/kjv/kjv
+DATAFILES=	${WRKDIR}/kjv/kjv
+PLISTS=		${PKGDIR}/PLIST
 .if defined(WITH_TRANSLATIONS)
-DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
-PLISTS+= ${PKGDIR}/PLIST.translations
+DATAFILES+= 	${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
+PLISTS+= 	${PKGDIR}/PLIST.translations
 .endif
 .if defined(WITH_SUPPLEMENTS)
-DATAFILES+= ${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
-PLISTS+= ${PKGDIR}/PLIST.supplements
+DATAFILES+= 	${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
+PLISTS+= 	${PKGDIR}/PLIST.supplements
 .endif
 
-PLISTS+=    ${PKGDIR}/PLIST
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 .if !defined(WITH_TRANSLATIONS)
 pre-fetch:
 	@${ECHO_MSG}
@@ -54,12 +49,11 @@ pre-fetch:
 .endif
 
 do-install:
-	@echo ${DATAFILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/biblereader ${PREFIX}/bin/biblereader
 	${MKDIR} ${PREFIX}/share/biblereader
 	@for file in ${DATAFILES}; do \
 		${INSTALL_DATA} $${file} ${PREFIX}/share/biblereader; \
 	done
-	@cat ${PLISTS} > ${PLIST}
+	@${CAT} ${PLISTS} > ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile
index f3549712bfcf..f4b9a8022641 100644
--- a/misc/gplbp/Makefile
+++ b/misc/gplbp/Makefile
@@ -12,17 +12,9 @@ MASTER_SITES=	ftp://ftp.stampede.org/skibum/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/misc/grun/Makefile b/misc/grun/Makefile
index a5c91a88c5e5..fc9130b840ed 100644
--- a/misc/grun/Makefile
+++ b/misc/grun/Makefile
@@ -12,15 +12,10 @@ MASTER_SITES=	http://www.geocities.com/ResearchTriangle/Facility/1468/sg/
 
 MAINTAINER=	domi@saargate.de
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=     ${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		grun.1x
 
-CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index b56b09ffb68b..dc367f55613f 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -15,13 +15,11 @@ MASTER_SITES=	http://www.oz.net/~mattg/
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		gtkfind.1 mktmp.1
-GNU_CONFIGURE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}"
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile
index 6b7dcc1b8511..e329d32c77d0 100644
--- a/misc/snowflake/Makefile
+++ b/misc/snowflake/Makefile
@@ -13,12 +13,8 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin