Updates for new shared library versions in GNOME 1.2

85 files changed, 131 insertions, 150 deletions

diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 64b56af..9a5e776 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.faradic.net/~jasta/files/
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 9437996..87ccfd1 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtracker
 PORTVERSION=	0.5.3
-CATEGORIES=	audio
+CATEGORIES=	audio gnome
 MASTER_SITES=	ftp://ftp.soundtracker.org/pub/soundtracker/v0.5/
 
 MAINTAINER=	kzentner@u.washington.edu
@@ -15,7 +15,7 @@ MAINTAINER=	kzentner@u.washington.edu
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 .if defined(USE_GNOME)
-LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 30bd24ad..c7e38a6 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	http://download.sourceforge.net/yamt/ \
 
 MAINTAINER=	dima@Chg.RU
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/deskutils/bulb/Makefile b/deskutils/bulb/Makefile
index b576bfd..b19b416 100644
--- a/deskutils/bulb/Makefile
+++ b/deskutils/bulb/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	http://www.idiap.ch/~gobry/bulb/
 
 MAINTAINER=	smoberly@xavier.dyndns.org
 
-LIB_DEPENDS=	panel_applet.2:${PORTSDIR}/x11/gnomecore \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index 45fe98e..2c09365 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gaddr
 PORTVERSION=	1.1.4
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.cse.unl.edu/~cluening/gaddr/
 
 MAINTAINER=	jim@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index cfadce6..6b57c39 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -22,8 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index c36e570..fbff497 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gnofin
 PORTVERSION=	0.8.0
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://download.sourceforge.net/gnofin/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile
index 75a29c9..3b738db 100644
--- a/deskutils/gnucash/Makefile
+++ b/deskutils/gnucash/Makefile
@@ -8,17 +8,14 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.3.4
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12 \
-		gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		guile.6:${PORTSDIR}/lang/guile
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index 330ceb2..eb9d7ec 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://home.ins.de/~m.hussmann/software/yank/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index ea69e26..9f48906 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	unstable/sources/bonobo
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 48e13fd..6236c26 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	unstable/sources/gIDE
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.3:${PORTSDIR}/devel/libglade \
 		guile.6:${PORTSDIR}/lang/guile
 
diff --git a/devel/gide/pkg-plist b/devel/gide/pkg-plist
index e335451..db7be59 100644
--- a/devel/gide/pkg-plist
+++ b/devel/gide/pkg-plist
@@ -26,7 +26,6 @@ share/locale/ja/LC_MESSAGES/gide.mo
 @dirrm share/gnome/gide/glade
 @dirrm share/gnome/gide/extra
 @dirrm share/gnome/gide
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
 @dirrm lib/gide/plugins/%%VERSION%%
 @dirrm lib/gide/plugins
 @dirrm lib/gide
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index ebed89f8..a570df4 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gob
-PORTVERSION= 	0.93.5
+PORTVERSION= 	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.5z.com/pub/gob/
 
diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo
index 88ac540..b877386 100644
--- a/devel/gob2/distinfo
+++ b/devel/gob2/distinfo
@@ -1 +1 @@
-MD5 (gob-0.93.5.tar.gz) = ed21a59073e0edf6d6e858a914d84a59
+MD5 (gob-1.0.0.tar.gz) = 353c10d6bf94c835ade466061858bc90
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index c2b89dd..24bbe73b 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libproplist
 PORTVERSION=	0.10.1
-CATEGORIES=	devel gnome
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	libs
 DISTNAME=	libPropList-${PORTVERSION}
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 5758bd4..eb527a6 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://home.earthlink.net/~nawalker/pharmacy/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 3f25bc7..e02a0ba 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dedit
 PORTVERSION=	0.5.6
-CATEGORIES=	editors
+CATEGORIES=	editors gnome
 MASTER_SITES=	ftp://ftp.debian.org/debian/dists/unstable/main/source/editors/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	iconv.0:${PORTSDIR}/converters/iconv \
-		gnome.3:${PORTSDIR}/x11/gnomelibs
+		gnome.4:${PORTSDIR}/x11/gnomelibs
 BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 
 WRKSRC=		${WRKDIR}/dedit-0.5.6
@@ -25,8 +25,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASSE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index de51431..ddc10dd 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.sourceforge.net/gedit/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gnomeprint.9:${PORTSDIR}/print/gnomeprint
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index de51431..ddc10dd 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.sourceforge.net/gedit/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gnomeprint.9:${PORTSDIR}/print/gnomeprint
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 89e7002..c09ba26 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnotepad+
 PORTVERSION=	1.3.0
-CATEGORIES=	editors www
+CATEGORIES=	editors www gnome
 MASTER_SITES=	http://download.sourceforge.net/gnotepad/
 .if !defined(NOPORTDOCS)
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -16,7 +16,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	brett@peloton.runet.edu
 
-LIB_DEPENDS=    gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=    gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index c36e570..fbff497 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gnofin
 PORTVERSION=	0.8.0
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://download.sourceforge.net/gnofin/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 75a29c9..3b738db 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -8,17 +8,14 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.3.4
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12 \
-		gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		guile.6:${PORTSDIR}/lang/guile
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 75a29c9..3b738db 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,17 +8,14 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.3.4
-CATEGORIES=	deskutils
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12 \
-		gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		guile.6:${PORTSDIR}/lang/guile
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index efda117..8341110 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -5,26 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gtm
-PORTVERSION=		0.3.1
-CATEGORIES=		ftp gnome
-MASTER_SITES=		http://www.rnl.ist.utl.pt/~bapm/gtm/files/     \
-			http://www.nectar.cc/distfiles/
+PORTNAME=	gtm
+PORTVERSION=	0.3.1
+CATEGORIES=	ftp gnome
+MASTER_SITES=	http://www.rnl.ist.utl.pt/~bapm/gtm/files/     \
+		http://www.nectar.cc/distfiles/
 
-MAINTAINER=		nectar@FreeBSD.org
+MAINTAINER=	nectar@FreeBSD.org
 
-# wget is in BUILD_DEPENDS because the configure script checks for it
-LIB_DEPENDS=		gnome.3:${PORTSDIR}/x11/gnomelibs               \
-			capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
-BUILD_DEPENDS=		wget:${PORTSDIR}/ftp/wget
-RUN_DEPENDS=		wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+BUILD_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
-GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-USE_X_PREFIX=		YES
-USE_GMAKE=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ENV=		GTK_CONFIG="${GTK_CONFIG}"
-CONFIGURE_ARGS=		--datadir=${PREFIX}/share/gnome
+USE_X_PREFIX=	YES
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 
 .include <bsd.port.mk>
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 6082f29..4888065 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	jm-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gnet.0:${PORTSDIR}/net/gnet \
 		popt.0:${PORTSDIR}/devel/popt \
 		glade.3:${PORTSDIR}/devel/libglade
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index d16e5b3..4cf7992 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	atomix
 PORTVERSION=	0.2.0.1
-CATEGORIES=	games
+CATEGORIES=	games gnome
 MASTER_SITES=	http://www.informatik.uni-oldenburg.de/~pearl/download/
 DISTNAME=	atomix-0.2.0-1
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 714fa80..1b8f341 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	gLife-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.3:${PORTSDIR}/devel/libglade
 
 USE_X_PREFIX=	yes
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e2218e2..fb0436c 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	gno3dtet
 PORTVERSION=	1.6.0
-CATEGORIES=	games
+CATEGORIES=	games gnome
 MASTER_SITES=	ftp://webdat.com/pub/seb/gno3dtet/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GNOME_CONFIG?=	${X11BASE}/bin/gnome-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 737a6d2..4ee7d09 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,13 +6,13 @@
 
 PORTNAME=	gtetrinet
 PORTVERSION=	0.4
-CATEGORIES=	games
+CATEGORIES=	games gnome
 MASTER_SITES=	ftp://ftp.netis.com/pub/mirrors1/linuxberg/files/gnome/entertain/ \
 		ftp://ftp.sunsite.auc.dk/disk1/linuxberg.com/files/gnome/entertain/
 
 MAINTAINER=	bugg@bugg.strangled.net
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG=	"${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index ad0caee..66fa0f4 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	diacanvas
 PORTVERSION=	0.40.1
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.linuxstart.com/~arjan/diacanvas/download/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 5377b79..3d5b04d 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_GMAKE=	yes
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 5377b79..3d5b04d 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_GMAKE=	yes
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 849c46c..58a58cf 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.sourceforge.net/gcolor/
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 USE_X_PREFIX=	yes
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index e276012..c716b86 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index e276012..c716b86 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index e276012..c716b86 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index e276012..c716b86 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index e276012..c716b86 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index e276012..c716b86 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.1.23
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
 		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -66,7 +66,7 @@ pre-fetch:
 
 .if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
     && !defined(WITHOUT_GNOME))
-LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
 pre-install:
 	@${CAT} ${PLISTORIG} > ${PLIST}
 .else
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 72a8f8f..c16d949 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gnofract4d
 PORTVERSION=	1.2
-CATEGORIES=	graphics
+CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.sourceforge.net/gnofract4d/
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index e5942e76..0b3ed7e 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	gnome-iconedit-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_GMAKE=	yes
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 8f867d4..cf4b79a 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.sourceforge.net/sodipodi/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.3:${PORTSDIR}/devel/libglade \
 		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
