Upgrade to 1.0.4,

sane split to 2 ports now, sane-backends and sane-frontends.

PR:		ports/24931
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

10 files changed, 61 insertions, 89 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 7e6768f3ed4..83ca9f627da 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	sane
+# New ports collection makefile for:	sane-backends
 # Date created:			Sat Jul 19 16:23:10 MET DST 1997
 # Whom:				gary@hotlava.com
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sane
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTNAME=	sane-backends
+PORTVERSION=	1.0.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.mostang.com/pub/sane/
@@ -19,28 +18,17 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
-INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=	saned.1 scanimage.1 xcam.1 xscanimage.1
+MAN1=	saned.1 scanimage.1
 MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
-	sane-avision.5 sane-canon.5 sane-coolscan.5 sane-dc210.5 \
-	sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
+	sane-as6e.5 sane-avision.5 sane-canon.5 sane-coolscan.5 \
+	sane-dc210.5 sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
 	sane-fujitsu.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
-	sane-mustek.5 sane-mustek_pp.5 sane-net.5 sane-pint.5 \
-	sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
+	sane-mustek.5 sane-mustek_pp.5 sane-nec.5 sane-net.5 sane-pie.5 \
+	sane-pint.5 sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
 	sane-s9036.5 sane-scsi.5 sane-sharp.5 sane-snapscan.5 \
 	sane-st400.5 sane-tamarack.5 sane-umax.5 sane-v4l.5
 
-pre-configure:
-	@${ECHO} "*** Note: SANE can be built with an X scanner interface"
-	@${ECHO} "*** (xscanimage) as well as a GIMP plug-in.  If you wish"
-	@${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
-	@${ECHO} "*** the GIMP and GTK packages/ports."
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 5c98b7de391..12925ad6b6d 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
+MD5 (sane-backends-1.0.4.tar.gz) = 9c265548bc5b628e6cc614124d49b00e
diff --git a/graphics/sane-backends/files/patch-ab b/graphics/sane-backends/files/patch-ab
deleted file mode 100644
index 922cf11de15..00000000000
--- a/graphics/sane-backends/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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-backends/files/patch-ac b/graphics/sane-backends/files/patch-ac
deleted file mode 100644
index f80c9252637..00000000000
--- a/graphics/sane-backends/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-backends/files/patch-ae b/graphics/sane-backends/files/patch-ae
index c880e73f2c0..8d7ef7a6640 100644
--- a/graphics/sane-backends/files/patch-ae
+++ b/graphics/sane-backends/files/patch-ae
@@ -1,6 +1,6 @@
---- sanei/sanei_scsi.c.orig	Sat Aug 12 23:54:15 2000
-+++ sanei/sanei_scsi.c	Fri Sep  8 22:38:49 2000
-@@ -2424,6 +2424,169 @@
+--- sanei/sanei_scsi.c.orig	Fri Dec  1 05:02:30 2000
++++ sanei/sanei_scsi.c	Sat Dec 23 04:14:27 2000
+@@ -2425,6 +2425,169 @@
     cam_freeccb(ccb);
     return SANE_STATUS_GOOD;
  }
@@ -170,11 +170,3 @@
  #endif
  
  
