4 files changed, 20 insertions, 80 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 83ca9f627daa..6b12fa0859b8 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		ftp://ftp.mostang.com/pub/sane/
-MASTER_SITE_SUBDIR=	apps/graphics/capture
+MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
+		ftp://ftp.de.mostang.com/pub/sane/ \
+		ftp://ftp.no.mostang.com/pub/sane/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,6 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
index 299e402eeff1..b922a02fa963 100644
--- a/graphics/sane-backends/files/patch-backend_Makefile.in
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -1,5 +1,5 @@
---- backend/Makefile.in.orig	Thu Mar 22 16:48:30 2001
-+++ backend/Makefile.in	Thu Mar 22 16:50:53 2001
+--- backend/Makefile.in.orig	Fri Dec  1 04:05:49 2000
++++ backend/Makefile.in	Tue Mar 27 07:00:10 2001
 @@ -69,7 +69,7 @@
  LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
  
@@ -9,3 +9,16 @@
  	$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
  	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
  
+@@ -109,10 +109,10 @@
+ 	@# Assume the dll name without any versions is last
+ 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
+ 	rm -f $(libdir)/libsane.a $(libdir)/libsane.$$dllend \
+-		$(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
++		$(libdir)/libsane.$$dllend.$(V_MAJOR); \
+ 	$(LN_S) sane/libsane-dll.a $(libdir)/libsane.a; \
+ 	$(LN_S) sane/libsane-dll.$$dllend $(libdir)/libsane.$$dllend ; \
+-	cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
++	cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR); do \
+ 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
+ 	  (cd ..; $(LN_S) sane/$$n $$nn); \
+ 	done || exit 1
diff --git a/graphics/sane-backends/pkg-message b/graphics/sane-backends/pkg-message
deleted file mode 100644
index 2990a3c62111..000000000000
--- a/graphics/sane-backends/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-Congratulations, SANE is now installed.
-
-If you built it with GIMP and GTK packages/ports installed, you can
-use SANE as a GIMP plug-in.  To do this, as root, type:
-
-ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/1.1/plug-ins/xscanimage
-
-Then run the GIMP, and a new "Acquire" menu item should appear in the
-"Xtras" menu.  Use this to access your scanner.
-
-Have fun!
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index a410541aaf4a..6299969d516f 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -35,102 +35,38 @@ 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-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-canon.a
 lib/sane/libsane-canon.so
-lib/sane/libsane-canon.so.1
-lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-dc210.a
 lib/sane/libsane-dc210.so
-lib/sane/libsane-dc210.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-hp.a
 lib/sane/libsane-hp.so
-lib/sane/libsane-hp.so.1
-lib/sane/libsane-m3096g.a
 lib/sane/libsane-m3096g.so
-lib/sane/libsane-m3096g.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_pp.a
 lib/sane/libsane-mustek_pp.so
-lib/sane/libsane-mustek_pp.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-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-pnm.a
 lib/sane/libsane-pnm.so
-lib/sane/libsane-pnm.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-sharp.a
 lib/sane/libsane-sharp.so
-lib/sane/libsane-sharp.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-umax.a
 lib/sane/libsane-umax.so
-lib/sane/libsane-umax.so.1
 sbin/saned
 @dirrm lib/sane
 @dirrm include/sane