6 files changed, 127 insertions, 209 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 6b12fa0859b8..c0ac48901e7c 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.0.5
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
-		ftp://ftp.de.mostang.com/pub/sane/ \
-		ftp://ftp.no.mostang.com/pub/sane/
+MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
+		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR/ \
+		ftp://ftp.no.mostang.com/pub/sane/%SUBDIR%/
+MASTER_SITE_SUBDIR=	sane-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,18 +19,21 @@ 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"
+MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
+INSTALLS_SHLIB=	yes
 
-MAN1=	saned.1 scanimage.1
+MAN1=	sane-find-scanner.1 saned.1 scanimage.1
 MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.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-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
+	sane-as6e.5 sane-avision.5 sane-bh.5 sane-canon.5 sane-coolscan.5 \
+	sane-dc210.5 sane-dc240.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-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-sm3600.5 sane-snapscan.5 sane-st400.5 sane-tamarack.5 \
+	sane-umax.5 sane-umax_pp.5 sane-v4l.5
+MAN7=	sane.7
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 12925ad6b6df..bc51f0120775 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-backends-1.0.4.tar.gz) = 9c265548bc5b628e6cc614124d49b00e
+MD5 (sane-backends-1.0.5.tar.gz) = 4e95675d474609b2b5d8eebdef2e0915
diff --git a/graphics/sane-backends/files/patch-ad b/graphics/sane-backends/files/patch-ad
deleted file mode 100644
index aa5e99f75678..000000000000
--- a/graphics/sane-backends/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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-backends/files/patch-ae b/graphics/sane-backends/files/patch-ae
deleted file mode 100644
index 8d7ef7a6640a..000000000000
--- a/graphics/sane-backends/files/patch-ae
+++ /dev/null
@@ -1,172 +0,0 @@
---- 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;
- }
-+
-+#define WE_HAVE_FIND_DEVICES
-+
-+int
-+cam_compare_inquiry(int fd, path_id_t path_id,
-+		    target_id_t target_id, lun_id_t target_lun,
-+		    const char *vendor, const char *product, const char *type)
-+{
-+  struct ccb_dev_match	cdm;
-+  struct device_match_pattern *pattern;
-+  struct scsi_inquiry_data *inq;
-+  int retval = 0;
-+
-+  /* build ccb for device match */
-+  bzero(&cdm, sizeof(cdm));
-+  cdm.ccb_h.func_code = XPT_DEV_MATCH;
-+
-+  /* result buffer */
-+  cdm.match_buf_len = sizeof(struct dev_match_result);
-+  cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len);
-+  cdm.num_matches = 0;
-+
-+  /* pattern buffer */
-+  cdm.num_patterns = 1;
-+  cdm.pattern_buf_len = sizeof(struct dev_match_pattern);
-+  cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len);
-+
-+  /* assemble conditions */
-+  cdm.patterns[0].type = DEV_MATCH_DEVICE;
-+  pattern = &cdm.patterns[0].pattern.device_pattern;
-+  pattern->flags = DEV_MATCH_PATH | DEV_MATCH_TARGET | DEV_MATCH_LUN;
-+  pattern->path_id = path_id;
-+  pattern->target_id = target_id;
-+  pattern->target_lun = target_lun;
-+  
-+  if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) {
-+    DBG (1, "error sending CAMIOCOMMAND ioctl");
-+    retval = -1;
-+    goto ret;
-+  }
-+
-+  if ((cdm.ccb_h.status != CAM_REQ_CMP)
-+      || ((cdm.status != CAM_DEV_MATCH_LAST)
-+	  && (cdm.status != CAM_DEV_MATCH_MORE))) {
-+    DBG (1, "got CAM error %#x, CDM error %d\n",
-+	 cdm.ccb_h.status, cdm.status);
-+    retval = -1;
-+    goto ret;
-+  }
-+
-+  if (cdm.num_matches == 0) {
-+    DBG (1, "not found\n");
-+    retval = -1;
-+    goto ret;
-+  }
-+	    
-+  if (cdm.matches[0].type != DEV_MATCH_DEVICE) {
-+    DBG (1, "no device match\n");
-+    retval = -1;
-+    goto ret;
-+  }
-+
-+  inq = &cdm.matches[0].result.device_result.inq_data;
-+  if ((vendor && cam_strmatch(inq->vendor, vendor, SID_VENDOR_SIZE)) ||
-+      (product && cam_strmatch(inq->product, product, SID_PRODUCT_SIZE)))
-+    retval = 1;
-+ 
-+ ret:
-+  free(cdm.patterns);
-+  free(cdm.matches);
-+  return(retval);
-+}
-+
-+void
-+sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
-+			 const char *findtype,
-+			 int findbus, int findchannel, int findid, int findlun,
-+			 SANE_Status (*attach) (const char *dev))
-+{
-+  int		fd;
-+  struct ccb_dev_match	cdm;
-+  struct periph_match_pattern *pattern;
-+  struct periph_match_result *result;
-+  int		i;
-+  char devname[16];
-+
-+  DBG_INIT();
-+
-+  if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) {
-+    DBG (1, "could not open %s\n", XPT_DEVICE);
-+    return;
-+  }
-+
-+  /* build ccb for device match */
-+  bzero(&cdm, sizeof(cdm));
-+  cdm.ccb_h.func_code = XPT_DEV_MATCH;
-+
-+  /* result buffer */
-+  cdm.match_buf_len = sizeof(struct dev_match_result) * 100;
-+  cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len);
-+  cdm.num_matches = 0;
-+
-+  /* pattern buffer */
-+  cdm.num_patterns = 1;
-+  cdm.pattern_buf_len = sizeof(struct dev_match_pattern);
-+  cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len);
-+
-+  /* assemble conditions ... findchannel is ignored */
-+  cdm.patterns[0].type = DEV_MATCH_PERIPH;
-+  pattern = &cdm.patterns[0].pattern.periph_pattern;
-+  pattern->flags = PERIPH_MATCH_NAME;
-+  strcpy(pattern->periph_name, "pass");
-+  if (findbus != -1) {
-+    pattern->path_id = findbus;
-+    pattern->flags |= PERIPH_MATCH_PATH;
-+  }    
-+  if (findid != -1) {
-+    pattern->target_id = findid;
-+    pattern->flags |= PERIPH_MATCH_TARGET;
-+  }
-+  if (findlun != -1) {
-+    pattern->target_lun = findlun;
-+    pattern->flags |= PERIPH_MATCH_LUN;
-+  }
-+
-+  /* result loop */
-+  do {
-+    if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) {
-+      DBG (1, "error sending CAMIOCOMMAND ioctl");
-+      break;
-+    }
-+
-+    if ((cdm.ccb_h.status != CAM_REQ_CMP)
-+	|| ((cdm.status != CAM_DEV_MATCH_LAST)
-+	    && (cdm.status != CAM_DEV_MATCH_MORE))) {
-+      DBG (1, "got CAM error %#x, CDM error %d\n", 
-+	   cdm.ccb_h.status, cdm.status);
-+      break;
-+    }
-+    
-+    for (i = 0; i < cdm.num_matches; i++) {
-+      if (cdm.matches[i].type != DEV_MATCH_PERIPH)
-+	continue;
-+      result = &cdm.matches[i].result.periph_result;
-+      DBG (4, "%s%d on scbus%d %d:%d\n",
-+	      result->periph_name, result->unit_number,
-+	      result->path_id, result->target_id, result->target_lun);
-+      if (cam_compare_inquiry(fd, result->path_id,
-+			      result->target_id, result->target_lun,
-+			      findvendor, findmodel, findtype) == 0) {
-+	sprintf(devname, "/dev/%s%d", result->periph_name, result->unit_number);
-+	(*attach) (devname);
-+      }
-+    }
-+  } while ((cdm.ccb_h.status == CAM_REQ_CMP)
-+	   && (cdm.status == CAM_DEV_MATCH_MORE));
-+
-+  free(cdm.patterns);
-+  free(cdm.matches);
-+  close(fd);
-+  return;
-+}
-+
- #endif
- 
- 
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..96ef5ff78ac0
--- /dev/null
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -0,0 +1,36 @@
+--- doc/Makefile.in.orig	Mon Jun 11 03:20:55 2001
++++ doc/Makefile.in	Tue Jul  3 04:48:46 2001
+@@ -20,7 +20,7 @@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ configdir = ${sysconfdir}/sane.d
+-docdir=$(prefix)/doc/sane-@VERSION@
++docdir=$(datadir)/doc/sane
+ 
+ MKDIR = $(top_srcdir)/mkinstalldirs
+ INSTALL = @INSTALL@
+@@ -55,7 +55,7 @@
+ EMACS   = xemacs
+ WWW_PATH= /home/httpd/html/sane/
+ 
+-all: sane.ps $(MANPAGES) 
++all: $(MANPAGES) 
+ 
+ %.1 %.5 %.7: %.man
+ 	@sed -e 's|@DATADIR@|$(datadir)|g' \
+@@ -80,6 +80,7 @@
+ 	  echo installing $${page} in $(mandir)/man7/$${page}...; \
+ 	  $(INSTALL_DATA) $${page} $(mandir)/man7/$${page} || exit 1; \
+ 	done
++ifndef NOPORTDOCS
+ 	$(MKDIR) $(docdir)
+ 	@for readme in $(READMES); do \
+ 	  echo installing $${readme} in $(docdir)/$${readme}...; \
+@@ -99,6 +100,7 @@
+ 	    echo installing $${doc} in $(docdir)/$${doc}...; \
+ 	    $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \
+ 	  done
++endif
+ 
+ uninstall:
+ 	@for page in $(SECT1); do \
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index a410541aaf4a..70debb3cd194 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -1,12 +1,16 @@
 bin/sane-config
+bin/sane-find-scanner
 bin/scanimage
 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/bh.conf
+etc/sane.d/canon.conf
 etc/sane.d/coolscan.conf
 etc/sane.d/dc210.conf
+etc/sane.d/dc240.conf
 etc/sane.d/dc25.conf
 etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
@@ -30,6 +34,7 @@ etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
+etc/sane.d/umax_pp.conf
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.a
@@ -53,6 +58,9 @@ 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
@@ -62,6 +70,9 @@ 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-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
@@ -104,9 +115,6 @@ 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
@@ -131,7 +139,69 @@ lib/sane/libsane-tamarack.so.1
 lib/sane/libsane-umax.a
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
+lib/sane/libsane-umax_pp.a
+lib/sane/libsane-umax_pp.so
+lib/sane/libsane-umax_pp.so.1
 sbin/saned
+%%PORTDOCS%%share/doc/sane/AUTHORS
+%%PORTDOCS%%share/doc/sane/COPYING
+%%PORTDOCS%%share/doc/sane/ChangeLog
+%%PORTDOCS%%share/doc/sane/LEVEL2
+%%PORTDOCS%%share/doc/sane/LICENSE
+%%PORTDOCS%%share/doc/sane/NEWS
+%%PORTDOCS%%share/doc/sane/PROBLEMS
+%%PORTDOCS%%share/doc/sane/PROJECTS
+%%PORTDOCS%%share/doc/sane/README
+%%PORTDOCS%%share/doc/sane/README.aix
+%%PORTDOCS%%share/doc/sane/README.hp-ux
+%%PORTDOCS%%share/doc/sane/README.linux
+%%PORTDOCS%%share/doc/sane/README.os2
+%%PORTDOCS%%share/doc/sane/README.solaris
+%%PORTDOCS%%share/doc/sane/README.unixware2
+%%PORTDOCS%%share/doc/sane/README.unixware7
+%%PORTDOCS%%share/doc/sane/TODO
+%%PORTDOCS%%share/doc/sane/backend-writing.txt
+%%PORTDOCS%%share/doc/sane/canon/canon.changes
+%%PORTDOCS%%share/doc/sane/canon/canon.install2700F.txt
+%%PORTDOCS%%share/doc/sane/mustek/mustek.CHANGES
+%%PORTDOCS%%share/doc/sane/umax/negative-types.txt
+%%PORTDOCS%%share/doc/sane/umax/sane-logo.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-logo2.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-advanced-options-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-advanced.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-astra-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-config-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.dvi
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.tex
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-histogram.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-mailinglist.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-mirage-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-not-listed-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-old-scanners-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-options-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-others-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-parport-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-powerlook-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-scanner-clones-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-scanners-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-speed-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-standard-options-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-standard.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-text.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-text2.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-text4.jpg
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-uc-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-vista-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax.jpg
+%%PORTDOCS%%share/doc/sane/umax/umax.BUGS
+%%PORTDOCS%%share/doc/sane/umax/umax.CHANGES
+%%PORTDOCS%%share/doc/sane/umax/umax.FAQ
+%%PORTDOCS%%share/doc/sane/umax/umax.TODO
+%%PORTDOCS%%@dirrm share/doc/sane/umax
+%%PORTDOCS%%@dirrm share/doc/sane/mustek
+%%PORTDOCS%%@dirrm share/doc/sane/canon
+%%PORTDOCS%%@dirrm share/doc/sane
 @dirrm lib/sane
 @dirrm include/sane
 @dirrm etc/sane.d