- major update to sane-backends-1.0.20:

* new and updated backends
* 75 more scanner models supported
* epson backend deprecated, use epson2
* coolscan2 backend deprecated, use coolscan3
* improved saned configuration
* updated translations and documentations
* bugfixes

graphics/sane-backends/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2009/03/05 07:54:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2009/05/06 10:23:21 ajacoutot Exp $
 
 COMMENT=	API for accessing scanners, backends
 
-DISTNAME=	sane-backends-1.0.19
+DISTNAME=	sane-backends-1.0.20
-PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	sane 2.0 # .1.0
-SHARED_LIBS=	sane 1.17 # .0.0
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.sane-project.org/
@@ -17,17 +16,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+WANTLIB += c exif jpeg ltdl m pthread usb z
+
 MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
 		ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/capture/ \
 		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 ltdl z
+LIB_DEPENDS=	tiff.>=38::graphics/tiff \
-
-LIB_DEPENDS=	usb.>=7::devel/libusb \
-		jpeg.>=62::graphics/jpeg \
-		tiff.>=38::graphics/tiff \
 		gphoto2.>=2,gphoto2_port.>=5::graphics/libgphoto2
 
 MODULES=	devel/gettext
@@ -46,8 +43,17 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-docdir=${PREFIX}/share/doc/sane-backends \
 		--localstatedir=/var/spool \
 		--with-gphoto2 \
-		--with-group=553
+		--with-group=553 \
+		--disable-avahi \
+		--disable-latex
 
 FAKE_FLAGS=	configdir=${PREFIX}/share/examples/sane-backends/sane.d
 
+post-install:
+	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
+		${PREFIX}/share/doc/sane-backends/README.OpenBSD
+	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/sane-backends
+	cp -R ${WRKSRC}/tools/openbsd/ \
+		${PREFIX}/share/examples/sane-backends/hotplug
+
 .include <bsd.port.mk>

graphics/sane-backends/distinfo

@@ -1,5 +1,5 @@
-MD5 (sane-backends-1.0.19.tar.gz) = jAk2Jy3P1OmMUVEmmfHAbw==
+MD5 (sane-backends-1.0.20.tar.gz) = oM/f3ryi/rTyul00GLFaQg==
-RMD160 (sane-backends-1.0.19.tar.gz) = Gq8wTL/rPWyV9ggdBCJUQah7ZkQ=
+RMD160 (sane-backends-1.0.20.tar.gz) = uAwKFadbO84HBg1lrs3K94YMMjs=
-SHA1 (sane-backends-1.0.19.tar.gz) = P/ju+o8y5y3NuqS/IP4SXfkBRNU=
+SHA1 (sane-backends-1.0.20.tar.gz) = O00uzei+QEu0Qml3HPXcbkwQsIY=
-SHA256 (sane-backends-1.0.19.tar.gz) = EycafrTcSqYHIWKrvXiEjk+q0yxGi5tE5/lc3pak4X4=
+SHA256 (sane-backends-1.0.20.tar.gz) = j7FTHmGSuc/i9EoCC4gdeKE/BUJrRiY8++f8JQeuPTo=
-SIZE (sane-backends-1.0.19.tar.gz) = 4293184
+SIZE (sane-backends-1.0.20.tar.gz) = 4760873

graphics/sane-backends/files/README.OpenBSD

@@ -0,0 +1,33 @@
+$OpenBSD: README.OpenBSD,v 1.1 2009/05/06 10:23:21 ajacoutot Exp $
+
+Using sane(7) under OpenBSD
+===========================
+
+First read ${TRUEPREFIX}/share/doc/sane-backends/PROBLEMS.
+
+Make sure your user has read/write access to the scanner device
+(e.g. /dev/uscanner0) or you will not be able to scan.
+
+* USB
+With some USB backends, the OpenBSD uscanner(4) driver does not support
+getting USB vendor and product ids. To make your scanner work with sane,
+you'll have to disable uscanner(4) in your kernel - see config(8) -
+which will allow libusb to claim your device instead. When using libusb,
+you need read/write permissions to ugen(4) (/dev/ugen*.*) and the usb(4)
+controller (/dev/usb*) your scanner is connected to (consider using
+hotplugd(8) attach and detach scripts).
+
+* SCSI
+SANE only supports the generic SCSI uk(4) devices, ss(4) won't work. If
+your scanner is detected as an ss(4) device, you'll have to disable
+ss(4) in your kernel - see config(8).
+
+* LOCKING
+Some backends (like sane-plustek(5)) use a lockfile for allowing
+multiple access to one scanner. If using such a backend, you must
+add yourself to the _saned group or you will not be able to scan.
+
+* NETWORK
+If you're planning on using the SANE network daemon (saned), add the
+following line in /etc/services:
+sane-port	6566/tcp	saned	# SANE network scanner daemon

