Update to xsane-0.22

7 files changed, 44 insertions, 88 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 83716979af0..3184657d581 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/03 16:29:22 rh Exp $
 #
 
-DISTNAME=	xsane-0.19
+DISTNAME=	xsane-0.22
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/
 
@@ -11,14 +11,13 @@ HOMEPAGE=	http://www.wolfsburg.de/~rauch/sane/sane-xsane.html
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png-1.0.3:../../graphics/png
 DEPENDS+=	tiff-3.4:../../graphics/tiff
-DEPENDS+=	gtk10-1.0.6:../../x11/gtk10
-DEPENDS+=	sane-1.00:../../graphics/sane
+DEPENDS+=	gtk+-1.2.2:../../x11/gtk
+DEPENDS+=	sane-1.0.1:../../graphics/sane
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X11BASE=	YES
 USE_LIBTOOL=	YES
-CONFIGURE_ENV+=	GTK_CONFIG="${X11BASE}/bin/gtk10-config"
 
 CPPFLAGS+=	-I${PREFIX}/include
 
diff --git a/graphics/xsane/files/md5 b/graphics/xsane/files/md5
index b28434e1d2f..a7db02ecdf7 100644
--- a/graphics/xsane/files/md5
+++ b/graphics/xsane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
+$NetBSD: md5,v 1.2 1999/05/03 16:29:22 rh Exp $
 
-MD5 (xsane-0.19.tar.gz) = 2cfad927bb8eb4a08782b40a9931520b
+MD5 (xsane-0.22.tar.gz) = 9da994af5d313ebb3967e3f6e8aaa071
diff --git a/graphics/xsane/patches/patch-aa b/graphics/xsane/patches/patch-aa
index d58e067ffc1..d8f9db7f792 100644
--- a/graphics/xsane/patches/patch-aa
+++ b/graphics/xsane/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
+$NetBSD: patch-aa,v 1.2 1999/05/03 16:29:23 rh Exp $
 
---- configure.orig	Mon Mar 22 16:39:21 1999
-+++ configure	Mon Apr  5 19:20:54 1999
+--- configure.orig	Wed Apr 14 00:42:49 1999
++++ configure	Sun May  2 14:11:59 1999
 @@ -9,7 +9,7 @@
  
  # Defaults:
@@ -10,24 +10,8 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
 +ac_default_prefix=${PREFIX}
  # Any additions from configure.in:
  ac_help="$ac_help
-   --enable-shared         build shared libraries [default=yes]
-@@ -2698,6 +2698,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -2743,6 +2744,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
- 
- 
- 
-@@ -3931,10 +3933,12 @@
+   --with-x                use the X Window System"
+@@ -3674,10 +3674,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/xsane/patches/patch-ab b/graphics/xsane/patches/patch-ab
index 7db4e66db88..a6e9b6c1d6f 100644
--- a/graphics/xsane/patches/patch-ab
+++ b/graphics/xsane/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
+$NetBSD: patch-ab,v 1.2 1999/05/03 16:29:23 rh Exp $
 
---- lib/Makefile.in.orig	Wed Mar  3 00:14:45 1999
-+++ lib/Makefile.in	Mon Apr  5 19:11:21 1999
-@@ -36,7 +36,7 @@
- DEFS = @DEFS@
+--- frontend/Makefile.in.orig	Thu Apr 15 18:18:45 1999
++++ frontend/Makefile.in	Sun May  2 14:17:15 1999
+@@ -29,12 +29,12 @@
  
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LIBTOOL = ../libtool
-+LIBTOOL = @LIBTOOL@
- MCOMP	= --mode=compile
- MLINK	= --mode=link
+ CC = @CC@
+ INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
+-	@GTK_CFLAGS@ @INCLUDES@
++	@GTK_CFLAGS@ @INCLUDES@ -I${LOCALBASE}/include
+ DEFS = @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -L${X11BASE}/lib -lsane
+ GTK_LIBS = @GTK_LIBS@
+ GIMP_LIBS = @GIMP_LIBS@
  
diff --git a/graphics/xsane/patches/patch-ac b/graphics/xsane/patches/patch-ac
index aef2218001c..9c08cff5504 100644
--- a/graphics/xsane/patches/patch-ac
+++ b/graphics/xsane/patches/patch-ac
@@ -1,32 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1999/04/17 01:27:28 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 1999/05/03 16:29:23 rh Exp $
 
---- frontend/Makefile.in.orig	Thu Mar 25 16:42:21 1999
-+++ frontend/Makefile.in	Sat Apr 17 03:11:52 1999
-@@ -29,16 +29,16 @@
+--- sanei/Makefile.in.orig	Wed Apr 14 00:34:23 1999
++++ sanei/Makefile.in	Sun May  2 14:18:04 1999
+@@ -27,7 +27,7 @@
+ INSTALL_DATA = @INSTALL_DATA@
  
  CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
--	@GTK_CFLAGS@ @INCLUDES@
-+	@GTK_CFLAGS@ @INCLUDES@ -I${LOCALBASE}/include
- DEFS = @DEFS@
+-INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
++INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I${PREFIX}/include
  CPPFLAGS = @CPPFLAGS@
  CFLAGS = @CFLAGS@
  LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L${X11BASE}/lib -lsane
- GTK_LIBS = @GTK_LIBS@
- GIMP_LIBS = @GIMP_LIBS@
- 
--LIBTOOL = ../libtool
-+LIBTOOL = @LIBTOOL@
- MINST	= --mode=install
- MLINK	= --mode=link
- XSCAN	= @XSCAN@
-@@ -66,7 +66,6 @@
- 	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${program} \
- 	    $(bindir)/$${program}; \
- 	done
--	$(INSTALL_DATA) $(srcdir)/sane-style.rc $(datadir)/sane-style.rc
- 	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(datasanedir)/xsane-logo.xpm
- 
- xsane: $(XSANE_OBJS) $(LIBSANEI) $(LIBLIB)
diff --git a/graphics/xsane/patches/patch-ad b/graphics/xsane/patches/patch-ad
deleted file mode 100644
index 5cbac1bd544..00000000000
--- a/graphics/xsane/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
-
---- sanei/Makefile.in.orig	Wed Mar  3 00:25:06 1999
-+++ sanei/Makefile.in	Mon Apr  5 19:13:46 1999
-@@ -27,7 +27,7 @@
- RANLIB = @RANLIB@
- 
- CC = @CC@
--INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I${PREFIX}/include
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -35,7 +35,7 @@
- DEFS = @DEFS@
- 
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LIBTOOL = ../libtool
-+LIBTOOL = @LIBTOOL@
- MCOMP	= --mode=compile
- MLINK	= --mode=link
- 
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index bbbd80b22a3..30339a966eb 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/06 05:57:31 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/05/03 16:29:25 rh Exp $
 bin/xsane
 man/man1/xsane.1
+share/sane/xsane-style.rc
 share/sane/xsane-logo.xpm
+share/sane/sane-pnm-doc.html
+share/sane/sane-pnm16-doc.html
 share/sane/sane-xsane-advanced-doc.html
 share/sane/sane-xsane-copy-doc.html
 share/sane/sane-xsane-doc.html
@@ -14,8 +17,13 @@ share/sane/sane-xsane-setup-doc.html
 share/sane/sane-xsane-standard-doc.html
 share/sane/sane-logo.gif
 share/sane/sane-xsane-advanced.gif
+share/sane/sane-xsane-copy.gif
+share/sane/sane-xsane-gimp.gif
 share/sane/sane-xsane-histogram.gif
-share/sane/sane-xsane-setup.gif
+share/sane/sane-xsane-setup-fax.gif
+share/sane/sane-xsane-setup-preview.gif
+share/sane/sane-xsane-setup-printer.gif
+share/sane/sane-xsane-setup-save.gif
 share/sane/sane-xsane-standard.gif
 share/sane/sane-xsane.gif
 share/sane/xsane-logo.gif