Update to 1.0.18 from Antoine Jacoutot <ajacoutot@lphp.org>

graphics/sane-backends/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2006/04/23 13:32:13 alek Exp $
+# $OpenBSD: Makefile,v 1.9 2006/07/21 10:31:08 alek Exp $
 
 COMMENT=	"API for accessing scanners, backends"
 
-DISTNAME=	sane-backends-1.0.17
+DISTNAME=	sane-backends-1.0.18
-PKGNAME=	${DISTNAME}p0
 SHARED_LIBS=	sane 1.17
 CATEGORIES=	graphics
 
@@ -21,10 +20,11 @@ MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
 		http://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
 		ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
 		ftp://ftp.sane-project.org/pub/sane/old-versions/${DISTNAME}/
-WANTLIB=	c m pthread exif
+WANTLIB=	c m pthread exif z
 
 LIB_DEPENDS=	usb.7::devel/libusb \
 		jpeg.62::graphics/jpeg \
+		tiff.38::graphics/tiff \
 		gphoto2.2,gphoto2_port.5::graphics/libgphoto2
 
 MODULES=	devel/gettext

graphics/sane-backends/distinfo

@@ -1,4 +1,4 @@
-MD5 (sane-backends-1.0.17.tar.gz) = b51c10da8a81a04e1bae88c9e6556df2
+MD5 (sane-backends-1.0.18.tar.gz) = 7ca7e2908e24721471de92cf40c75e60
-RMD160 (sane-backends-1.0.17.tar.gz) = 43e440712e9da676e235dc6148c5dda347c30e22
+RMD160 (sane-backends-1.0.18.tar.gz) = aa863adff417d7c33cbb85c193878aa54a056100
-SHA1 (sane-backends-1.0.17.tar.gz) = a73e01575458a5fb7dc265cea50c6740555e1711
+SHA1 (sane-backends-1.0.18.tar.gz) = f4c360b87ced287e4015a0dafd766ad885c539e1
-SIZE (sane-backends-1.0.17.tar.gz) = 3588993
+SIZE (sane-backends-1.0.18.tar.gz) = 3789493

graphics/sane-backends/patches/patch-backend_Makefile_in

@@ -1,6 +1,7 @@
---- backend/Makefile.in.orig	Sun Dec 18 14:32:31 2005
+$OpenBSD: patch-backend_Makefile_in,v 1.1 2006/07/21 10:31:09 alek Exp $
-+++ backend/Makefile.in	Mon Dec 19 15:22:23 2005
+--- backend/Makefile.in.orig	Mon Jul  3 10:16:42 2006
-@@ -25,7 +25,7 @@ infodir = @infodir@
++++ backend/Makefile.in	Mon Jul  3 10:19:17 2006
+@@ -26,7 +26,7 @@ infodir = @infodir@
  mandir = @mandir@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -9,7 +10,7 @@
  BEOS_ADDONDIR = @BEOS_ADDONDIR@
  
  V_MAJOR = @V_MAJOR@
-@@ -175,7 +175,8 @@ DISTFILES = abaton.c abaton.conf abaton.
+@@ -180,7 +180,8 @@ DISTFILES = abaton.c abaton.conf.in abat
  libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
  	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
  	$(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
@@ -19,29 +20,30 @@
  
  %-s.lo:	%-s.c
  	@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
-@@ -203,7 +204,6 @@ install-be:
+@@ -208,7 +209,7 @@ install-be:
  	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} \
                $(DESTDIR)$(libsanedir)/$${be} >/dev/null || exit 1; \
  	done
 -	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir) >/dev/null
++#	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir) >/dev/null
  	@# Remove libsane.* links in lib/sane/ as these links to libsane-v4l.so
  	@# cause misdetection of scanners.
  	rm -f $(DESTDIR)$(libsanedir)/libsane.*
-@@ -250,7 +250,7 @@ install-becfg:
+@@ -255,7 +256,7 @@ install-becfg:
  	 done
  
  install-lockpath:
--	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(localstatesanedir)
+-	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
-+#	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(localstatesanedir)
++#	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
  
  uninstall:
- 	rm -rf $(libsanedir) $(configdir) $(localstatesanedir)
+ 	rm -rf $(libsanedir) $(configdir) $(locksanedir)
-@@ -274,7 +274,7 @@ dll-preload.c:
+@@ -287,7 +288,7 @@ dll-preload.c:
  libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS)
  	@$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS)  $^ \
  		$(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \
 -		-rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
 +		-rpath $(libdir) $(libsane_la_LDFLAGS)
  
- # additional dependencies
+ # Generate .conf files for all existing .conf.in files
- 
+ becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in)) 

graphics/sane-backends/patches/patch-backend_dll_conf_in