graphics/sane-backends/patches/patch-Makefile_in

@@ -0,0 +1,25 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2009/05/06 10:23:21 ajacoutot Exp $
+--- Makefile.in.orig	Tue May  5 11:36:35 2009
++++ Makefile.in	Tue May  5 11:37:09 2009
+@@ -33,7 +33,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = .
+-DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
++DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/configure $(top_srcdir)/include/sane/config.h.in \
+ 	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+@@ -246,11 +246,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = include lib sanei backend frontend tools doc po
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+- README README.aix README.beos README.darwin README.djpeg README.freebsd \
+- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
+- README.solaris README.unixware2 README.unixware7 README.windows \
+- README.zeta
++dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS
+ 
+ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
+  ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \

graphics/sane-backends/patches/patch-backend_Makefile_in

@@ -1,49 +1,12 @@
-$OpenBSD: patch-backend_Makefile_in,v 1.3 2008/02/13 13:23:58 ajacoutot Exp $
+$OpenBSD: patch-backend_Makefile_in,v 1.4 2009/05/06 10:23:21 ajacoutot Exp $
---- backend/Makefile.in.orig	Mon Feb 11 00:02:31 2008
+--- backend/Makefile.in.orig	Tue May  5 10:27:46 2009
-+++ backend/Makefile.in	Tue Feb 12 11:40:39 2008
++++ backend/Makefile.in	Tue May  5 10:29:13 2009
-@@ -213,7 +213,8 @@ DISTFILES = Makefile.in saned.conf.in sane_strstatus.c
+@@ -1485,7 +1485,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
- libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
+ # The -rpath option is added because we are creating _LTLIBRARIES based
- 	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
+ # on configure substitution.  This causes automake to not know the
- 	$(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
+ # correct $libdir and must be added here.
--	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
+-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
-+	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG) \
++DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -avoid-version $(DYNAMIC_FLAG)
-+	-avoid-version
+ DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
+ FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
  
- %-s.lo:	%-s.c
- 	@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
-@@ -241,7 +242,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.*
-@@ -270,7 +271,7 @@ install-libsane:
- 	@echo installing libsane.la in $(DESTDIR)$(libdir)/libsane.la...
- 	@$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \
-           $(DESTDIR)$(libdir)/libsane.la >/dev/null
--	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libdir)
-+#	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libdir)
- 
- install-becfg:
- 	@list="$(CONFIGS)"; for cfg in $$list; do \
-@@ -288,7 +289,7 @@ install-becfg:
- 	 done
- 
- install-lockpath:
--	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
-+#	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
- 
- uninstall:
- 	rm -rf $(libsanedir) $(configdir) $(locksanedir)
-@@ -320,7 +321,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)
- 
- # Generate .conf files for all existing .conf.in files
- becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in)) 

graphics/sane-backends/patches/patch-backend_dll_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_dll_c,v 1.3 2008/02/13 13:23:58 ajacoutot Exp $
+$OpenBSD: patch-backend_dll_c,v 1.4 2009/05/06 10:23:21 ajacoutot Exp $
---- backend/dll.c.orig	Sat Nov 10 12:35:34 2007
+--- backend/dll.c.orig	Tue May  5 10:01:03 2009
-+++ backend/dll.c	Tue Feb 12 11:40:39 2008
++++ backend/dll.c	Tue May  5 10:02:12 2009
-@@ -396,7 +396,7 @@ load (struct backend *be)
+@@ -398,7 +398,7 @@ load (struct backend *be)
  # elif defined (__APPLE__) && defined (__MACH__)
  #   define POSTFIX ".%u.so"
  # else
