diff options
| -rw-r--r-- | graphics/xsane/Makefile | 18 | ||||
| -rw-r--r-- | graphics/xsane/files/md5 | 4 | ||||
| -rw-r--r-- | graphics/xsane/files/patch-sum | 7 | ||||
| -rw-r--r-- | graphics/xsane/patches/patch-aa | 30 | ||||
| -rw-r--r-- | graphics/xsane/pkg/PLIST | 91 |
5 files changed, 67 insertions, 83 deletions
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 9f1fed7362d..204881c7bf3 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,26 +1,28 @@ -# $NetBSD: Makefile,v 1.21 2001/02/16 15:22:37 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2001/02/21 20:18:49 veego Exp $ # -DISTNAME= xsane-0.64 +DISTNAME= xsane-0.72 CATEGORIES= graphics -MASTER_SITES= http://www.wolfsburg.de/~rauch/sane/ \ +MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ ftp://ftp.mostang.com/pub/sane/xsane/ \ - ftp://ftp.informatik.uni-oldenburg.de/pub/sane/xsane/ \ + ftp://ftp.no.mostang.com/pub/sane/xsane/ \ + ftp://ftp.de.mostang.com/pub/sane/xsane/ \ ftp://gd.tuwien.ac.at/hci/sane/xsane/ \ ftp://ftp.u-aizu.ac.jp/pub/misc/device/scsi/scanner/sane/xsane/ \ - ftp://ftp.umax.co.uk/sane/ \ ftp://sunsite.uio.no/pub/sane/xsane/ MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.wolfsburg.de/~rauch/sane/sane-xsane.html +HOMEPAGE= http://www.xsane.org/ COMMENT= New improved frontend for SANE BUILD_DEPENDS+= msgfmt:../../devel/gettext DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= gtk+>=1.2.5:../../x11/gtk DEPENDS+= png>=1.0.6:../../graphics/png DEPENDS+= tiff-*:../../graphics/tiff -DEPENDS+= sane>=1.0.3:../../graphics/sane +DEPENDS+= gimp>=1.0.4:../../graphics/gimp +DEPENDS+= sane-backends>=1.0.4:../../graphics/sane-backends USE_LIBINTL= YES GNU_CONFIGURE= YES @@ -30,6 +32,6 @@ USE_X11BASE= YES LDFLAGS+= -L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane INCLUDES= -I${PREFIX}/include -I${LOCALBASE}/include CPPFLAGS+= ${INCLUDES} -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" LIBS="-lintl" +CONFIGURE_ENV+= CPPFLAGS="${INCLUDES}" LIBS="-lintl" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xsane/files/md5 b/graphics/xsane/files/md5 index cdbf355e180..b62a9a6aaee 100644 --- a/graphics/xsane/files/md5 +++ b/graphics/xsane/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.11 2000/11/29 22:09:15 wiz Exp $ +$NetBSD: md5,v 1.12 2001/02/21 20:18:49 veego Exp $ -MD5 (xsane-0.64.tar.gz) = b2f6db27c3738649ac35fe16f4c4e908 +MD5 (xsane-0.72.tar.gz) = 30e35e4d17e59270a839eb9f81293ade diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum index b687cc574b7..9a6591bf9ad 100644 --- a/graphics/xsane/files/patch-sum +++ b/graphics/xsane/files/patch-sum @@ -1,3 +1,6 @@ -$NetBSD: patch-sum,v 1.9 2000/11/29 22:09:15 wiz Exp $ +$NetBSD: patch-sum,v 1.10 2001/02/21 20:18:49 veego Exp $ -MD5 (patch-aa) = 531381cacfa7a80a4a409b0d17cb1bd7 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/graphics/xsane/patches/patch-aa b/graphics/xsane/patches/patch-aa deleted file mode 100644 index b813fe35892..00000000000 --- a/graphics/xsane/patches/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2000/11/29 22:09:16 wiz Exp $ - ---- configure.orig Sun Nov 12 10:47:37 2000 -+++ configure -@@ -9,7 +9,7 @@ - - # Defaults: - ac_help= --ac_default_prefix=/usr/local -+ac_default_prefix=${PREFIX} - # Any additions from configure.in: - ac_help="$ac_help - --disable-gimp do not include GIMP plugin mode" -@@ -1356,7 +1356,6 @@ - fi - - --INCLUDES="${INCLUDES} -I/usr/local/include" - CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" - if test "${ac_cv_prog_gcc}" = "yes"; then - CFLAGS="${CFLAGS} -Wall" -@@ -4587,7 +4586,7 @@ - # and all following checks (=sane) - # saved_CPPFLAGS is still up to date - if test -n "${x_includes}" ; then -- CPPFLAGS="${CPPFLAGS} -I${x_includes}" -+ CPPFLAGS="${CPPFLAGS} -I${x_includes} -I${LOCALBASE}/include" - fi - if test "${USE_PNG}" = "yes"; then - for ac_hdr in png.h diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST index 355f838cfef..b819e968991 100644 --- a/graphics/xsane/pkg/PLIST +++ b/graphics/xsane/pkg/PLIST @@ -1,73 +1,82 @@ -@comment $NetBSD: PLIST,v 1.9 2000/11/29 22:09:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/02/21 20:18:50 veego Exp $ bin/xsane man/man1/xsane.1 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/sv/LC_MESSAGES/xsane.mo share/locale/tr/LC_MESSAGES/xsane.mo -share/sane/autoenhance.jpg -share/sane/brightness.jpg -share/sane/contrast.jpg -share/sane/default.jpg -share/sane/gamma.jpg -share/sane/negative.jpg -share/sane/restore.jpg -share/sane/rgb-default.jpg share/sane/sane-backends-doc.html -share/sane/sane-logo.jpg -share/sane/sane-logo2.jpg share/sane/sane-pnm-doc.html -share/sane/sane-pnm16-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-advanced.jpg +share/sane/sane-xsane-color-correction-doc.html share/sane/sane-xsane-copy-doc.html -share/sane/sane-xsane-copy.jpg share/sane/sane-xsane-doc.html -share/sane/sane-xsane-enhancement-doc.html +share/sane/sane-xsane-empty-doc.html share/sane/sane-xsane-fax-doc.html -share/sane/sane-xsane-fax-project.jpg -share/sane/sane-xsane-fax.jpg share/sane/sane-xsane-gimp-doc.html -share/sane/sane-xsane-gimp.jpg share/sane/sane-xsane-histogram-doc.html -share/sane/sane-xsane-histogram.jpg share/sane/sane-xsane-main-doc.html -share/sane/sane-xsane-output-formats-doc.html -share/sane/sane-xsane-pipette-black.jpg -share/sane/sane-xsane-pipette-gray.jpg -share/sane/sane-xsane-pipette-white.jpg share/sane/sane-xsane-preview-doc.html -share/sane/sane-xsane-preview.jpg share/sane/sane-xsane-scan-doc.html share/sane/sane-xsane-setup-copy-doc.html -share/sane/sane-xsane-setup-copy.jpg -share/sane/sane-xsane-setup-device-doc.html -share/sane/sane-xsane-setup-device.jpg share/sane/sane-xsane-setup-display-doc.html -share/sane/sane-xsane-setup-display.jpg +share/sane/sane-xsane-setup-enhancement-doc.html share/sane/sane-xsane-setup-fax-doc.html -share/sane/sane-xsane-setup-fax.jpg share/sane/sane-xsane-setup-save-doc.html -share/sane/sane-xsane-setup-save.jpg share/sane/sane-xsane-standard-doc.html -share/sane/sane-xsane-standard.jpg -share/sane/sane-xsane-visible-area.jpg -share/sane/sane-xsane-zoom-in.jpg -share/sane/sane-xsane-zoom-not.jpg -share/sane/sane-xsane-zoom-out.jpg -share/sane/sane-xsane-zoom-undo.jpg -share/sane/sane-xsane.jpg -share/sane/store.jpg -share/sane/threshold.jpg -share/sane/xsane-logo.jpg +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-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-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-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-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/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/umax-logo.xpm share/sane/xsane/xsane-calibration.pnm +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 -@dirrm share/sane |