- Update to 1.0.16

PR:		ports/85383
Submitted by:	Ports Fury

6 files changed, 34 insertions, 34 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 6614b32836e9..58e709cbd6c7 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.15
+PORTVERSION=	1.0.16
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
+MASTER_SITES=	http://alioth.debian.org/download.php/1079/ \
+		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \
@@ -20,20 +21,21 @@ COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GNOME=	gnometarget lthack
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+OPTIONS=	USB "USB support" on \
+		NLS "NLS support" on \
+		GPHOTO2 "gPhoto2 support" off
+
+USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS} \
-		DOCSDIR="${DOCSDIR}"
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
+MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 INSTALLS_SHLIB=	yes
 
-OPTIONS=	USB "USB support" on \
-		NLS "NLS support" on \
-		GPHOTO2 "gPhoto2 support" off
-
+.include "Makefile.man"
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_USB)
@@ -61,10 +63,7 @@ PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|' \
-		${WRKSRC}/backend/Makefile.in ${WRKSRC}/frontend/Makefile.in \
-		${WRKSRC}/japi/Makefile.in ${WRKSRC}/lib/Makefile.in \
-		${WRKSRC}/sanei/Makefile.in ${WRKSRC}/tools/Makefile.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|= \.\./libtool|= @LIBTOOL@|g'
 
-.include "Makefile.man"
 .include <bsd.port.post.mk>
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index 7919fedaa87c..d6f2e1906f8c 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -22,6 +22,7 @@ MAN5+=	sane-dll.5
 MAN5+=	sane-dmc.5
 MAN5+=	sane-epson.5
 MAN5+=	sane-fujitsu.5
+MAN5+=	sane-genesys.5
 MAN5+=	sane-gphoto2.5
 MAN5+=	sane-gt68xx.5
 MAN5+=	sane-hp.5
@@ -51,6 +52,7 @@ MAN5+=	sane-sceptre.5
 MAN5+=	sane-scsi.5
 MAN5+=	sane-sharp.5
 MAN5+=	sane-sm3600.5
+MAN5+=	sane-sm3840.5
 MAN5+=	sane-snapscan.5
 MAN5+=	sane-sp15c.5
 MAN5+=	sane-st400.5
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 6c37707cb314..17e410ec7c82 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,2 +1,2 @@
-MD5 (sane-backends-1.0.15.tar.gz) = 3b804f35cdfbc5ad2d201ffe078bbac9
-SIZE (sane-backends-1.0.15.tar.gz) = 3231759
+MD5 (sane-backends-1.0.16.tar.gz) = bec9b9262246316b4ebfe2bc7451aa28
+SIZE (sane-backends-1.0.16.tar.gz) = 3409799
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
index d8c8b273d2db..2d0744985b94 100644
--- a/graphics/sane-backends/files/patch-configure
+++ b/graphics/sane-backends/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Thu Jul  8 18:29:34 2004
-+++ configure	Thu Jul  8 18:29:51 2004
-@@ -6464,7 +6464,7 @@
+--- configure.orig	Sun Aug  7 18:50:27 2005
++++ configure	Mon Aug  8 03:17:30 2005
+@@ -6868,7 +6868,7 @@
  
  
  
 -for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
 +for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \
-     sys/time.h sys/shm.h \
+     sys/time.h sys/shm.h sys/ipc.h sys/signal.h \
      sys/scanio.h scsi.h sys/scsi.h sys/scsicmd.h sys/scsiio.h \
-     bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h io/cam/cam.h \
+     bsd/dev/scsireg.h scsi/sg.h /usr/src/linux/include/scsi/sg.h \
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index 7c91d2acfe09..918549d3f577 100644
--- a/graphics/sane-backends/files/patch-doc_Makefile.in
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -1,14 +1,5 @@
---- doc/Makefile.in.orig	Wed Aug  4 01:22:28 2004
-+++ doc/Makefile.in	Tue Nov  9 12:19:47 2004
-@@ -25,7 +25,7 @@
- includedir = @includedir@
- oldincludedir = /usr/include
- configdir = ${sysconfdir}/sane.d
--docdir=$(prefix)/doc/sane-@VERSION@
-+docdir=$(DOCSDIR)
- 
- MKDIR = $(top_srcdir)/mkinstalldirs
- INSTALL = @INSTALL@
+--- doc/Makefile.in.orig	Sat Jul 16 06:19:07 2005
++++ doc/Makefile.in	Mon Aug  8 03:19:18 2005
 @@ -56,7 +56,7 @@
  SECT7   = sane.7
  SECT8	= saned.8
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 730eb84ddf74..8cd355a9d5d2 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -20,6 +20,7 @@ etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
 etc/sane.d/epson.conf
 etc/sane.d/fujitsu.conf
+etc/sane.d/genesys.conf
 %%GPHOTO2%%etc/sane.d/gphoto2.conf
 etc/sane.d/gt68xx.conf
 etc/sane.d/hp.conf
@@ -42,6 +43,7 @@ etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
 etc/sane.d/sceptre.conf
 etc/sane.d/sharp.conf
+etc/sane.d/sm3840.conf
 etc/sane.d/snapscan.conf
 etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
@@ -97,6 +99,8 @@ lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
+lib/sane/libsane-genesys.so
+lib/sane/libsane-genesys.so.1
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so
 %%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
 lib/sane/libsane-gt68xx.so
@@ -143,6 +147,8 @@ lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
 %%USB%%lib/sane/libsane-sm3600.so
 %%USB%%lib/sane/libsane-sm3600.so.1
+lib/sane/libsane-sm3840.so
+lib/sane/libsane-sm3840.so.1
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
 lib/sane/libsane-sp15c.so
@@ -189,6 +195,7 @@ sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/README.unixware2
 %%PORTDOCS%%%%DOCSDIR%%/README.unixware7
 %%PORTDOCS%%%%DOCSDIR%%/README.windows
+%%PORTDOCS%%%%DOCSDIR%%/README.zeta
 %%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes
 %%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt
 %%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES
@@ -256,6 +263,7 @@ sbin/saned
 %%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/no/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo