Implement USE_GTK, part 1.

16 files changed, 58 insertions, 95 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index a0d8322fdaac..4c0ac50f8031 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -14,20 +14,17 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 ONLY_FOR_ARCHS=	i386
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+INSTALL_TARGET=	bininstall
 
 USE_XLIB=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-asm
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -pedantic" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-asm
-INSTALL_TARGET=	bininstall
 
 MAN1=		cqcam.1
 MLINKS=		cqcam.1 webcam.1 \
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index cbbeaaba9ddc..ae28b6392d22 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -7,17 +7,20 @@
 
 PORTNAME=	gcolor
 PORTVERSION=	0.4
-CATEGORIES=	graphics gnome x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-
 USE_X_PREFIX=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gcolor/pkg-comment b/graphics/gcolor/pkg-comment
index 1926879f1673..33e13d8dee22 100644
--- a/graphics/gcolor/pkg-comment
+++ b/graphics/gcolor/pkg-comment
@@ -1 +1 @@
-GNOME-based color picker
+GTK-based color picker
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 3299b7086735..feeb40880a3a 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	gtkDPS-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
+RUN_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
-CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
-		--with-dps-libraries=${X11BASE}/lib
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
+		--with-dps-libraries=${X11BASE}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index 7371ca268054..d407433db7d4 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -13,12 +13,8 @@ MASTER_SITES=	ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
 
 MAINTAINER=	dirk@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}"
 
 .include <bsd.port.mk>
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index cdd92ad5b079..30bf9cc6ca5d 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -13,18 +13,16 @@ MASTER_SITES=	http://hotaru.clinuxworld.com/gtksee/ \
 
 MAINTAINER=	dirk@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip \
 		bzip2:${PORTSDIR}/archivers/bzip2
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${PREFIX}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LDFLAGS=-L${PREFIX}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/graphics/gxanim/Makefile b/graphics/gxanim/Makefile
index d21487b28ed8..3c80a02ca56d 100644
--- a/graphics/gxanim/Makefile
+++ b/graphics/gxanim/Makefile
@@ -13,14 +13,10 @@ MASTER_SITE_SUBDIR=	fenner
 
 MAINTAINER=	rbt@zort.on.ca
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
-GTK_CONFIG= 	${X11BASE}/bin/gtk12-config
-
-USE_XLIB=	yes
-
 USE_BZIP2=	yes
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_XLIB=	yes
+USE_GTK=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f108ba488e84..1ae7fe824d35 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -15,22 +15,16 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib \
-		--disable-gtktest
 
 pre-configure:
 	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
index ed31cf167d97..8f53b916c5cb 100644
--- a/graphics/imlib/files/patch-ab
+++ b/graphics/imlib/files/patch-ab
@@ -1,5 +1,5 @@
---- ./imlib-config.in.org	Thu Aug 26 08:09:25 1999
-+++ ./imlib-config.in	Fri Mar  3 11:08:41 2000
+--- imlib-config.in.org	Thu Aug 26 08:09:25 1999
++++ imlib-config.in	Fri Mar  3 11:08:41 2000
 @@ -3,7 +3,7 @@
  # Shamelessly ripped form gtk's gtk-config.in
  #
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index f108ba488e84..1ae7fe824d35 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -15,22 +15,16 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib \
-		--disable-gtktest
 
 pre-configure:
 	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f108ba488e84..1ae7fe824d35 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -15,22 +15,16 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib \
-		--disable-gtktest
 
 pre-configure:
 	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 0be0865f8056..46f183b00564 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR=	apps/graphics/capture
 
 MAINTAINER= 	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtktest
-INSTALLS_SHLIB=	yes
 
 MAN1=	saned.1 scanimage.1 xcam.1 xscanimage.1
 MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 0be0865f8056..46f183b00564 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR=	apps/graphics/capture
 
 MAINTAINER= 	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtktest
-INSTALLS_SHLIB=	yes
 
 MAN1=	saned.1 scanimage.1 xcam.1 xscanimage.1
 MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 0be0865f8056..46f183b00564 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR=	apps/graphics/capture
 
 MAINTAINER= 	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtktest
-INSTALLS_SHLIB=	yes
 
 MAN1=	saned.1 scanimage.1 xcam.1 xscanimage.1
 MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile
index 5f3d7dccdaaa..076823110601 100644
--- a/graphics/smpeg/Makefile
+++ b/graphics/smpeg/Makefile
@@ -16,16 +16,15 @@ MASTER_SITES=	ftp://ftp.lokigames.com/pub/open-source/smpeg/ \
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=  	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=  	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
 
-GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
-GNU_CONFIGURE=	yes
+
 USE_GMAKE=	yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		SDL_CONFIG="${SDL_CONFIG}" \
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		GLBASE="${X11BASE}" \
 		CPPFLAGS="-I${X11BASE}/include"
 
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a2000a58bad1..b143ade1b448 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -14,24 +14,28 @@ MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/ \
 
 MAINTAINER=	domi@saargate.de
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
 		sane.1:${PORTSDIR}/graphics/sane \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		png.4:${PORTSDIR}/graphics/png
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 USE_AUTOCONF=	yes
+CONFIGURE_ARGS=	--enable-intl-patch
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-intl-patch
 
 MAN1=		xsane.1
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/aclocal.m4
+
 post-install:
 	@${CAT} ${PKGMESSAGE}