6 files changed, 74 insertions, 15 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 91d4de72d093..6cfa009c91e2 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.17
-PORTREVISION=	3
+PORTVERSION=	1.0.18
 CATEGORIES=	graphics
-MASTER_SITES=	http://alioth.debian.org/download.php/1347/ \
+MASTER_SITES=	http://alioth.debian.org/download.php/1669/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
@@ -20,7 +19,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 OPTIONS=	USB "USB support" on \
 		NLS "NLS support" on \
@@ -31,7 +31,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --disable-locking
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man --with-docdir=${DOCSDIR} \
+		--disable-locking
+		
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 USE_LDCONFIG=	yes
 
@@ -60,13 +62,13 @@ CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=		GPHOTO2="@comment "
 .endif
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "*** ATTENTION ***"
-	@${ECHO} ""
-	@${ECHO} "Older versions than 1.0.17_1 do not check if you change config files."
-	@${ECHO} "If that's the case for you, press CTRL+C and backup your config files."
-	@${ECHO} ""
+pre-everithing::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "*** ATTENTION ***"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Older versions than 1.0.17_1 do not check if you change config files."
+	@${ECHO_MSG} "If that's the case for you, press CTRL+C and backup your config files."
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index 5815fd4f62e1..d3d0b39ffb77 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -26,6 +26,7 @@ MAN5+=	sane-genesys.5
 MAN5+=	sane-gphoto2.5
 MAN5+=	sane-gt68xx.5
 MAN5+=	sane-hp.5
+MAN5+=	sane-hp3500.5
 MAN5+=	sane-hp4200.5
 MAN5+=	sane-hp5400.5
 MAN5+=	sane-hpsj5s.5
@@ -45,6 +46,7 @@ MAN5+=	sane-net.5
 MAN5+=	sane-niash.5
 MAN5+=	sane-pie.5
 MAN5+=	sane-pint.5
+MAN5+=	sane-pixma.5
 MAN5+=	sane-plustek.5
 MAN5+=	sane-plustek_pp.5
 MAN5+=	sane-pnm.5
@@ -59,6 +61,7 @@ MAN5+=	sane-sm3840.5
 MAN5+=	sane-snapscan.5
 MAN5+=	sane-sp15c.5
 MAN5+=	sane-st400.5
