35 files changed, 224 insertions, 58 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 5b263186e185..59a80beb5172 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sound-juicer
 PORTVERSION=	0.5.10.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
@@ -20,7 +20,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui gstreamerplugins
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 
 pre-everything::
diff --git a/audio/sound-juicer/files/patch-configure b/audio/sound-juicer/files/patch-configure
new file mode 100644
index 000000000000..9c7f97921521
--- /dev/null
+++ b/audio/sound-juicer/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Mar 13 11:06:49 2004
++++ configure	Sat Mar 13 11:07:45 2004
+@@ -6889,7 +6889,7 @@
+ HAVE_GSTREAMER=no
+ 
+ # Look for 0.7
+-GST_MAJORMINOR=0.7
++GST_MAJORMINOR=0.8
+ 
+   succeeded=no
+ 
diff --git a/audio/sound-juicer/pkg-descr b/audio/sound-juicer/pkg-descr
index d2fe92826282..ec4721433982 100644
--- a/audio/sound-juicer/pkg-descr
+++ b/audio/sound-juicer/pkg-descr
@@ -1,5 +1,5 @@
 Sound Juicer is a clean, mean and lean CD ripper for GNOME2.
-It supports a clean interface and simple preferences, aiming
+It provides a clean interface and simple preferences, aiming
 to do The Right Thing and What You Mean all of the time.
 
 WWW: http://www.burtonini.com/blog/computers/sound-juicer/
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 6ecd3130ffef..90bd18bc1e2a 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,5 +1,6 @@
 bin/sound-juicer
 etc/gconf/gconf.xml.defaults/apps/sound-juicer/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/sound-juicer/%gconf.xml
 etc/gconf/schemas/sound-juicer.schemas
 share/gnome/applications/sound-juicer.desktop
 share/gnome/help/sound-juicer/C/fdl-appendix.xml
@@ -17,5 +18,6 @@ share/gnome/sound-juicer/sound-juicer.glade
 @dirrm share/gnome/help/sound-juicer/C/figures
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/sound-juicer
 @dirrm etc/gconf/gconf.xml.defaults/apps/sound-juicer
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf 2>/dev/null || /usr/bin/true
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index c4443bb97f2e..1d10d5f61a9a 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-hacker-tools
-PORTVERSION=	2.6.0
+PORTVERSION=	2.5.92
 CATEGORIES=	devel gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 736ac527c6a4..5a599925c6fe 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.3.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -21,10 +21,15 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget lthack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|gedit-2.4|gedit-2.6|g" \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile
index 3b1efac93c5e..b78950ce842a 100644
--- a/editors/gnome2-office/Makefile
+++ b/editors/gnome2-office/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-office
-PORTVERSION=	2.6.0
+PORTVERSION=	2.5.92
 CATEGORIES=	editors gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 1e34cb6e0166..85b394b4616c 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gtetrinet
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -29,6 +29,6 @@ MAN6=		gtetrinet.6
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]prefix[)]/games|{bindir}|g'
+		's|[(]prefix[)]/games|{bindir}|g; /_DISABLE_DEPRECATED/d'
 
 .include <bsd.port.mk>
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 38f783da312d..9fcf72a0b40a 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	monkeybubble
 PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	games gnome
 #MASTER_SITES=	http://monkey-bubble.tuxfamily.org/ #OMG where did the website go?!?!
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -19,6 +19,7 @@ COMMENT=	GTK2 Puzzle Bobble clone with monkeys
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix librsvg2 libgnomeui \
 		gstreamerplugins intlhack lthack
@@ -26,4 +27,8 @@ USE_GNOME=	gnomehack gnomeprefix librsvg2 libgnomeui \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|gstreamer-0.6|gstreamer-0.8|g" \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/games/monkeybubble/pkg-descr b/games/monkeybubble/pkg-descr
index b2bf4902d152..cafb063d6514 100644
--- a/games/monkeybubble/pkg-descr
+++ b/games/monkeybubble/pkg-descr
@@ -1,6 +1,6 @@
-Think Puzzle Bobble, but with monkeys. Monkeys that throw
-colourful things. It's a game, except SO MUCH MORE, because
-it has monkeys. It has sound and network play and a spiffy
+Think Puzzle Bobble, but with monkeys.  Monkeys that throw
+colourful things.  It's a game, except SO MUCH MORE, because
+it has monkeys.  It has sound and network play and a spiffy
 GTK+-2 interface, but that's all irrelevant because, come on...
 monkeys!
 
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 98dde8ae2724..5171a48b8897 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomespell
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
diff --git a/textproc/gnome-spell/files/patch-gnome-spell_Makefile.in b/textproc/gnome-spell/files/patch-gnome-spell_Makefile.in
new file mode 100644
index 000000000000..8050486bcabd
--- /dev/null
+++ b/textproc/gnome-spell/files/patch-gnome-spell_Makefile.in
@@ -0,0 +1,10 @@
+--- gnome-spell/Makefile.in.orig	Tue Dec  9 15:48:14 2003
++++ gnome-spell/Makefile.in	Tue Dec  9 15:48:18 2003
+@@ -138,7 +138,6 @@
+         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        \
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		\
+-	-DGTK_DISABLE_DEPRECATED=1			\
+ 	-DASPELL_DICT=\""$(ASPELL_DICT)"\"		\
+ 	$(GNOME_SPELL_CFLAGS)				\
+ 	$(END)
diff --git a/textproc/gnome-spell/pkg-descr b/textproc/gnome-spell/pkg-descr
index a5004d360237..10f0e6faa6bf 100644
--- a/textproc/gnome-spell/pkg-descr
+++ b/textproc/gnome-spell/pkg-descr
@@ -1,6 +1,3 @@
-Gnome Spell is GNOME/Bonobo component for spell checking. In current version
-it contains GNOME::Spell::Dictionary object, which provides spell checking
-dictionary. It's based on pspell package, which is required to build
-gnome-spell.
+Gnome Spell is GNOME/Bonobo component for spell-checking.
 
 WWW: http://www.gnome.org/
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index 98dde8ae2724..5171a48b8897 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomespell
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
diff --git a/textproc/gnomespell/files/patch-gnome-spell_Makefile.in b/textproc/gnomespell/files/patch-gnome-spell_Makefile.in
new file mode 100644
index 000000000000..8050486bcabd
--- /dev/null
+++ b/textproc/gnomespell/files/patch-gnome-spell_Makefile.in
@@ -0,0 +1,10 @@
+--- gnome-spell/Makefile.in.orig	Tue Dec  9 15:48:14 2003
++++ gnome-spell/Makefile.in	Tue Dec  9 15:48:18 2003
+@@ -138,7 +138,6 @@
+         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        \
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		\
+-	-DGTK_DISABLE_DEPRECATED=1			\
+ 	-DASPELL_DICT=\""$(ASPELL_DICT)"\"		\
+ 	$(GNOME_SPELL_CFLAGS)				\
+ 	$(END)
diff --git a/textproc/gnomespell/pkg-descr b/textproc/gnomespell/pkg-descr
index a5004d360237..10f0e6faa6bf 100644
--- a/textproc/gnomespell/pkg-descr
+++ b/textproc/gnomespell/pkg-descr
@@ -1,6 +1,3 @@
-Gnome Spell is GNOME/Bonobo component for spell checking. In current version
-it contains GNOME::Spell::Dictionary object, which provides spell checking
-dictionary. It's based on pspell package, which is required to build
-gnome-spell.
+Gnome Spell is GNOME/Bonobo component for spell-checking.
 
 WWW: http://www.gnome.org/
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index b8a1699ab1a0..13229e93b76a 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -21,12 +21,14 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnomeui
+USE_GNOME=	gnomehack libgnomeui lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFLICTS=	gtk-smooth-engine-*
 
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		"/^themedir =.*metacity-1$$/s|themes|gnome/themes|"
diff --git a/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c b/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
new file mode 100644
index 000000000000..d3728a2302da
--- /dev/null
+++ b/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
@@ -0,0 +1,11 @@
+--- Smooth/smooth_style.c.orig	Thu Dec 11 10:05:56 2003
++++ Smooth/smooth_style.c	Thu Dec 11 10:06:13 2003
+@@ -707,7 +707,7 @@
+ {
+   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+ 
+-  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
++  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
+   {
+        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
+ 
diff --git a/x11-themes/gnome-themes-extras/files/patch-configure b/x11-themes/gnome-themes-extras/files/patch-configure
deleted file mode 100644
index 99515043d8c1..000000000000
--- a/x11-themes/gnome-themes-extras/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Thu Jun 12 03:11:39 2003
-+++ configure	Thu Jun 12 03:12:05 2003
-@@ -7905,6 +7905,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-themes/gnome-themes-extras/pkg-descr b/x11-themes/gnome-themes-extras/pkg-descr
index c2f2a9463521..f77d2b9e9b07 100644
--- a/x11-themes/gnome-themes-extras/pkg-descr
+++ b/x11-themes/gnome-themes-extras/pkg-descr
@@ -1,2 +1,2 @@
-Extra GNOME 2 themes, not contained within the x11-toolkits/gnome-themes
-package.
+Commonly used GNOME 2 themes that are not a part of the 
+x11-toolkits/gnome-themes package.
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 2a7cf25a354c..e1d9519c4a2b 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.2.0/engines/libindustrial.so
-lib/gtk-2.0/2.2.0/engines/libsmooth.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
 share/gnome/themes/Amaranth/metacity-1/left-side.png
 share/gnome/themes/Amaranth/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Amaranth/metacity-1/right-side.png
diff --git a/x11-toolkits/gnome-themes-extras/Makefile b/x11-toolkits/gnome-themes-extras/Makefile
index b8a1699ab1a0..13229e93b76a 100644
--- a/x11-toolkits/gnome-themes-extras/Makefile
+++ b/x11-toolkits/gnome-themes-extras/Makefile
@@ -21,12 +21,14 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgnomeui
+USE_GNOME=	gnomehack libgnomeui lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFLICTS=	gtk-smooth-engine-*
 
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		"/^themedir =.*metacity-1$$/s|themes|gnome/themes|"
diff --git a/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c b/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c
new file mode 100644
index 000000000000..d3728a2302da
--- /dev/null
+++ b/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c
@@ -0,0 +1,11 @@
+--- Smooth/smooth_style.c.orig	Thu Dec 11 10:05:56 2003
++++ Smooth/smooth_style.c	Thu Dec 11 10:06:13 2003
+@@ -707,7 +707,7 @@
+ {
+   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+ 
+-  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
++  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
+   {
+        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
+ 
diff --git a/x11-toolkits/gnome-themes-extras/files/patch-configure b/x11-toolkits/gnome-themes-extras/files/patch-configure
deleted file mode 100644
index 99515043d8c1..000000000000
--- a/x11-toolkits/gnome-themes-extras/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Thu Jun 12 03:11:39 2003
-+++ configure	Thu Jun 12 03:12:05 2003
-@@ -7905,6 +7905,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gnome-themes-extras/pkg-descr b/x11-toolkits/gnome-themes-extras/pkg-descr
index c2f2a9463521..f77d2b9e9b07 100644
--- a/x11-toolkits/gnome-themes-extras/pkg-descr
+++ b/x11-toolkits/gnome-themes-extras/pkg-descr
@@ -1,2 +1,2 @@
-Extra GNOME 2 themes, not contained within the x11-toolkits/gnome-themes
-package.
+Commonly used GNOME 2 themes that are not a part of the 
+x11-toolkits/gnome-themes package.
diff --git a/x11-toolkits/gnome-themes-extras/pkg-plist b/x11-toolkits/gnome-themes-extras/pkg-plist
index 2a7cf25a354c..e1d9519c4a2b 100644
--- a/x11-toolkits/gnome-themes-extras/pkg-plist
+++ b/x11-toolkits/gnome-themes-extras/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.2.0/engines/libindustrial.so
-lib/gtk-2.0/2.2.0/engines/libsmooth.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
 share/gnome/themes/Amaranth/metacity-1/left-side.png
 share/gnome/themes/Amaranth/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Amaranth/metacity-1/right-side.png
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 3b057cbce729..fadf52a645b7 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rep-gtk2
 PORTVERSION=	0.18
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs b/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
new file mode 100644
index 000000000000..06a547e90e6a
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
@@ -0,0 +1,14 @@
+--- gnome-canvas.defs.orig	Thu Mar 18 15:02:22 2004
++++ gnome-canvas.defs	Thu Mar 18 15:02:26 2004
+@@ -295,11 +295,6 @@
+ 
+ ;; GnomeCanvasGroup
+ 
+-(define-func gnome_canvas_group_child_bounds
+-  none
+-  ((GnomeCanvasGroup group)
+-   (GnomeCanvasItem item)))
+-
+ 
+ ;; gnome-canvas-util
+ 
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs b/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
new file mode 100644
index 000000000000..6d963c35e226
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
@@ -0,0 +1,72 @@
+--- gnomeui.defs.orig	Thu Mar 18 15:03:51 2004
++++ gnomeui.defs	Thu Mar 18 15:04:41 2004
+@@ -228,42 +228,6 @@
+   (protection *result*))
+ 
+ 
+-;; gnome-geometry
+-
+-(define-func gnome_parse_geometry
+-  bool
+-  ((string geom)
+-   ((ret int) xpos)
+-   ((ret int) ypos)
+-   ((ret int) width)
+-   ((ret int) height)))
+-
+-(define-func gnome_geometry_string
+-  string
+-  ((GdkWindow window)))
+-
+-
+-;; gtkcauldron
+-
+-;; [the interface isn't suited to lisp anyway..]
+-
+-
+-;; GnomeAbout
+-
+-(define-object GnomeAbout (GtkDialog))
+-
+-(define-func gnome_about_new
+-  GtkWidget
+-  ((string name)
+-   (string version)
+-   (string copyright)
+-   (string comments)
+-   ((tvec string) authors)
+-   ((tvec string) documentors)
+-   (string translator_credits)
+-   (GdkPixbuf logo (null-ok))))
+-
+-
+ ;; GnomeApp
+ 
+ (define-object GnomeApp (GtkWindow))
+@@ -327,11 +291,6 @@
+   none
+   ((GnomeAppBar appbar)))
+ 
+-(define-func gnome_appbar_set_progress
+-  none
+-  ((GnomeAppBar appbar)
+-   (float percentage)))
+-
+ (define-func gnome_appbar_get_progress
+   GtkProgress
+   ((GnomeAppBar appbar)))
+@@ -675,14 +634,6 @@
+   ((GnomeEntry ge)
+    (int save)
+    (string text)))
+-
+-(define-func gnome_entry_load_history
+-  none
+-  ((GnomeEntry ge)))
+-
+-(define-func gnome_entry_save_history
+-  none
+-  ((GnomeEntry ge)))
+ 
+ 
+ ;; GnomeFileEntry
diff --git a/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c b/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
new file mode 100644
index 000000000000..7ee510da51b5
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
@@ -0,0 +1,20 @@
+--- gtk-compat.c.orig	Thu Mar 18 16:17:34 2004
++++ gtk-compat.c	Thu Mar 18 16:17:49 2004
+@@ -64,7 +64,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label)
++						const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_label (g, label);
+@@ -72,7 +72,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label)
++						   const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_mnemonic (g, label);
diff --git a/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h b/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
new file mode 100644
index 000000000000..d08df121e00e
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
@@ -0,0 +1,15 @@
+--- rep-gtk.h.orig	Thu Mar 18 16:17:18 2004
++++ rep-gtk.h	Thu Mar 18 16:17:29 2004
+@@ -291,10 +291,10 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label);
++						const gchar            *label);
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label);
++						   const gchar            *label);
+ GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
+ GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);
+ 
diff --git a/x11-toolkits/rep-gtk2/pkg-descr b/x11-toolkits/rep-gtk2/pkg-descr
index 4ceb045b3fef..597294953b5c 100644
--- a/x11-toolkits/rep-gtk2/pkg-descr
+++ b/x11-toolkits/rep-gtk2/pkg-descr
@@ -1,3 +1,3 @@
-Rep-gtk offers GTK+-2 bindings for rep Lisp interpreter.
+Rep-gtk offers GTK+-2 bindings for the rep Lisp interpreter.
 
 WWW: http://rep-gtk.sourceforge.net/
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index d26cdc2ac887..812f2faa6802 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	gnome2-fifth-toe
-PORTVERSION=	2.6.0
+PORTVERSION=	2.5.92
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 23389eccc204..b6d77edf0494 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.6.0
+PORTVERSION=	2.5.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-lite
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 7a17343ca01d..4991c11e2008 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-power-tools
-PORTVERSION=	2.6.0
+PORTVERSION=	2.5.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -17,7 +17,7 @@ COMMENT=	"Geektoys" for the GNOME 2 power user
 
 RUN_DEPENDS=	${X11BASE}/lib/epiphany/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
 		gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
-		${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
+		${X11BASE}/lib/libquicklounge-applet.so:${PORTSDIR}/misc/quick-lounge-applet \
 		${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
 		${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
 		splashsetter:${PORTSDIR}/deskutils/splashsetter \