From 574ab4dfa77a0822f99d67912722afc9e0900b41 Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 20 Aug 2002 12:33:49 +0000 Subject: Pullup revisions 1.58 and 1.59 to the 1.6 pkgsrc branch. Requested by Thomas Klausner. > Date: Mon, 19 Aug 2002 18:17:57 +0300 (EEST) > From: Thomas Klausner > > Module Name: pkgsrc > Committed By: wiz > Date: Mon Aug 19 15:17:56 UTC 2002 > > Modified Files: > pkgsrc/security/openssl: Makefile > > Log Message: > Compile no-shared on 1.4.x. This makes the package install and work for me > on 1.4.2/i386. Approved by agc. > Date: Mon, 19 Aug 2002 19:00:07 +0300 (EEST) > From: Thomas Klausner > > Module Name: pkgsrc > Committed By: wiz > Date: Mon Aug 19 16:00:07 UTC 2002 > > Modified Files: > pkgsrc/security/openssl: Makefile > > Log Message: > Fix a comment, and improve pattern to also work on netbsd-1-4. --- graphics/ogle/Makefile | 5 +- graphics/ogle/PLIST | 10 +- graphics/ogle/distinfo | 10 +- graphics/ogle/patches/patch-ab | 12 +- graphics/ogle/patches/patch-ag | 8 +- graphics/ogle_gui/Makefile | 6 +- graphics/ogle_gui/distinfo | 6 +- graphics/sane-backends/Makefile.common | 4 +- graphics/sane-backends/PLIST | 100 ++++++++--------- graphics/sane-backends/distinfo | 9 +- graphics/sane-backends/patches/patch-aa | 14 +-- graphics/sane-backends/patches/patch-ae | 61 +++++++++++ graphics/sane-frontends/Makefile | 3 +- graphics/sane-frontends/distinfo | 6 +- graphics/xsane/Makefile | 5 +- graphics/xsane/PLIST | 187 ++++++++++++++------------------ graphics/xsane/distinfo | 6 +- 17 files changed, 238 insertions(+), 214 deletions(-) create mode 100644 graphics/sane-backends/patches/patch-ae (limited to 'graphics') diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index a2f6d0da4a2..f81a950480f 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2002/08/19 18:57:57 mycroft Exp $ +# $NetBSD: Makefile,v 1.9 2002/07/12 18:29:29 mycroft Exp $ -DISTNAME= ogle-0.8.5 +DISTNAME= ogle-0.8.4 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -29,6 +29,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../graphics/jpeg/buildlink.mk" .include "../../misc/libdvdread/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" -.include "../../audio/mad/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ogle/PLIST b/graphics/ogle/PLIST index 2930d742a19..291fa7ccafd 100644 --- a/graphics/ogle/PLIST +++ b/graphics/ogle/PLIST @@ -1,17 +1,17 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/19 18:57:57 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/07/12 18:29:29 mycroft Exp $ bin/ifo_dump bin/ogle include/ogle/dvd.h include/ogle/dvdcontrol.h include/ogle/msgevents.h include/ogle/dvdevents.h -lib/ogle/libmsgevents.so.5.0 -lib/ogle/libmsgevents.so.5 +lib/ogle/libmsgevents.so.4.0 +lib/ogle/libmsgevents.so.4 lib/ogle/libmsgevents.so lib/ogle/libmsgevents.la lib/ogle/libmsgevents.a -lib/ogle/libdvdcontrol.so.8.0 -lib/ogle/libdvdcontrol.so.8 +lib/ogle/libdvdcontrol.so.7.0 +lib/ogle/libdvdcontrol.so.7 lib/ogle/libdvdcontrol.so lib/ogle/libdvdcontrol.la lib/ogle/libdvdcontrol.a diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo index dd1e78b4003..e3d724a4529 100644 --- a/graphics/ogle/distinfo +++ b/graphics/ogle/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.7 2002/08/19 18:57:58 mycroft Exp $ +$NetBSD: distinfo,v 1.6 2002/07/12 18:29:29 mycroft Exp $ -SHA1 (ogle-0.8.5.tar.gz) = b1853f49fa8847a3079f32ca4487845a9fbb549d -Size (ogle-0.8.5.tar.gz) = 449086 bytes +SHA1 (ogle-0.8.4.tar.gz) = 15ab65b6ec9cd7631b1c4341896072fa308fc15c +Size (ogle-0.8.4.tar.gz) = 437475 bytes SHA1 (patch-aa) = c7ed5f7b957c0303c451650df2e4b1044d7430ef -SHA1 (patch-ab) = 30907590717a329cb7d2456647971055bf038f7d +SHA1 (patch-ab) = 4f921f7c65de8bc0f9b1ef54442ae6f9462bb8d3 SHA1 (patch-ac) = 0443cd0493039150c79b54f876349ab2c7601fcf SHA1 (patch-ae) = a37d75d4c15ab60060df5339680ce863488c2f26 SHA1 (patch-af) = 66a5c30aaf455e794a4c8940dc2a98815c62ae58 -SHA1 (patch-ag) = 67fad5e4962ace6dfc65492361f29fed029babc2 +SHA1 (patch-ag) = 386f8be5ce347f150b6b836a3d9c9b3db12cfbc7 SHA1 (patch-ah) = 1fb41606f1fc0593597afb54cb2839f7c87221dc SHA1 (patch-ai) = 32ca5020e831cabc978c31c4d853cc94ed994a1d diff --git a/graphics/ogle/patches/patch-ab b/graphics/ogle/patches/patch-ab index d02f30952d1..a4775be0d4d 100644 --- a/graphics/ogle/patches/patch-ab +++ b/graphics/ogle/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $ +$NetBSD: patch-ab,v 1.3 2002/07/12 18:29:29 mycroft Exp $ ---- configure.in.orig Mon Aug 5 18:30:55 2002 -+++ configure.in Mon Aug 12 18:35:45 2002 -@@ -403,16 +403,16 @@ +--- configure.in.orig Sat Jun 29 22:49:43 2002 ++++ configure.in Thu Jul 11 02:18:38 2002 +@@ -351,16 +351,16 @@ esac fi @@ -20,10 +20,10 @@ $NetBSD: patch-ab,v 1.4 2002/08/19 18:57:59 mycroft Exp $ dnl sys/audioio.h - AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao OpenBSD audio support]) + AC_DEFINE([LIBOGLEAO_OBSD],,[libogleao NetBSD/OpenBSD audio support]) - BUILD_AUDIO_OBSD=1 DEFAULT_AUDIO_DRIVER="obsd" DEFAULT_AUDIO_DEVICE="/dev/audio" -@@ -425,7 +425,7 @@ + ;; +@@ -372,7 +372,7 @@ [ --disable-sunaudio make a version not using Sun audio]) if test "x$enable_sunaudio" != xno; then case "$host" in diff --git a/graphics/ogle/patches/patch-ag b/graphics/ogle/patches/patch-ag index 8af3b5a5fd9..14b7ff172a4 100644 --- a/graphics/ogle/patches/patch-ag +++ b/graphics/ogle/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.2 2002/08/19 18:57:59 mycroft Exp $ +$NetBSD: patch-ag,v 1.1 2002/06/16 18:12:59 wiz Exp $ ---- ogle/dvdcontrol.h.orig Sat Aug 3 17:34:50 2002 -+++ ogle/dvdcontrol.h Mon Aug 12 18:37:09 2002 +--- ogle/dvdcontrol.h.orig Tue Apr 2 21:06:05 2002 ++++ ogle/dvdcontrol.h Thu Jun 13 13:57:32 2002 @@ -22,7 +22,7 @@ #include - #include /* Only for the hack with DVDNextEvent !! */ + #include // Only for the hack with DVDNextEvent !! -#if (defined(__unix__) || defined(unix)) && !defined(USG) +#if (defined(__unix__) || defined(unix) || defined(__NetBSD__)) && !defined(USG) diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index 1c4cc162857..6099209bbd1 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/08/19 18:58:00 mycroft Exp $ +# $NetBSD: Makefile,v 1.5 2002/06/16 18:34:19 wiz Exp $ -DISTNAME= ogle_gui-0.8.5 +DISTNAME= ogle_gui-0.8.3 CATEGORIES= graphics MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= GUI for the Ogle DVD player -DEPENDS+= ogle>=0.8.5:../../graphics/ogle +DEPENDS+= ogle>=0.8.3:../../graphics/ogle # Normally, we would use the "../../devel/libglade/buildlink.mk" file, # but this doesn't work here, because ogle_gui wants libxml2 and the # buildlink file for libglade would also link it with libxml1. diff --git a/graphics/ogle_gui/distinfo b/graphics/ogle_gui/distinfo index fb4067324e7..15c61ca3f74 100644 --- a/graphics/ogle_gui/distinfo +++ b/graphics/ogle_gui/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/08/19 18:58:00 mycroft Exp $ +$NetBSD: distinfo,v 1.3 2002/06/16 18:34:19 wiz Exp $ -SHA1 (ogle_gui-0.8.5.tar.gz) = e24f2b0dec2b91995e44b713328999f0add3bda4 -Size (ogle_gui-0.8.5.tar.gz) = 370182 bytes +SHA1 (ogle_gui-0.8.3.tar.gz) = aa418375f455f82fbff7b4af04d44e36f9c0a7cf +Size (ogle_gui-0.8.3.tar.gz) = 354405 bytes SHA1 (patch-aa) = 1238dfb676a32186231c3be20441b279f70329ff SHA1 (patch-ac) = 5a06dcc97b6749d533eaab1ba9d1128ca2a8368c diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 4378c4c3ccf..9c35585bf76 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $ +# $NetBSD: Makefile.common,v 1.1 2002/02/10 00:50:42 rh 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= 8 +SANE_MICRO= 7 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 29ecfa3fb20..753a51046cd 100644 --- a/graphics/sane-backends/PLIST +++ b/graphics/sane-backends/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/10 00:50:42 rh Exp $ bin/sane-config bin/sane-find-scanner bin/scanimage @@ -9,19 +9,15 @@ 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/leo.conf -etc/sane.d/matsushita.conf +etc/sane.d/m3096g.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf etc/sane.d/mustek.conf @@ -34,14 +30,11 @@ 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 @@ -52,182 +45,192 @@ 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-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.a 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-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.a 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-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.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-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-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-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-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.a 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-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.a 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} @@ -243,10 +246,7 @@ 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,8 +256,6 @@ 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 @@ -272,16 +270,12 @@ 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 @@ -309,12 +303,9 @@ 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 @@ -349,11 +340,8 @@ 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 f86fa80337c..6acb19ca668 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $ +$NetBSD: distinfo,v 1.8 2002/02/18 23:49:07 mycroft Exp $ -SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a -Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes -SHA1 (patch-aa) = ace1112377c0a330d80183193bf15b8ffbff2da3 +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 diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa index 015b78b3531..d4b76c6b251 100644 --- a/graphics/sane-backends/patches/patch-aa +++ b/graphics/sane-backends/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $ +$NetBSD: patch-aa,v 1.4 2002/02/10 00:50:42 rh Exp $ ---- doc/Makefile.in.orig Sun May 5 16:59:45 2002 -+++ doc/Makefile.in Sat Jul 13 03:15:58 2002 +--- doc/Makefile.in.orig Sat Jan 19 17:58:06 2002 ++++ doc/Makefile.in @@ -24,7 +24,7 @@ includedir = @includedir@ oldincludedir = /usr/include @@ -11,18 +11,18 @@ $NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $ MKDIR = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ -@@ -54,7 +54,7 @@ +@@ -51,7 +51,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 matsushita mustek mustek_usb umax sceptre teco + BACKDIRS= canon mustek mustek_usb umax LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh -@@ -89,7 +89,7 @@ +@@ -82,7 +82,7 @@ .PHONY: all clean depend dist distclean html html-man install \ - install-mostang sane-html uninstall + install-mostang sane-backends.html 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 new file mode 100644 index 00000000000..ceeb2505270 --- /dev/null +++ b/graphics/sane-backends/patches/patch-ae @@ -0,0 +1,61 @@ +$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; ++ } ++ } ++ } ++ diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 094f8822f06..68cd1e855fe 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2002/08/19 19:18:31 mycroft Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:17 fredb Exp $ .include "../../graphics/sane-backends/Makefile.common" DISTNAME= sane-frontends-${SANE_VERSION} +PKGREVISION= 1 COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo index 04983bc6e18..214b32487e3 100644 --- a/graphics/sane-frontends/distinfo +++ b/graphics/sane-frontends/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/19 19:18:31 mycroft Exp $ +$NetBSD: distinfo,v 1.4 2002/02/10 00:52:18 rh Exp $ -SHA1 (sane-frontends-1.0.8.tar.gz) = ccf798639e2b4f852aab4abc9e53077f51797df6 -Size (sane-frontends-1.0.8.tar.gz) = 173886 bytes +SHA1 (sane-frontends-1.0.7.tar.gz) = 8db056bb620212429062647d74adc4b904d5bde9 +Size (sane-frontends-1.0.7.tar.gz) = 172061 bytes diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index f56074c1193..f85929e5a2b 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2002/08/19 19:36:48 mycroft Exp $ +# $NetBSD: Makefile,v 1.32 2002/03/13 17:37:19 fredb Exp $ # -DISTNAME= xsane-0.86 +DISTNAME= xsane-0.80 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ diff --git a/graphics/xsane/PLIST b/graphics/xsane/PLIST index 280ab1baab5..5f6273bbb52 100644 --- a/graphics/xsane/PLIST +++ b/graphics/xsane/PLIST @@ -1,120 +1,93 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/19 19:36:48 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:48 zuntum Exp $ bin/xsane man/man1/xsane.1 -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xsane.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xsane.mo +share/locale/cs/LC_MESSAGES/xsane.mo +share/locale/de/LC_MESSAGES/xsane.mo +share/locale/fr/LC_MESSAGES/xsane.mo +share/locale/it/LC_MESSAGES/xsane.mo +share/locale/ja/LC_MESSAGES/xsane.mo +share/locale/ru/LC_MESSAGES/xsane.mo +share/locale/sl/LC_MESSAGES/xsane.mo +share/locale/sv/LC_MESSAGES/xsane.mo +share/locale/tr/LC_MESSAGES/xsane.mo +share/sane/sane-backends-doc.html +share/sane/sane-pnm-doc.html +share/sane/sane-problems-doc.html +share/sane/sane-scantips-doc.html +share/sane/sane-xsane-advanced-doc.html +share/sane/sane-xsane-color-correction-doc.html +share/sane/sane-xsane-copy-doc.html +share/sane/sane-xsane-doc.html +share/sane/sane-xsane-empty-doc.html +share/sane/sane-xsane-fax-doc.html +share/sane/sane-xsane-gimp-doc.html +share/sane/sane-xsane-histogram-doc.html +share/sane/sane-xsane-main-doc.html +share/sane/sane-xsane-preview-doc.html +share/sane/sane-xsane-scan-doc.html +share/sane/sane-xsane-setup-copy-doc.html +share/sane/sane-xsane-setup-display-doc.html +share/sane/sane-xsane-setup-enhancement-doc.html +share/sane/sane-xsane-setup-fax-doc.html +share/sane/sane-xsane-setup-image-doc.html +share/sane/sane-xsane-setup-mail-doc.html +share/sane/sane-xsane-setup-save-doc.html +share/sane/sane-xsane-standard-doc.html +share/sane/xsane-advanced.jpg +share/sane/xsane-autoenhance.jpg +share/sane/xsane-autoselect.jpg +share/sane/xsane-brightness.jpg +share/sane/xsane-colormode.jpg +share/sane/xsane-contrast.jpg +share/sane/xsane-copy.jpg +share/sane/xsane-default.jpg +share/sane/xsane-delete-preview-cache.jpg +share/sane/xsane-disk.jpg +share/sane/xsane-fax-project.jpg +share/sane/xsane-fax.jpg +share/sane/xsane-gamma.jpg +share/sane/xsane-gimp.jpg +share/sane/xsane-histogram.jpg +share/sane/xsane-logo2.jpg +share/sane/xsane-negative.jpg +share/sane/xsane-pipette-black.jpg +share/sane/xsane-pipette-gray.jpg +share/sane/xsane-pipette-white.jpg +share/sane/xsane-preferences.jpg +share/sane/xsane-preset-area.jpg +share/sane/xsane-preview.jpg +share/sane/xsane-printer.jpg +share/sane/xsane-resolution.jpg +share/sane/xsane-restore.jpg +share/sane/xsane-rgb-default.jpg +share/sane/xsane-rotation.jpg +share/sane/xsane-scansource.jpg +share/sane/xsane-setup-copy.jpg +share/sane/xsane-setup-display.jpg +share/sane/xsane-setup-enhancement.jpg +share/sane/xsane-setup-fax.jpg +share/sane/xsane-setup-image.jpg +share/sane/xsane-setup-mail.jpg +share/sane/xsane-setup-save.jpg +share/sane/xsane-standard.jpg +share/sane/xsane-store.jpg +share/sane/xsane-threshold.jpg +share/sane/xsane-visible-area.jpg +share/sane/xsane-zoom-in.jpg +share/sane/xsane-zoom-not.jpg +share/sane/xsane-zoom-out.jpg +share/sane/xsane-zoom-undo.jpg +share/sane/xsane-zoom.jpg +share/sane/xsane.jpg share/sane/xsane/Mustek-logo.xpm -share/sane/xsane/Plustek-logo.xpm share/sane/xsane/UMAX-logo.xpm -share/sane/xsane/doc/sane-backends-doc.html -share/sane/xsane/doc/sane-pnm-doc.html -share/sane/xsane/doc/sane-problems-doc.html -share/sane/xsane/doc/sane-scantips-doc.html -share/sane/xsane/doc/sane-xsane-advanced-doc.html -share/sane/xsane/doc/sane-xsane-color-correction-doc.html -share/sane/xsane/doc/sane-xsane-copy-doc.html -share/sane/xsane/doc/sane-xsane-doc.html -share/sane/xsane/doc/sane-xsane-empty-doc.html -share/sane/xsane/doc/sane-xsane-fax-doc.html -share/sane/xsane/doc/sane-xsane-gimp-doc.html -share/sane/xsane/doc/sane-xsane-histogram-doc.html -share/sane/xsane/doc/sane-xsane-mail-doc.html -share/sane/xsane/doc/sane-xsane-main-doc.html -share/sane/xsane/doc/sane-xsane-preview-doc.html -share/sane/xsane/doc/sane-xsane-save-doc.html -share/sane/xsane/doc/sane-xsane-setup-copy-doc.html -share/sane/xsane/doc/sane-xsane-setup-display-doc.html -share/sane/xsane/doc/sane-xsane-setup-enhancement-doc.html -share/sane/xsane/doc/sane-xsane-setup-fax-doc.html -share/sane/xsane/doc/sane-xsane-setup-image-doc.html -share/sane/xsane/doc/sane-xsane-setup-mail-doc.html -share/sane/xsane/doc/sane-xsane-setup-save-doc.html -share/sane/xsane/doc/sane-xsane-standard-doc.html -share/sane/xsane/doc/sane-xsane-viewer-doc.html -share/sane/xsane/doc/xsane-advanced.jpg -share/sane/xsane/doc/xsane-autoenhance.jpg -share/sane/xsane/doc/xsane-autoraise_scanarea.jpg -share/sane/xsane/doc/xsane-autoselect.jpg -share/sane/xsane/doc/xsane-blur.jpg -share/sane/xsane/doc/xsane-brightness.jpg -share/sane/xsane/doc/xsane-clone.jpg -share/sane/xsane/doc/xsane-colormode.jpg -share/sane/xsane/doc/xsane-contrast.jpg -share/sane/xsane/doc/xsane-copy.jpg -share/sane/xsane/doc/xsane-default.jpg -share/sane/xsane/doc/xsane-delete-preview-cache.jpg -share/sane/xsane/doc/xsane-despeckle.jpg -share/sane/xsane/doc/xsane-disk.jpg -share/sane/xsane/doc/xsane-fax-project.jpg -share/sane/xsane/doc/xsane-fax.jpg -share/sane/xsane/doc/xsane-gamma.jpg -share/sane/xsane/doc/xsane-gimp.jpg -share/sane/xsane/doc/xsane-histogram.jpg -share/sane/xsane/doc/xsane-logo2.jpg -share/sane/xsane/doc/xsane-mail-project.jpg -share/sane/xsane/doc/xsane-mail.jpg -share/sane/xsane/doc/xsane-medium.jpg -share/sane/xsane/doc/xsane-mirror-x.jpg -share/sane/xsane/doc/xsane-mirror-y.jpg -share/sane/xsane/doc/xsane-negative.jpg -share/sane/xsane/doc/xsane-ocr.jpg -share/sane/xsane/doc/xsane-pipette-black.jpg -share/sane/xsane/doc/xsane-pipette-gray.jpg -share/sane/xsane/doc/xsane-pipette-white.jpg -share/sane/xsane/doc/xsane-preferences.jpg -share/sane/xsane/doc/xsane-preset-area.jpg -share/sane/xsane/doc/xsane-preview.jpg -share/sane/xsane/doc/xsane-printer.jpg -share/sane/xsane/doc/xsane-resolution.jpg -share/sane/xsane/doc/xsane-restore.jpg -share/sane/xsane/doc/xsane-rgb-default.jpg -share/sane/xsane/doc/xsane-rotate-180.jpg -share/sane/xsane/doc/xsane-rotate-270.jpg -share/sane/xsane/doc/xsane-rotate-90.jpg -share/sane/xsane/doc/xsane-rotation.jpg -share/sane/xsane/doc/xsane-save.jpg -share/sane/xsane/doc/xsane-scale.jpg -share/sane/xsane/doc/xsane-scansource.jpg -share/sane/xsane/doc/xsane-setup-copy.jpg -share/sane/xsane/doc/xsane-setup-display.jpg -share/sane/xsane/doc/xsane-setup-enhancement.jpg -share/sane/xsane/doc/xsane-setup-fax.jpg -share/sane/xsane/doc/xsane-setup-image.jpg -share/sane/xsane/doc/xsane-setup-mail.jpg -share/sane/xsane/doc/xsane-setup-ocr.jpg -share/sane/xsane/doc/xsane-setup-save.jpg -share/sane/xsane/doc/xsane-standard.jpg -share/sane/xsane/doc/xsane-store.jpg -share/sane/xsane/doc/xsane-threshold.jpg -share/sane/xsane/doc/xsane-viewer-window.jpg -share/sane/xsane/doc/xsane-viewer.jpg -share/sane/xsane/doc/xsane-visible-area.jpg -share/sane/xsane/doc/xsane-zoom-in.jpg -share/sane/xsane/doc/xsane-zoom-not.jpg -share/sane/xsane/doc/xsane-zoom-out.jpg -share/sane/xsane/doc/xsane-zoom-undo.jpg -share/sane/xsane/doc/xsane-zoom.jpg -share/sane/xsane/doc/xsane.jpg share/sane/xsane/sane-epson-logo.xpm share/sane/xsane/sane-hp-logo.xpm share/sane/xsane/sane-umax-logo.xpm share/sane/xsane/sane-xsane-logo.xpm share/sane/xsane/xsane-calibration.pnm -share/sane/xsane/xsane-eula.txt -share/sane/xsane/xsane-gpl.txt +share/sane/xsane/xsane-license.txt share/sane/xsane/xsane-logo.xpm share/sane/xsane/xsane-startimage.pnm share/sane/xsane/xsane-style.rc -@dirrm share/sane/xsane/doc @dirrm share/sane/xsane -@dirrm share/sane diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo index a0946f5243f..3dd609ce80a 100644 --- a/graphics/xsane/distinfo +++ b/graphics/xsane/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/19 19:36:49 mycroft Exp $ +$NetBSD: distinfo,v 1.4 2001/10/15 21:28:42 veego Exp $ -SHA1 (xsane-0.86.tar.gz) = 9ca1dc7be786073101a9eda4e77555aac455422c -Size (xsane-0.86.tar.gz) = 2259870 bytes +SHA1 (xsane-0.80.tar.gz) = da176c70271ab22666ab79fa7b2af61a3037fd4c +Size (xsane-0.80.tar.gz) = 1364632 bytes -- cgit v1.2.3