6 files changed, 71 insertions, 37 deletions

diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 1d39d4f57d78..eafc4bd5ff95 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sane
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.mostang.com/pub/sane/
@@ -19,40 +19,18 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-.include <bsd.port.pre.mk>
-
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-.if ${OSVERSION} < 300000
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}"
-.else
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lcam" \
-		GTK_CONFIG="${GTK_CONFIG}"
-.endif
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-gtktest
 
-MAN1=		scanimage.1 \
-		xscanimage.1 \
-		saned.1
-MAN5=		sane-abaton.5 \
-		sane-agfafocus.5 \
-		sane-apple.5 \
-		sane-dc25.5 \
-		sane-dll.5 \
-		sane-dmc.5 \
-		sane-epson.5 \
-		sane-hp.5 \
-		sane-microtek.5 \
-		sane-microtek2.5 \
-		sane-mustek.5 \
-		sane-net.5 \
-		sane-pint.5 \
-		sane-pnm.5 \
-		sane-qcam.5 \
-		sane-scsi.5 \
-		sane-umax.5
+MAN1=	saned.1 scanimage.1 xscanimage.1
+MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-dll.5 sane-dc25.5 \
+	sane-dmc.5 sane-epson.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
+	sane-mustek.5 sane-net.5 sane-pint.5 sane-pnm.5 sane-umax.5 \
+	sane-qcam.5 sane-scsi.5 sane-artec.5 sane-fujitsu.5 sane-sharp.5
 
 pre-configure:
 	@${ECHO} "*** Note: SANE can be built with an X scanner interface"
@@ -61,6 +39,6 @@ pre-configure:
 	@${ECHO} "*** the GIMP and GTK packages/ports."
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sane/distinfo b/graphics/sane/distinfo
index 3812b0c4393d..eade6264497e 100644
--- a/graphics/sane/distinfo
+++ b/graphics/sane/distinfo
@@ -1 +1 @@
-MD5 (sane-1.0.1.tar.gz) = d7989b2b18505c72b8568d11b56bb97a
+MD5 (sane-1.0.2.tar.gz) = 8cd5d092225f98032db88a221a1d6efe
diff --git a/graphics/sane/files/patch-ab b/graphics/sane/files/patch-ab
new file mode 100644
index 000000000000..922cf11de150
--- /dev/null
+++ b/graphics/sane/files/patch-ab
@@ -0,0 +1,14 @@
+--- backend/artec.c.orig	Sun Mar  5 22:40:43 2000
++++ backend/artec.c	Wed Apr 19 06:00:00 2000
+@@ -3238,7 +3238,11 @@
+   if (DBG_LEVEL == 101)
+     {
+       debug_fd = open ("artec.data.raw",
++#ifdef __FreeBSD__
++		       O_WRONLY | O_CREAT | O_TRUNC, 0666);
++#else
+ 		       O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666);
++#endif
+       if (debug_fd > -1)
+ 	DBG (101, "opened artec.data.raw output file\n");
+     }
diff --git a/graphics/sane/files/patch-ac b/graphics/sane/files/patch-ac
new file mode 100644
index 000000000000..f80c92526370
--- /dev/null
+++ b/graphics/sane/files/patch-ac
@@ -0,0 +1,11 @@
+--- backend/Makefile.in.orig	Sun Mar  5 22:40:35 2000
++++ backend/Makefile.in	Wed Apr 19 06:00:00 2000
+@@ -113,7 +113,7 @@
+ 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
+ 	  (cd ..; $(LN_S) sane/$$n $$nn); \
+ 	done || exit 1
+-	$(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
++	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
+ 	@list="$(CONFIGS)"; for cfg in $$list; do \
+ 	  if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
+ 	  if test -f $(configdir)/$${cfg}; then \
diff --git a/graphics/sane/files/patch-ad b/graphics/sane/files/patch-ad
new file mode 100644
index 000000000000..aa5e99f75678
--- /dev/null
+++ b/graphics/sane/files/patch-ad
@@ -0,0 +1,19 @@
+--- tools/Makefile.in.orig	Sun Mar  5 22:45:19 2000
++++ tools/Makefile.in	Wed Apr 19 06:00:00 2000
+@@ -25,6 +25,7 @@
+ MKDIR = $(top_srcdir)/mkinstalldirs
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ RANLIB = @RANLIB@
+ 
+@@ -65,7 +66,7 @@
+ all:	$(DESTINATIONS)
+ 
+ install: sane-config
+-	$(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
++	$(INSTALL_SCRIPT) sane-config $(bindir)/sane-config
+ 
+ sane-config: sane-config.in $(top_builddir)/config.status 
+ 	cd $(top_builddir) \
diff --git a/graphics/sane/pkg-plist b/graphics/sane/pkg-plist
index ff66b11e0440..03f476089f1f 100644
--- a/graphics/sane/pkg-plist
+++ b/graphics/sane/pkg-plist
@@ -5,6 +5,7 @@ etc/sane.d/abaton.conf
 etc/sane.d/agfafocus.conf
 etc/sane.d/apple.conf
 etc/sane.d/artec.conf
+etc/sane.d/avision.conf
 etc/sane.d/coolscan.conf
 etc/sane.d/dc210.conf
 etc/sane.d/dc25.conf
@@ -12,6 +13,7 @@ etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
 etc/sane.d/epson.conf
 etc/sane.d/hp.conf
+etc/sane.d/m3096g.conf
 etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
@@ -21,6 +23,7 @@ etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
 etc/sane.d/sharp.conf
 etc/sane.d/snapscan.conf
+etc/sane.d/sp15c.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
 include/sane/config.h
@@ -49,6 +52,9 @@ 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-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
@@ -73,6 +79,9 @@ 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
@@ -100,14 +109,17 @@ 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-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
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+@unexec /sbin/ldconfig -R
 sbin/saned
 share/sane-style.rc
 @dirrm lib/sane