+MAN5+=	sane-stv680.5
 MAN5+=	sane-tamarack.5
 MAN5+=	sane-teco1.5
 MAN5+=	sane-teco2.5
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 3293c3c0ccf9..6b43a981c977 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (sane-backends-1.0.17.tar.gz) = b51c10da8a81a04e1bae88c9e6556df2
-SHA256 (sane-backends-1.0.17.tar.gz) = f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
-SIZE (sane-backends-1.0.17.tar.gz) = 3588993
+MD5 (sane-backends-1.0.18.tar.gz) = 7ca7e2908e24721471de92cf40c75e60
+SHA256 (sane-backends-1.0.18.tar.gz) = d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
+SIZE (sane-backends-1.0.18.tar.gz) = 3789493
diff --git a/graphics/sane-backends/files/patch-backend__dell1600n_net.c b/graphics/sane-backends/files/patch-backend__dell1600n_net.c
new file mode 100644
index 000000000000..2446295533dd
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__dell1600n_net.c
@@ -0,0 +1,20 @@
+--- backend/dell1600n_net.c.orig	Tue Jun 20 06:07:52 2006
++++ backend/dell1600n_net.c	Fri Sep 15 01:42:26 2006
+@@ -73,6 +73,8 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#include <sys/time.h>
++
+ #include <jpeglib.h>
+ #include <tiffio.h>
+ 
+@@ -1762,7 +1764,7 @@
+ ProcessPageData (struct ScannerState *pState)
+ {
+ 
+-  char tempFilename[TMP_MAX] = "scan.dat";
++  char tempFilename[L_tmpnam] = "scan.dat";
+   FILE *fTmp;
+   int fdTmp;
+   struct jpeg_source_mgr jpegSrcMgr;
diff --git a/graphics/sane-backends/files/patch-backend__pixma.h b/graphics/sane-backends/files/patch-backend__pixma.h
new file mode 100644
index 000000000000..0a76076887dd
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__pixma.h
@@ -0,0 +1,20 @@
+--- backend/pixma.h.orig	Mon Jun 12 05:56:42 2006
++++ backend/pixma.h	Fri Sep 15 01:11:40 2006
+@@ -104,14 +104,14 @@
+ 
+ #include <errno.h>
+ 
+-#ifdef HAVE_STDINT_H
+-# include <stdint.h>		/* available in ISO C99 */
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
+ #else
+ # include <sys/types.h>
+ typedef u_int8_t uint8_t;
+ typedef u_int16_t uint16_t;
+ typedef u_int32_t uint32_t;
+-#endif /* HAVE_STDINT_H */
++#endif /* HAVE_INTTYPES_H */
+ 
+ #ifndef EPROTO
+ # define EPROTO        10000
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index b8de3efe3136..5a0e31de28ce 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -49,6 +49,7 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/snapscan.conf %D/etc/sane.d/dist/snapscan.conf; then rm -f %D/etc/sane.d/snapscan.conf; fi
 @unexec if cmp -s %D/etc/sane.d/sp15c.conf %D/etc/sane.d/dist/sp15c.conf; then rm -f %D/etc/sane.d/sp15c.conf; fi
 @unexec if cmp -s %D/etc/sane.d/st400.conf %D/etc/sane.d/dist/st400.conf; then rm -f %D/etc/sane.d/st400.conf; fi
+@unexec if cmp -s %D/etc/sane.d/stv680.conf %D/etc/sane.d/dist/stv680.conf; then rm -f %D/etc/sane.d/stv680.conf; fi
 @unexec if cmp -s %D/etc/sane.d/tamarack.conf %D/etc/sane.d/dist/tamarack.conf; then rm -f %D/etc/sane.d/tamarack.conf; fi
 @unexec if cmp -s %D/etc/sane.d/teco1.conf %D/etc/sane.d/dist/teco1.conf; then rm -f %D/etc/sane.d/teco1.conf; fi
 @unexec if cmp -s %D/etc/sane.d/teco2.conf %D/etc/sane.d/dist/teco2.conf; then rm -f %D/etc/sane.d/teco2.conf; fi
@@ -106,6 +107,7 @@ etc/sane.d/dist/sm3840.conf
 etc/sane.d/dist/snapscan.conf
 etc/sane.d/dist/sp15c.conf
 etc/sane.d/dist/st400.conf
+etc/sane.d/dist/stv680.conf
 etc/sane.d/dist/tamarack.conf
 etc/sane.d/dist/teco1.conf
 etc/sane.d/dist/teco2.conf
@@ -165,6 +167,9 @@ lib/sane/libsane-dc240.so.1
 lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
+lib/sane/libsane-dell1600n_net.la
+lib/sane/libsane-dell1600n_net.so
+lib/sane/libsane-dell1600n_net.so.1
 lib/sane/libsane-dll.la
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
@@ -189,6 +194,9 @@ lib/sane/libsane-gt68xx.so.1
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
+lib/sane/libsane-hp3500.la
+lib/sane/libsane-hp3500.so
+lib/sane/libsane-hp3500.so.1
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp4200.so.1
@@ -237,6 +245,9 @@ lib/sane/libsane-niash.so.1
 lib/sane/libsane-pie.la
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
+lib/sane/libsane-pixma.la
+lib/sane/libsane-pixma.so
+lib/sane/libsane-pixma.so.1
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
@@ -270,6 +281,9 @@ lib/sane/libsane-sp15c.so.1
 lib/sane/libsane-st400.la
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
+lib/sane/libsane-stv680.la
+lib/sane/libsane-stv680.so
+lib/sane/libsane-stv680.so.1
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1