The old sane package is replaced by two new packages:

sane-backends and sane-frontends

10 files changed, 1 insertions, 500 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 70ea3fd4b98..57018779c82 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2001/02/21 20:17:10 veego Exp $
+# $NetBSD: Makefile,v 1.120 2001/02/21 20:33:52 veego Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -97,7 +97,6 @@ SUBDIR+=	py-imaging
 SUBDIR+=	qvplay
 SUBDIR+=	rayshade
 SUBDIR+=	ruby-gl
-SUBDIR+=	sane
 SUBDIR+=	sane-backends
 SUBDIR+=	sane-frontends
 SUBDIR+=	scigraphica
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
deleted file mode 100644
index c76af14a1a3..00000000000
--- a/graphics/sane/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2001/02/16 15:22:33 wiz Exp $
-# FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
-#
-
-DISTNAME=       sane-1.0.3
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
-		ftp://gd.tuwien.ac.at/hci/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/
-COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
-
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	gimp>=1.0.4:../../graphics/gimp
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_X11BASE=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-
-# -O to work around a bug with -O2 and egcs.
-CFLAGS=		-O -I${LOCALBASE}/include
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane/files/md5 b/graphics/sane/files/md5
deleted file mode 100644
index 7ce8acf948c..00000000000
--- a/graphics/sane/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.6 2000/08/28 15:18:54 rh Exp $
-
-MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
diff --git a/graphics/sane/files/patch-sum b/graphics/sane/files/patch-sum
deleted file mode 100644
index 833d8707984..00000000000
--- a/graphics/sane/files/patch-sum
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-sum,v 1.5 2000/11/29 21:38:24 wiz Exp $
-
-MD5 (patch-aa) = 92931980b8f644b698a5ae8dcbb0ad8b
-MD5 (patch-ab) = 94a70c16258c033418094e8dc14dec51
-MD5 (patch-ac) = 6ff46739fc3bffb80a66b3e9cb016eb6
-MD5 (patch-ad) = 8fd9b78c3c8baccfddd85d585a3ae0d4
diff --git a/graphics/sane/patches/patch-aa b/graphics/sane/patches/patch-aa
deleted file mode 100644
index 00eb94a2cde..00000000000
--- a/graphics/sane/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/08/28 15:18:54 rh Exp $
-
---- backend/Makefile.in.orig	Sat Aug 12 16:47:55 2000
-+++ backend/Makefile.in
-@@ -33,7 +33,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- RANLIB = @RANLIB@
--LN_S = @LN_S@
-+LN_S = @LN_S@ -f
- 
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -92,7 +92,7 @@
- 	$(MKDIR) $(libdir) $(libsanedir) $(configdir)
- 	@list="$(LIBS)"; for be in $$list; do \
- 	  echo installing $${be} in $(libsanedir)...; \
--	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} $(libsanedir)/$${be} \
-+	  $(LIBTOOL) $(MINST) $(INSTALL_DATA) $${be} $(libsanedir)/$${be} \
- 	    || exit 1; \
- 	done
- 	@$(LIBTOOL) $(MINST) --finish $(libsanedir)
-@@ -100,10 +100,14 @@
- 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
- 	list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
- 	  file=libsane-$${be}.$$dllend.$(V_MAJOR); \
-+	  lnkf=libsane-$${be}.so.$(V_MAJOR); \
- 	  lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
- 	  if test ! -f $${file} -a -n "$${lib}"; then \
- 	    $(LN_S) $${lib} $${file}; \
- 	  fi; \
-+	  if test ! -f $${lnkf} -a -n "$${lib}"; then \
-+	    $(LN_S) $${lib} $${lnkf}; \
-+	  fi; \
- 	done
- 	@# Assume the dll name without any versions is last
- 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-@@ -115,7 +119,7 @@
- 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
- 	  (cd ..; $(LN_S) sane/$$n $$nn); \
- 	done || exit 1
--	$(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-+	$(INSTALL_DATA) libsane.la $(libdir)/libsane.la
- 	@list="$(CONFIGS)"; for cfg in $$list; do \
- 	  if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
- 	  if test -f $(configdir)/$${cfg}; then \
diff --git a/graphics/sane/patches/patch-ab b/graphics/sane/patches/patch-ab
deleted file mode 100644
index de806b54730..00000000000
--- a/graphics/sane/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2000/08/28 15:18:54 rh Exp $
-
---- configure.orig	Sat Aug 12 16:47:33 2000
-+++ configure
-@@ -2109,7 +2109,7 @@
- EOF
- if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
-+  eval "ac_cv_lib_$ac_lib_var=no"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -4501,8 +4501,8 @@
-   echo "disabling DC210 backend (failed to find JPEG library)"
-   DC210=
- else
--  echo "enabling DC210 backend"
--  DC210=dc210
-+  echo "disabling DC210 backend (does not compile on NetBSD yet)"
-+  DC210=
- fi
- 
- if test "${ac_cv_header_sys_scanio_h}" = "no"; then
diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac
deleted file mode 100644
index 120e92f62b8..00000000000
--- a/graphics/sane/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2000/08/30 12:19:08 rh Exp $
-
---- tools/Makefile.in.orig	Sun Mar  5 14:45:19 2000
-+++ tools/Makefile.in	Mon Jul  3 17:13:09 2000
-@@ -65,7 +65,7 @@
- all:	$(DESTINATIONS)
- 
- install: sane-config
--	$(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
-+	${BSD_INSTALL_SCRIPT} sane-config ${bindir}/sane-config
- 
- sane-config: sane-config.in $(top_builddir)/config.status 
- 	cd $(top_builddir) \
diff --git a/graphics/sane/patches/patch-ad b/graphics/sane/patches/patch-ad
deleted file mode 100644
index 87c94e13a15..00000000000
--- a/graphics/sane/patches/patch-ad
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/11/29 21:38:24 wiz Exp $
-
---- frontend/xscanimage.c.orig	Sat Aug 12 16:53:36 2000
-+++ frontend/xscanimage.c
-@@ -57,6 +57,11 @@
- 
- #ifdef HAVE_LIBGIMP_GIMP_H
- 
-+/*
-+ * Enable old Gimp API.  Eventually, we should rewrite this frontend
-+ * to use the new API. [pere 2000-10-29]
-+ */
-+#define GIMP_ENABLE_COMPAT_CRUFT
- #include <libgimp/gimp.h>
- 
- static void query (void);
-@@ -119,10 +124,13 @@
-   {
-     {"help", no_argument, NULL, 'h'},
-     {"version", no_argument, NULL, 'V'},
--    {0, }
-+    {0, 0, 0, 0 }
-   };
- 
- 
-+static int gtk_quit_flag; /* Call gtk_main_quit() only if at least one device
-+                             device is found. */
-+
- /* forward declarations: */
- 
- int main (int argc, char ** argv);
-@@ -367,24 +375,24 @@
-   if (sane_get_parameters (gsg_dialog_get_device (dialog), &params)
-       == SANE_STATUS_GOOD)
-     {
--      u_long size = 10 * params.bytes_per_line * params.lines;
-+      double size = params.bytes_per_line * params.lines;
-       const char *unit = "B";
- 
-       if (params.format >= SANE_FRAME_RED && params.format <= SANE_FRAME_BLUE)
- 	size *= 3;
- 
--      if (size >= 10 * 1024 * 1024)
-+      if (size >= 1024 * 1024)
- 	{
- 	  size /= 1024 * 1024;
- 	  unit = "MB";
- 	}
--      else if (size >= 10 * 1024)
-+      else if (size >= 1024)
- 	{
- 	  size /= 1024;
- 	  unit = "KB";
- 	}
--      sprintf (buf, "%dx%d: %lu.%01lu %s", params.pixels_per_line,
--	       params.lines, size / 10, size % 10, unit);
-+      sprintf (buf, "%dx%d: %1.1f %s", params.pixels_per_line,
-+	       params.lines, size, unit);
-     }
-   else
-     sprintf (buf, "Invalid parameters.");
-@@ -454,11 +462,13 @@
-   if (dialog && gsg_dialog_get_device (dialog))
-     sane_close (gsg_dialog_get_device (dialog));
-   sane_exit ();
--  gtk_main_quit ();
-+  if (gtk_quit_flag == 1)
-+    gtk_main_quit ();
- #ifdef HAVE_LIBGIMP_GIMP_H
-   if (scan_win.mode == SANE_GIMP_EXTENSION)
-     gimp_quit ();
- #endif
-+  fprintf(stderr, "xscanimage exiting.\n");
-   exit (0);
- }
- 
-@@ -555,7 +565,7 @@
- 
-   while (1)
-     {
--      status = sane_read (dev, buf, sizeof (buf), &len);
-+      status = sane_read (dev, (unsigned char *) buf, sizeof (buf), &len);
-       if (status != SANE_STATUS_GOOD)
- 	{
- 	  if (status == SANE_STATUS_EOF)
-@@ -1692,10 +1702,15 @@
- 	}
-       else
- 	{
--	  fprintf (stderr, "%s: no devices available.\n", prog_name);
-+	  fprintf(stderr, "No scanners were identified. If you were expecting something\n"
-+	       "          different, check that the scanner is plugged in, turned on and\n"
-+	       "          detected by the find-scanner tool (if appropriate). Please read\n"
-+	       "          the documentation which came with this software (README, FAQ,\n"
-+	       "          manpages).\n");
- 	  quit_xscan ();
- 	}
-     }
-+  gtk_quit_flag = 1;
-   gtk_main ();
-   sane_exit ();
- }
-@@ -1703,8 +1718,10 @@
- int
- main (int argc, char **argv)
- {
-+  fprintf(stderr, "xscanimage (version: %s, package: %s) starting\n", VERSION,
-+      PACKAGE);
-   scan_win.mode = STANDALONE;
--
-+  gtk_quit_flag = 0;
-   prog_name = strrchr (argv[0], '/');
-   if (prog_name)
-     ++prog_name;
-@@ -1714,6 +1731,7 @@
- #ifdef HAVE_LIBGIMP_GIMP_H
-   {
-     GPrintFunc old_print_func;
-+    GPrintFunc old_printerr_func;
-     int result;
- 
-     /* Temporarily install a print function that discards all output.
-@@ -1721,9 +1739,11 @@
-        gimp" messages when xscanimage gets invoked in stand-alone
-        mode.  */
-     old_print_func = g_set_print_handler (null_print_func);
-+    old_printerr_func = g_set_printerr_handler(null_print_func);
-     /* gimp_main () returns 1 if xscanimage wasn't invoked by GIMP */
-     result = gimp_main (argc, argv);
-     g_set_message_handler (old_print_func);
-+    g_set_error_handler(old_printerr_func);
-     if (result)
-       interface (argc, argv);
-   }
diff --git a/graphics/sane/pkg/DESCR b/graphics/sane/pkg/DESCR
deleted file mode 100644
index 79696e59f96..00000000000
--- a/graphics/sane/pkg/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-SANE is a universal scanner interface. The value of such a universal
-interface is that it allows writing just one driver per image acquisition
-device rather than one driver for each device and application. So, if you
-have three applications and four devices, traditionally you'd have had to
-write 12 different programs. With SANE, this number is reduced to seven:
-the three applications plus the four drivers. Of course, the savings get
-even bigger as more and more drivers and/or applications are added. 
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
deleted file mode 100644
index 0181a6ff5d1..00000000000
--- a/graphics/sane/pkg/PLIST
+++ /dev/null
@@ -1,235 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:44 agc Exp $
-bin/sane-config
-bin/scanimage
-bin/xcam
-bin/xscanimage
-etc/sane.d/abaton.conf
-etc/sane.d/agfafocus.conf
-etc/sane.d/apple.conf
-etc/sane.d/artec.conf
-etc/sane.d/avision.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
-etc/sane.d/m3096g.conf
-etc/sane.d/microtek.conf
-etc/sane.d/microtek2.conf
-etc/sane.d/mustek.conf
-etc/sane.d/mustek_pp.conf
-etc/sane.d/net.conf
-etc/sane.d/plustek.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/sp15c.conf
-etc/sane.d/st400.conf
-etc/sane.d/tamarack.conf
-etc/sane.d/umax.conf
-include/sane/config.h
-include/sane/sane.h
-include/sane/sanei.h
-include/sane/sanei_backend.h
-include/sane/sanei_codec_ascii.h
-include/sane/sanei_codec_bin.h
-include/sane/sanei_debug.h
-include/sane/sanei_net.h
-include/sane/sanei_pa4s2.h
-include/sane/sanei_scsi.h
-include/sane/sanei_wire.h
-include/sane/saneopts.h
-lib/libsane.a
-lib/libsane.la
-lib/libsane.so
-lib/libsane.so.1
-lib/libsane.so.1.3
-lib/sane/libsane-abaton.a
-lib/sane/libsane-abaton.la
-lib/sane/libsane-abaton.so
-lib/sane/libsane-abaton.so.1
-lib/sane/libsane-abaton.so.1.3
-lib/sane/libsane-agfafocus.a
-lib/sane/libsane-agfafocus.la
-lib/sane/libsane-agfafocus.so
-lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-agfafocus.so.1.3
-lib/sane/libsane-apple.a
-lib/sane/libsane-apple.la
-lib/sane/libsane-apple.so
-lib/sane/libsane-apple.so.1
-lib/sane/libsane-apple.so.1.3
-lib/sane/libsane-artec.a
-lib/sane/libsane-artec.la
-lib/sane/libsane-artec.so
-lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec.so.1.3
-lib/sane/libsane-avision.a
-lib/sane/libsane-avision.la
-lib/sane/libsane-avision.so
-lib/sane/libsane-avision.so.1
-lib/sane/libsane-avision.so.1.3
-lib/sane/libsane-canon.a
-lib/sane/libsane-canon.la
-lib/sane/libsane-canon.so
-lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon.so.1.3
-lib/sane/libsane-coolscan.a
-lib/sane/libsane-coolscan.la
-lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan.so.1.3
-lib/sane/libsane-dc25.a
-lib/sane/libsane-dc25.la
-lib/sane/libsane-dc25.so
-lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dc25.so.1.3
-lib/sane/libsane-dll.a
-lib/sane/libsane-dll.la
-lib/sane/libsane-dll.so
-lib/sane/libsane-dll.so.1
-lib/sane/libsane-dll.so.1.3
-lib/sane/libsane-dmc.a
-lib/sane/libsane-dmc.la
-lib/sane/libsane-dmc.so
-lib/sane/libsane-dmc.so.1
-lib/sane/libsane-dmc.so.1.3
-lib/sane/libsane-epson.a
-lib/sane/libsane-epson.la
-lib/sane/libsane-epson.so
-lib/sane/libsane-epson.so.1
-lib/sane/libsane-epson.so.1.3
-lib/sane/libsane-hp.a
-lib/sane/libsane-hp.la
-lib/sane/libsane-hp.so
-lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp.so.1.3
-lib/sane/libsane-m3096g.a
-lib/sane/libsane-m3096g.la
-lib/sane/libsane-m3096g.so
-lib/sane/libsane-m3096g.so.1
-lib/sane/libsane-m3096g.so.1.3
-lib/sane/libsane-microtek.a
-lib/sane/libsane-microtek.la
-lib/sane/libsane-microtek.so
-lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek.so.1.3
-lib/sane/libsane-microtek2.a
-lib/sane/libsane-microtek2.la
-lib/sane/libsane-microtek2.so
-lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-microtek2.so.1.3
-lib/sane/libsane-mustek.a
-lib/sane/libsane-mustek.la
-lib/sane/libsane-mustek.so
-lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek.so.1.3
-lib/sane/libsane-mustek_pp.so
-lib/sane/libsane-mustek_pp.so.1
-lib/sane/libsane-mustek_pp.so.1.3
-lib/sane/libsane-mustek_pp.la
-lib/sane/libsane-mustek_pp.a
-lib/sane/libsane-net.a
-lib/sane/libsane-net.la
-lib/sane/libsane-net.so
-lib/sane/libsane-net.so.1
-lib/sane/libsane-net.so.1.3
-lib/sane/libsane-pint.a
-lib/sane/libsane-pint.la
-lib/sane/libsane-pint.so
-lib/sane/libsane-pint.so.1
-lib/sane/libsane-pint.so.1.3
-lib/sane/libsane-plustek.so
-lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek.so.1.3
-lib/sane/libsane-plustek.la
-lib/sane/libsane-plustek.a
-lib/sane/libsane-pnm.a
-lib/sane/libsane-pnm.la
-lib/sane/libsane-pnm.so
-lib/sane/libsane-pnm.so.1
-lib/sane/libsane-pnm.so.1.3
-lib/sane/libsane-ricoh.a
-lib/sane/libsane-ricoh.la
-lib/sane/libsane-ricoh.so
-lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-ricoh.so.1.3
-lib/sane/libsane-s9036.a
-lib/sane/libsane-s9036.la
-lib/sane/libsane-s9036.so
-lib/sane/libsane-s9036.so.1
-lib/sane/libsane-s9036.so.1.3
-lib/sane/libsane-sharp.a
-lib/sane/libsane-sharp.la
-lib/sane/libsane-sharp.so
-lib/sane/libsane-sharp.so.1
-lib/sane/libsane-sharp.so.1.3
-lib/sane/libsane-snapscan.a
-lib/sane/libsane-snapscan.la
-lib/sane/libsane-snapscan.so
-lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-snapscan.so.1.3
-lib/sane/libsane-sp15c.a
-lib/sane/libsane-sp15c.la
-lib/sane/libsane-sp15c.so
-lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-sp15c.so.1.3
-lib/sane/libsane-st400.so
-lib/sane/libsane-st400.so.1
-lib/sane/libsane-st400.so.1.3
-lib/sane/libsane-st400.la
-lib/sane/libsane-st400.a
-lib/sane/libsane-tamarack.a
-lib/sane/libsane-tamarack.la
-lib/sane/libsane-tamarack.so
-lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-tamarack.so.1.3
-lib/sane/libsane-umax.a
-lib/sane/libsane-umax.la
-lib/sane/libsane-umax.so
-lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax.so.1.3
-man/man1/saned.1
-man/man1/scanimage.1
-man/man1/xcam.1
-man/man1/xscanimage.1
-man/man5/sane-abaton.5
-man/man5/sane-agfafocus.5
-man/man5/sane-apple.5
-man/man5/sane-artec.5
-man/man5/sane-avision.5
-man/man5/sane-canon.5
-man/man5/sane-coolscan.5
-man/man5/sane-dc210.5
-man/man5/sane-dc25.5
-man/man5/sane-dll.5
-man/man5/sane-dmc.5
-man/man5/sane-epson.5
-man/man5/sane-fujitsu.5
-man/man5/sane-hp.5
-man/man5/sane-microtek.5
-man/man5/sane-microtek2.5
-man/man5/sane-mustek.5
-man/man5/sane-mustek_pp.5
-man/man5/sane-net.5
-man/man5/sane-pint.5
-man/man5/sane-plustek.5
-man/man5/sane-pnm.5
-man/man5/sane-qcam.5
-man/man5/sane-ricoh.5
-man/man5/sane-s9036.5
-man/man5/sane-scsi.5
-man/man5/sane-sharp.5
-man/man5/sane-snapscan.5
-man/man5/sane-st400.5
-man/man5/sane-tamarack.5
-man/man5/sane-umax.5
-man/man5/sane-v4l.5
-sbin/saned
-share/sane-style.rc
-@dirrm etc/sane.d
-@dirrm include/sane
-@dirrm lib/sane