Update to 1.0.22

PR:		159479
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 53 insertions, 27 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 41432d68b302..a1fba3cfbccc 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,40 +6,38 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.21
-PORTREVISION=	3
+PORTVERSION=	1.0.22
 CATEGORIES=	graphics
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3258/ \
-		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%/ \
-		http://gd.tuwien.ac.at/hci/sane/%SUBDIR%/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3503/ \
+		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 OPTIONS=	USB "USB support" on \
 		NLS "NLS support" on \
 		GPHOTO2 "gPhoto2 support" off \
+		SNMP "SNMP support" off \
 		AVAHI "Avahi support" off \
 		IEEE1284 "libieee1284 support" off \
 		IPV6 "IPV6 support" off
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
 		--disable-latex \
 		--disable-locking \
 		--enable-pthread
-MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 USE_RC_SUBR=	saned
 SUB_FILES+=	pkg-message
@@ -47,11 +45,14 @@ SUB_FILES+=	pkg-message
 USERS=	saned
 GROUPS=	saned
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
 
 .if defined(NOPORTDOCS)
-MAKE_ENV=	NOPORTDOCS=1
+MAKE_ENV+=	NOPORTDOCS=1
 .endif
 
 .if defined(WITHOUT_USB)
@@ -83,6 +84,12 @@ CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=		GPHOTO2="@comment "
 .endif
 
+.if defined(WITH_SNMP)
+LIB_DEPENDS=		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+.else
+CONFIGURE_ARGS+=	--without-snmp
+.endif
+
 .if defined(WITH_AVAHI)
 LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
@@ -98,9 +105,7 @@ PLIST_SUB+=		IEEE1284="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h||g ; \
-		 s|} -D_REENT|} ${PTHREAD_CFLAGS} -D_REENT|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@(cd ${WRKSRC}/po; ${BASENAME} -s .po `${LS} *.po` > LINGUAS)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index faf1a80f3fa5..5c78451526be 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -39,9 +39,11 @@ MAN5+=	sane-hs2p.5
 MAN5+=	sane-ibm.5
 MAN5+=	sane-kodak.5
 MAN5+=	sane-kvs1025.5
+MAN5+=	sane-kvs20xx.5
 MAN5+=	sane-leo.5
 MAN5+=	sane-lexmark.5
 MAN5+=	sane-ma1509.5
+MAN5+=	sane-magicolor.5
 MAN5+=	sane-matsushita.5
 MAN5+=	sane-microtek.5
 MAN5+=	sane-microtek2.5
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 7781a9d6835f..b0b261b7b4b3 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sane-backends-1.0.21.tar.gz) = e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
-SIZE (sane-backends-1.0.21.tar.gz) = 5050344
+SHA256 (sane-backends-1.0.22.tar.gz) = 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
+SIZE (sane-backends-1.0.22.tar.gz) = 5150661
diff --git a/graphics/sane-backends/files/patch-backend__genesys.c b/graphics/sane-backends/files/patch-backend__genesys.c
deleted file mode 100644
index 9804688e00de..000000000000
--- a/graphics/sane-backends/files/patch-backend__genesys.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/genesys.c.orig	2011-06-07 13:06:00.000000000 +0200
-+++ backend/genesys.c	2011-06-07 13:06:46.000000000 +0200
-@@ -5436,7 +5436,7 @@
-  * @param size maximum size of the range
-  * @return a poiter to a valid range or NULL
-  */
--static create_range(SANE_Fixed size)
-+static SANE_Range *create_range(SANE_Fixed size)
- {
- SANE_Range *range=NULL;
- 
diff --git a/graphics/sane-backends/files/patch-backend__magicolor.c b/graphics/sane-backends/files/patch-backend__magicolor.c
new file mode 100644
index 000000000000..1ab4d7954e9f
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__magicolor.c
@@ -0,0 +1,11 @@
+--- backend/magicolor.c.orig	2011-01-31 03:49:46.000000000 +0900
++++ backend/magicolor.c	2011-08-02 02:38:15.000000000 +0900
+@@ -50,6 +50,8 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <math.h>
+ #include <poll.h>
+ 
diff --git a/graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c b/graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c
new file mode 100644
index 000000000000..60677656bacc
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c
@@ -0,0 +1,11 @@
+--- backend/xerox_mfp-tcp.c.orig	2010-12-02 08:49:58.000000000 +0900
++++ backend/xerox_mfp-tcp.c	2011-08-02 02:37:27.000000000 +0900
+@@ -27,6 +27,8 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ 
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 580c2027c5ea..3efa22333ebe 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -41,6 +41,7 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/leo.conf %D/etc/sane.d/dist/leo.conf; then rm -f %D/etc/sane.d/leo.conf; fi
 @unexec if cmp -s %D/etc/sane.d/lexmark.conf %D/etc/sane.d/dist/lexmark.conf; then rm -f %D/etc/sane.d/lexmark.conf; fi
 @unexec if cmp -s %D/etc/sane.d/ma1509.conf %D/etc/sane.d/dist/ma1509.conf; then rm -f %D/etc/sane.d/ma1509.conf; fi
+@unexec if cmp -s %D/etc/sane.d/magicolor.conf %D/etc/sane.d/dist/magicolor.conf; then rm -f %D/etc/sane.d/magicolor.conf; fi
 @unexec if cmp -s %D/etc/sane.d/matsushita.conf %D/etc/sane.d/dist/matsushita.conf; then rm -f %D/etc/sane.d/matsushita.conf; fi
 @unexec if cmp -s %D/etc/sane.d/microtek.conf %D/etc/sane.d/dist/microtek.conf; then rm -f %D/etc/sane.d/microtek.conf; fi
 @unexec if cmp -s %D/etc/sane.d/microtek2.conf %D/etc/sane.d/dist/microtek2.conf; then rm -f %D/etc/sane.d/microtek2.conf; fi
@@ -115,6 +116,7 @@ etc/sane.d/dist/kodak.conf
 etc/sane.d/dist/leo.conf
 etc/sane.d/dist/lexmark.conf
 etc/sane.d/dist/ma1509.conf
+etc/sane.d/dist/magicolor.conf
 etc/sane.d/dist/matsushita.conf
 etc/sane.d/dist/microtek.conf
 etc/sane.d/dist/microtek2.conf
@@ -277,6 +279,9 @@ lib/sane/libsane-kodak.so.1
 lib/sane/libsane-kvs1025.la
 lib/sane/libsane-kvs1025.so
 lib/sane/libsane-kvs1025.so.1
+lib/sane/libsane-kvs20xx.la
+lib/sane/libsane-kvs20xx.so
+lib/sane/libsane-kvs20xx.so.1
 lib/sane/libsane-leo.la
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
@@ -286,6 +291,9 @@ lib/sane/libsane-lexmark.so.1
 lib/sane/libsane-ma1509.la
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
+lib/sane/libsane-magicolor.la
+lib/sane/libsane-magicolor.so
+lib/sane/libsane-magicolor.so.1
 lib/sane/libsane-matsushita.la
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1