diff options
-rw-r--r-- | graphics/sane-backends/Makefile.common | 4 | ||||
-rw-r--r-- | graphics/sane-backends/PLIST | 100 | ||||
-rw-r--r-- | graphics/sane-backends/distinfo | 9 | ||||
-rw-r--r-- | graphics/sane-backends/patches/patch-aa | 14 | ||||
-rw-r--r-- | graphics/sane-backends/patches/patch-ae | 61 |
5 files changed, 69 insertions, 119 deletions
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 9c35585bf76..4378c4c3ccf 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2002/02/10 00:50:42 rh Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $ CATEGORIES?= graphics MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \ @@ -12,7 +12,7 @@ COMMENT?= API for access to scanners, digitals camera, frame grabbers etc. SANE_MAJOR= 1 SANE_MINOR= 0 -SANE_MICRO= 7 +SANE_MICRO= 8 SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO} PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR} PLIST_SUBST+= SANE_MINOR=${SANE_MINOR} diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST index 753a51046cd..29ecfa3fb20 100644 --- a/graphics/sane-backends/PLIST +++ b/graphics/sane-backends/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/10 00:50:42 rh Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $ bin/sane-config bin/sane-find-scanner bin/scanimage @@ -9,15 +9,19 @@ etc/sane.d/artec.conf etc/sane.d/avision.conf etc/sane.d/bh.conf etc/sane.d/canon.conf +etc/sane.d/canon630u.conf etc/sane.d/coolscan.conf +etc/sane.d/coolscan2.conf etc/sane.d/dc210.conf etc/sane.d/dc240.conf etc/sane.d/dc25.conf etc/sane.d/dll.conf etc/sane.d/dmc.conf etc/sane.d/epson.conf +etc/sane.d/fujitsu.conf etc/sane.d/hp.conf -etc/sane.d/m3096g.conf +etc/sane.d/leo.conf +etc/sane.d/matsushita.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf etc/sane.d/mustek.conf @@ -30,11 +34,14 @@ etc/sane.d/plustek.conf etc/sane.d/ricoh.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf +etc/sane.d/sceptre.conf etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/sp15c.conf etc/sane.d/st400.conf etc/sane.d/tamarack.conf +etc/sane.d/teco1.conf +etc/sane.d/test.conf etc/sane.d/umax.conf etc/sane.d/umax1220u.conf etc/sane.d/umax_pp.conf @@ -45,192 +52,182 @@ lib/libsane.la lib/libsane.so lib/libsane.so.${SANE_MAJOR} lib/libsane.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-abaton.a lib/sane/libsane-abaton.la lib/sane/libsane-abaton.so lib/sane/libsane-abaton.so.${SANE_MAJOR} lib/sane/libsane-abaton.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-agfafocus.a lib/sane/libsane-agfafocus.la lib/sane/libsane-agfafocus.so lib/sane/libsane-agfafocus.so.${SANE_MAJOR} lib/sane/libsane-agfafocus.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-apple.a lib/sane/libsane-apple.la lib/sane/libsane-apple.so lib/sane/libsane-apple.so.${SANE_MAJOR} lib/sane/libsane-apple.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-artec.a 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-as6e.a lib/sane/libsane-as6e.la lib/sane/libsane-as6e.so lib/sane/libsane-as6e.so.${SANE_MAJOR} lib/sane/libsane-as6e.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-avision.a lib/sane/libsane-avision.la lib/sane/libsane-avision.so lib/sane/libsane-avision.so.${SANE_MAJOR} lib/sane/libsane-avision.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-bh.a lib/sane/libsane-bh.la lib/sane/libsane-bh.so lib/sane/libsane-bh.so.${SANE_MAJOR} lib/sane/libsane-bh.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-canon.a lib/sane/libsane-canon.la lib/sane/libsane-canon.so lib/sane/libsane-canon.so.${SANE_MAJOR} lib/sane/libsane-canon.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-coolscan.a +lib/sane/libsane-canon630u.la +lib/sane/libsane-canon630u.so +lib/sane/libsane-canon630u.so.${SANE_MAJOR} +lib/sane/libsane-canon630u.so.${SANE_MAJOR}.${SANE_MICRO} lib/sane/libsane-coolscan.la lib/sane/libsane-coolscan.so lib/sane/libsane-coolscan.so.${SANE_MAJOR} lib/sane/libsane-coolscan.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-dc210.a +lib/sane/libsane-coolscan2.la +lib/sane/libsane-coolscan2.so +lib/sane/libsane-coolscan2.so.${SANE_MAJOR} +lib/sane/libsane-coolscan2.so.${SANE_MAJOR}.${SANE_MICRO} lib/sane/libsane-dc210.la lib/sane/libsane-dc210.so lib/sane/libsane-dc210.so.${SANE_MAJOR} lib/sane/libsane-dc210.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-dc240.a lib/sane/libsane-dc240.la lib/sane/libsane-dc240.so lib/sane/libsane-dc240.so.${SANE_MAJOR} lib/sane/libsane-dc240.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-dc25.a lib/sane/libsane-dc25.la lib/sane/libsane-dc25.so lib/sane/libsane-dc25.so.${SANE_MAJOR} lib/sane/libsane-dc25.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-dll.a lib/sane/libsane-dll.la lib/sane/libsane-dll.so lib/sane/libsane-dll.so.${SANE_MAJOR} lib/sane/libsane-dll.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-dmc.a lib/sane/libsane-dmc.la lib/sane/libsane-dmc.so lib/sane/libsane-dmc.so.${SANE_MAJOR} lib/sane/libsane-dmc.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-epson.a lib/sane/libsane-epson.la lib/sane/libsane-epson.so lib/sane/libsane-epson.so.${SANE_MAJOR} lib/sane/libsane-epson.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-hp.a +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-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-m3096g.a -lib/sane/libsane-m3096g.la -lib/sane/libsane-m3096g.so -lib/sane/libsane-m3096g.so.${SANE_MAJOR} -lib/sane/libsane-m3096g.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-microtek.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-matsushita.la +lib/sane/libsane-matsushita.so +lib/sane/libsane-matsushita.so.${SANE_MAJOR} +lib/sane/libsane-matsushita.so.${SANE_MAJOR}.${SANE_MICRO} lib/sane/libsane-microtek.la lib/sane/libsane-microtek.so lib/sane/libsane-microtek.so.${SANE_MAJOR} lib/sane/libsane-microtek.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-microtek2.a lib/sane/libsane-microtek2.la lib/sane/libsane-microtek2.so lib/sane/libsane-microtek2.so.${SANE_MAJOR} lib/sane/libsane-microtek2.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-mustek.a lib/sane/libsane-mustek.la lib/sane/libsane-mustek.so lib/sane/libsane-mustek.so.${SANE_MAJOR} lib/sane/libsane-mustek.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-mustek_pp.a lib/sane/libsane-mustek_pp.la lib/sane/libsane-mustek_pp.so lib/sane/libsane-mustek_pp.so.${SANE_MAJOR} lib/sane/libsane-mustek_pp.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-mustek_usb.a lib/sane/libsane-mustek_usb.la lib/sane/libsane-mustek_usb.so lib/sane/libsane-mustek_usb.so.${SANE_MAJOR} lib/sane/libsane-mustek_usb.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-nec.a lib/sane/libsane-nec.la lib/sane/libsane-nec.so lib/sane/libsane-nec.so.${SANE_MAJOR} lib/sane/libsane-nec.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-net.a lib/sane/libsane-net.la lib/sane/libsane-net.so lib/sane/libsane-net.so.${SANE_MAJOR} lib/sane/libsane-net.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-pie.a lib/sane/libsane-pie.la lib/sane/libsane-pie.so lib/sane/libsane-pie.so.${SANE_MAJOR} lib/sane/libsane-pie.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-pint.a lib/sane/libsane-pint.la lib/sane/libsane-pint.so lib/sane/libsane-pint.so.${SANE_MAJOR} lib/sane/libsane-pint.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-plustek.a lib/sane/libsane-plustek.la lib/sane/libsane-plustek.so lib/sane/libsane-plustek.so.${SANE_MAJOR} lib/sane/libsane-plustek.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-ricoh.a lib/sane/libsane-ricoh.la lib/sane/libsane-ricoh.so lib/sane/libsane-ricoh.so.${SANE_MAJOR} lib/sane/libsane-ricoh.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-s9036.a lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.${SANE_MAJOR} lib/sane/libsane-s9036.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-sharp.a +lib/sane/libsane-sceptre.la +lib/sane/libsane-sceptre.so +lib/sane/libsane-sceptre.so.${SANE_MAJOR} +lib/sane/libsane-sceptre.so.${SANE_MAJOR}.${SANE_MICRO} lib/sane/libsane-sharp.la lib/sane/libsane-sharp.so lib/sane/libsane-sharp.so.${SANE_MAJOR} lib/sane/libsane-sharp.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-sm3600.a lib/sane/libsane-sm3600.la lib/sane/libsane-sm3600.so lib/sane/libsane-sm3600.so.${SANE_MAJOR} lib/sane/libsane-sm3600.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-snapscan.a lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so lib/sane/libsane-snapscan.so.${SANE_MAJOR} lib/sane/libsane-snapscan.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-sp15c.a lib/sane/libsane-sp15c.la lib/sane/libsane-sp15c.so lib/sane/libsane-sp15c.so.${SANE_MAJOR} lib/sane/libsane-sp15c.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-st400.a lib/sane/libsane-st400.la lib/sane/libsane-st400.so lib/sane/libsane-st400.so.${SANE_MAJOR} lib/sane/libsane-st400.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-tamarack.a lib/sane/libsane-tamarack.la lib/sane/libsane-tamarack.so lib/sane/libsane-tamarack.so.${SANE_MAJOR} lib/sane/libsane-tamarack.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-umax.a +lib/sane/libsane-teco1.la +lib/sane/libsane-teco1.so +lib/sane/libsane-teco1.so.${SANE_MAJOR} +lib/sane/libsane-teco1.so.${SANE_MAJOR}.${SANE_MICRO} +lib/sane/libsane-test.la +lib/sane/libsane-test.so +lib/sane/libsane-test.so.${SANE_MAJOR} +lib/sane/libsane-test.so.${SANE_MAJOR}.${SANE_MICRO} lib/sane/libsane-umax.la lib/sane/libsane-umax.so lib/sane/libsane-umax.so.${SANE_MAJOR} lib/sane/libsane-umax.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-umax1220u.a lib/sane/libsane-umax1220u.la lib/sane/libsane-umax1220u.so lib/sane/libsane-umax1220u.so.${SANE_MAJOR} lib/sane/libsane-umax1220u.so.${SANE_MAJOR}.${SANE_MICRO} -lib/sane/libsane-umax_pp.a lib/sane/libsane-umax_pp.la lib/sane/libsane-umax_pp.so lib/sane/libsane-umax_pp.so.${SANE_MAJOR} @@ -246,7 +243,10 @@ man/man5/sane-as6e.5 man/man5/sane-avision.5 man/man5/sane-bh.5 man/man5/sane-canon.5 +man/man5/sane-canon630u.5 +man/man5/sane-canon_pp.5 man/man5/sane-coolscan.5 +man/man5/sane-coolscan2.5 man/man5/sane-dc210.5 man/man5/sane-dc240.5 man/man5/sane-dc25.5 @@ -256,6 +256,8 @@ man/man5/sane-epson.5 man/man5/sane-fujitsu.5 man/man5/sane-gphoto2.5 man/man5/sane-hp.5 +man/man5/sane-leo.5 +man/man5/sane-matsushita.5 man/man5/sane-microtek.5 man/man5/sane-microtek2.5 man/man5/sane-mustek.5 @@ -270,12 +272,16 @@ man/man5/sane-pnm.5 man/man5/sane-qcam.5 man/man5/sane-ricoh.5 man/man5/sane-s9036.5 +man/man5/sane-sceptre.5 man/man5/sane-scsi.5 man/man5/sane-sharp.5 man/man5/sane-sm3600.5 man/man5/sane-snapscan.5 +man/man5/sane-sp15c.5 man/man5/sane-st400.5 man/man5/sane-tamarack.5 +man/man5/sane-teco1.5 +man/man5/sane-test.5 man/man5/sane-umax.5 man/man5/sane-umax1220u.5 man/man5/sane-umax_pp.5 @@ -303,9 +309,12 @@ 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}/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}/sceptre/s1200.txt +share/doc/sane-${SANE_VERSION}/teco/teco1.txt share/doc/sane-${SANE_VERSION}/umax/sane-logo.jpg share/doc/sane-${SANE_VERSION}/umax/sane-logo2.jpg share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced-options-doc.html @@ -340,8 +349,11 @@ share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES share/doc/sane-${SANE_VERSION}/umax/umax.FAQ share/doc/sane-${SANE_VERSION}/umax/umax.TODO @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}/mustek_usb @dirrm share/doc/sane-${SANE_VERSION}/mustek +@dirrm share/doc/sane-${SANE_VERSION}/matsushita @dirrm share/doc/sane-${SANE_VERSION}/canon @dirrm share/doc/sane-${SANE_VERSION} @dirrm lib/sane diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 6acb19ca668..f86fa80337c 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2002/02/18 23:49:07 mycroft Exp $ +$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $ -SHA1 (sane-backends-1.0.7.tar.gz) = 5e527b62d067b50965155d9e0836c207139307e5 -Size (sane-backends-1.0.7.tar.gz) = 1867577 bytes -SHA1 (patch-aa) = c17cbd11a05dcf62d0c2183859eeeac259a0026a -SHA1 (patch-ae) = ea66a072d1b0d22eacaab77b2aee8fe06a461706 +SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a +Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes +SHA1 (patch-aa) = ace1112377c0a330d80183193bf15b8ffbff2da3 diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa index d4b76c6b251..015b78b3531 100644 --- a/graphics/sane-backends/patches/patch-aa +++ b/graphics/sane-backends/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2002/02/10 00:50:42 rh Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $ ---- doc/Makefile.in.orig Sat Jan 19 17:58:06 2002 -+++ doc/Makefile.in +--- doc/Makefile.in.orig Sun May 5 16:59:45 2002 ++++ doc/Makefile.in Sat Jul 13 03:15:58 2002 @@ -24,7 +24,7 @@ includedir = @includedir@ oldincludedir = /usr/include @@ -11,18 +11,18 @@ $NetBSD: patch-aa,v 1.4 2002/02/10 00:50:42 rh Exp $ MKDIR = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \ PROJECTS README README.aix README.hp-ux README.linux README.os2 \ README.solaris README.unixware2 README.unixware7 TODO -DOCS = backend-writing.txt sane.ps sane.dvi +DOCS = backend-writing.txt - BACKDIRS= canon mustek mustek_usb umax + BACKDIRS= canon matsushita mustek mustek_usb umax sceptre teco LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh -@@ -82,7 +82,7 @@ +@@ -89,7 +89,7 @@ .PHONY: all clean depend dist distclean html html-man install \ - install-mostang sane-backends.html sane-html uninstall + install-mostang sane-html uninstall -all: sane.ps $(MANPAGES) +all: $(MANPAGES) diff --git a/graphics/sane-backends/patches/patch-ae b/graphics/sane-backends/patches/patch-ae deleted file mode 100644 index ceeb2505270..00000000000 --- a/graphics/sane-backends/patches/patch-ae +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/02/18 23:49:08 mycroft Exp $ - ---- frontend/scanimage.c.orig Sat Feb 16 12:54:39 2002 -+++ frontend/scanimage.c Sat Feb 16 13:06:23 2002 -@@ -64,6 +64,9 @@ - } - Image; - -+ -+void damn_i386_centric_vprintf(const char *, const char **); -+ - #define OPTION_FORMAT 1001 - #define OPTION_MD5 1002 - #define OPTION_BATCH_COUNT 1003 -@@ -1561,8 +1564,8 @@ - } - start = percent; - } -- vprintf(fmt, arglist); -- va_end(arglist); -+ damn_i386_centric_vprintf(fmt, arglist); -+ free(arglist); - } - } - -@@ -1910,3 +1913,35 @@ - - return status; - } -+ -+void damn_i386_centric_vprintf(const char *fmt, const char **arglist) -+ { -+ int c; -+ -+ while(c = *fmt++) -+ { -+ switch(c) -+ { -+ case '%': -+ switch(*fmt++) -+ { -+ case 'i': -+ fprintf(stdout, "%d", (int) *arglist++); -+ break; -+ case 's': -+ fputs(*arglist++, stdout); -+ break; -+ case '%': -+ default: -+ fputc('%', stdout); -+ break; -+ } -+ break; -+ -+ default: -+ fputc(c, stdout); -+ break; -+ } -+ } -+ } -+ |