From 3d8c217539278cfc01a8a1887f58f52325f5ef3f Mon Sep 17 00:00:00 2001 From: rh Date: Sun, 29 Jun 2003 10:16:44 +0000 Subject: Update sane-backends to 1.0.12. Changes include: * Documentation updates * Updated backends: apple, artec_eplus48u, as6e, avision, canon, canon630u, dc210, dc240, dll, epson, fujitsu (fi4220), gphoto2, gt68xx, hp, mustek, mustek_pp, mustek_usb, net, pie, plustek, snapscan, teco2, test, umax, umax_pp * New backends: ibm, ma1509, some versions of hp5400 * Added IPv6 support for saned and net backend * Added SCSI support for MacOS X * Build system improvements * USB access improvements * Portability fixes * Translation updates and new translations: nl, no * Bugfixes --- graphics/sane-backends/Makefile | 4 +- graphics/sane-backends/Makefile.common | 17 +++++---- graphics/sane-backends/PLIST | 67 ++++++++++++++++++++++++++++++++- graphics/sane-backends/distinfo | 8 ++-- graphics/sane-backends/patches/patch-aa | 26 ++----------- 5 files changed, 85 insertions(+), 37 deletions(-) (limited to 'graphics/sane-backends') diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index ca03c9149ff..0071f9d37a7 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2002/12/16 17:59:05 tron Exp $ +# $NetBSD: Makefile,v 1.14 2003/06/29 10:16:44 rh Exp $ .include "Makefile.common" COMMENT= API for access to scanners, digitals camera, frame grabbers etc. DISTNAME= sane-backends-${SANE_VERSION} +SANE_MICRO= 12 + .include "../../devel/libusb/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 2707b25f567..f1a7b46c63c 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,17 +1,17 @@ -# $NetBSD: Makefile.common,v 1.7 2003/06/23 14:23:17 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.8 2003/06/29 10:16:44 rh Exp $ CATEGORIES?= graphics -MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \ - ftp://ftp.mostang.com/pub/sane/old-versions/sane-${SANE_VERSION}/ \ - ftp://gd.tuwien.ac.at/hci/sane/sane-${SANE_VERSION}/ \ - ftp://ftp.informatik.uni-oldenburg.de/pub/sane/sane-${SANE_VERSION}/ +MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \ + ftp://ftp.mostang.com/pub/sane/old-versions/${SANE_VERSION}/ \ + ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \ + ftp://ftp.informatik.uni-oldenburg.de/pub/${DISTNAME}/ MAINTAINER?= tech-pkg@netbsd.org HOMEPAGE?= http://www.mostang.com/sane/ -SANE_MAJOR= 1 -SANE_MINOR= 0 -SANE_MICRO= 9 +SANE_MAJOR?= 1 +SANE_MINOR?= 0 +SANE_MICRO?= 11 SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO} PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR} PLIST_SUBST+= SANE_MINOR=${SANE_MINOR} @@ -25,6 +25,7 @@ USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +CONFIGURE_ENV+= ac_cv_path_LATEX="no" .include "../../mk/bsd.prefs.mk" # -O to work around a bug with -O2 and egcs. diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST index c90f5992c79..444bb885aea 100644 --- a/graphics/sane-backends/PLIST +++ b/graphics/sane-backends/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/12/16 17:59:05 tron Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/06/29 10:16:44 rh Exp $ bin/gamma4scanimage bin/sane-config bin/sane-find-scanner @@ -7,6 +7,7 @@ etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf etc/sane.d/apple.conf etc/sane.d/artec.conf +etc/sane.d/artec_eplus48u.conf etc/sane.d/avision.conf etc/sane.d/bh.conf etc/sane.d/canon.conf @@ -20,8 +21,12 @@ etc/sane.d/dll.conf etc/sane.d/dmc.conf etc/sane.d/epson.conf etc/sane.d/fujitsu.conf +etc/sane.d/gt68xx.conf etc/sane.d/hp.conf +etc/sane.d/hp5400.conf +etc/sane.d/ibm.conf etc/sane.d/leo.conf +etc/sane.d/ma1509.conf etc/sane.d/matsushita.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf @@ -75,6 +80,11 @@ lib/sane/libsane-artec.la lib/sane/libsane-artec.so lib/sane/libsane-artec.so.${SANE_MAJOR} lib/sane/libsane-artec.so.${SANE_MAJOR}.${SANE_MICRO} +lib/sane/libsane-artec_eplus48u.a +lib/sane/libsane-artec_eplus48u.la +lib/sane/libsane-artec_eplus48u.so +lib/sane/libsane-artec_eplus48u.so.1 +lib/sane/libsane-artec_eplus48u.so.1.12 lib/sane/libsane-as6e.a lib/sane/libsane-as6e.la lib/sane/libsane-as6e.so @@ -145,16 +155,36 @@ lib/sane/libsane-fujitsu.la lib/sane/libsane-fujitsu.so lib/sane/libsane-fujitsu.so.${SANE_MAJOR} lib/sane/libsane-fujitsu.so.${SANE_MAJOR}.${SANE_MICRO} +lib/sane/libsane-gt68xx.a +lib/sane/libsane-gt68xx.la +lib/sane/libsane-gt68xx.so +lib/sane/libsane-gt68xx.so.1 +lib/sane/libsane-gt68xx.so.1.12 lib/sane/libsane-hp.a lib/sane/libsane-hp.la lib/sane/libsane-hp.so lib/sane/libsane-hp.so.${SANE_MAJOR} lib/sane/libsane-hp.so.${SANE_MAJOR}.${SANE_MICRO} +lib/sane/libsane-hp5400.a +lib/sane/libsane-hp5400.la +lib/sane/libsane-hp5400.so +lib/sane/libsane-hp5400.so.1 +lib/sane/libsane-hp5400.so.1.12 +lib/sane/libsane-ibm.a +lib/sane/libsane-ibm.la +lib/sane/libsane-ibm.so +lib/sane/libsane-ibm.so.1 +lib/sane/libsane-ibm.so.1.12 lib/sane/libsane-leo.a lib/sane/libsane-leo.la lib/sane/libsane-leo.so lib/sane/libsane-leo.so.${SANE_MAJOR} lib/sane/libsane-leo.so.${SANE_MAJOR}.${SANE_MICRO} +lib/sane/libsane-ma1509.a +lib/sane/libsane-ma1509.la +lib/sane/libsane-ma1509.so +lib/sane/libsane-ma1509.so.1 +lib/sane/libsane-ma1509.so.1.12 lib/sane/libsane-matsushita.a lib/sane/libsane-matsushita.la lib/sane/libsane-matsushita.so @@ -295,7 +325,11 @@ man/man1/sane-config.1 man/man1/sane-find-scanner.1 man/man1/saned.1 man/man1/scanimage.1 +man/man5/sane-artec_eplus48u.5 +man/man5/sane-gt68xx.5 man/man5/sane-hpsj5s.5 +man/man5/sane-ibm.5 +man/man5/sane-ma1509.5 man/man5/sane-teco2.5 man/man5/sane-teco3.5 man/man5/sane-abaton.5 @@ -319,6 +353,7 @@ man/man5/sane-epson.5 man/man5/sane-fujitsu.5 man/man5/sane-gphoto2.5 man/man5/sane-hp.5 +man/man5/sane-hp5400.5 man/man5/sane-leo.5 man/man5/sane-matsushita.5 man/man5/sane-microtek.5 @@ -355,7 +390,6 @@ sbin/saned share/doc/sane-${SANE_VERSION}/AUTHORS share/doc/sane-${SANE_VERSION}/COPYING share/doc/sane-${SANE_VERSION}/ChangeLog -share/doc/sane-${SANE_VERSION}/LEVEL2 share/doc/sane-${SANE_VERSION}/LICENSE share/doc/sane-${SANE_VERSION}/NEWS share/doc/sane-${SANE_VERSION}/PROBLEMS @@ -377,10 +411,20 @@ share/doc/sane-${SANE_VERSION}/TODO share/doc/sane-${SANE_VERSION}/backend-writing.txt share/doc/sane-${SANE_VERSION}/canon/canon.changes share/doc/sane-${SANE_VERSION}/canon/canon.install2700F.txt +share/doc/sane-${SANE_VERSION}/gt68xx/gt68xx.CHANGES +share/doc/sane-${SANE_VERSION}/leo/leo.txt share/doc/sane-${SANE_VERSION}/matsushita/matsushita.txt share/doc/sane-${SANE_VERSION}/mustek/mustek.CHANGES share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.CHANGES share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.TODO +share/doc/sane-${SANE_VERSION}/plustek/Plustek-PARPORT.txt +share/doc/sane-${SANE_VERSION}/plustek/Plustek-USB-TODO.txt +share/doc/sane-${SANE_VERSION}/plustek/Plustek-USB.txt +share/doc/sane-${SANE_VERSION}/plustek/Plustek.changes +share/doc/sane-${SANE_VERSION}/sane-backends-external.html +share/doc/sane-${SANE_VERSION}/sane-backends.html +share/doc/sane-${SANE_VERSION}/sane-mfgs-external.html +share/doc/sane-${SANE_VERSION}/sane-mfgs.html share/doc/sane-${SANE_VERSION}/sceptre/s1200.txt share/doc/sane-${SANE_VERSION}/teco/teco1.txt share/doc/sane-${SANE_VERSION}/teco/teco2.txt @@ -391,12 +435,16 @@ share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced-options-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced.jpg share/doc/sane-${SANE_VERSION}/umax/sane-umax-astra-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-config-doc.html +share/doc/sane-${SANE_VERSION}/umax/sane-umax-contact.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.dvi share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.tex +share/doc/sane-${SANE_VERSION}/umax/sane-umax-download.html +share/doc/sane-${SANE_VERSION}/umax/sane-umax-firewire-info.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-histogram.jpg share/doc/sane-${SANE_VERSION}/umax/sane-umax-mailinglist.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-mirage-doc.html +share/doc/sane-${SANE_VERSION}/umax/sane-umax-news.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-not-listed-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-old-scanners-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-options-doc.html @@ -413,19 +461,34 @@ share/doc/sane-${SANE_VERSION}/umax/sane-umax-text2.jpg share/doc/sane-${SANE_VERSION}/umax/sane-umax-text4.jpg share/doc/sane-${SANE_VERSION}/umax/sane-umax-uc-doc.html share/doc/sane-${SANE_VERSION}/umax/sane-umax-vista-doc.html +share/doc/sane-${SANE_VERSION}/umax/sane-umax-websites.html share/doc/sane-${SANE_VERSION}/umax/sane-umax.jpg share/doc/sane-${SANE_VERSION}/umax/umax.BUGS share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES share/doc/sane-${SANE_VERSION}/umax/umax.FAQ share/doc/sane-${SANE_VERSION}/umax/umax.TODO +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sane-backends.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo @dirrm share/doc/sane-${SANE_VERSION}/umax @dirrm share/doc/sane-${SANE_VERSION}/teco @dirrm share/doc/sane-${SANE_VERSION}/sceptre +@dirrm share/doc/sane-${SANE_VERSION}/plustek @dirrm share/doc/sane-${SANE_VERSION}/mustek_usb @dirrm share/doc/sane-${SANE_VERSION}/mustek @dirrm share/doc/sane-${SANE_VERSION}/matsushita +@dirrm share/doc/sane-${SANE_VERSION}/leo +@dirrm share/doc/sane-${SANE_VERSION}/gt68xx @dirrm share/doc/sane-${SANE_VERSION}/canon @dirrm share/doc/sane-${SANE_VERSION} +@exec ${MKDIR} %D/share/sane/gt68xx +@dirrm share/sane/gt68xx +@dirrm share/sane @dirrm lib/sane @dirrm include/sane @dirrm etc/sane.d diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 07b587437aa..359b14e4ab7 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.11 2002/12/16 17:59:05 tron Exp $ +$NetBSD: distinfo,v 1.12 2003/06/29 10:16:44 rh Exp $ -SHA1 (sane-backends-1.0.9.tar.gz) = cbfcf4abb805065821f4c9aef64765b0563255aa -Size (sane-backends-1.0.9.tar.gz) = 2289976 bytes -SHA1 (patch-aa) = 32070ca6afef7f96a1fa291857598cf116cbeeae +SHA1 (sane-backends-1.0.12.tar.gz) = f50c17957291e40de8b55d002ef178b742659759 +Size (sane-backends-1.0.12.tar.gz) = 2790931 bytes +SHA1 (patch-aa) = b782bc8ee2e6d68e667706659998a6c82ce1d5e6 diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa index 20cc7ea7bdb..53abef1e40e 100644 --- a/graphics/sane-backends/patches/patch-aa +++ b/graphics/sane-backends/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2002/12/16 17:59:06 tron Exp $ +$NetBSD: patch-aa,v 1.8 2003/06/29 10:16:45 rh Exp $ ---- doc/Makefile.in.orig Tue Oct 15 13:52:38 2002 -+++ doc/Makefile.in Mon Dec 16 18:15:37 2002 -@@ -24,7 +24,7 @@ +--- doc/Makefile.in.orig Thu May 1 09:12:55 2003 ++++ doc/Makefile.in +@@ -25,7 +25,7 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include configdir = ${sysconfdir}/sane.d @@ -11,21 +11,3 @@ $NetBSD: patch-aa,v 1.7 2002/12/16 17:59:06 tron Exp $ MKDIR = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ -@@ -56,7 +56,7 @@ - PROJECTS README README.aix README.beos README.darwin README.freebsd \ - README.hp-ux README.linux README.netbsd README.openbsd README.os2 \ - README.solaris README.unixware2 README.unixware7 TODO --DOCS = backend-writing.txt sane.ps sane.dvi -+DOCS = backend-writing.txt - BACKDIRS= canon matsushita mustek mustek_usb umax sceptre teco - LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex - DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh -@@ -92,7 +92,7 @@ - .PHONY: all clean depend dist distclean html html-man install \ - install-mostang sane-html uninstall - --all: sane.ps $(MANPAGES) -+all: $(MANPAGES) - - %.1 %.5 %.7: %.man - @sed -e 's|@DATADIR@|$(datadir)|g' \ -- cgit v1.2.3