Chase the module location for gtk20.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2103 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 22 insertions, 14 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 8b8237631..b085da859 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	librsvg2
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--with-svgz \
 		--disable-gtk-doc \
 		--without-gimp \
 		--with-croco
-PLIST_SUB=	GTK_VERSION="2.2.0"
+PLIST_SUB=	GTK_VERSION="2.4.0"
 
 MAN1=		rsvg.1
 
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index b5413a2c1..a51ee348d 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.5.92
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -26,6 +27,8 @@ USE_GNOME=	gnomehack lthack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
 
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index eabfea5f3..c78fa9955 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,8 +1,8 @@
-lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
-lib/gtk-2.0/2.2.0/engines/libhcengine.so
-lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
-lib/gtk-2.0/2.2.0/engines/libmist.so
-lib/gtk-2.0/2.2.0/engines/libthinice.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
 share/eazel-engine/arrow_down-spinner.png
 share/eazel-engine/arrow_down.png
 share/eazel-engine/arrow_left.png
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index b5413a2c1..a51ee348d 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.5.92
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -26,6 +27,8 @@ USE_GNOME=	gnomehack lthack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
 
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index eabfea5f3..c78fa9955 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -1,8 +1,8 @@
-lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
-lib/gtk-2.0/2.2.0/engines/libhcengine.so
-lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
-lib/gtk-2.0/2.2.0/engines/libmist.so
-lib/gtk-2.0/2.2.0/engines/libthinice.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
 share/eazel-engine/arrow_down-spinner.png
 share/eazel-engine/arrow_down.png
 share/eazel-engine/arrow_left.png
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index dfdc824fc..565cafb72 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeui
 PORTVERSION=	2.5.92
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -29,6 +30,6 @@ USE_LIBTOOL_VER=13
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB=	GTK_VERSION="2.2.0"
+PLIST_SUB=	GTK_VERSION="2.4.0"
 
 .include <bsd.port.mk>
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 23e78551f..a1b03e2be 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome2-fifth-toe
 PORTVERSION=	2.5.91
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -25,7 +26,7 @@ RUN_DEPENDS=	pan:${PORTSDIR}/news/pan2 \
 		tsclient:${PORTSDIR}/net/tsclient \
 		galeon:${PORTSDIR}/www/galeon2 \
 		seahorse:${PORTSDIR}/security/seahorse \
-		${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \
+		${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras \
 		bluefish:${PORTSDIR}/www/bluefish-devel \
 		gossip:${PORTSDIR}/net/gossip \
 		inkscape:${PORTSDIR}/graphics/inkscape \