Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 62 insertions, 3 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 766c13cfafd0..3aae3ea3f7f9 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://alioth.debian.org/download.php/1347/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
@@ -28,7 +28,7 @@ OPTIONS=	USB "USB support" on \
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --disable-locking
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index d0356820b1c6..d7f044023864 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -116,125 +116,184 @@ etc/sane.d/dist/umax1220u.conf
 etc/sane.d/dist/umax_pp.conf
 include/sane/sane.h
 include/sane/saneopts.h
-lib/libsane.a
+lib/libsane.la
 lib/libsane.so
 lib/libsane.so.1
+lib/sane/libsane-abaton.la
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
+lib/sane/libsane-agfafocus.la
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
+lib/sane/libsane-apple.la
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
+lib/sane/libsane-artec.la
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
+lib/sane/libsane-artec_eplus48u.la
 lib/sane/libsane-artec_eplus48u.so
 lib/sane/libsane-artec_eplus48u.so.1
+lib/sane/libsane-as6e.la
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.1
+lib/sane/libsane-avision.la
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
+lib/sane/libsane-bh.la
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.1
+lib/sane/libsane-canon.la
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
+lib/sane/libsane-canon630u.la
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
+lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
+lib/sane/libsane-coolscan2.la
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
+lib/sane/libsane-dc210.la
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
+lib/sane/libsane-dc240.la
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.1
+lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
+lib/sane/libsane-dll.la
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
+lib/sane/libsane-dmc.la
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
+lib/sane/libsane-epson.la
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
+lib/sane/libsane-fujitsu.la
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
+lib/sane/libsane-genesys.la
 lib/sane/libsane-genesys.so
 lib/sane/libsane-genesys.so.1
+%%GPHOTO2%%lib/sane/libsane-gphoto2.la
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
+lib/sane/libsane-gt68xx.la
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-gt68xx.so.1
+lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
+lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp4200.so.1
+lib/sane/libsane-hp5400.la
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-hp5400.so.1
+lib/sane/libsane-ibm.la
 lib/sane/libsane-ibm.so
 lib/sane/libsane-ibm.so.1
+lib/sane/libsane-leo.la
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
+lib/sane/libsane-lexmark.la
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-lexmark.so.1
+lib/sane/libsane-ma1509.la
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
+lib/sane/libsane-matsushita.la
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1
+lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
+lib/sane/libsane-microtek2.la
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
+lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
+lib/sane/libsane-mustek_usb.la
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
+lib/sane/libsane-mustek_usb2.la
 lib/sane/libsane-mustek_usb2.so
 lib/sane/libsane-mustek_usb2.so.1
+lib/sane/libsane-nec.la
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.1
+lib/sane/libsane-net.la
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
+lib/sane/libsane-niash.la
 lib/sane/libsane-niash.so
 lib/sane/libsane-niash.so.1
+lib/sane/libsane-pie.la
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
+lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
+lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-plustek_pp.so.1
+lib/sane/libsane-ricoh.la
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
+lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
+lib/sane/libsane-sceptre.la
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sceptre.so.1
+lib/sane/libsane-sharp.la
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
+lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3600.so
 lib/sane/libsane-sm3600.so.1
+lib/sane/libsane-sm3840.la
 lib/sane/libsane-sm3840.so
 lib/sane/libsane-sm3840.so.1
+lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
+lib/sane/libsane-sp15c.la
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
+lib/sane/libsane-st400.la
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
+lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
+lib/sane/libsane-teco1.la
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.1
+lib/sane/libsane-teco2.la
 lib/sane/libsane-teco2.so
 lib/sane/libsane-teco2.so.1
+lib/sane/libsane-teco3.la
 lib/sane/libsane-teco3.so
 lib/sane/libsane-teco3.so.1
+lib/sane/libsane-test.la
 lib/sane/libsane-test.so
 lib/sane/libsane-test.so.1
+lib/sane/libsane-u12.la
 lib/sane/libsane-u12.so
 lib/sane/libsane-u12.so.1
+lib/sane/libsane-umax.la
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
+lib/sane/libsane-umax1220u.la
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.1
+lib/sane/libsane-umax_pp.la
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
 sbin/saned