@@ -25,8 +25,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index c8a59be..dce1840 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	BitchX
 PORTVERSION=	1.0c16
-CATEGORIES=	irc
+CATEGORIES=	irc gnome
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://ukug.uk.freebsd.org/pub/lord_cj/
 
 MAINTAINER=	calle.madestrand@norrgarden.se
 
 .if defined(WITH_GNOME)
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 885980f..1251123 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irssi
 PORTVERSION=	0.7.28-3
-CATEGORIES=	irc ipv6
+CATEGORIES=	irc ipv6 gnome
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
 
 MAINTAINER=	jim@FreeBSD.org
@@ -15,7 +15,7 @@ MAINTAINER=	jim@FreeBSD.org
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		PropList.2:${PORTSDIR}/devel/libPropList
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 885980f..1251123 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irssi
 PORTVERSION=	0.7.28-3
-CATEGORIES=	irc ipv6
+CATEGORIES=	irc ipv6 gnome
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
 
 MAINTAINER=	jim@FreeBSD.org
@@ -15,7 +15,7 @@ MAINTAINER=	jim@FreeBSD.org
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		PropList.2:${PORTSDIR}/devel/libPropList
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile
index 1a68264..58a727e 100644
--- a/irc/xchat-devel/Makefile
+++ b/irc/xchat-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.5.2
-CATEGORIES=		irc
+CATEGORIES=		irc gnome
 MASTER_SITES=		http://xchat.org/files/source/1.5/ \
 			http://xchat.linuxpower.org/files/source/1.5/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 			Imlib.5:${PORTSDIR}/graphics/imlib
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 1a68264..58a727e 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.5.2
-CATEGORIES=		irc
+CATEGORIES=		irc gnome
 MASTER_SITES=		http://xchat.org/files/source/1.5/ \
 			http://xchat.linuxpower.org/files/source/1.5/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 			Imlib.5:${PORTSDIR}/graphics/imlib
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 1a68264..58a727e 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.5.2
-CATEGORIES=		irc
+CATEGORIES=		irc gnome
 MASTER_SITES=		http://xchat.org/files/source/1.5/ \
 			http://xchat.linuxpower.org/files/source/1.5/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 			Imlib.5:${PORTSDIR}/graphics/imlib
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 1a68264..58a727e 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.5.2
-CATEGORIES=		irc
+CATEGORIES=		irc gnome
 MASTER_SITES=		http://xchat.org/files/source/1.5/ \
 			http://xchat.linuxpower.org/files/source/1.5/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 			Imlib.5:${PORTSDIR}/graphics/imlib
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 1a68264..58a727e 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.5.2
-CATEGORIES=		irc
+CATEGORIES=		irc gnome
 MASTER_SITES=		http://xchat.org/files/source/1.5/ \
 			http://xchat.linuxpower.org/files/source/1.5/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 			Imlib.5:${PORTSDIR}/graphics/imlib
 .if defined(WITH_GNOME)
-LIB_DEPENDS+=		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 07b8bb7..7ab2c38 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --with-english-keyboard=dvorak
 .if defined(WITH_GNOME_APPLET)
 PKGNAMESUFFIX=	-gnome
 RUN_DEPENDS+=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS+=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
 CONFIGURE_ARGS+= --enable-gnome-applet
 .endif
 
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 0030ff4..fa70459 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.newton.cx/pub/balsa/ \
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0030ff4..fa70459 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.newton.cx/pub/balsa/ \
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index e6bba9e..c45349b 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbuffy
 PORTVERSION= 	0.2.2
-CATEGORIES=	mail gnome
+CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/
 
 MAINTAINER=	kaj@Raditex.se
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index aa22428..cc12ca7 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://glacier.linuxave.net/
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 0ee09eb..fa17130 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grpn
 PORTVERSION=	1.1.1
-CATEGORIES=	math gnome
+CATEGORIES=	math
 MASTER_SITES=	http://wilkins.ne.mediaone.net/grpn/
 
 MAINTAINER=	jedgar@fxp.org
diff --git a/math/rcalc/Makefile b/math/rcalc/Makefile
index 1a3c053..c76b357 100644
--- a/math/rcalc/Makefile
+++ b/math/rcalc/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	rCalc-${PORTVERSION}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 6f10e63..2f4252a 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=		nectar@FreeBSD.org
 
-LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=		panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
 
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 6f10e63..2f4252a 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=		nectar@FreeBSD.org
 
-LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=		panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
 
diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index d38be01..15c972b 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	http://gnomba.darkcorner.net/tars/ \
 
 MAINTAINER=	dima@Chg.RU
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index ff1932d..d60a18e 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gnome-vnc
 PORTVERSION=	0.1
-CATEGORIES= 	net
+CATEGORIES= 	net gnome
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/gnome/
 
 MAINTAINER=	domi@saargate.de
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 6f10e63..2f4252a 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=		nectar@FreeBSD.org
 
-LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=		panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
 
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 6f10e63..2f4252a 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=		nectar@FreeBSD.org
 
-LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=		panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
 
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 6f10e63..2f4252a 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
 
 MAINTAINER=		nectar@FreeBSD.org
 
-LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=		panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
 
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index 492c4d2..2ffd95d 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gnosamba
 PORTVERSION=	0.3.3
-CATEGORIES=	net
+CATEGORIES=	net gnome
 MASTER_SITES=	http://www.open-systems.com/gnosamba/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/news/pan/Makefile b/news/pan/Makefile
index c684ca9..144afe9 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://source.rebelbase.com/pub/pan/${PORTVERSION}/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index c684ca9..144afe9 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://source.rebelbase.com/pub/pan/${PORTVERSION}/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 0c882b3..61735b3 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
 		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 67b9f2b..4226912 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index 0c882b3..61735b3 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
 		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index 0c882b3..61735b3 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	gnome-pilot-conduits-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter \
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
 		gpilotd.0:${PORTSDIR}/palm/gnomepilot
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 67b9f2b..4226912 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 67b9f2b..4226912 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	pisock.3:${PORTSDIR}/palm/pilot-link \
-		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/sysutils/guitar/Makefile b/sysutils/guitar/Makefile
index fcdca69..46c4527 100644
--- a/sysutils/guitar/Makefile
+++ b/sysutils/guitar/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}"
 .if defined(NO_GNOME)
 CONFIGURE_ARGS	+=	--disable-gnome
 .else
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 do-install:
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index b174ca2..2fc1a2e 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	jeremy@external.org
 
 BUILD_DEPENDS=	${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
 .if defined(WITH_GNOME)
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
 .if defined(WITH_GNOME)
diff --git a/textproc/gaspell/Makefile b/textproc/gaspell/Makefile
index 14e8b9a..4e7e465 100644
--- a/textproc/gaspell/Makefile
+++ b/textproc/gaspell/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-.29.1
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
+RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
 
 USE_NEWGCC=	yes
 ALL_TARGET=	gaspell
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 64112dc..8e3dd89 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.ainet.or.jp/~inoue/software/gtkdiff/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index b540a7c..00ed5aa 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://peacock.sourceforge.net/sources/
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index ebed89f8..a570df4 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gob
-PORTVERSION= 	0.93.5
+PORTVERSION= 	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.5z.com/pub/gob/
 
diff --git a/x11-toolkits/gob/distinfo b/x11-toolkits/gob/distinfo
index 88ac540..b877386 100644
--- a/x11-toolkits/gob/distinfo
+++ b/x11-toolkits/gob/distinfo
@@ -1 +1 @@
-MD5 (gob-0.93.5.tar.gz) = ed21a59073e0edf6d6e858a914d84a59
+MD5 (gob-1.0.0.tar.gz) = 353c10d6bf94c835ade466061858bc90
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index fcc954c..6187300 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 .if !defined(NOGNOME)
 LIB_DEPENDS+=	glade.3:${PORTSDIR}/devel/libglade \
-		gnome.3:${PORTSDIR}/x11/gnomelibs
+		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 BUILD_DEPENDS=	rep:${PORTSDIR}/lang/librep
 
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index fcc954c..6187300 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 .if !defined(NOGNOME)
 LIB_DEPENDS+=	glade.3:${PORTSDIR}/devel/libglade \
-		gnome.3:${PORTSDIR}/x11/gnomelibs
+		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 BUILD_DEPENDS=	rep:${PORTSDIR}/lang/librep
 
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile
index c8cabcf..f71f4e1 100644
--- a/x11-wm/gnome2wmaker/Makefile
+++ b/x11-wm/gnome2wmaker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome2wmaker
 PORTVERSION= 	1.2
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	http://ulli.linuxbox.com/gnome2wmaker/
 
 MAINTAINER=     reg@FreeBSD.org
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index cbe0fcf..78b6bda 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		Imlib.5:${PORTSDIR}/graphics/imlib \
 		rep.8:${PORTSDIR}/lang/librep
 .if !defined(NOGNOME)
-LIB_DEPENDS+=	capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+LIB_DEPENDS+=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
 .endif
 BUILD_DEPENDS=	${LOCALBASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${LOCALBASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index cbe0fcf..78b6bda 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		Imlib.5:${PORTSDIR}/graphics/imlib \
 		rep.8:${PORTSDIR}/lang/librep
 .if !defined(NOGNOME)
-LIB_DEPENDS+=	capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
+LIB_DEPENDS+=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
 .endif
 BUILD_DEPENDS=	${LOCALBASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${LOCALBASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk