11 files changed, 18 insertions, 57 deletions

diff --git a/net/amcl/Makefile b/net/amcl/Makefile
index a42c25af6aa7..b8455d393ae7 100644
--- a/net/amcl/Makefile
+++ b/net/amcl/Makefile
@@ -16,12 +16,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}pl1
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 5126ae24bea6..90a9b640d92d 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -16,16 +16,10 @@ MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-snmp=no
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 MAN1=		ethereal.1 tethereal.1 editcap.1
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index 31c8982b32e1..bdec694702a0 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -16,20 +16,15 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=	dima@chg.ru
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 EXTRACT_CMD=	${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 WRKSRC=		${WRKDIR}/GGSD
 
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
 
 do-install:
-
 	${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ggsd
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index a42c25af6aa7..b8455d393ae7 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -16,12 +16,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}pl1
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile
index fca5c5243bca..50de6beb2429 100644
--- a/net/gnubile/Makefile
+++ b/net/gnubile/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	http://gnutella.wego.com/file_depot/0-10000000/110000-120000/11670
 
 MAINTAINER=	klaus.herrmann@gmx.net
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 25c6551d2c55..8c139cbc271b 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -12,14 +12,11 @@ MASTER_SITES=	http://biot.com/gq/download/
 
 MAINTAINER=	roman@xpert.com
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
 
 USE_X_PREFIX=	yes
-
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 CONFIGURE_ARGS=	--with-ldap=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 6dabf901295f..d7b6c6d85716 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -13,12 +13,9 @@ MASTER_SITES=	http://gtk-gnutella.sourceforge.net/download/ \
 
 MAINTAINER=	rbt@zort.on.ca
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/gtkyahoo/Makefile b/net/gtkyahoo/Makefile
index af38ea9e1a62..415e5d4de521 100644
--- a/net/gtkyahoo/Makefile
+++ b/net/gtkyahoo/Makefile
@@ -12,12 +12,8 @@ MASTER_SITES=	http://www.unixtools.org/gtkyahoo/dist/tars/
 
 MAINTAINER=	dannyman@dannyland.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 5126ae24bea6..90a9b640d92d 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -16,16 +16,10 @@ MASTER_SITES=	http://alpha1.linuxberg.com/files/x11/network/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-snmp=no
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 MAN1=		ethereal.1 tethereal.1 editcap.1
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index ff8c6b3fdc33..053a5642f8f1 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -13,19 +13,16 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_MESA=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib \
 		--with-lib-GL
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 DATAFILES=	ndg_files.tar.gz
@@ -33,7 +30,7 @@ DATAFILES=	ndg_files.tar.gz
 MAN1=		xtraceroute.1
 
 post-install:
-		${INSTALL_DATA} ${WRKDIR}/hosts.cache ${PREFIX}/share/xtraceroute
-		${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute
+	${INSTALL_DATA} ${WRKDIR}/hosts.cache ${PREFIX}/share/xtraceroute
+	${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute
 
 .include <bsd.port.mk>
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index d5cf7a048c63..a9fd8142d7b5 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -14,13 +14,9 @@ MASTER_SITES=	http://c64.org/~nr/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin