change the libtool version to use from 1.3 to 1.5

2 files changed, 8 insertions, 55 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 24dae6b14901..6614b32836e9 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 7aeea099bc91..730eb84ddf74 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