change the libtool version to use from 1.3 to 1.5

70 files changed, 197 insertions, 116 deletions

diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index bac8a7f9ffc2..4c6aa6fd14e7 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} --disable-html
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 
 MAN1=		nefu.1
 MAN4=		nefu.conf.4
diff --git a/news/grn/Makefile b/news/grn/Makefile
index d4562c780181..84c9e464b961 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -20,10 +20,15 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 LIBTOOLFILES=	configure libmutt/configure
 CONFIGURE_ENV=	glibpath="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure ${WRKSRC}/libmutt/configure
+
 .include <bsd.port.mk>
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index cbe142050468..1f910acf9f08 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist
index 6e8ab5ad0eb5..79a025105d79 100644
--- a/palm/pilot-link-devel/pkg-plist
+++ b/palm/pilot-link-devel/pkg-plist
@@ -75,19 +75,15 @@ include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
 lib/libpisock++.a
-lib/libpisock++.la
 lib/libpisock++.so
 lib/libpisock++.so.0
 lib/libpisock.a
-lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
 lib/libpisync.a
-lib/libpisync.la
 lib/libpisync.so
 lib/libpisync.so.0
 %%WITH_TCL%%lib/libpitcl.a
-%%WITH_TCL%%lib/libpitcl.la
 %%WITH_TCL%%lib/libpitcl.so.0
 %%WITH_TCL%%lib/libpitcl.so
 share/aclocal/pilot-link.m4
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index cbe142050468..1f910acf9f08 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 TCL_VER?=	8.4
diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist
index 6e8ab5ad0eb5..79a025105d79 100644
--- a/palm/pilot-link/pkg-plist
+++ b/palm/pilot-link/pkg-plist
@@ -75,19 +75,15 @@ include/pi-usb.h
 include/pi-util.h
 include/pi-version.h
 lib/libpisock++.a
-lib/libpisock++.la
 lib/libpisock++.so
 lib/libpisock++.so.0
 lib/libpisock.a
-lib/libpisock.la
 lib/libpisock.so
 lib/libpisock.so.8
 lib/libpisync.a
-lib/libpisync.la
 lib/libpisync.so
 lib/libpisync.so.0
 %%WITH_TCL%%lib/libpitcl.a
-%%WITH_TCL%%lib/libpitcl.la
 %%WITH_TCL%%lib/libpitcl.so.0
 %%WITH_TCL%%lib/libpitcl.so
 share/aclocal/pilot-link.m4
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 9015a26e6ba7..a42a795ae409 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -20,14 +20,21 @@ MASTER_SITE_SUBDIR=	freetype1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free and portable TrueType font rendering engine
 
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
+USE_REINPLACE=	yes
 
 .ifdef USE_FREETYPE
 .error You have `USE_FREETYPE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|'
+
 # Older versions of freetype installed include files in ${PREFIX}/include
 # this is a compatibility hack for now
 
diff --git a/print/libijs/Makefile b/print/libijs/Makefile
index 4f3dff9a8bb2..70ef6be2da89 100644
--- a/print/libijs/Makefile
+++ b/print/libijs/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C library that supports plugin printer driver for Ghostscript
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 MAN1=		ijs-config.1
diff --git a/print/panda/Makefile b/print/panda/Makefile
index cd35d5a87251..850fea7b6d3d 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41 \
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-berkeley-db
 INSTALLS_SHLIB=	yes
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 119bda96dcd9..7ef3d89a2c3b 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
 		png:${PORTSDIR}/graphics/png
 
 USE_MESA=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lstdc++"
 USE_GMAKE=	yes
diff --git a/science/xloops-ginac/Makefile b/science/xloops-ginac/Makefile
index 23217981ded5..bd7e52df4bb7 100644
--- a/science/xloops-ginac/Makefile
+++ b/science/xloops-ginac/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	ginac-1.3.1:${PORTSDIR}/math/GiNaC
 USE_GCC=	3.4
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 05dcc1f1e3ce..2e10d24e603a 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small library to interface the ident protocol server (rfc1413)
 
 USE_GNOME=	gnometarget lthack
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 MAN3=		ident.3
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index a8d2028d702e..47d0fff46a12 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 USE_GCC=	3.4
 USE_REINPLACE=	yes
 USE_GETOPT_LONG=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/ntfsprogs/pkg-plist b/sysutils/ntfsprogs/pkg-plist
index 4a022e935b87..080b8a557c5e 100644
--- a/sysutils/ntfsprogs/pkg-plist
+++ b/sysutils/ntfsprogs/pkg-plist
@@ -35,7 +35,6 @@ include/ntfs/volume.h
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.1
 lib/libntfs.a
-lib/libntfs.la
 lib/libntfs.so
 lib/libntfs.so.6
 sbin/mkntfs
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 1ac2e03efe5a..98f9bd466527 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -15,7 +15,12 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free C OLE library
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	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/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index b6117496112b..c0d9d6e26126 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 XERCESCROOT=	`cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index d7a27535b88e..60262a932fd8 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -18,9 +18,14 @@ COMMENT=	An XML library which wraps expat
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	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/textproc/minidom/Makefile b/textproc/minidom/Makefile
index 778862e280b4..e239844c097b 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-libxml2=yes
@@ -28,6 +28,8 @@ INSTALLS_SHLIB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lglib|-lglib12|g ; \
-		 s|glib-config|${GLIB_CONFIG}|g' ${WRKSRC}/configure
+		s|glib-config|${GLIB_CONFIG}|g ; \
+		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 259988fad9f4..889a354a7690 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sagasu is a GNOME tool to find strings in a set of files
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index fd28e4d9a80d..efd35e8f343d 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -18,9 +18,14 @@ COMMENT=	A utility for converting MS Excel files to XML
 LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lcole"
 