@@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_c,v 1.3 2008/02/13 13:23:58 ajacoutot Exp $
  # endif
    mode = getenv ("LD_BIND_NOW") ? RTLD_NOW : RTLD_LAZY;
  #elif defined(HAVE_SHL_LOAD)
-@@ -458,7 +458,7 @@ load (struct backend *be)
+@@ -460,7 +460,7 @@ load (struct backend *be)
                                              (be->name)+2, V_MAJOR);
  #else
        snprintf (libname, sizeof (libname), "%s/" PREFIX "%s" POSTFIX,

graphics/sane-backends/patches/patch-backend_dll_conf_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_dll_conf_in,v 1.2 2008/02/13 13:23:58 ajacoutot Exp $
+$OpenBSD: patch-backend_dll_conf_in,v 1.3 2009/05/06 10:23:21 ajacoutot Exp $
---- backend/dll.conf.in.orig	Tue Feb 12 11:38:02 2008
+--- backend/dll.conf.in.orig	Tue May  5 10:02:26 2009
-+++ backend/dll.conf.in	Tue Feb 12 11:38:35 2008
++++ backend/dll.conf.in	Tue May  5 10:03:00 2009
-@@ -28,7 +28,7 @@ genesys
+@@ -30,7 +30,7 @@ genesys
  gt68xx
  hp
  hp3900
@@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.2 2008/02/13 13:23:58 ajacoutot Exp $
  hp3500
  hp4200
  hp5400
-@@ -50,11 +50,11 @@ nec
+@@ -52,11 +52,11 @@ nec
  niash
  pie
  pint
@@ -22,14 +22,12 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.2 2008/02/13 13:23:58 ajacoutot Exp $
 -qcam
 +#qcam
  ricoh
+ rts8891
  s9036
- sceptre
+@@ -77,5 +77,5 @@ u12
-@@ -74,7 +74,7 @@ u12
  umax
  #umax_pp
  umax1220u
 -v4l
 +#v4l
- #
+ xerox_mfp
- # The following backends are not included in the sane-backends distribution
- # If you want to use them, download them from their webpages and read their

graphics/sane-backends/patches/patch-configure

@@ -1,25 +1,16 @@
-$OpenBSD: patch-configure,v 1.6 2008/02/13 13:23:58 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.7 2009/05/06 10:23:21 ajacoutot Exp $
---- configure.orig	Mon Feb 11 00:02:31 2008
+--- configure.orig	Tue May  5 10:03:09 2009
-+++ configure	Tue Feb 12 11:47:39 2008
++++ configure	Tue May  5 10:04:50 2009
-@@ -6388,7 +6388,7 @@ done
+@@ -11606,13 +11606,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
- 
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-   #check if links for dynamic libs should be created
-   case "${host_os}" in
--  darwin*)
-+  darwin* | openbsd* )
-     USE_LINKS=no
-     ;;
-   *)
-@@ -7657,13 +7657,13 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
  _ACEOF
  
