26 files changed, 96 insertions, 14 deletions

diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index ae3d1defa187..9af585512a42 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -20,6 +20,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/buffy/pkg-plist b/x11-themes/buffy/pkg-plist
index 3b262ffb40fd..959774106f60 100644
--- a/x11-themes/buffy/pkg-plist
+++ b/x11-themes/buffy/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libbuffy.a
 lib/gtk/themes/engines/libbuffy.so
 share/themes/buffyEro/ICON.png
 share/themes/buffyEro/README.html
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index de5fd1de41a1..d5b2f1086c90 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -19,8 +19,13 @@ COMMENT=	The Clean GTK theme engine
 WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/clean-theme-gtk/pkg-plist b/x11-themes/clean-theme-gtk/pkg-plist
index e0babf12024e..d5089175bd84 100644
--- a/x11-themes/clean-theme-gtk/pkg-plist
+++ b/x11-themes/clean-theme-gtk/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libclean.a
 lib/gtk/themes/engines/libclean.so
 share/themes/Clean/ICON.png
 share/themes/Clean/README.html
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 96a4cae58e90..7506f2100d4a 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -20,6 +20,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/colorstep/pkg-plist b/x11-themes/colorstep/pkg-plist
index 46c74583455a..a78c2a9387df 100644
--- a/x11-themes/colorstep/pkg-plist
+++ b/x11-themes/colorstep/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libcolorstep.a
 lib/gtk/themes/engines/libcolorstep.so
 share/themes/ColorStep/ICON.png
 share/themes/ColorStep/README.html
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index a465b945c4a0..b3d28ca9db81 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -20,7 +20,12 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/engradient/pkg-plist b/x11-themes/engradient/pkg-plist
index 8004944ba336..95de8e6071e7 100644
--- a/x11-themes/engradient/pkg-plist
+++ b/x11-themes/engradient/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libengradient.a
 lib/gtk/themes/engines/libengradient.so
 share/themes/EnGradient-Blue/gtk/gtkrc
 share/themes/EnGradient-Brushed/gtk/brushed-dark.xpm
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 7c58f1c8157d..cdd7840c3a2f 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -17,7 +17,12 @@ COMMENT=	A GTK theme engine designed to look nice with the GNOME desktop environ
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-look/pkg-plist b/x11-themes/gnome-look/pkg-plist
index 7b44e036090a..6fe539038bd4 100644
--- a/x11-themes/gnome-look/pkg-plist
+++ b/x11-themes/gnome-look/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libgnomelook.a
 lib/gtk/themes/engines/libgnomelook.so
 share/themes/Gnome-Look-Grey/gtk/gtkrc
 share/themes/Gnome-Look-Icy/gtk/gtkrc
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index bb6bf10a9796..57fcea3f5f92 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -20,7 +20,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-Mac2-theme/pkg-plist b/x11-themes/gtk-Mac2-theme/pkg-plist
index 5b9debfae853..5f6dfc39db4d 100644
--- a/x11-themes/gtk-Mac2-theme/pkg-plist
+++ b/x11-themes/gtk-Mac2-theme/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libmac2.a
 lib/gtk/themes/engines/libmac2.so
 share/themes/Mac2/ICON.png
 share/themes/Mac2/README.html
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index be26c48589d2..f06d67af5f71 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -20,7 +20,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 955b1a241a14..ecf9f8e09ec5 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -20,7 +20,12 @@ WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkbe/pkg-plist b/x11-themes/gtkbe/pkg-plist
index eec881230cec..c7af8e4e88fc 100644
--- a/x11-themes/gtkbe/pkg-plist
+++ b/x11-themes/gtkbe/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libgtkbe.a
 lib/gtk/themes/engines/libgtkbe.so
 share/themes/GTKBe/ICON.png
 share/themes/GTKBe/README.html
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 1b9a8d8adc75..e0bf5d65c04b 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -20,6 +20,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep-pastel/pkg-plist b/x11-themes/gtkstep-pastel/pkg-plist
index 94c0115b27ec..820064059797 100644
--- a/x11-themes/gtkstep-pastel/pkg-plist
+++ b/x11-themes/gtkstep-pastel/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libsteppastel.a
 lib/gtk/themes/engines/libsteppastel.so
 share/themes/StepPastel/ICON.png
 share/themes/StepPastel/README.html
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 1aef51de22aa..fa522133bf83 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -20,6 +20,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/pkg-plist b/x11-themes/gtkstep/pkg-plist
index 813409b1de80..4af1afff0a51 100644
--- a/x11-themes/gtkstep/pkg-plist
+++ b/x11-themes/gtkstep/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libstep.a
 lib/gtk/themes/engines/libstep.so
 share/themes/Step/ICON.png
 share/themes/Step/README.html
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index bcdfa07476d3..06c4a7b4ba92 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -21,7 +21,12 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/icegradient/pkg-plist b/x11-themes/icegradient/pkg-plist
index 6869ce6a8122..a1c614f88a98 100644
--- a/x11-themes/icegradient/pkg-plist
+++ b/x11-themes/icegradient/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libicegradient.a
 lib/gtk/themes/engines/libicegradient.so
 share/themes/IceGradient/ICON.png
 share/themes/IceGradient/README.html
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 9b70d1f2545c..b65d3bcb2a6e 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -20,9 +20,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 
 GTKVERSION=	1.2
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index 10b734e1af6f..fc6c46bdc02c 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -20,6 +20,11 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/thinice/pkg-plist b/x11-themes/thinice/pkg-plist
index dbff94c5f80f..fc97d9a9d417 100644
--- a/x11-themes/thinice/pkg-plist
+++ b/x11-themes/thinice/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libthinice.a
 lib/gtk/themes/engines/libthinice.so
 share/themes/ThinIce/ICON.png
 share/themes/ThinIce/README.html
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 673cc2f0440d..2b3bcd6788a9 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -20,7 +20,12 @@ WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-themes/whistlerk/pkg-plist b/x11-themes/whistlerk/pkg-plist
index 1cd22e6ea6bb..c318bccda61e 100644
--- a/x11-themes/whistlerk/pkg-plist
+++ b/x11-themes/whistlerk/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libwhistler.a
 lib/gtk/themes/engines/libwhistler.so
 share/themes/WhistlerK/ICON.png
 share/themes/WhistlerK/README.html