14 files changed, 34 insertions, 18 deletions

diff --git a/security/crank/Makefile b/security/crank/Makefile
index ae049ea876fe..33b438a52b02 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 GUILE_CONFIG=	${LOCALBASE}/bin/guile-config
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${GUILE_CONFIG} compile`" \
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 015fc69ef9d9..97bed6de1d84 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 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/security/gpasman/Makefile b/security/gpasman/Makefile
index 28a93eae302c..5e87692d77dd 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	domi@saargate.de
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
 
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index 4d1807f67a70..cdbbb4bb3012 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	pat@FreeBSD.org
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 MAN1=		gtk-knocker.1
 
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index 571e64eb5285..09987306232d 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 43c5e65d7877..2294e548d5c4 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 43c5e65d7877..2294e548d5c4 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 43c5e65d7877..2294e548d5c4 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 6016d8627adb..b95e2f455526 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -27,12 +27,14 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
 USE_LIBTOOL=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 17b0f6d46b6b..fdc2dbde57f8 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -27,12 +27,14 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
 USE_LIBTOOL=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 174c1959a030..5864cb4ddeea 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -12,7 +12,8 @@ PORTNAME=	nmapfe
 
 RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALL_TARGET=	install-nmapfe
 MAN1=		nmapfe.1 xnmap.1
 
diff --git a/security/ssh-gui/Makefile b/security/ssh-gui/Makefile
index 6cee389c4ca6..6493c9287137 100644
--- a/security/ssh-gui/Makefile
+++ b/security/ssh-gui/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	hmendes@brturbo.com
 
 RUN_DEPENDS=	ssh:${PORTSDIR}/security/openssh
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	ssh-gui
 
 DOC_FILES=	README
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index cdad09c027f8..1c5f3e552ec6 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -25,7 +25,8 @@ MAN1=		stegdetect.1 stegbreak.1
 .if defined(WITHOUT_X11)
 PLIST_SUB+=	X11="@comment "
 .else
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}"
 PLIST_SUB+=	X11=""
 .endif
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 174c1959a030..5864cb4ddeea 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -12,7 +12,8 @@ PORTNAME=	nmapfe
 
 RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALL_TARGET=	install-nmapfe
 MAN1=		nmapfe.1 xnmap.1