head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.54 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.52 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.50 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.48 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.46 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.44 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.42 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.40 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.38 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.36 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.34 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.32 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.30 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.28 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.26 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.24 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.22 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.20 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.18 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 buildlink2-base:1.6 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.6 date 2001.02.21.20.33.53; author veego; state dead; branches; next 1.5; 1.5 date 2000.08.28.15.18.54; author rh; state Exp; branches; next 1.4; 1.4 date 99.05.03.16.20.01; author rh; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.53; author agc; state Exp; branches; next 1.2; 1.2 date 98.08.06.20.56.35; author frueauf; state Exp; branches; next 1.1; 1.1 date 98.05.03.20.49.45; author frueauf; state Exp; branches; next ; desc @@ 1.6 log @The old sane package is replaced by two new packages: sane-backends and sane-frontends @ text @$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 \ @ 1.5 log @Update sane to 1.0.3. Changes include: * New backends: mustek_pp, plustek, st400, v4l. * Updated backends: Artec (v0.5.14), Coolscan (v0.4.3), Epson (v0.1.33), HP (v0.88), Mustek (v1.0-96), Sharp (v0.31), UMAX (v1.0-21). * Removed backend info sagitta.desc due to lack of interest. * Installing no longer depends on 'rev'. * Added and structured documentation. * Every backend has a man page now. * Debug messages are now sent to syslog if stderr is a socket. * New 16 bit support to scanimage. * Aliased and hidden backend support. * Port to UnixWare 2.x and UnixWare 7. * New script 'sane-config' to help frontend developers. * Added Ricoh IS50 support. * Updated backends: Artec (v0.5.13), CANON (v991108), DC-25 (1.2), HP (v0.86), Microtek (0.12.0), Microtek2 (v0.8), UMAX (v1.0-build-18), Epson (v0.1.15), Sharp (v0.30), sp15c (1.12) and m3096g (1.11). * Automatic document feeder support for scanimage. * New backend for Avision AV 630 CS. * New Linux SCSI Generic driver. * Upgraded to libtool 1.3.4 * GIMP compatibility patch. * OS/2 patches. * Bugfixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to sane-1.0.1 @ text @d3 2 a4 2 --- backend/Makefile.in.orig Sun Apr 4 01:00:44 1999 +++ backend/Makefile.in Wed Apr 21 21:04:33 1999 d14 33 @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 8 a10 3 --- backend/Makefile.in.orig Fri Jul 24 07:06:49 1998 +++ backend/Makefile.in Thu Aug 6 22:49:14 1998 @@@@ -75,7 +75,7 @@@@ d12 2 a13 18 %-s.c: $(srcdir)/stubs.c rm -f $@@ - ln -s $(srcdir)/stubs.c $@@ + ln -sf $(srcdir)/stubs.c $@@ # Don't delete any intermediate files. .PRECIOUS: %-s.c %-s.lo %.lo dll-preload.c @@@@ -99,8 +99,8 @@@@ done rm -f $(libdir)/libsane.a $(libdir)/libsane.so \ $(libdir)/libsane.so.$(V_MAJOR)* - ln -s sane/libsane-dll.a $(libdir)/libsane.a - ln -s sane/libsane-dll.so $(libdir)/libsane.so + ln -sf sane/libsane-dll.a $(libdir)/libsane.a + ln -sf sane/libsane-dll.so $(libdir)/libsane.so @@cd $(libsanedir) && for n in libsane-dll.so.$(V_MAJOR)*; do \ nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \ (cd ..; ln -s sane/$$n $$nn); \ @ 1.2 log @Somehow forgot to commit those? make them apply again... @ text @d1 2 @ 1.1 log @Initial addition of sane 0.72 based on pr 5389. @ text @d1 2 a2 2 --- backend/Makefile.in.orig Thu Apr 30 05:54:27 1998 +++ backend/Makefile.in Thu Apr 30 05:55:10 1998 d12 2 a13 2 @@@@ -92,8 +92,8 @@@@ @@$(LIBTOOL) $(MINST) --finish $(libdir) d16 5 a20 5 - ln -s libsane-dll.a $(libdir)/libsane.a - ln -s libsane-dll.so $(libdir)/libsane.so + ln -sf libsane-dll.a $(libdir)/libsane.a + ln -sf libsane-dll.so $(libdir)/libsane.so @@cd $(libdir) && for n in libsane-dll.so.$(V_MAJOR)*; do \ d22 1 a22 1 ln -s $$n $$nn; \ @