change the libtool version to use from 1.3 to 1.5

26 files changed, 89 insertions, 84 deletions

diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index f52ed89..7acb87a 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fast pixel formats conversion library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 3adb436..234774f 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An ascii art library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_X11)
@@ -56,7 +56,8 @@ post-extract:
 post-patch:
 	@${RM} -f ${WRKSRC}/config.cache
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
-		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
+		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g ; \
+		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \
 		| ${XARGS} ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index ea2b07e..898d7a4 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gnometarget lthack
 USE_BISON=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 806e5dd..7e7c7a7 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -20,7 +20,12 @@ COMMENT=	A general drawing canvas from dia dialog editor
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 imlib gnomehack
-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/graphics/entice/Makefile b/graphics/entice/Makefile
index adeaf03..671fd4e 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -20,8 +20,13 @@ LIB_DEPENDS=	ecore.0:${PORTSDIR}/x11/ecore \
 		evas.6:${PORTSDIR}/graphics/evas
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+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/graphics/evas/Makefile b/graphics/evas/Makefile
index 7555b26..9b5e34a 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -19,12 +19,17 @@ LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_FREETYPE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--disable-gl
 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/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 0007a00..9db8315 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Fonts and font libraries necessary for Enlightenment
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 2c7c58d..d2622b1 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo gnomeprint
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 9c123eb..fbcb7ed 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 RUN_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
 		--with-dps-libraries=${X11BASE}/lib
@@ -30,4 +31,8 @@ CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
 BROKEN=		"Does not compile on alpha"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 3539c9b..da600bd 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -17,8 +17,13 @@ COMMENT=	A very simple GUI framework for use with SDL
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-release $$(LT_RELEASE)||g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index d11e5e3..79f0273 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_ZIP=	yes
 USE_GNOME=	gnometarget lthack
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libgrass5/Makefile b/graphics/libgrass5/Makefile
index d466adc..70b71c9 100644
--- a/graphics/libgrass5/Makefile
+++ b/graphics/libgrass5/Makefile
@@ -15,8 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library of functions from the GRASS GIS application for use by non-GRASS programs
 
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 INSTALLS_SHLIB=	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/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index f378593..19c58b7 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -15,7 +15,12 @@ COMMENT=	A library for loading (and saving) 3d modeller object files
 
 CONFLICTS=	xmorph*
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	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/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 0704a2e..a3b8b0b 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ENV+=	GLVER="${GLVER}" LIBS="-lm"
 SUB_GL=		src si-glu src-glu
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index 5a6abf5..e5d4e63 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -6,14 +6,22 @@ include/GL/glu_mangle.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glext.h
+include/GL/glut.h
+include/GL/glutf90.h
+include/GL/glxext.h
 include/GL/osmesa.h
 include/GL/xmesa.h
 include/GL/xmesa_x.h
 include/GL/xmesa_xf86.h
+lib/libGL.a
 lib/libGL.so
 lib/libGL.so.14
+lib/libGLU.a
 lib/libGLU.so
 lib/libGLU.so.14
 lib/libMesaGL.so
 lib/libMesaGLU.so
+lib/libOSMesa.a
+lib/libOSMesa.so
+lib/libOSMesa.so.4
 @dirrm include/GL
diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile
index 4c5dfb2..13edd44 100644
--- a/graphics/paintlib/Makefile
+++ b/graphics/paintlib/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		tiff:${PORTSDIR}/graphics/tiff \
 		ungif:${PORTSDIR}/graphics/libungif
 
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-SDL --disable-dfb
diff --git a/graphics/paintlib/pkg-plist b/graphics/paintlib/pkg-plist
index b526da1..980c6f0 100644
--- a/graphics/paintlib/pkg-plist
+++ b/graphics/paintlib/pkg-plist
@@ -94,7 +94,6 @@ include/paintlib/test/pltestfilters.h
 include/paintlib/test/pltestcountedpointer.h
 include/paintlib/test/pltestexif.h
 lib/libpaintlib.a
-lib/libpaintlib.la
 lib/libpaintlib.so
 lib/libpaintlib.so.1
 bin/paintlib-config
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index f59dcee..df5096d 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A plotting library and toolkit
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_MOTIF=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		MOTIFLIB="${MOTIFLIB}" \
@@ -30,6 +30,8 @@ MAN1=		ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
 INFO=	libxmi plotutils
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|-lXm |\$$\{MOTIFLIB\} |g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lXm |\$$\{MOTIFLIB\} |g ; \
+		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 077570a..2d5a44f 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PostScript to other vector graphic formats
 
-USE_GHOSTSCRIPT=	yes
+USE_GHOSTSCRIPT=yes
 
 LIB_DEPENDS=	Magick++.8:${PORTSDIR}/graphics/ImageMagick \
 		ming.3:${PORTSDIR}/graphics/ming \
@@ -22,7 +22,7 @@ LIB_DEPENDS=	Magick++.8:${PORTSDIR}/graphics/ImageMagick \
 		EMF.1:${PORTSDIR}/graphics/libemf
 
 USE_GNOME=	gnometarget pkgconfig
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--with-libemf-include=${LOCALBASE}/include/libEMF
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index 4764c07..53bb81d 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Use OpenGL to play around with three dimensional scenes
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index 1d10531..207b3b8 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		quicktime.0:${PORTSDIR}/multimedia/libquicktime
 
 USE_GNOME=	glib12
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 24dae6b..6614b32 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS} \
@@ -59,5 +60,11 @@ CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|' \
+		${WRKSRC}/backend/Makefile.in ${WRKSRC}/frontend/Makefile.in \
+		${WRKSRC}/japi/Makefile.in ${WRKSRC}/lib/Makefile.in \
+		${WRKSRC}/sanei/Makefile.in ${WRKSRC}/tools/Makefile.in
+
 .include "Makefile.man"
 .include <bsd.port.post.mk>
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 7aeea09..730eb84 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -59,166 +59,112 @@ include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.so
 lib/libsane.so.1
-lib/sane/libsane-abaton.a
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
-lib/sane/libsane-agfafocus.a
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-apple.a
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
-lib/sane/libsane-artec.a
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec_eplus48u.a
 lib/sane/libsane-artec_eplus48u.so
 lib/sane/libsane-artec_eplus48u.so.1
-lib/sane/libsane-as6e.a
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.1
-lib/sane/libsane-avision.a
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
-lib/sane/libsane-bh.a
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.1
-lib/sane/libsane-canon.a
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon630u.a
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
-lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan2.a
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
-lib/sane/libsane-dc210.a
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc240.a
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.1
-lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dll.a
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
-lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
-lib/sane/libsane-epson.a
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
-lib/sane/libsane-fujitsu.a
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
-%%GPHOTO2%%lib/sane/libsane-gphoto2.a
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
-lib/sane/libsane-gt68xx.a
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-gt68xx.so.1
-lib/sane/libsane-hp.a
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp5400.a
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-hp5400.so.1
-lib/sane/libsane-ibm.a
 lib/sane/libsane-ibm.so
 lib/sane/libsane-ibm.so.1
-lib/sane/libsane-leo.a
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
-lib/sane/libsane-ma1509.a
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
-lib/sane/libsane-matsushita.a
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1
-lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek_usb.a
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
-lib/sane/libsane-nec.a
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.1
-lib/sane/libsane-net.a
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
-lib/sane/libsane-niash.a
 lib/sane/libsane-niash.so
 lib/sane/libsane-niash.so.1
-lib/sane/libsane-pie.a
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
-lib/sane/libsane-plustek.a
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek_pp.a
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-plustek_pp.so.1
-lib/sane/libsane-ricoh.a
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
-lib/sane/libsane-sceptre.a
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sceptre.so.1
-lib/sane/libsane-sharp.a
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
-%%USB%%lib/sane/libsane-sm3600.a
 %%USB%%lib/sane/libsane-sm3600.so
 %%USB%%lib/sane/libsane-sm3600.so.1
-lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-sp15c.a
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-st400.a
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
-lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-teco1.a
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.1
-lib/sane/libsane-teco2.a
 lib/sane/libsane-teco2.so
 lib/sane/libsane-teco2.so.1
-lib/sane/libsane-teco3.a
 lib/sane/libsane-teco3.so
 lib/sane/libsane-teco3.so.1
-lib/sane/libsane-test.a
 lib/sane/libsane-test.so
 lib/sane/libsane-test.so.1
-lib/sane/libsane-u12.a
 lib/sane/libsane-u12.so
 lib/sane/libsane-u12.so.1
-lib/sane/libsane-umax.a
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax1220u.a
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.1
-lib/sane/libsane-umax_pp.a
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
 sbin/saned
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 19232e5..f7a5425 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -28,7 +28,8 @@ USE_X_PREFIX=	yes
 USE_QT_VER=	3
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
@@ -36,4 +37,8 @@ MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${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/graphics/vp/Makefile b/graphics/vp/Makefile
index 9fd1836..f25d23c 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An image viewer for X
 PLIST_FILES=	bin/vp
 USE_SDL=	image
 USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index 7936f55..b175a8f 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -28,13 +28,15 @@ USE_BISON=	yes
 USE_GNOME=	gtk12 libxml2
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	XMMS_CONFIG="${XMMS_CONFIG}"
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<xml|<libxml/xml|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|<xml|<libxml/xml|g ; \
+		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)