Update to 1.07

PR:		34768, 34769
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

7 files changed, 49 insertions, 28 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 5b7951b2b145..fb5f12392bf5 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
 		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR/ \
@@ -15,25 +15,28 @@ MASTER_SITE_SUBDIR=	sane-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	usb-0.1.4:${PORTSDIR}/devel/libusb \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_UNION_SEMUN" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-gphoto2=no
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 INSTALLS_SHLIB=	yes
 
 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-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-gphoto2.5 sane-hp.5 sane-microtek.5 \
-	sane-microtek2.5 sane-mustek.5 sane-mustek_pp.5 sane-mustek_usb.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-usb.5 sane-v4l.5
+MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.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-gphoto2.5 sane-hp.5 sane-microtek.5 \
+	sane-microtek2.5 sane-mustek.5 sane-mustek_pp.5 sane-mustek_usb.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-umax1220u.5 sane-umax_pp.5 \
+	sane-usb.5 sane-v4l.5
 MAN7=	sane.7
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 51c446532554..bf2a502dbe58 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-backends-1.0.6.tar.gz) = 67e24ae6a5b237a2a946efd91e354f01
+MD5 (sane-backends-1.0.7.tar.gz) = 6010d68d8a8c29d1dcbf0c6d5005770b
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index 96ef5ff78ac0..70e4d1d45e91 100644
--- a/graphics/sane-backends/files/patch-doc_Makefile.in
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- doc/Makefile.in.orig	Sat Jan 19 16:58:06 2002
++++ doc/Makefile.in	Tue Jan 29 02:05:10 2002
+@@ -24,7 +24,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
  configdir = ${sysconfdir}/sane.d
@@ -9,16 +9,30 @@
  
  MKDIR = $(top_srcdir)/mkinstalldirs
  INSTALL = @INSTALL@
-@@ -55,7 +55,7 @@
- EMACS   = xemacs
- WWW_PATH= /home/httpd/html/sane/
+@@ -48,11 +48,11 @@
+ 	  sane-mustek_usb.5
+ SECT7   = sane.7
+ MANPAGES = $(SECT1) $(SECT5) $(SECT7)
+-READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
++READMES = README AUTHORS ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
+           PROJECTS README README.aix README.hp-ux README.linux README.os2 \
+           README.solaris README.unixware2 README.unixware7 TODO
+ DOCS    = backend-writing.txt sane.ps sane.dvi
+-BACKDIRS= canon mustek mustek_usb umax
++BACKDIRS= canon mustek umax
+ LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS latex
+ DLH	= TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
+ MAN2HTML= nroff -man |\
+@@ -82,7 +82,7 @@
+ .PHONY: all clean depend dist distclean html html-man install \
+   install-mostang sane-backends.html sane-html uninstall
  
 -all: sane.ps $(MANPAGES) 
 +all: $(MANPAGES) 
  
  %.1 %.5 %.7: %.man
  	@sed -e 's|@DATADIR@|$(datadir)|g' \
-@@ -80,6 +80,7 @@
+@@ -107,6 +107,7 @@
  	  echo installing $${page} in $(mandir)/man7/$${page}...; \
  	  $(INSTALL_DATA) $${page} $(mandir)/man7/$${page} || exit 1; \
  	done
@@ -26,7 +40,7 @@
  	$(MKDIR) $(docdir)
  	@for readme in $(READMES); do \
  	  echo installing $${readme} in $(docdir)/$${readme}...; \
-@@ -99,6 +100,7 @@
+@@ -126,6 +127,7 @@
  	    echo installing $${doc} in $(docdir)/$${doc}...; \
  	    $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \
  	  done
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index ab411a2a2e03..4a8ed6f1095d 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -35,6 +35,7 @@ etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
+etc/sane.d/umax1220u.conf
 etc/sane.d/umax_pp.conf
 include/sane/sane.h
 include/sane/saneopts.h
@@ -128,6 +129,9 @@ 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-sm3600.a
+lib/sane/libsane-sm3600.so
+lib/sane/libsane-sm3600.so.1
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
@@ -143,12 +147,14 @@ 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-umax1220u.a
+lib/sane/libsane-umax1220u.so
+lib/sane/libsane-umax1220u.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
@@ -168,8 +174,6 @@ sbin/saned
 %%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/mustek_usb/mustek_usb.CHANGES
-%%PORTDOCS%%share/doc/sane/mustek_usb/mustek_usb.TODO
 %%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
@@ -204,7 +208,6 @@ sbin/saned
 %%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_usb
 %%PORTDOCS%%@dirrm share/doc/sane/mustek
 %%PORTDOCS%%@dirrm share/doc/sane/canon
 %%PORTDOCS%%@dirrm share/doc/sane
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index abb4de144947..0321e162fdb2 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sane-frontends
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
 		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		xcam.1 xscanimage.1
+MAN1=		scanadf.1 xcam.1 xscanimage.1
 
 .if defined(WITH_GIMP)
 LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo
index e37710052169..bfbd4b3190fe 100644
--- a/graphics/sane-frontends/distinfo
+++ b/graphics/sane-frontends/distinfo
@@ -1 +1 @@
-MD5 (sane-frontends-1.0.6.tar.gz) = d9cd57d56fc91025e404fcf9311ecc9c
+MD5 (sane-frontends-1.0.7.tar.gz) = 058c924a766df70d339e8579f6916527
diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist
index 0baedc8dec5b..e4aed551633e 100644
--- a/graphics/sane-frontends/pkg-plist
+++ b/graphics/sane-frontends/pkg-plist
@@ -1,3 +1,4 @@
+bin/scanadf
 bin/xcam
 bin/xscanimage
 share/sane/sane-style.rc