@@ -1,16 +1,16 @@
-$OpenBSD: patch-backend_dll_conf,v 1.2 2006/04/23 10:29:53 alek Exp $
+$OpenBSD: patch-backend_dll_conf_in,v 1.1 2006/07/21 10:31:09 alek Exp $
---- backend/dll.conf.orig	Mon Dec 19 11:11:01 2005
+--- backend/dll.conf.in.orig	Mon Jul  3 10:09:52 2006
-+++ backend/dll.conf	Mon Dec 19 11:11:44 2005
++++ backend/dll.conf.in	Mon Jul  3 10:10:14 2006
-@@ -23,7 +23,7 @@ fujitsu
+@@ -24,7 +24,7 @@ fujitsu
  genesys
  gt68xx
  hp
 -hpsj5s
 +#hpsj5s
+ hp3500
  hp4200
  hp5400
- ibm
+@@ -47,7 +47,7 @@ pixma
-@@ -44,7 +44,7 @@ pint
  plustek
  #plustek_pp
  #pnm
@@ -19,7 +19,7 @@ $OpenBSD: patch-backend_dll_conf,v 1.2 2006/04/23 10:29:53 alek Exp $
  ricoh
  s9036
  sceptre
-@@ -63,7 +63,7 @@ u12
+@@ -67,7 +67,7 @@ u12
  umax
  #umax_pp
  umax1220u

graphics/sane-backends/patches/patch-backend_fujitsu_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-backend_fujitsu_c,v 1.2 2006/04/23 10:29:53 alek Exp $
---- backend/fujitsu.c.orig	Tue Nov  8 17:19:12 2005
-+++ backend/fujitsu.c	Mon Dec 19 15:01:40 2005
-@@ -7638,7 +7638,7 @@ setDefaults3096 (struct fujitsu *scanner
- 
-   scanner->imprinter_direction = S_im_dir_top_bottom;
-   scanner->imprinter_y_offset = 7;
--  memcpy(scanner->imprinter_string, "%05ud", max_imprinter_string_length);
-+  strlcpy(scanner->imprinter_string, "%05ud", max_imprinter_string_length);
-   scanner->imprinter_ctr_init = 0;
-   scanner->imprinter_ctr_step = 1;
-   scanner->imprinter_ctr_dir = S_im_dir_inc;

graphics/sane-backends/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2006/04/23 13:32:13 alek Exp $
+$OpenBSD: patch-configure,v 1.5 2006/07/21 10:31:09 alek Exp $
---- configure.orig	Sun Dec 18 14:16:04 2005
+--- configure.orig	Mon Jul  3 00:22:09 2006
-+++ configure	Sun Apr 23 15:39:34 2006
++++ configure	Mon Jul  3 16:43:49 2006
-@@ -4929,7 +4929,7 @@ done
+@@ -5779,7 +5779,7 @@ done
  
    #check if links for dynamic libs should be created
    case "${host_os}" in
@@ -10,11 +10,10 @@ $OpenBSD: patch-configure,v 1.4 2006/04/23 13:32:13 alek Exp $
      USE_LINKS=no
      ;;
    *)
-@@ -6381,18 +6381,6 @@ if test "${with_group+set}" = set; then
+@@ -7549,17 +7549,17 @@ if test "${with_group+set}" = set; then
-   LOCKPATH_GROUP="$withval"
+ fi
  
- fi;
+     # check if the group does exist
--    # check if the group does exist
 -    lasterror=""
 -    touch sanetest.file
 -    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
@@ -26,6 +25,26 @@ $OpenBSD: patch-configure,v 1.4 2006/04/23 13:32:13 alek Exp $
 -echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
 -      use_locking=no
 -    fi
++#    lasterror=""
++#    touch sanetest.file
++#    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
++#    rm -f sanetest.file
++#    if test ! -z "$lasterror"; then
++#      { echo "$as_me:$LINENO: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
++#echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;}
++#      { echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5
++#echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
++#      use_locking=no
++#    fi
    fi
    if test $use_locking = yes ; then
      INSTALL_LOCKPATH=install-lockpath
+@@ -28966,7 +28966,7 @@ echo "$as_me: Manually selected backends
+     BACKENDS="abaton agfafocus apple artec as6e avision bh canon \
+           canon630u coolscan coolscan2 dc25 dmc \
+           epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek \
+-          microtek2 mustek mustek_usb nec pie pixma plustek \
++          microtek2 mustek mustek_usb nec pie plustek \
+           plustek_pp ricoh s9036 sceptre sharp \
+           sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
+           artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200 \

graphics/sane-backends/patches/patch-doc_Makefile_in

