diff options
author | rh <rh@pkgsrc.org> | 1999-05-03 16:20:00 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 1999-05-03 16:20:00 +0000 |
commit | 33cc6a4305d3c99c552369a077b92d610c31dfc1 (patch) | |
tree | 6bdbf1f1f9ea8c00591db30952a9ba6cf22025b0 /graphics | |
parent | eec87a80a72456a75c0c979c6cbca77ea0743d64 (diff) | |
download | pkgsrc-33cc6a4305d3c99c552369a077b92d610c31dfc1.tar.gz |
Update to sane-1.0.1
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/sane/Makefile | 12 | ||||
-rw-r--r-- | graphics/sane/files/md5 | 4 | ||||
-rw-r--r-- | graphics/sane/patches/patch-aa | 33 | ||||
-rw-r--r-- | graphics/sane/patches/patch-ac | 21 | ||||
-rw-r--r-- | graphics/sane/patches/patch-ad | 13 | ||||
-rw-r--r-- | graphics/sane/pkg/PLIST | 159 |
6 files changed, 102 insertions, 140 deletions
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile index 30a3d91753c..54baad42912 100644 --- a/graphics/sane/Makefile +++ b/graphics/sane/Makefile @@ -1,23 +1,25 @@ -# $NetBSD: Makefile,v 1.13 1999/04/06 02:03:00 abs Exp $ +# $NetBSD: Makefile,v 1.14 1999/05/03 16:20:00 rh Exp $ # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp # -DISTNAME= sane-1.00 +DISTNAME= sane-1.0.1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \ ftp://gd.tuwien.ac.at/hci/sane/ \ - ftp://ftp.u-aizu.ac.jp/pub/misc/device/scsi/scanner/sane/ + ftp://metalab.unc.edu/pub/Linux/apps/graphics/capture/ \ + ftp://metalab.unc.edu/pub/Linux/Incoming/ \ + ftp://ftp.u-aizu.ac.jp/pub/misc/device/scsi/scanner/sane/ \ + http://gd.tuwien.ac.at/hci/sane/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mostang.com/sane/ -DEPENDS+= gtk10-1.0.6:../../x11/gtk10 +DEPENDS+= gtk+-1.2.2:../../x11/gtk DEPENDS+= gimp-1.0.4:../../graphics/gimp GNU_CONFIGURE= yes USE_GMAKE= yes USE_X11BASE= yes -CONFIGURE_ENV+= GTK_CONFIG="${X11BASE}/bin/gtk10-config" # -O to workaorund bug with -O2 and egcs. CFLAGS= -O -I${LOCALBASE}/include diff --git a/graphics/sane/files/md5 b/graphics/sane/files/md5 index f798fe28b57..455d5d6ecfd 100644 --- a/graphics/sane/files/md5 +++ b/graphics/sane/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.4 1998/11/28 20:59:58 frueauf Exp $ +$NetBSD: md5,v 1.5 1999/05/03 16:20:01 rh Exp $ -MD5 (sane-1.00.tar.gz) = 0723e78ab57c7340a0b8180a546c3871 +MD5 (sane-1.0.1.tar.gz) = d7989b2b18505c72b8568d11b56bb97a diff --git a/graphics/sane/patches/patch-aa b/graphics/sane/patches/patch-aa index 0c58230e719..092594c29bf 100644 --- a/graphics/sane/patches/patch-aa +++ b/graphics/sane/patches/patch-aa @@ -1,24 +1,13 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:53 agc Exp $ +$NetBSD: patch-aa,v 1.4 1999/05/03 16:20:01 rh Exp $ ---- backend/Makefile.in.orig Fri Jul 24 07:06:49 1998 -+++ backend/Makefile.in Thu Aug 6 22:49:14 1998 -@@ -75,7 +75,7 @@ +--- backend/Makefile.in.orig Sun Apr 4 01:00:44 1999 ++++ backend/Makefile.in Wed Apr 21 21:04:33 1999 +@@ -33,7 +33,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + RANLIB = @RANLIB@ +-LN_S = @LN_S@ ++LN_S = @LN_S@ -f - %-s.c: $(srcdir)/stubs.c - rm -f $@ -- ln -s $(srcdir)/stubs.c $@ -+ ln -sf $(srcdir)/stubs.c $@ - - # Don't delete any intermediate files. - .PRECIOUS: %-s.c %-s.lo %.lo dll-preload.c -@@ -99,8 +99,8 @@ - done - rm -f $(libdir)/libsane.a $(libdir)/libsane.so \ - $(libdir)/libsane.so.$(V_MAJOR)* -- ln -s sane/libsane-dll.a $(libdir)/libsane.a -- ln -s sane/libsane-dll.so $(libdir)/libsane.so -+ ln -sf sane/libsane-dll.a $(libdir)/libsane.a -+ ln -sf sane/libsane-dll.so $(libdir)/libsane.so - @cd $(libsanedir) && for n in libsane-dll.so.$(V_MAJOR)*; do \ - nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \ - (cd ..; ln -s sane/$$n $$nn); \ + CC = @CC@ + INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac deleted file mode 100644 index c26369ece62..00000000000 --- a/graphics/sane/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.4 1998/11/28 20:59:58 frueauf Exp $ - ---- backend/snapscan.c-orig Thu Oct 29 08:02:29 1998 -+++ backend/snapscan.c Sat Nov 28 12:16:28 1998 -@@ -55,7 +55,6 @@ - #include <sys/time.h> - #include <sys/types.h> - #include <sys/stat.h> --#include <values.h> - #include <limits.h> - #include <fcntl.h> - #include <unistd.h> -@@ -3150,7 +3149,7 @@ - - { - int result = write (pss->tfd, other_buf, pss->read_bytes); -- if (result < 0 || result == MAXINT) -+ if (result < 0 || result == INT_MAX) - { - DBG (DL_MAJOR_ERROR, "%s: write of test data to file failed.\n", - me); diff --git a/graphics/sane/patches/patch-ad b/graphics/sane/patches/patch-ad deleted file mode 100644 index 512af8c3c34..00000000000 --- a/graphics/sane/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/11/28 20:59:58 frueauf Exp $ - ---- backend/abaton.c-orig Sun Nov 22 03:54:14 1998 -+++ backend/abaton.c Sat Nov 28 11:20:23 1998 -@@ -1113,7 +1113,7 @@ - - case OPT_Y_RESOLUTION: - if (s->val[OPT_PREVIEW].w || s->val[OPT_RESOLUTION_BIND].w) { -- s->val[OPT_X_RESOLUTION] = *(SANE_Word *)val; -+ s->val[OPT_X_RESOLUTION].w = *(SANE_Word *)val; - if (info) - *info |= SANE_INFO_RELOAD_OPTIONS; - } diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST index e5d64c88390..4d728a2df21 100644 --- a/graphics/sane/pkg/PLIST +++ b/graphics/sane/pkg/PLIST @@ -1,14 +1,13 @@ -@comment $NetBSD: PLIST,v 1.4 1998/11/28 20:59:58 frueauf Exp $ +@comment $NetBSD: PLIST,v 1.5 1999/05/03 16:20:01 rh Exp $ bin/scanimage -bin/xcam bin/xscanimage +bin/xcam etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf etc/sane.d/apple.conf etc/sane.d/artec.conf etc/sane.d/coolscan.conf etc/sane.d/dc25.conf -etc/sane.d/dll.conf etc/sane.d/dmc.conf etc/sane.d/epson.conf etc/sane.d/hp.conf @@ -18,11 +17,12 @@ etc/sane.d/mustek.conf etc/sane.d/net.conf etc/sane.d/ricoh.conf etc/sane.d/s9036.conf -etc/sane.d/saned.conf +etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/tamarack.conf etc/sane.d/umax.conf -include/sane/config.h +etc/sane.d/dll.conf +etc/sane.d/saned.conf include/sane/sane.h include/sane/sanei.h include/sane/sanei_backend.h @@ -33,103 +33,106 @@ include/sane/sanei_net.h include/sane/sanei_scsi.h include/sane/sanei_wire.h include/sane/saneopts.h -lib/sane/libsane-abaton.a +include/sane/config.h +lib/sane/libsane-abaton.so.1.1 lib/sane/libsane-abaton.la -lib/sane/libsane-abaton.so.1 -lib/sane/libsane-abaton.so.1.0 -lib/sane/libsane-agfafocus.a +lib/sane/libsane-abaton.a +lib/sane/libsane-agfafocus.so.1.1 lib/sane/libsane-agfafocus.la -lib/sane/libsane-agfafocus.so.1 -lib/sane/libsane-agfafocus.so.1.0 -lib/sane/libsane-apple.a +lib/sane/libsane-agfafocus.a +lib/sane/libsane-apple.so.1.1 lib/sane/libsane-apple.la -lib/sane/libsane-apple.so.1 -lib/sane/libsane-apple.so.1.0 -lib/sane/libsane-artec.a +lib/sane/libsane-apple.a +lib/sane/libsane-artec.so.1.1 lib/sane/libsane-artec.la -lib/sane/libsane-artec.so.1 -lib/sane/libsane-artec.so.1.0 -lib/sane/libsane-canon.a +lib/sane/libsane-artec.a +lib/sane/libsane-canon.so.1.1 lib/sane/libsane-canon.la -lib/sane/libsane-canon.so.1 -lib/sane/libsane-canon.so.1.0 -lib/sane/libsane-coolscan.a +lib/sane/libsane-canon.a +lib/sane/libsane-coolscan.so.1.1 lib/sane/libsane-coolscan.la -lib/sane/libsane-coolscan.so.1 -lib/sane/libsane-coolscan.so.1.0 -lib/sane/libsane-dc25.a +lib/sane/libsane-coolscan.a +lib/sane/libsane-dc25.so.1.1 lib/sane/libsane-dc25.la -lib/sane/libsane-dc25.so.1 -lib/sane/libsane-dc25.so.1.0 -lib/sane/libsane-dll.a -lib/sane/libsane-dll.la -lib/sane/libsane-dll.so.1 -lib/sane/libsane-dll.so.1.0 -lib/sane/libsane-dmc.a +lib/sane/libsane-dc25.a +lib/sane/libsane-dmc.so.1.1 lib/sane/libsane-dmc.la -lib/sane/libsane-dmc.so.1 -lib/sane/libsane-dmc.so.1.0 -lib/sane/libsane-epson.a +lib/sane/libsane-dmc.a +lib/sane/libsane-epson.so.1.1 lib/sane/libsane-epson.la -lib/sane/libsane-epson.so.1 -lib/sane/libsane-epson.so.1.0 -lib/sane/libsane-hp.a +lib/sane/libsane-epson.a +lib/sane/libsane-hp.so.1.1 lib/sane/libsane-hp.la -lib/sane/libsane-hp.so.1 -lib/sane/libsane-hp.so.1.0 -lib/sane/libsane-microtek.a +lib/sane/libsane-hp.a +lib/sane/libsane-microtek.so.1.1 lib/sane/libsane-microtek.la -lib/sane/libsane-microtek.so.1 -lib/sane/libsane-microtek.so.1.0 -lib/sane/libsane-microtek2.a +lib/sane/libsane-microtek.a +lib/sane/libsane-microtek2.so.1.1 lib/sane/libsane-microtek2.la -lib/sane/libsane-microtek2.so.1 -lib/sane/libsane-microtek2.so.1.0 -lib/sane/libsane-mustek.a +lib/sane/libsane-microtek2.a +lib/sane/libsane-mustek.so.1.1 lib/sane/libsane-mustek.la -lib/sane/libsane-mustek.so.1 -lib/sane/libsane-mustek.so.1.0 -lib/sane/libsane-net.a +lib/sane/libsane-mustek.a +lib/sane/libsane-net.so.1.1 lib/sane/libsane-net.la -lib/sane/libsane-net.so.1 -lib/sane/libsane-net.so.1.0 -lib/sane/libsane-pint.a +lib/sane/libsane-net.a +lib/sane/libsane-pint.so.1.1 lib/sane/libsane-pint.la -lib/sane/libsane-pint.so.1 -lib/sane/libsane-pint.so.1.0 -lib/sane/libsane-pnm.a +lib/sane/libsane-pint.a +lib/sane/libsane-pnm.so.1.1 lib/sane/libsane-pnm.la -lib/sane/libsane-pnm.so.1 -lib/sane/libsane-pnm.so.1.0 -lib/sane/libsane-ricoh.a +lib/sane/libsane-pnm.a +lib/sane/libsane-ricoh.so.1.1 lib/sane/libsane-ricoh.la -lib/sane/libsane-ricoh.so.1 -lib/sane/libsane-ricoh.so.1.0 -lib/sane/libsane-s9036.a +lib/sane/libsane-ricoh.a +lib/sane/libsane-s9036.so.1.1 lib/sane/libsane-s9036.la -lib/sane/libsane-s9036.so.1 -lib/sane/libsane-s9036.so.1.0 -lib/sane/libsane-snapscan.a +lib/sane/libsane-s9036.a +lib/sane/libsane-sharp.so.1.1 +lib/sane/libsane-sharp.la +lib/sane/libsane-sharp.a +lib/sane/libsane-snapscan.so.1.1 lib/sane/libsane-snapscan.la -lib/sane/libsane-snapscan.so.1 -lib/sane/libsane-snapscan.so.1.0 -lib/sane/libsane-tamarack.a +lib/sane/libsane-snapscan.a +lib/sane/libsane-tamarack.so.1.1 lib/sane/libsane-tamarack.la -lib/sane/libsane-tamarack.so.1 -lib/sane/libsane-tamarack.so.1.0 -lib/sane/libsane-umax.a +lib/sane/libsane-tamarack.a +lib/sane/libsane-umax.so.1.1 lib/sane/libsane-umax.la +lib/sane/libsane-umax.a +lib/sane/libsane-dll.so.1.1 +lib/sane/libsane-dll.la +lib/sane/libsane-dll.a +lib/sane/libsane-abaton.so.1 +lib/sane/libsane-agfafocus.so.1 +lib/sane/libsane-apple.so.1 +lib/sane/libsane-artec.so.1 +lib/sane/libsane-canon.so.1 +lib/sane/libsane-coolscan.so.1 +lib/sane/libsane-dc25.so.1 +lib/sane/libsane-dmc.so.1 +lib/sane/libsane-epson.so.1 +lib/sane/libsane-hp.so.1 +lib/sane/libsane-microtek.so.1 +lib/sane/libsane-microtek2.so.1 +lib/sane/libsane-mustek.so.1 +lib/sane/libsane-net.so.1 +lib/sane/libsane-pint.so.1 +lib/sane/libsane-pnm.so.1 +lib/sane/libsane-ricoh.so.1 +lib/sane/libsane-s9036.so.1 +lib/sane/libsane-sharp.so.1 +lib/sane/libsane-snapscan.so.1 +lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.so.1 -lib/sane/libsane-umax.so.1.0 +lib/sane/libsane-dll.so.1 lib/libsane.a lib/libsane.so -lib/libsane.so.1.0 lib/libsane.so.1 -man/man1/saned.1.gz +lib/libsane.so.1.1 man/man1/scanimage.1.gz +man/man1/saned.1.gz man/man1/xscanimage.1.gz -man/man5/sane-abaton.5.gz -man/man5/sane-agfafocus.5.gz man/man5/sane-apple.5.gz man/man5/sane-dc25.5.gz man/man5/sane-dll.5.gz @@ -141,10 +144,12 @@ man/man5/sane-microtek2.5.gz man/man5/sane-mustek.5.gz man/man5/sane-net.5.gz man/man5/sane-pnm.5.gz -man/man5/sane-pint.5.gz man/man5/sane-qcam.5.gz -man/man5/sane-umax.5.gz man/man5/sane-scsi.5.gz +man/man5/sane-abaton.5.gz +man/man5/sane-agfafocus.5.gz +man/man5/sane-pint.5.gz +man/man5/sane-umax.5.gz sbin/saned share/sane-style.rc @dirrm include/sane |