Implement USE_GTK, part 1.

10 files changed, 24 insertions, 54 deletions

diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 9dbea410fce5..b4bdd13fb6b7 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -13,12 +13,10 @@ DISTNAME=	AutoZen-${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+WRKSRC=		${WRKDIR}/${PORTNAME}-1.2
 
 USE_X_PREFIX=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-MAKE_ENV=	GTK_CONFIG=${GTK_CONFIG}
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.2
+USE_GTK=	yes
 
 DOC_FILES=	CHANGES COPYING
 DATA_FILES=	deep-relax.seq relax.seq test.seq test2.seq test3.seq
@@ -39,4 +37,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/autozen
 .endfor
 .endif
+
 .include <bsd.port.mk>
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index d7965260b457..ed44e1023249 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -15,17 +15,12 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_AUTOMAKE=	yes
 AUTOMAKE=	automake -a -i
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-glibtest --disable-gtktest
 
 pre-configure:
 	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 60ea5c32c97c..ffea2e4c3282 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -13,13 +13,10 @@ MASTER_SITE_SUBDIR=	cpiazza
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 ALL_TARGET=	gmixer
 
+USE_GTK=	yes
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/pixmaps
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index dc40d8751134..cd6e9862c180 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -13,12 +13,9 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-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
+
 ALL_TARGET=	gripnopar gcd
 
 MAN1=		grip.1
diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 90d051c9ba50..830743bd94b6 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -15,15 +15,11 @@ DISTNAME=	${PORTNAME}-source-dgtk_${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		esd.2:${PORTSDIR}/audio/esound
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
+USE_ESOUND=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .if defined(WITH_I18N)
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index f23b86b5d286..cc728fa2e3ee 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -38,16 +38,14 @@ PKGMESSAGE=	${PKGDIR}/MESSAGE
 PLIST_SUB=	TIMID_LIBDIR=${TIMID_LIBDIR}
 DIST_SUBDIR=	timidity
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 TIMID_LIBDIR=	${PREFIX}/lib/timidity
 
 .if ${INTERFACE} == "emacs"
 ELISPDIR=	${PREFIX}/share/emacs/site-lisp
 .elif ${INTERFACE} == "gtk"
 LINK=		gtkmidi
-INTERFACE_DEPS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG} SHLD="gcc -shared"
+USE_GTK=	yes
+CONFIGURE_ENV=	SHLD="gcc -shared"
 .elif ${INTERFACE} == "motif"
 LINK=		xmmidi
 REQUIRES_MOTIF=	yes
diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index 779decd0377c..69e13923b0e1 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -14,21 +14,21 @@ MAINTAINER=	t.vanklaveren@student.utwente.nl
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		xmms.1:${PORTSDIR}/audio/xmms
-RUN_DEPENDS=	${X11BASE}/bin/xmms:${PORTSDIR}/audio/xmms
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 # Vorbis doesn't depend on X, but it's needed for the XMMS plugin :-(
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_AUTOCONF=	yes
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/vorbis
+
+MAN1=	ogg123.1 vorbize.1 oggenc.1
 
 post-build:
 	cd ${WRKSRC}/vorbis-tools/libao && ${SETENV} ${MAKE_ENV} ${MAKE}
 	cd ${WRKSRC}/vorbis-tools && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
-	cd ${WRKSRC}/xmms && ${SETENV} ${MAKE_ENV} ${MAKE} GLIB_CONFIG=${GLIB_CONFIG} GTK_CONFIG=${GTK_CONFIG} target
+	cd ${WRKSRC}/xmms && ${SETENV} ${MAKE_ENV} ${MAKE} target
+
 do-install:
 # Install all vorbis libraries and headers by hand. There is no target for it.
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libvorbis.a ${PREFIX}/lib/
@@ -49,6 +49,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/vorbis/*.h ${PREFIX}/include/vorbis/
 	${INSTALL_DATA} ${WRKSRC}/include/vorbis/book/*.vqh ${PREFIX}/include/vorbis/book/
 
-MAN1=	ogg123.1 vorbize.1 oggenc.1
-
 .include <bsd.port.mk>
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 12da908271e7..153c3b3cea89 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -13,16 +13,11 @@ MASTER_SITE_SUBDIR=	apps/sound/mixers
 
 MAINTAINER=	trevor@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
+USE_GTK=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 MAN1=		xmixer.1
 
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 812ec5edf0b6..830466e97dad 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -14,15 +14,12 @@ DISTNAME=	liveice-xmms
 MAINTAINER=	esk@ira.uka.de
 
 LIB_DEPENDS=	xmms.1:${PORTSDIR}/audio/xmms
-RUN_DEPENDS=	${LOCALBASE}/bin/lame:${PORTSDIR}/audio/lame
+RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 
 WRKSRC=		${WRKDIR}/LiveIce-1.0.0
 
 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/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index e446bada6a45..f605749ebb5e 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -15,11 +15,9 @@ MAINTAINER=	anders@fix.no
 
 LIB_DEPENDS=	xmms.1:${PORTSDIR}/audio/xmms
 
-USE_LIBTOOL=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
+USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>