Update to xsane-0.64 (to make it compile again). Sort PLIST.

Major changes since 0.61:
Documentation updates, bug fixes, two new translations (it&tr), update
to gimp-current API.

5 files changed, 51 insertions, 57 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index c19c265a0b0..1c0576f9f3d 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2000/11/04 23:36:12 veego Exp $
+# $NetBSD: Makefile,v 1.20 2000/11/29 22:09:15 wiz Exp $
 #
 
-DISTNAME=	xsane-0.61
+DISTNAME=	xsane-0.64
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xsane/files/md5 b/graphics/xsane/files/md5
index 6697687ddec..cdbf355e180 100644
--- a/graphics/xsane/files/md5
+++ b/graphics/xsane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 2000/08/28 16:00:19 rh Exp $
+$NetBSD: md5,v 1.11 2000/11/29 22:09:15 wiz Exp $
 
-MD5 (xsane-0.61.tar.gz) = 1464d82315c15deb5f4f3d9d392d6285
+MD5 (xsane-0.64.tar.gz) = b2f6db27c3738649ac35fe16f4c4e908
diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum
index 789bbaeef0a..b687cc574b7 100644
--- a/graphics/xsane/files/patch-sum
+++ b/graphics/xsane/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.8 2000/10/26 21:33:04 veego Exp $
+$NetBSD: patch-sum,v 1.9 2000/11/29 22:09:15 wiz Exp $
 
-MD5 (patch-aa) = 386eaeefe17552582ce95ce7990733d1
+MD5 (patch-aa) = 531381cacfa7a80a4a409b0d17cb1bd7
diff --git a/graphics/xsane/patches/patch-aa b/graphics/xsane/patches/patch-aa
index a8a3f9ffda2..b813fe35892 100644
--- a/graphics/xsane/patches/patch-aa
+++ b/graphics/xsane/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2000/10/26 21:33:05 veego Exp $
+$NetBSD: patch-aa,v 1.7 2000/11/29 22:09:16 wiz Exp $
 
---- configure.orig	Thu Jul 27 14:59:24 2000
+--- configure.orig	Sun Nov 12 10:47:37 2000
 +++ configure
 @@ -9,7 +9,7 @@
  
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.6 2000/10/26 21:33:05 veego Exp $
 +ac_default_prefix=${PREFIX}
  # Any additions from configure.in:
  ac_help="$ac_help
-   --enable-intl-patch     add -lintl to check for sane"
-@@ -1364,7 +1364,6 @@
+   --disable-gimp          do not include GIMP plugin mode"
+@@ -1356,7 +1356,6 @@
  fi
  
  
@@ -19,20 +19,12 @@ $NetBSD: patch-aa,v 1.6 2000/10/26 21:33:05 veego Exp $
  CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
  if test "${ac_cv_prog_gcc}" = "yes"; then
    CFLAGS="${CFLAGS} -Wall"
-@@ -4739,7 +4738,7 @@
- #  so we have to use x_includes and x_libraries to test for png
+@@ -4587,7 +4586,7 @@
  #  and all following checks (=sane)
  # saved_CPPFLAGS is still up to date
--CPPFLAGS="${CPPFLAGS} -I${x_includes}"
-+CPPFLAGS="${CPPFLAGS} -I${x_includes} -I${LOCALBASE}/include"
+ 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
- do
-@@ -4840,6 +4839,7 @@
- # check must stand at end of list because of the missing libintl in libsane.so
- # check needs x_libraries and x_includes because they may be needed by png
- if test "${ADD_LIBINTL}" = "no"; then
-+  CPPFLAGS="${CPPFLAGS} -I${x_includes} -I${LOCALBASE}/include"
-   for ac_hdr in sane/sane.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index 080e8c04715..355f838cfef 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,39 +1,13 @@
-@comment $NetBSD: PLIST,v 1.8 2000/08/28 16:00:20 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/11/29 22:09:16 wiz Exp $
 bin/xsane
 man/man1/xsane.1
-share/locale/fr/LC_MESSAGES/xsane.mo
-share/locale/de/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/sv/LC_MESSAGES/xsane.mo
-share/sane/xsane/xsane-style.rc
-share/sane/xsane/xsane-calibration.pnm
-share/sane/xsane/xsane-logo.xpm
-share/sane/xsane/xsane-startimage.pnm
-share/sane/sane-backends-doc.html
-share/sane/sane-pnm-doc.html
-share/sane/sane-pnm16-doc.html
-share/sane/sane-scantips-doc.html
-share/sane/sane-xsane-advanced-doc.html
-share/sane/sane-xsane-copy-doc.html
-share/sane/sane-xsane-doc.html
-share/sane/sane-xsane-enhancement-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/locale/tr/LC_MESSAGES/xsane.mo
 share/sane/autoenhance.jpg
-share/sane/sane-xsane-preview-doc.html
-share/sane/sane-xsane-scan-doc.html
-share/sane/sane-xsane-setup-display-doc.html
-share/sane/sane-xsane-setup-fax-doc.html
-share/sane/sane-xsane-setup-save-doc.html
-share/sane/sane-xsane-standard-doc.html
-share/sane/sane-problems-doc.html
-share/sane/sane-xsane-setup-copy-doc.html
-share/sane/sane-xsane-output-formats-doc.html
-share/sane/sane-xsane-setup-device-doc.html
-share/sane/sane-xsane-setup-device.jpg
-share/sane/threshold.jpg
 share/sane/brightness.jpg
 share/sane/contrast.jpg
 share/sane/default.jpg
@@ -41,31 +15,59 @@ 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-xsane-copy.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-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-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-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-setup-copy.jpg
-share/sane/store.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-logo2.jpg
+share/sane/xsane/xsane-calibration.pnm
+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