diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/Makefile /usr/ports/mystuff/sane-backends/Makefile --- /usr/ports/graphics/sane-backends/Makefile Sun Oct 9 11:12:19 2005 +++ /usr/ports/mystuff/sane-backends/Makefile Mon Dec 19 15:40:57 2005 @@ -2,8 +2,7 @@ COMMENT= "API for accessing scanners, backends" -DISTNAME= sane-backends-1.0.16 -PKGNAME= ${DISTNAME}p2 +DISTNAME= sane-backends-1.0.17 CATEGORIES= graphics HOMEPAGE= http://www.sane-project.org/ @@ -20,17 +19,19 @@ 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 +WANTLIB= c m pthread LIB_DEPENDS= usb.7::devel/libusb \ jpeg.62::graphics/jpeg +MODULES= devel/gettext USE_LIBTOOL= Yes USE_GMAKE= Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_path_MAKEDEPEND="no" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --sbindir=${LOCALBASE}/libexec \ --with-docdir=${LOCALBASE}/share/doc/sane-backends \ @@ -44,7 +45,6 @@ LIB_DEPENDS+= gphoto2,gphoto2_port::graphics/libgphoto2 CONFIGURE_ARGS+=--with-gphoto2 WANTLIB+= exif -MODULES= devel/gettext .else CONFIGURE_ARGS+=--without-gphoto2 .endif diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/distinfo /usr/ports/mystuff/sane-backends/distinfo --- /usr/ports/graphics/sane-backends/distinfo Mon Oct 3 23:15:04 2005 +++ /usr/ports/mystuff/sane-backends/distinfo Mon Dec 19 11:06:09 2005 @@ -1,4 +1,4 @@ -MD5 (sane-backends-1.0.16.tar.gz) = bec9b9262246316b4ebfe2bc7451aa28 -RMD160 (sane-backends-1.0.16.tar.gz) = 694030faddf3b14035b6d4cee0151aa48f71049d -SHA1 (sane-backends-1.0.16.tar.gz) = 38e2bf7aef648f3ea19bd6c89af2c2fdd8b6eeb1 -SIZE (sane-backends-1.0.16.tar.gz) = 3409799 +MD5 (sane-backends-1.0.17.tar.gz) = b51c10da8a81a04e1bae88c9e6556df2 +RMD160 (sane-backends-1.0.17.tar.gz) = 43e440712e9da676e235dc6148c5dda347c30e22 +SHA1 (sane-backends-1.0.17.tar.gz) = a73e01575458a5fb7dc265cea50c6740555e1711 +SIZE (sane-backends-1.0.17.tar.gz) = 3588993 diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-backend_Makefile /usr/ports/mystuff/sane-backends/patches/patch-backend_Makefile --- /usr/ports/graphics/sane-backends/patches/patch-backend_Makefile Tue Nov 15 22:04:58 2005 +++ /usr/ports/mystuff/sane-backends/patches/patch-backend_Makefile Mon Dec 19 15:22:59 2005 @@ -1,5 +1,5 @@ ---- backend/Makefile.in.orig Sat Jul 30 14:28:10 2005 -+++ backend/Makefile.in Tue Nov 15 21:52:39 2005 +--- backend/Makefile.in.orig Sun Dec 18 14:32:31 2005 ++++ backend/Makefile.in Mon Dec 19 15:22:23 2005 @@ -25,7 +25,7 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ @@ -9,7 +9,16 @@ BEOS_ADDONDIR = @BEOS_ADDONDIR@ V_MAJOR = @V_MAJOR@ -@@ -168,7 +168,8 @@ DISTFILES = abaton.c abaton.conf abaton. +@@ -54,7 +54,7 @@ DEFS = @DEFS@ + DYNAMIC_FLAG=@DYNAMIC_FLAG@ + USE_LINKS=@USE_LINKS@ + +-LIBTOOL = ../libtool ++LIBTOOL = /usr/local/bin/libtool + MCOMP = --mode=compile + MLINK = --mode=link + MINST = --mode=install +@@ -175,7 +175,8 @@ DISTFILES = abaton.c abaton.conf abaton. libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS) @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \ $(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \ @@ -19,11 +28,20 @@ %-s.lo: %-s.c @$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $< -@@ -195,7 +196,6 @@ install-be: +@@ -203,7 +204,6 @@ install-be: $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} \ - $(DESTDIR)$(libsanedir)/$${be} || exit 1; \ + $(DESTDIR)$(libsanedir)/$${be} >/dev/null || exit 1; \ done -- @$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libsanedir) - # @# Assume the dll name without any versions is last - # @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \ - # list="$(ALL_BACKENDS)"; cd $(DESTDIR)$(libsanedir) && for be in $$list; do \ +- @$(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: + done + + install-lockpath: +- $(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(localstatesanedir) ++# $(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(localstatesanedir) + + uninstall: + rm -rf $(libsanedir) $(configdir) $(localstatesanedir) diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-backend_dll_conf /usr/ports/mystuff/sane-backends/patches/patch-backend_dll_conf --- /usr/ports/graphics/sane-backends/patches/patch-backend_dll_conf Mon Oct 3 23:15:04 2005 +++ /usr/ports/mystuff/sane-backends/patches/patch-backend_dll_conf Mon Dec 19 11:17:18 2005 @@ -1,16 +1,16 @@ $OpenBSD: patch-backend_dll_conf,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $ ---- backend/dll.conf.orig Sun Sep 25 18:10:33 2005 -+++ backend/dll.conf Sun Sep 25 18:11:51 2005 +--- backend/dll.conf.orig Mon Dec 19 11:11:01 2005 ++++ backend/dll.conf Mon Dec 19 11:11:44 2005 @@ -23,7 +23,7 @@ fujitsu genesys gt68xx hp -hpsj5s +#hpsj5s + hp4200 hp5400 ibm - leo -@@ -41,7 +41,7 @@ pint +@@ -44,7 +44,7 @@ pint plustek #plustek_pp #pnm @@ -19,7 +19,7 @@ ricoh s9036 sceptre -@@ -60,7 +60,7 @@ u12 +@@ -63,7 +63,7 @@ u12 umax #umax_pp umax1220u diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-backend_fujitsu_c /usr/ports/mystuff/sane-backends/patches/patch-backend_fujitsu_c --- /usr/ports/graphics/sane-backends/patches/patch-backend_fujitsu_c Mon Oct 3 23:15:04 2005 +++ /usr/ports/mystuff/sane-backends/patches/patch-backend_fujitsu_c Mon Dec 19 15:01:44 2005 @@ -1,7 +1,7 @@ $OpenBSD: patch-backend_fujitsu_c,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $ ---- backend/fujitsu.c.orig Sun Oct 2 16:01:38 2005 -+++ backend/fujitsu.c Sun Oct 2 16:13:22 2005 -@@ -7629,7 +7629,7 @@ setDefaults3096 (struct fujitsu *scanner +--- 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; diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-configure /usr/ports/mystuff/sane-backends/patches/patch-configure --- /usr/ports/graphics/sane-backends/patches/patch-configure Thu Jan 1 01:00:00 1970 +++ /usr/ports/mystuff/sane-backends/patches/patch-configure Mon Dec 19 15:02:58 2005 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.orig Mon Dec 19 15:02:38 2005 ++++ configure Mon Dec 19 15:02:54 2005 +@@ -4929,7 +4929,7 @@ done + + #check if links for dynamic libs should be created + case "${host_os}" in +- darwin*) ++ darwin* | openbsd* ) + USE_LINKS=no + ;; + *) diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-doc_saned_man /usr/ports/mystuff/sane-backends/patches/patch-doc_saned_man --- /usr/ports/graphics/sane-backends/patches/patch-doc_saned_man Fri Oct 7 00:37:45 2005 +++ /usr/ports/mystuff/sane-backends/patches/patch-doc_saned_man Mon Dec 19 15:43:24 2005 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_saned_man,v 1.2 2005/10/06 22:37:45 alek Exp $ ---- doc/saned.man.orig Sat Apr 16 15:06:50 2005 -+++ doc/saned.man Thu Oct 6 11:00:15 2005 +--- doc/saned.man.orig Mon Dec 19 11:12:10 2005 ++++ doc/saned.man Mon Dec 19 11:15:51 2005 @@ -92,7 +92,7 @@ support IPv6, check the documentation fo The configuration line normally looks like this: .PP @@ -10,7 +10,7 @@ .RE .PP However, if your system uses -@@ -105,13 +105,13 @@ and use a line of the following form in +@@ -105,16 +105,16 @@ and use a line of the following form in instead: .PP .RS @@ -26,16 +26,19 @@ +.B _saned user. If you follow this example, please make sure that the access permissions on the special device are set such that - .B saned -@@ -140,9 +140,9 @@ socket_type = stream - .br - wait = no - .br --user = saned -+user = _saned - .br --group = saned -+group = _saned - .br - server = @SBINDIR@/saned - .RE +-.B saned ++.B _saned + can access the scanner (the program generally needs read and + write access to scanner devices). + .PP +@@ -133,8 +133,8 @@ service sane-port + port = 6566 + socket_type = stream + wait = no +- user = saned +- group = saned ++ user = _saned ++ group = _saned + server = @SBINDIR@/saned + } + .fi diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/patches/patch-frontend_scanimage_c /usr/ports/mystuff/sane-backends/patches/patch-frontend_scanimage_c --- /usr/ports/graphics/sane-backends/patches/patch-frontend_scanimage_c Mon Oct 3 23:15:04 2005 +++ /usr/ports/mystuff/sane-backends/patches/patch-frontend_scanimage_c Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-frontend_scanimage_c,v 1.1.1.1 2005/10/03 21:15:04 alek Exp $ ---- frontend/scanimage.c.orig Sun Oct 2 16:17:35 2005 -+++ frontend/scanimage.c Sun Oct 2 16:23:55 2005 -@@ -172,7 +172,7 @@ auth_callback (SANE_String_Const resourc - else - len = strlen (resource); - -- while (fgets (tmp, 512, pass_file)) -+ while (fgets (tmp, sizeof(tmp), pass_file)) - { - - if ((strlen (tmp) > 0) && (tmp[strlen (tmp) - 1] == '\n')) diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/pkg/PFRAG.shared /usr/ports/mystuff/sane-backends/pkg/PFRAG.shared --- /usr/ports/graphics/sane-backends/pkg/PFRAG.shared Tue Oct 4 23:42:39 2005 +++ /usr/ports/mystuff/sane-backends/pkg/PFRAG.shared Mon Dec 19 14:41:29 2005 @@ -1,5 +1,5 @@ @comment $OpenBSD: PFRAG.shared,v 1.2 2005/10/04 21:42:39 alek Exp $ -@lib lib/libsane.so.1.16 +@lib lib/libsane.so.1.17 lib/sane/libsane-abaton.so lib/sane/libsane-agfafocus.so lib/sane/libsane-apple.so @@ -22,15 +22,18 @@ lib/sane/libsane-genesys.so lib/sane/libsane-gt68xx.so lib/sane/libsane-hp.so +lib/sane/libsane-hp4200.so lib/sane/libsane-hp5400.so lib/sane/libsane-ibm.so lib/sane/libsane-leo.so +lib/sane/libsane-lexmark.so lib/sane/libsane-ma1509.so lib/sane/libsane-matsushita.so lib/sane/libsane-microtek.so lib/sane/libsane-microtek2.so lib/sane/libsane-mustek.so lib/sane/libsane-mustek_usb.so +lib/sane/libsane-mustek_usb2.so lib/sane/libsane-nec.so lib/sane/libsane-net.so lib/sane/libsane-niash.so diff -uNr --exclude=CVS /usr/ports/graphics/sane-backends/pkg/PLIST /usr/ports/mystuff/sane-backends/pkg/PLIST --- /usr/ports/graphics/sane-backends/pkg/PLIST Sun Oct 9 11:12:20 2005 +++ /usr/ports/mystuff/sane-backends/pkg/PLIST Mon Dec 19 15:35:47 2005 @@ -56,12 +56,16 @@ lib/sane/libsane-gt68xx.la lib/sane/libsane-hp.a lib/sane/libsane-hp.la +lib/sane/libsane-hp4200.a +lib/sane/libsane-hp4200.la lib/sane/libsane-hp5400.a lib/sane/libsane-hp5400.la lib/sane/libsane-ibm.a lib/sane/libsane-ibm.la lib/sane/libsane-leo.a lib/sane/libsane-leo.la +lib/sane/libsane-lexmark.a +lib/sane/libsane-lexmark.la lib/sane/libsane-ma1509.a lib/sane/libsane-ma1509.la lib/sane/libsane-matsushita.a @@ -74,6 +78,8 @@ lib/sane/libsane-mustek.la lib/sane/libsane-mustek_usb.a lib/sane/libsane-mustek_usb.la +lib/sane/libsane-mustek_usb2.a +lib/sane/libsane-mustek_usb2.la lib/sane/libsane-nec.a lib/sane/libsane-nec.la lib/sane/libsane-net.a @@ -153,10 +159,12 @@ @comment @man man/man5/sane-gphoto2.5 @man man/man5/sane-gt68xx.5 @man man/man5/sane-hp.5 +@man man/man5/sane-hp4200.5 @man man/man5/sane-hp5400.5 @comment @man man/man5/sane-hpsj5s.5 @man man/man5/sane-ibm.5 @man man/man5/sane-leo.5 +@man man/man5/sane-lexmark.5 @man man/man5/sane-ma1509.5 @man man/man5/sane-matsushita.5 @man man/man5/sane-microtek.5 @@ -164,6 +172,7 @@ @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 @man man/man5/sane-net.5 @man man/man5/sane-niash.5 @@ -236,6 +245,9 @@ share/doc/sane-backends/mustek_usb/ share/doc/sane-backends/mustek_usb/mustek_usb.CHANGES share/doc/sane-backends/mustek_usb/mustek_usb.TODO +share/doc/sane-backends/mustek_usb2/ +share/doc/sane-backends/mustek_usb2/mustek_usb2.CHANGES +share/doc/sane-backends/mustek_usb2/mustek_usb2.TODO share/doc/sane-backends/niash/ share/doc/sane-backends/niash/niash.TODO share/doc/sane-backends/plustek/ @@ -253,8 +265,6 @@ 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/ @@ -336,12 +346,16 @@ @sample ${SYSCONFDIR}/sane.d/gt68xx.conf share/examples/sane-backends/sane.d/hp.conf @sample ${SYSCONFDIR}/sane.d/hp.conf +share/examples/sane-backends/sane.d/hp4200.conf +@sample ${SYSCONFDIR}/sane.d/hp4200.conf share/examples/sane-backends/sane.d/hp5400.conf @sample ${SYSCONFDIR}/sane.d/hp5400.conf share/examples/sane-backends/sane.d/ibm.conf @sample ${SYSCONFDIR}/sane.d/ibm.conf share/examples/sane-backends/sane.d/leo.conf @sample ${SYSCONFDIR}/sane.d/leo.conf +share/examples/sane-backends/sane.d/lexmark.conf +@sample ${SYSCONFDIR}/sane.d/lexmark.conf share/examples/sane-backends/sane.d/ma1509.conf @sample ${SYSCONFDIR}/sane.d/ma1509.conf share/examples/sane-backends/sane.d/matsushita.conf @@ -443,7 +457,9 @@ share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/sane-backends.mo share/sane/ +share/sane/artec_eplus48u/ share/sane/gt68xx/ +share/sane/snapscan/ %%gphoto2%% @mode 775 @group _saned