+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/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index e67482df40bd..beab68dc294f 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -16,13 +16,17 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Parser and Validator
 
 USE_REINPLACE=	yes
-FETCH_CMD=	/usr/bin/fetch
+#FETCH_CMD=	/usr/bin/fetch
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/share|$$(datadir)|g'
 	@${RM} ${WRKSRC}/config.cache
 
+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/www/aria/Makefile b/www/aria/Makefile
index e19ba9cebc5f..1fef75d2fcc0 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -19,10 +19,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk12
 USE_OPENSSL=	yes
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index 999e6741a185..a28ccae76f07 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -19,7 +19,8 @@ COMMENT=	Open source search engine for Internet and Intranet sites
 
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 DOCSDIR=	${PREFIX}/share/doc/dataparksearch
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \
@@ -122,6 +123,10 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 pre-install:
 	@${MKDIR} ${DATADIR}
 
diff --git a/www/dpsearch/pkg-plist b/www/dpsearch/pkg-plist
index 8a57fe8364d8..d686a185b8a0 100644
--- a/www/dpsearch/pkg-plist
+++ b/www/dpsearch/pkg-plist
@@ -260,11 +260,9 @@ include/dps_xmalloc.h
 include/dpsearch.h
 lib/libdpcharset-4.so
 lib/libdpcharset.a
-lib/libdpcharset.la
 lib/libdpcharset.so
 lib/libdpsearch-4.so
 lib/libdpsearch.a
-lib/libdpsearch.la
 lib/libdpsearch.so
 sbin/cached
 sbin/dpconv
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index eab75b71930c..9e6616d56b74 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -16,12 +16,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The W3C Reference Library
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib
 USE_PERL5_BUILD=yes
 MAKE_ENV=	objformat=${PORTOBJFORMAT}
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 5bc60ef3b74a..8f2549f59adf 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -20,8 +20,10 @@ MAN1=		indexer.1
 MAN5=		indexer.conf.5
 
 INSTALLS_SHLIB= yes
+USE_GNOME=	lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-phrase \
@@ -85,6 +87,10 @@ pre-configure:
 	@exit 1
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 pre-install:
 	@${MKDIR} ${PREFIX}/share/mnogosearch
 
diff --git a/www/mnogosearch/files/patch-ad b/www/mnogosearch/files/patch-ad
index 9b5300f64807..5334d08f91e4 100644
--- a/www/mnogosearch/files/patch-ad
+++ b/www/mnogosearch/files/patch-ad
@@ -1,31 +1,5 @@
 --- configure.orig	Tue Jun 17 13:35:22 2003
 +++ configure	Mon Jun 14 07:46:23 2004
-@@ -3176,13 +3176,14 @@
- fi
- rm -f confcache
- 
-+lt_aux_dir=${LOCALBASE}/share/libtool13
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
-+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
- || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
- echo "$as_me: error: libtool configure failed" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -3207,7 +3208,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -3659,6 +3660,8 @@
  #line $LINENO "configure"
  #include "confdefs.h"
@@ -46,23 +20,3 @@
  else
      echo "$as_me:$LINENO: result: disabled" >&5
  echo "${ECHO_T}disabled" >&6
-@@ -7553,8 +7556,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
-+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
- || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
- echo "$as_me: error: libtool configure failed" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -7579,7 +7582,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index b76e0254bf05..715bd8f8860e 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -44,7 +44,6 @@ include/udm_word.h
 include/udm_xmalloc.h
 include/udmsearch.h
 lib/libudmsearch.a
-lib/libudmsearch.la
 lib/libudmsearch.so
 lib/libudmsearch.so.1
 sbin/cachelogd
diff --git a/www/scout/Makefile b/www/scout/Makefile
index a525e4ea42ef..1f2e019d03b9 100644
--- a/www/scout/Makefile
+++ b/www/scout/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://sid.joedog.org/pub/scout/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility to harvest URLs from a given start point
 
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS+=	--disable-shared --enable-static
 MAN1=		scout.1
 PLIST_FILES=	bin/scout
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
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index fc239bb3ae11..3afb8a01e261 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Coin:${PORTSDIR}/graphics/Coin
 
 USE_MESA=	yes
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${X11BASE}
 # avoid renaming of soxt-config and soxt-config.1
diff --git a/x11-toolkits/SoXt/pkg-plist b/x11-toolkits/SoXt/pkg-plist
index 407fefa871ac..2550f7a8da51 100644
--- a/x11-toolkits/SoXt/pkg-plist
+++ b/x11-toolkits/SoXt/pkg-plist
@@ -36,7 +36,6 @@ include/Inventor/Xt/SoXtRenderArea.h
 lib/libSoXt.a
 lib/libSoXt.so.0
 lib/libSoXt.so
-lib/libSoXt.la
 share/aclocal/soxt.m4
 share/Coin/conf/soxt-default.cfg
 @dirrm share/Coin/conf
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index a1876a631338..9ff656d2cf3a 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 INSTALLS_SHLIB=	yes
@@ -30,4 +31,8 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \
 		${PTHREAD_LIBS}
 
+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-toolkits/gtkglarea--/pkg-plist b/x11-toolkits/gtkglarea--/pkg-plist
index a37abc493f22..eeda5778019b 100644
--- a/x11-toolkits/gtkglarea--/pkg-plist
+++ b/x11-toolkits/gtkglarea--/pkg-plist
@@ -2,7 +2,6 @@ include/gtkgl--/private/glarea_p.h
 include/gtkgl--/gdkgl.h
 include/gtkgl--/glarea.h
 lib/libgtkglmm.a
-lib/libgtkglmm.la
 lib/libgtkglmm.so
 lib/libgtkglmm.so.1
 @dirrm include/gtkgl--/private
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 62d4dba08723..98bc6dac6b11 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-lib-GL
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index e10d6d58e2d0..a4d2bce3d1c1 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GL=		yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 1095df26ef96..dedb0855f0dc 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglextmm/pkg-plist b/x11-toolkits/gtkglextmm/pkg-plist
index 633483591220..311374f3e00e 100644
--- a/x11-toolkits/gtkglextmm/pkg-plist
+++ b/x11-toolkits/gtkglextmm/pkg-plist
@@ -34,11 +34,9 @@ lib/gtkglextmm-1.0/proc/m4/convert.m4
 lib/gtkglextmm-1.0/proc/m4/convert_gdkglext.m4
 lib/gtkglextmm-1.0/proc/m4/convert_gtkglext.m4
 lib/libgdkglextmm-x11-1.0.a
-lib/libgdkglextmm-x11-1.0.la
 lib/libgdkglextmm-x11-1.0.so
 lib/libgdkglextmm-x11-1.0.so.0
 lib/libgtkglextmm-x11-1.0.a
-lib/libgtkglextmm-x11-1.0.la
 lib/libgtkglextmm-x11-1.0.so
 lib/libgtkglextmm-x11-1.0.so.0
 @dirrm lib/gtkglextmm-1.0/proc/m4
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index fe410ddd177e..25d43f84613c 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
 USE_MOTIF=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 08c077c41bde..ce050968c175 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index be8caf3e868c..3888ef39f72d 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -47,6 +47,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[$][(]SDL_CFLAGS[)]|\$\(PARAGUI_CFLAGS\)|g ; \
 		 s|lib/pkgconfig|libdata/pkgconfig|g ; \
-		 s|-L[./]*../src|&/.libs |g'
+		 s|-L[./]*../src|&/.libs |g ; \
+		 s|-release $$(LT_RELEASE)||g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index be8caf3e868c..3888ef39f72d 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -47,6 +47,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[$][(]SDL_CFLAGS[)]|\$\(PARAGUI_CFLAGS\)|g ; \
 		 s|lib/pkgconfig|libdata/pkgconfig|g ; \
-		 s|-L[./]*../src|&/.libs |g'
+		 s|-L[./]*../src|&/.libs |g ; \
+		 s|-release $$(LT_RELEASE)||g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index d0eb11ed19dc..59b2b91acbf3 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ wrapper for GTK+ toolkit
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20 lthack
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 40a180ca35e5..051d98ec4722 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -17,7 +17,12 @@ COMMENT=	Standard library for Window Maker dock apps
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	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-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index cf923e060508..9c33678348f0 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \