Update xsane to 0.72:

xsane-0.64 -> 0.65:
-------------------

 - src/Makefile.in: added usage of SANE_CFLAGS and GTK_CFLAGS

 - added secure password transmission for authorisation (md5digest)

 - ~/.sane/pass is used for reading user:password:resource from file before asking the user

 - configure: removed test for X (AC_PATH_X), this is done in GTK (gtk-config)
   gtk includes and libs are used for png test (because png often is in X directories)

 - changed xsane_*_with_pixmap:
   old status: routines used xsane.histogram_dialog->window as window for gdk_pixmap_create_from_xpm_d()
     this made problems with preview window if X default color depth differd from X color depth
   new status: routines are called with parameter GdkWindow *window now.


xsane-0.65 -> 0.66:
-------------------

 - added setup menu for Automatic Document Feeder Scansource
   (ADF-Scansource name was predefined to "Automatic Document Feeder" before,
    now it can be defined for each device (is saved in decice settings))

 - changed setup for lineart->grayscale scanmode from entry to menu with available scanmodes

 - updated xsane.WIN32-compilation and src/Makefile.in.WIN32
   I compiled a pre version of xsane-0.66 with the cygwin snapshot from 2000-12-10 and
   gtk+-dev-20001023.zip, glib-dev-20001023.zip, libiconv-dev-20001007.zip
   with the way described in xsane.WIN32-compilation without any problems.
   The problem with the fork() seems to be solved in this cygwin version.

 - updated aclocal.m4 and configure (gimp test)


xsane-0.66 -> 0.67:
-------------------

 - added test if (xsane.adf_scansource) before usage of xsane.adf_scansource
   (caused segfault when no ADF Scanmode was defined in setup)


