Implement USE_GNOME, part 1.

25 files changed, 79 insertions, 179 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 2f2bed1ade16..fc309fb6fa29 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -14,26 +14,17 @@ MASTER_SITE_SUBDIR=	unstable/sources/bonobo
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gnomeprint.12:${PORTSDIR}/print/gnomeprint \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+LIB_DEPENDS=	gnomeprint.12:${PORTSDIR}/print/gnomeprint \
 		oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libefs/configure
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -14,14 +14,12 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -14,14 +14,12 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index ec9caf4f7e44..d20427919e0b 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -14,14 +14,12 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 621e0b84dc7b..bec890d21515 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -14,26 +14,17 @@ DISTNAME=	GConf-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		guile.9:${PORTSDIR}/lang/guile \
 		oaf.0:${PORTSDIR}/devel/oaf \
 		iconv.1:${PORTSDIR}/converters/iconv
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
+USE_GNOME=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
 pre-patch:
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 621e0b84dc7b..bec890d21515 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -14,26 +14,17 @@ DISTNAME=	GConf-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		guile.9:${PORTSDIR}/lang/guile \
 		oaf.0:${PORTSDIR}/devel/oaf \
 		iconv.1:${PORTSDIR}/converters/iconv
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
+USE_GNOME=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
 pre-patch:
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 12d3a3ee6cd3..baa952b41160 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -13,19 +13,14 @@ MASTER_SITE_SUBDIR=	unstable/sources/gIDE
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		guile.9:${PORTSDIR}/lang/guile
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gide.1 gdbio.1
@@ -34,12 +29,12 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		 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}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-post-patch:
 	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
 
diff --git a/devel/gide/files/patch-bb b/devel/gide/files/patch-bb
index 28789b97b335..dc537e6b474f 100644
--- a/devel/gide/files/patch-bb
+++ b/devel/gide/files/patch-bb
@@ -12,25 +12,3 @@
  if eval "test \"`echo '$''{'am_cv_gnu_regex'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5163,15 +5164,15 @@
- fi
- 
-         
--	USE_INCLUDED_LIBINTL=yes
-+	USE_INCLUDED_LIBINTL=no
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
-         DATADIRNAME=share
--	INTLDEPS='$(top_builddir)/intl/libintl.a'
--	INTLLIBS=$INTLDEPS
--	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
--        nls_cv_header_intl=intl/libintl.h
--        nls_cv_header_libgt=intl/libgettext.h
-+	INTLDEPS=
-+	INTLLIBS=
-+	LIBS='-lintl'
-+        nls_cv_header_intl=
-+        nls_cv_header_libgt=
-       fi
- 
-             if test "$XGETTEXT" != ":"; then
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index cbf755a0f200..46540636d01a 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR=	stable/sources/glade
 
 MAINTAINER=     ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 FETCH_BEFORE_ARGS=	-b
 
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/libs"
 
+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}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 0b3b4f6c7b1b..8db740474c64 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -139,7 +139,6 @@ share/locale/uk/LC_MESSAGES/glade.mo
 @dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
 @dirrm share/glade/gtk
 @dirrm share/glade/gnome
 @dirrm share/glade
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index cbf755a0f200..46540636d01a 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR=	stable/sources/glade
 
 MAINTAINER=     ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 FETCH_BEFORE_ARGS=	-b
 
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/libs"
 
+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}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 0b3b4f6c7b1b..8db740474c64 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -139,7 +139,6 @@ share/locale/uk/LC_MESSAGES/glade.mo
 @dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
 @dirrm share/glade/gtk
 @dirrm share/glade/gnome
 @dirrm share/glade
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -14,25 +14,17 @@ DISTNAME=	gnome-vfs-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-gconf
+CONFIGURE_ARGS=	--disable-gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN5=		gnome-vfs-mime.5
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -14,25 +14,17 @@ DISTNAME=	gnome-vfs-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-gconf
+CONFIGURE_ARGS=	--disable-gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN5=		gnome-vfs-mime.5
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -14,25 +14,17 @@ DISTNAME=	gnome-vfs-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-gconf
+CONFIGURE_ARGS=	--disable-gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN5=		gnome-vfs-mime.5
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index b8cbc8c87707..04ca4cbacf94 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -14,25 +14,17 @@ DISTNAME=	gnome-vfs-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
+LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALL_SHLIBS=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-gconf
+CONFIGURE_ARGS=	--disable-gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN5=		gnome-vfs-mime.5
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 49657e41be92..65b3f6e1fda8 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -14,24 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		gmc:${PORTSDIR}/x11-fm/gnomemc
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS=	oaf.0:${PORTSDIR}/devel/oaf
+RUN_DEPENDS=	gmc:${PORTSDIR}/x11-fm/gnomemc
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gtranslator.1
 
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 172e7d4c2ccb..c4beaba3469b 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -13,17 +13,14 @@ MASTER_SITE_SUBDIR=	stable/sources/libglade
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index 83ac017513a8..ca9e9529d029 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -7,7 +7,8 @@
 -SUBDIRS = intl po macros glade doc
 +SUBDIRS = intl po macros glade
  
- m4datadir = $(datadir)/aclocal
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libglade.m4
  
 -confexecdir = $(libdir)
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 172e7d4c2ccb..c4beaba3469b 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -13,17 +13,14 @@ MASTER_SITE_SUBDIR=	stable/sources/libglade
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index 83ac017513a8..ca9e9529d029 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -7,7 +7,8 @@
 -SUBDIRS = intl po macros glade doc
 +SUBDIRS = intl po macros glade
  
- m4datadir = $(datadir)/aclocal
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libglade.m4
  
 -confexecdir = $(libdir)
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 27fe508006a6..75d5749b66b0 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -13,18 +13,15 @@ MASTER_SITE_SUBDIR=	stable/sources/libgtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		guile.9:${PORTSDIR}/lang/guile
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 27fe508006a6..75d5749b66b0 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -13,18 +13,15 @@ MASTER_SITE_SUBDIR=	stable/sources/libgtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		guile.9:${PORTSDIR}/lang/guile
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index eb527a624bbb..127fc7423c9c 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -12,18 +12,20 @@ MASTER_SITES=	http://home.earthlink.net/~nawalker/pharmacy/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
+CONFIGURE_ENV+=	CPPCFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+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}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/devel/pharmacy/pkg-plist b/devel/pharmacy/pkg-plist
index 848c8bccfda5..a61bd4fcd76a 100644
--- a/devel/pharmacy/pkg-plist
+++ b/devel/pharmacy/pkg-plist
@@ -11,7 +11,7 @@ share/gnome/help/pharmacy/C/topic.dat
 share/gnome/help/pharmacy/C/update.html
 share/gnome/help/pharmacy/C/using.html
 share/gnome/help/pharmacy/C/web.html
-share/pixmaps/pharmacy.png
+share/gnome/pixmaps/pharmacy.png
 share/locale/de/LC_MESSAGES/pharmacy.mo
 share/locale/fr/LC_MESSAGES/pharmacy.mo
 share/locale/ko/LC_MESSAGES/pharmacy.mo