@@ -0,0 +1,24 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1 2006/07/21 10:31:09 alek Exp $
+--- doc/Makefile.in.orig	Tue Jun  6 18:32:02 2006
++++ doc/Makefile.in	Fri Jul 21 11:44:03 2006
+@@ -21,7 +21,7 @@ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
+-mandir = @mandir@
++mandir = @prefix@/man
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ configdir = ${sysconfdir}/sane.d
+@@ -77,11 +77,7 @@ MAN2HTML= nroff -man |\
+ HTML_PAGES = sane-backends.html sane-backends-external.html \
+              sane-mfgs.html sane-mfgs-external.html
+ 
+-ifeq (@USE_LATEX@,no)
+ STANDARD =
+-else
+-STANDARD = sane.ps
+-endif
+ 
+ SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external
+ 

graphics/sane-backends/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2006/04/23 10:29:53 alek Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.5 2006/07/21 10:31:09 alek Exp $
 @lib lib/libsane.so.${LIBsane_VERSION}
 lib/sane/libsane-abaton.so
 lib/sane/libsane-agfafocus.so
@@ -15,6 +15,7 @@ lib/sane/libsane-coolscan2.so
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc25.so
+lib/sane/libsane-dell1600n_net.so
 lib/sane/libsane-dll.so
 lib/sane/libsane-dmc.so
 lib/sane/libsane-epson.so
@@ -23,6 +24,7 @@ lib/sane/libsane-genesys.so
 lib/sane/libsane-gphoto2.so
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-hp.so
+lib/sane/libsane-hp3500.so
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-ibm.so
@@ -51,6 +53,7 @@ lib/sane/libsane-sm3840.so
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-st400.so
+lib/sane/libsane-stv680.so
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco2.so

graphics/sane-backends/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2006/04/23 10:29:53 alek Exp $
+@comment $OpenBSD: PLIST,v 1.4 2006/07/21 10:31:09 alek Exp $
 @newgroup _saned:553
 @newuser _saned:553:_saned:daemon:Scanner Daemon:/var/empty:/sbin/nologin
 %%SHARED%%
@@ -42,6 +42,8 @@ lib/sane/libsane-dc240.a
 lib/sane/libsane-dc240.la
 lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
+lib/sane/libsane-dell1600n_net.a
+lib/sane/libsane-dell1600n_net.la
 lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
 lib/sane/libsane-dmc.a
@@ -58,6 +60,8 @@ lib/sane/libsane-gt68xx.a
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
+lib/sane/libsane-hp3500.a
+lib/sane/libsane-hp3500.la
 lib/sane/libsane-hp4200.a
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.a
@@ -114,6 +118,8 @@ lib/sane/libsane-sp15c.a
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-st400.a
 lib/sane/libsane-st400.la
+lib/sane/libsane-stv680.a
+lib/sane/libsane-stv680.la
 lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-teco1.a
@@ -161,6 +167,7 @@ libexec/saned
 @man man/man5/sane-gphoto2.5
 @man man/man5/sane-gt68xx.5
 @man man/man5/sane-hp.5
+@man man/man5/sane-hp3500.5
 @man man/man5/sane-hp4200.5
 @man man/man5/sane-hp5400.5
 @comment @man man/man5/sane-hpsj5s.5
@@ -180,6 +187,7 @@ libexec/saned
 @man man/man5/sane-niash.5
 @man man/man5/sane-pie.5
 @man man/man5/sane-pint.5
+@man man/man5/sane-pixma.5
 @man man/man5/sane-plustek.5
 @man man/man5/sane-plustek_pp.5
 @comment @man man/man5/sane-pnm.5
@@ -194,6 +202,7 @@ libexec/saned
 @man man/man5/sane-snapscan.5
 @man man/man5/sane-sp15c.5
 @man man/man5/sane-st400.5
+@man man/man5/sane-stv680.5
 @man man/man5/sane-tamarack.5
 @man man/man5/sane-teco1.5
 @man man/man5/sane-teco2.5
@@ -267,8 +276,6 @@ share/doc/sane-backends/sane-backends-external.html
 share/doc/sane-backends/sane-backends.html
 share/doc/sane-backends/sane-mfgs-external.html
 share/doc/sane-backends/sane-mfgs.html
-@comment share/doc/sane-backends/sane.dvi
-@comment share/doc/sane-backends/sane.ps
 share/doc/sane-backends/sceptre/
 share/doc/sane-backends/sceptre/s1200.txt
 share/doc/sane-backends/teco/
@@ -403,6 +410,8 @@ share/examples/sane-backends/sane.d/sp15c.conf
 @sample ${SYSCONFDIR}/sane.d/sp15c.conf
 share/examples/sane-backends/sane.d/st400.conf
 @sample ${SYSCONFDIR}/sane.d/st400.conf
+share/examples/sane-backends/sane.d/stv680.conf
+@sample ${SYSCONFDIR}/sane.d/stv680.conf
 share/examples/sane-backends/sane.d/tamarack.conf
 @sample ${SYSCONFDIR}/sane.d/tamarack.conf
 share/examples/sane-backends/sane.d/teco1.conf