xsane-0.67 -> 0.68:
-------------------

 - changed src/Makefile.in.WIN32 so that the installation directory can
   be selected by configure --prefix=... and the used paths are more
   common to the one on unix (/usr/local => c:\sane)

 - changed src/Makefile.in.WIN32 for gimp support (uncomment GIMP_LIBS)

 - WIN32+gimp-support: set_gimp_PLUG_IN_INFO_PTR(&PLUG_IN_INFO) is called

 - added extern GimpPlugIn PLUG_IN_INFO to xsane.h (needed in xsane.c for win32)

 - replaced free(xsane.tile) by g_free(xsane.tile)
   (the free(...) caused a crash on win32)

 - changed aclocal.m4: gimp test does work with gimp-1.0.x version again

 - renamed xsane.WIN32 and xsane.WIN32-compilation to xsane-WIN32.txt
   and xsane-WIN32-compilation.txt (it is easer to use on windows)

 - removed (#ifndef _WIN32) gtk_set_locale() from xsane.c for win32
   (when it was called gimp plugin created transparent images)

 - saved xsane-style.rc in DOS mode (\n\r)


xsane-0.68 -> 0.69:
-------------------

 - some changes in aclocal.m4 for gimp test:
   - When gimp-config is not found, the output of gtk-config is used
   - GTK_CFLAGS or GIMP_CFLAGS are added to CPPFLAGS for test for gimp.h and gimpfeatures.h
   - GTK_CFLAGS and GTK_LIBS are erased when gimp_config is available

 - changed src/Makefile.in: GIMP_CFLAGS is used now

 - saved xsane-style.rc in unix mode (\n) because DOS mode (\n\r) made problems

 - added new way to call netscape remote command:
   at first xsane tries to find out if netscape is running, for this it tries to
   find out if there is a link "~/.netscape/lock". If this link exists netscape should
   be running and xsane calls "netscape -remote openFile(...)". Otherwise xsane calls
   "netscape ..."

 - changed keywork "netscape-remote" as docviewer to "netscape"

 - changed way to find out home directory in xsane-back-gtk.c:
   now getenv(ENVIRONMENT_HOME_DIR_NAME) is used instead of getpwuid(...)->pw_dir.
   (getenv is usable for Win32 and unix, getpwuid makes problems on Win32)



xsane-0.69 -> 0.70:
-------------------

 - removed some bugs in text for pipette in sane-xsane-preview-doc.html

 - changed acloacal.m4: when gimp-config is not found we look for gimptool

 - for WIN32 the filetypes listed in the filetype menu are ".jpg" and ".tif"
   instead of ".jpeg" and ".tiff"

 - added manufacturer image to bottom of standard and advanced options window.
   The name of the image is "vendor"-logo.xpm" or "sane-"backend"-logo.xpm",
   the size of the image should be 256x48 pixels with a transparent background.

 - changed src/Makfile.in: *-logo.xpm are installed (make install) and
   uninstalled (make uninstall) now

 - changed src/Makfile.in.WIN32: *-logo.xpm are installed (make install)now

 - several changes in xsane-preview.c for rotating preview by 0/90/180/270 degree
   the preview rotation is ready now

 - added new routine xsane_save_rotate_image to xsane-save.c

 - added new routine xsane_save_grayscale_image_as_lineart to xsane-save.c

 - lineart images are saved in grayscale mode at first if transformation has to be done

 - xsane_save_rotate_image is called beween scanning and saving image

 - xsane_save_grayscale_image_as_lineart is called beween rotating and saving image

 - aclocal.m4/configure: changed sane_major_version etc to SANE_CURRENT_MAJOR

 - fileheader of raw format changed. This format is not defined, but some programs
   can read it as 16 bit pnm binary data, so we use a compatible header now:
     P5
     # This file is in a not public defined data format.
     # It is a 16 bit gray binary format.
     # Some programs can read this as pnm/pgm format.
     # SANE data follows.
     100 100
     65535



xsane-0.70 -> 0.71:
-------------------

 - corrected aspect ratio in xsane-preview.c in routine that calculates preview resolution

 - corrected user definition of maximum scanner surface

 - added translation of preview menu maximum surface(preset area)

 - added tooltip for maximum surface(preset area) menu and rotation menu

 - finished  preview_autoselect_scanarea()

 - added autoselect scanarea button to preview window

 - changed automaitic increase of filename counter:
   - the step direction and length is not forced to +1,
     the user can select one of the values -2/-1/0/+1/+2.
     It is defined by preferences.filename_counter_step.
     This way it is possible to scan double sided papers
     with correct automatic page number generation.
   - the digits are not increased by a loop any more,
     the number is read, the new number is calculated
     and the new filename is generated. The user can
     select a minimum filename counter length now,
     it is defined in preferences.filename_counter_len
     and can be selected by the user in setup/saving options
   - when the number of digits are not enough the number is
     automatically increased now.
   - a message comes up when counter gets smaller than 0

 - pipette the color is averaged on a square, the size of the
   square can be defined by the user

 - updated html doc (not complete)

 - added tooltips to permission buttons (r,w,x)
   permission texts: user, group, all, read, write, execute can be translated now.

 - added japanese translation (thanks to Kimizuka Tomokazu <sgtom@pluto.dti.ne.jp>)

 - renamed oldgimp.h to gimp-1_0-compat.h


xsane-0.71 -> 0.72:
-------------------

 - changed default postscript viewer from xv to gv

 - moved int i, select = 1; in static void xsane_saving_notebook() out of #ifdef HAVE_LIBTIFF block

 - filename counter length correction is only done in sane_start when there is a user selectable filename

 - if external filename is given the counter len is not touched when not necessary

 - added "insert file" function to fax mode

 - added output of gamma, brightness and contrast settings to pnm headers

 - updated xsane online-documentation (html)

 - added license dialog, it is shown when it was not already accepted for this xsane version
   (tested in local xsane.rc)

 - about and about translation dialogs do not set XSane´s sensitivity to false any more

 - copyright sign is now always defined as "(c)", can be translated with \251 if character is available

 - device preferences are not saved/loaded any more when file selection is aborted

 - in xsane_info_dialog the scanner type is translated now

 - added accelerator keys to device selection dialog:
     Escape   -> Cancel
     F1,F2,.. -> select device number 1,2,...

 - added usleep(100ms) in device selection dialog before scanning for devices, this way we make
   sure that the text "scanning for devices" is displayed

 - added some accelarator keys to the preview window:
    Alt ESC   Cancel Preview Scan
    Alt KP+  Zoom in
    Alt KP-  Zoom out
    Alt KP*  Zoom not
    Alt KP/  Zoom undo
    Alt A     Autoselect scanarea
    Alt V     Select visible scanarea

 - added accelerator key Escape to file-selection-dialog, about-dialog and about-translation-dialog
   attached to cancel/close button

 - updated translations:
   - german translation
   - czech translation    - thanks to Stanislav Brabec <utx@penguin.cz>
   - turkish translation  - thanks to Togan Muftuoglo <toganm@yahoo.com>
   - japanese translation - thanks to Kimizuka Tomokazu <sgtom@pluto.dti.ne.jp>
   - french translation   - thanks to Laurent Grawet <laurent.grawet@ibelgique.com>

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