12 files changed, 17 insertions, 19 deletions

diff --git a/x11-themes/clearlooks-themes-extras/Makefile b/x11-themes/clearlooks-themes-extras/Makefile
index 522ecca34945..580223c0acc5 100644
--- a/x11-themes/clearlooks-themes-extras/Makefile
+++ b/x11-themes/clearlooks-themes-extras/Makefile
@@ -25,7 +25,7 @@ THEME_DIR=	${PREFIX}/share/themes
 .if exists(${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc) || defined(WITH_GTKENGINE)
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
 .else
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.4.0/engines/libclearlooks.so:${PORTSDIR}/x11-themes/clearlooks
+RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libclearlooks.so:${PORTSDIR}/x11-themes/clearlooks
 .endif
 
 do-extract:
diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist
index 7fec8db68699..333c5ed6676c 100644
--- a/x11-themes/clearlooks/pkg-plist
+++ b/x11-themes/clearlooks/pkg-plist
@@ -1,5 +1,5 @@
-%%ENGINE%%lib/gtk-2.0/2.4.0/engines/libclearlooks.la
-%%ENGINE%%lib/gtk-2.0/2.4.0/engines/libclearlooks.so
+%%ENGINE%%lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.la
+%%ENGINE%%lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.so
 share/icons/Clearlooks/16x16/gtk/gtk-apply.png
 share/icons/Clearlooks/16x16/gtk/gtk-cancel.png
 share/icons/Clearlooks/16x16/gtk/gtk-go-back-ltr.png
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index 2be50732dbcf..a2fc60b1c0ed 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	Slick GNOME2 theme from Ximian
 
 EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
+BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index f66ac8fbbc6d..a5e3f8136a14 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -31,8 +31,6 @@ USE_GNOME=	gnomehack intlhack 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/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index aa3242d639bc..530321a6b9c3 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -32,7 +32,7 @@ GTK2_LIBS=	`${LOCALBASE}/bin/pkg-config --libs gtk+-2.0`
 GTK2_WRKSRC=	${WRKSRC}/art/gtk/Bluecurve
 GTK2_RCDIR=	gtk-2.0
 GTK2_SOURCES=	bluecurve_rc_style.c bluecurve_style.c bluecurve_theme_main.c
-GTK2_ENGINEDIR=	lib/gtk-2.0/2.4.0/engines
+GTK2_ENGINEDIR=	lib/gtk-2.0/${GTK2_VERSION}/engines
 
 PLIST=		${WRKDIR}/pkg-plist
 EXTRA_STYLES=	BerriesAndCream Gnome Grape Lime Slate Strawberry Tangerine
diff --git a/x11-themes/gtk-cleanice-engine/pkg-plist b/x11-themes/gtk-cleanice-engine/pkg-plist
index 42146a3b9a66..8760dfd67fbe 100644
--- a/x11-themes/gtk-cleanice-engine/pkg-plist
+++ b/x11-themes/gtk-cleanice-engine/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.4.0/engines/libcleanice.la
-lib/gtk-2.0/2.4.0/engines/libcleanice.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.so
 share/themes/CleanIce/index.theme
 share/themes/CleanIce/gtk-2.0/gtkrc
 share/themes/CleanIce/metacity-1/metacity-theme-1.xml
diff --git a/x11-themes/gtk-flat-theme2/pkg-plist b/x11-themes/gtk-flat-theme2/pkg-plist
index 087d9693362e..4c6787234063 100644
--- a/x11-themes/gtk-flat-theme2/pkg-plist
+++ b/x11-themes/gtk-flat-theme2/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.4.0/engines/libflat.la
-lib/gtk-2.0/2.4.0/engines/libflat.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libflat.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libflat.so
 share/themes/Flat/ICON.png
 share/themes/Flat/README.html
 share/themes/Flat/gtk-2.0/gtkrc
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index c105c919c437..562578128ce9 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gnomehack gtk20
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 
-PLIST_SUB=	GTK_VER=2.4.0
+PLIST_SUB=	GTK_VER=${GTK2_VERSION}
 PLIST_SUB+=	X11BASE=${X11BASE} LOCALBASE=${LOCALBASE}
 
 CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index c105c919c437..562578128ce9 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	gnomehack gtk20
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 
-PLIST_SUB=	GTK_VER=2.4.0
+PLIST_SUB=	GTK_VER=${GTK2_VERSION}
 PLIST_SUB+=	X11BASE=${X11BASE} LOCALBASE=${LOCALBASE}
 
 CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff --git a/x11-themes/gtk-smooth-engine/pkg-plist b/x11-themes/gtk-smooth-engine/pkg-plist
index 5fb08c757f4c..ab15b8d21f54 100644
--- a/x11-themes/gtk-smooth-engine/pkg-plist
+++ b/x11-themes/gtk-smooth-engine/pkg-plist
@@ -1,4 +1,4 @@
 %%GTK1:%%lib/gtk/themes/engines/libsmooth.la
 %%GTK1:%%lib/gtk/themes/engines/libsmooth.so
-%%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.la
-%%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.so
+%%GTK2:%%lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.la
+%%GTK2:%%lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index 427748f13088..e95c286d757d 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.4.0/engines/libxfce.la
-lib/gtk-2.0/2.4.0/engines/libxfce.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.so
 share/themes/Xfce-4.0/gtk-2.0/gtkrc
 share/themes/Xfce-4.0/ICON.png
 share/themes/Xfce-4.0/README.html
diff --git a/x11-themes/ubuntulooks/pkg-plist b/x11-themes/ubuntulooks/pkg-plist
index fde8bd90f2b5..c41da6283b82 100644
--- a/x11-themes/ubuntulooks/pkg-plist
+++ b/x11-themes/ubuntulooks/pkg-plist
@@ -1,5 +1,5 @@
-lib/gtk-2.0/2.4.0/engines/libubuntulooks.so
-lib/gtk-2.0/2.4.0/engines/libubuntulooks.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libubuntulooks.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libubuntulooks.la
 share/themes/Human/gtk-2.0/gtkrc
 @dirrm share/themes/Human/gtk-2.0
 @dirrm share/themes/Human