Implement USE_GTK, part 2.

13 files changed, 13 insertions, 74 deletions

diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 77a5621711e4..f85cfe2bdead 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -12,15 +12,10 @@ MASTER_SITES=	http://reality.sgi.com/offer/src/buffy/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 FETCH_BEFORE_ARGS=	-b
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index 65e56edb9943..e1d7b00547da 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -12,16 +12,11 @@ MASTER_SITES=	http://progen.dynodns.net/dengen/cleantheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
+USE_GTK=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 591d3fad87b5..448d973cfd9c 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -14,15 +14,10 @@ DISTNAME=	ColorStep-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.5
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index aa3293d2eea0..a44d6e701c8f 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -14,16 +14,11 @@ DISTNAME=	EnGradient-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 1c54bbbccc8a..39d49e0cb69a 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -13,14 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index fa55b76d6ccd..86c6bacfaddd 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -14,16 +14,11 @@ DISTNAME=	Mac2-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 83c5ecc1320d..f8d46d24ab9c 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -14,16 +14,11 @@ DISTNAME=	GTK-Be-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 11c822e96bf3..131f431cb2f3 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -14,15 +14,10 @@ DISTNAME=	${PORTNAME}-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 8a8c69f5a4aa..7f2358477d35 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -12,13 +12,9 @@ MASTER_SITES=	http://ulli.linuxave.net/gtkstep/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/pkg-plist b/x11-themes/gtkstep/pkg-plist
index 05941a6dad6d..813409b1de80 100644
--- a/x11-themes/gtkstep/pkg-plist
+++ b/x11-themes/gtkstep/pkg-plist
@@ -1,6 +1,6 @@
+lib/gtk/themes/engines/libstep.so
 share/themes/Step/ICON.png
 share/themes/Step/README.html
 share/themes/Step/gtk/gtkrc
-lib/gtk/themes/engines/libstep.so
 @dirrm share/themes/Step/gtk
 @dirrm share/themes/Step
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index cdd5b4c899e1..a440908a942f 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -15,16 +15,11 @@ DISTNAME=	IceGradient-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.2
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index cec85d690e51..69dc7dcc49c7 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -13,13 +13,8 @@ DISTNAME=	gtk-${PORTNAME}-theme-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-
 .include <bsd.port.mk>
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index a3e856502db7..f038f5a6c4e4 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -13,15 +13,8 @@ DISTNAME=	Xenophilia-${PORTVERSION}
 
 MAINTAINER=	sobomax@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
 ALL_TARGET=	# empty
 
-pre-install:
-		@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
-
 .include <bsd.port.mk>