-@@ -3722,6 +3885,7 @@
- 			 int findbus, int findchannel, int findid, int findlun,
- 			 SANE_Status (*attach) (const char *dev))
- {
-+  DBG_INIT();
-   DBG (1, "sanei_scsi_find_devices: not implemented for this platform\n");
- }
- 
diff --git a/graphics/sane-backends/files/patch-af b/graphics/sane-backends/files/patch-af
deleted file mode 100644
index 22046d4f022..00000000000
--- a/graphics/sane-backends/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
---- frontend/xscanimage.c.orig	Sun Oct 15 08:12:12 2000
-+++ frontend/xscanimage.c	Sun Oct 15 08:12:39 2000
-@@ -57,6 +57,8 @@
- 
- #ifdef HAVE_LIBGIMP_GIMP_H
- 
-+#define GIMP_ENABLE_COMPAT_CRUFT
-+
- #include <libgimp/gimp.h>
- 
- static void query (void);
-
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
new file mode 100644
index 00000000000..299e402eeff
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -0,0 +1,11 @@
+--- backend/Makefile.in.orig	Thu Mar 22 16:48:30 2001
++++ backend/Makefile.in	Thu Mar 22 16:50:53 2001
+@@ -69,7 +69,7 @@
+ LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
+ 
+ libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
+-	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
++	@$(LIBTOOL) $(MLINK) $(CC) -avoid-version -module -o $@ $($*_LIBS) \
+ 	$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
+ 	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
+ 
diff --git a/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
new file mode 100644
index 00000000000..3c56a56b1a4
--- /dev/null
+++ b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
@@ -0,0 +1,15 @@
+--- sanei/sanei_pa4s2.c.orig	Sun Oct  8 22:58:42 2000
++++ sanei/sanei_pa4s2.c	Wed Feb  7 00:28:27 2001
+@@ -89,6 +89,12 @@
+ #define IO_SUPPORT_MISSING
+ #endif
+ 
++#if defined(__FreeBSD__) && defined(__i386__)
++#define HAVE_IOPERM
++#define ioperm i386_set_ioperm
++#include <machine/sysarch.h>
++#endif
++
+ #include "sane/sane.h"
+ #include "sane/sanei.h"
+ #include "sane/sanei_pa4s2.h"
diff --git a/graphics/sane-backends/pkg-descr b/graphics/sane-backends/pkg-descr
index ea85009d7c4..2b465338c49 100644
--- a/graphics/sane-backends/pkg-descr
+++ b/graphics/sane-backends/pkg-descr
@@ -1,9 +1,14 @@
-SANE is a universal scanner interface. The value of such a universal
-interface is that it allows writing just one driver per image acquisition
-device rather than one driver for each device and application. So, if you
-have three applications and four devices, traditionally you'd have had to
-write 12 different programs. With SANE, this number is reduced to seven:
-the three applications plus the four drivers. Of course, the savings get
-even bigger as more and more drivers and/or applications are added. 
+SANE ("Scanner Access Now Easy") is a universal scanner interface.
+The value of such a universal interface is that it allows writing
+just one driver per image acquisition device rather than one driver
+for each device and application. So, if you have three applications
+and four devices, traditionally you'd have had to write 12 different
+programs.  With SANE, this number is reduced to seven: the three
+applications plus the four drivers. Of course, the savings get even
+bigger as more and more drivers and/or applications are added.
+
+sane-backends cotains documentation, several backends, scanimage
+command line frontend, and networking support. For other/graphical
+frontends take a look at sane-frontends and/or xsane.
 
 WWW: http://www.mostang.com/sane/
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index e6f6d114695..a410541aaf4 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -1,7 +1,5 @@
 bin/sane-config
 bin/scanimage
-bin/xcam
-bin/xscanimage
 etc/sane.d/abaton.conf
 etc/sane.d/agfafocus.conf
 etc/sane.d/apple.conf
@@ -19,7 +17,9 @@ etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
 etc/sane.d/mustek_pp.conf
+etc/sane.d/nec.conf
 etc/sane.d/net.conf
+etc/sane.d/pie.conf
 etc/sane.d/plustek.conf
 etc/sane.d/ricoh.conf
 etc/sane.d/s9036.conf
@@ -30,17 +30,7 @@ etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
-include/sane/config.h
 include/sane/sane.h
-include/sane/sanei.h
-include/sane/sanei_backend.h
-include/sane/sanei_codec_ascii.h
-include/sane/sanei_codec_bin.h
-include/sane/sanei_debug.h
-include/sane/sanei_net.h
-include/sane/sanei_pa4s2.h
-include/sane/sanei_scsi.h
-include/sane/sanei_wire.h
 include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.so
@@ -57,6 +47,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-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
@@ -99,9 +92,15 @@ 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
@@ -133,7 +132,6 @@ lib/sane/libsane-umax.a
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
 sbin/saned
-share/sane-style.rc
 @dirrm lib/sane
 @dirrm include/sane
 @dirrm etc/sane.d