- 
+-       { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
++       { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
++$as_echo_n "checking for pthread_create in -pthread... " >&6; }
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
@@ -27,16 +18,16 @@ $OpenBSD: patch-configure,v 1.6 2008/02/13 13:23:58 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7723,7 +7723,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
+@@ -11672,7 +11672,7 @@ fi
- #define HAVE_LIBPTHREAD 1
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- _ACEOF
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- 
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
--  LIBS="-lpthread $LIBS"
+-  PTHREAD_LIBS="-lpthread"
-+  LIBS="-pthread $LIBS"
++  PTHREAD_LIBS="-pthread"
- 
  fi
  
-@@ -7884,18 +7884,6 @@ if test "${with_group+set}" = set; then
+        have_pthread=yes
+@@ -11843,18 +11843,6 @@ if test "${with_group+set}" = set; then
  
  fi
  
@@ -46,21 +37,21 @@ $OpenBSD: patch-configure,v 1.6 2008/02/13 13:23:58 ajacoutot Exp $
 -    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
+-      { $as_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;}
+-$as_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
+-      { $as_echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5
--echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
+-$as_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
-@@ -27050,7 +27038,7 @@ echo "$as_me: Manually selected backends: ${BACKENDS}"
+@@ -34117,7 +34105,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus
- 	  hp hp3500 hp3900 hp4200 hp5400 hp5590 hpljm1005 hs2p \
+         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
- 	  ibm leo lexmark \
+         matsushita microtek microtek2 mustek mustek_pp \
- 	  ma1509 matsushita microtek microtek2 mustek mustek_usb \
+         mustek_usb mustek_usb2 nec net niash pie pint \
--	  nec niash pie pixma plustek ricoh \
+-        pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
-+	  nec niash pie plustek ricoh \
++        plustek plustek_pp qcam ricoh rts8891 s9036 \
- 	  s9036 sceptre sharp sm3600 sm3840 snapscan sp15c st400 stv680 \
+         sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
- 	  tamarack teco1 teco2 teco3 test u12 umax umax_pp umax1220u"
+         stv680 tamarack teco1 teco2 teco3 test u12 umax
- 
+         umax_pp umax1220u v4l xerox_mfp"

graphics/sane-backends/patches/patch-doc_Makefile_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2008/02/13 13:23:58 ajacoutot Exp $
---- doc/Makefile.in.orig	Sun Feb  3 07:59:35 2008
-+++ doc/Makefile.in	Tue Feb 12 11:40:39 2008
-@@ -84,11 +84,7 @@ else
- HTML_PAGES =
- endif
- 
--ifeq (@USE_LATEX@,no)
- STANDARD =
--else
--STANDARD = sane.ps
--endif
- 
- SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external
- 

graphics/sane-backends/patches/patch-doc_saned_man

@@ -1,21 +1,21 @@
-$OpenBSD: patch-doc_saned_man,v 1.4 2008/02/13 13:23:58 ajacoutot Exp $
+$OpenBSD: patch-doc_saned_man,v 1.5 2009/05/06 10:23:21 ajacoutot Exp $
---- doc/saned.man.orig	Sat Nov 26 06:31:26 2005
+--- doc/saned.man.orig	Tue May  5 10:05:38 2009
-+++ doc/saned.man	Tue Feb 12 11:40:39 2008
++++ doc/saned.man	Tue May  5 10:06:49 2009
-@@ -92,7 +92,7 @@ support IPv6, check the documentation for your inetd d
+@@ -136,7 +136,7 @@ support IPv6, check the documentation for your inetd d
  The configuration line normally looks like this:
  .PP
  .RS
--sane-port stream tcp nowait saned.saned @SBINDIR@/saned saned
+-sane\-port stream tcp nowait saned.saned @SBINDIR@/saned saned
-+sane-port stream tcp nowait _saned._saned @SBINDIR@/saned saned
++sane\-port stream tcp nowait _saned._saned @SBINDIR@/saned saned
  .RE
  .PP
  However, if your system uses
-@@ -105,16 +105,16 @@ and use a line of the following form in
+@@ -149,16 +149,16 @@ and use a line of the following form in
  instead:
  .PP
  .RS
--sane-port stream tcp nowait saned.saned /usr/sbin/tcpd @SBINDIR@/saned
+-sane\-port stream tcp nowait saned.saned /usr/sbin/tcpd @SBINDIR@/saned
-+sane-port stream tcp nowait _saned._saned /usr/libexec/tcpd @SBINDIR@/saned
++sane\-port stream tcp nowait _saned._saned /usr/sbin/tcpd @SBINDIR@/saned
  .RE
  .PP
  Note that both examples assume that there is a
@@ -31,7 +31,7 @@ $OpenBSD: patch-doc_saned_man,v 1.4 2008/02/13 13:23:58 ajacoutot Exp $
  can access the scanner (the program generally needs read and
  write access to scanner devices).
  .PP
-@@ -133,8 +133,8 @@ service sane-port
+@@ -177,8 +177,8 @@ service sane\-port
     port        = 6566
     socket_type = stream
     wait        = no

graphics/sane-backends/patches/patch-japi_Makefile_in

@@ -1,11 +0,0 @@
-$OpenBSD: patch-japi_Makefile_in,v 1.2 2008/02/13 13:23:58 ajacoutot Exp $
---- japi/Makefile.in.orig	Sun Feb  3 07:59:35 2008
-+++ japi/Makefile.in	Tue Feb 12 11:40:39 2008
-@@ -113,7 +113,6 @@ install:
- 	$(MKDIR) $(libdir) $(configdir)
- 	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsanej.la \
- 		$(libdir)/libsanej.la || exit 1;
--	@$(LIBTOOL) $(MINST) --finish $(libdir)
- 
- 
- # fixme

graphics/sane-backends/pkg/MESSAGE

@@ -1,18 +1,2 @@
-Before using this program, make sure you read the
+Please see ${PREFIX}/share/doc/sane-backends/README.OpenBSD
-${PREFIX}/share/doc/sane-backends/PROBLEMS file.
+for information about running sane(4) on OpenBSD.
-
-Make sure your user has read+write access to the scanner device
-(e.g. /dev/uscanner0) or you will not be able to scan.
-
-With some USB backends, the OpenBSD uscanner driver does not support
-getting USB vendor and product ids. To make your scanner work with sane,
-you'll have to disable uscanner in your kernel - see config(8) - which
-will allow libusb to claim your device instead.
-
-Some backends (like plustek) use a lockfile for allowing multiple access
-to one scanner. If using such a backend, you must add yourself to the
-_saned group or you will not be able to scan.
-
-If you're planning on using the SANE network daemon (saned), add the
-following line in /etc/services:
-sane-port 6566/tcp saned # SANE network scanner daemon

graphics/sane-backends/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2008/02/13 13:23:58 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.7 2009/05/06 10:23:21 ajacoutot Exp $
 @lib lib/libsane.so.${LIBsane_VERSION}
 lib/sane/libsane-abaton.so
 lib/sane/libsane-agfafocus.so
@@ -10,9 +10,11 @@ lib/sane/libsane-avision.so
 lib/sane/libsane-bh.so
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon630u.so
+lib/sane/libsane-canon_dr.so
 lib/sane/libsane-cardscan.so
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan2.so
+lib/sane/libsane-coolscan3.so
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc25.so
@@ -52,6 +54,7 @@ lib/sane/libsane-pint.so
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-ricoh.so
+lib/sane/libsane-rts8891.so
 lib/sane/libsane-s9036.so
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sharp.so
@@ -70,3 +73,4 @@ lib/sane/libsane-u12.so
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax_pp.so
+lib/sane/libsane-xerox_mfp.so

graphics/sane-backends/pkg/PLIST

@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/02/13 13:23:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/05/06 10:23:21 ajacoutot Exp $
 @newgroup _saned:553
-@newuser _saned:553:_saned:daemon:Scanner Daemon:/var/empty:/sbin/nologin
+@newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
 %%SHARED%%
-bin/gamma4scanimage
+@bin bin/gamma4scanimage
 bin/sane-config
-bin/sane-find-scanner
+@bin bin/sane-find-scanner
-bin/scanimage
+@bin bin/scanimage
 include/sane/
 include/sane/sane.h
 include/sane/saneopts.h
@@ -32,12 +32,16 @@ lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon630u.a
 lib/sane/libsane-canon630u.la
+lib/sane/libsane-canon_dr.a
+lib/sane/libsane-canon_dr.la
 lib/sane/libsane-cardscan.a
 lib/sane/libsane-cardscan.la
 lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan2.a
 lib/sane/libsane-coolscan2.la
+lib/sane/libsane-coolscan3.a
+lib/sane/libsane-coolscan3.la
 lib/sane/libsane-dc210.a
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc240.a
@@ -116,6 +120,8 @@ lib/sane/libsane-plustek_pp.a
 lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-ricoh.a
 lib/sane/libsane-ricoh.la
+lib/sane/libsane-rts8891.a
+lib/sane/libsane-rts8891.la
 lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.a
@@ -152,7 +158,9 @@ lib/sane/libsane-umax1220u.a
 lib/sane/libsane-umax1220u.la
 lib/sane/libsane-umax_pp.a
 lib/sane/libsane-umax_pp.la
-libexec/saned
+lib/sane/libsane-xerox_mfp.a
+lib/sane/libsane-xerox_mfp.la
+@bin libexec/saned
 @man man/man1/gamma4scanimage.1
 @man man/man1/sane-config.1
 @man man/man1/sane-find-scanner.1
@@ -167,10 +175,11 @@ libexec/saned
 @man man/man5/sane-bh.5
 @man man/man5/sane-canon.5
 @man man/man5/sane-canon630u.5
-@comment @man man/man5/sane-canon_pp.5
+@man man/man5/sane-canon_dr.5
 @man man/man5/sane-cardscan.5
 @man man/man5/sane-coolscan.5
 @man man/man5/sane-coolscan2.5
+@man man/man5/sane-coolscan3.5
 @man man/man5/sane-dc210.5
 @man man/man5/sane-dc240.5
 @man man/man5/sane-dc25.5
@@ -178,6 +187,7 @@ libexec/saned
 @man man/man5/sane-dmc.5
 @man man/man5/sane-epjitsu.5
 @man man/man5/sane-epson.5
+@man man/man5/sane-epson2.5
 @man man/man5/sane-fujitsu.5
 @man man/man5/sane-genesys.5
 @man man/man5/sane-gphoto2.5
@@ -189,7 +199,6 @@ libexec/saned
 @man man/man5/sane-hp5400.5
 @man man/man5/sane-hp5590.5
 @man man/man5/sane-hpljm1005.5
-@comment @man man/man5/sane-hpsj5s.5
 @man man/man5/sane-hs2p.5
 @man man/man5/sane-ibm.5
 @man man/man5/sane-leo.5
@@ -199,7 +208,6 @@ libexec/saned
 @man man/man5/sane-microtek.5
 @man man/man5/sane-microtek2.5
 @man man/man5/sane-mustek.5
-@comment @man man/man5/sane-mustek_pp.5
 @man man/man5/sane-mustek_usb.5
 @man man/man5/sane-mustek_usb2.5
 @man man/man5/sane-nec.5
@@ -207,12 +215,10 @@ 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
-@comment @man man/man5/sane-qcam.5
 @man man/man5/sane-ricoh.5
+@man man/man5/sane-rts8891.5
 @man man/man5/sane-s9036.5
 @man man/man5/sane-sceptre.5
 @man man/man5/sane-scsi.5
@@ -233,7 +239,7 @@ libexec/saned
 @man man/man5/sane-umax1220u.5
 @man man/man5/sane-umax_pp.5
 @man man/man5/sane-usb.5
-@comment @man man/man5/sane-v4l.5
+@man man/man5/sane-xerox_mfp.5
 @man man/man7/sane.7
 @man man/man8/saned.8
 share/doc/sane-backends/
@@ -244,22 +250,7 @@ share/doc/sane-backends/LICENSE
 share/doc/sane-backends/NEWS
 share/doc/sane-backends/PROBLEMS
 share/doc/sane-backends/PROJECTS
-share/doc/sane-backends/README
+share/doc/sane-backends/README.OpenBSD
-share/doc/sane-backends/README.aix
-share/doc/sane-backends/README.beos
-share/doc/sane-backends/README.darwin
-share/doc/sane-backends/README.djpeg
-share/doc/sane-backends/README.freebsd
-share/doc/sane-backends/README.hp-ux
-share/doc/sane-backends/README.linux
-share/doc/sane-backends/README.netbsd
-share/doc/sane-backends/README.openbsd
-share/doc/sane-backends/README.os2
-share/doc/sane-backends/README.solaris
-share/doc/sane-backends/README.unixware2
-share/doc/sane-backends/README.unixware7
-share/doc/sane-backends/README.windows
-share/doc/sane-backends/README.zeta
 share/doc/sane-backends/backend-writing.txt
 share/doc/sane-backends/canon/
 share/doc/sane-backends/canon/canon.changes
@@ -334,6 +325,9 @@ share/doc/sane-backends/umax/umax.CHANGES
 share/doc/sane-backends/umax/umax.FAQ
 share/doc/sane-backends/umax/umax.TODO
 share/examples/sane-backends/
+share/examples/sane-backends/hotplug/
+share/examples/sane-backends/hotplug/attach
+share/examples/sane-backends/hotplug/detach
 share/examples/sane-backends/sane.d/
 @sample ${SYSCONFDIR}/sane.d/
 share/examples/sane-backends/sane.d/abaton.conf
@@ -354,12 +348,16 @@ share/examples/sane-backends/sane.d/canon.conf
 @sample ${SYSCONFDIR}/sane.d/canon.conf
 share/examples/sane-backends/sane.d/canon630u.conf
 @sample ${SYSCONFDIR}/sane.d/canon630u.conf
+share/examples/sane-backends/sane.d/canon_dr.conf
+@sample ${SYSCONFDIR}/sane.d/canon_dr.conf
 share/examples/sane-backends/sane.d/cardscan.conf
 @sample ${SYSCONFDIR}/sane.d/cardscan.conf
 share/examples/sane-backends/sane.d/coolscan.conf
 @sample ${SYSCONFDIR}/sane.d/coolscan.conf
 share/examples/sane-backends/sane.d/coolscan2.conf
 @sample ${SYSCONFDIR}/sane.d/coolscan2.conf
+share/examples/sane-backends/sane.d/coolscan3.conf
+@sample ${SYSCONFDIR}/sane.d/coolscan3.conf
 share/examples/sane-backends/sane.d/dc210.conf
 @sample ${SYSCONFDIR}/sane.d/dc210.conf
 share/examples/sane-backends/sane.d/dc240.conf
@@ -370,6 +368,8 @@ share/examples/sane-backends/sane.d/dell1600n_net.conf
 @sample ${SYSCONFDIR}/sane.d/dell1600n_net.conf
 share/examples/sane-backends/sane.d/dll.conf
 @sample ${SYSCONFDIR}/sane.d/dll.conf
+share/examples/sane-backends/sane.d/dll.d/
+@sample ${SYSCONFDIR}/sane.d/dll.d/
 share/examples/sane-backends/sane.d/dmc.conf
 @sample ${SYSCONFDIR}/sane.d/dmc.conf
 share/examples/sane-backends/sane.d/epjitsu.conf
@@ -425,6 +425,8 @@ share/examples/sane-backends/sane.d/plustek_pp.conf
 @sample ${SYSCONFDIR}/sane.d/plustek_pp.conf
 share/examples/sane-backends/sane.d/ricoh.conf
 @sample ${SYSCONFDIR}/sane.d/ricoh.conf
+share/examples/sane-backends/sane.d/rts8891.conf
+@sample ${SYSCONFDIR}/sane.d/rts8891.conf
 share/examples/sane-backends/sane.d/s9036.conf
 @sample ${SYSCONFDIR}/sane.d/s9036.conf
 share/examples/sane-backends/sane.d/saned.conf
@@ -461,10 +463,15 @@ share/examples/sane-backends/sane.d/umax1220u.conf
 @sample ${SYSCONFDIR}/sane.d/umax1220u.conf
 share/examples/sane-backends/sane.d/umax_pp.conf
 @sample ${SYSCONFDIR}/sane.d/umax_pp.conf
+share/examples/sane-backends/sane.d/xerox_mfp.conf
+@sample ${SYSCONFDIR}/sane.d/xerox_mfp.conf
 share/locale/bg/LC_MESSAGES/sane-backends.mo
 share/locale/cs/LC_MESSAGES/sane-backends.mo
 share/locale/da/LC_MESSAGES/sane-backends.mo
 share/locale/de/LC_MESSAGES/sane-backends.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/sane-backends.mo
 share/locale/eo/LC_MESSAGES/sane-backends.mo
 share/locale/es/LC_MESSAGES/sane-backends.mo
 share/locale/fi/LC_MESSAGES/sane-backends.mo