Date: Wed, 7 Feb 2001 10:23:45 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24931: Update port: graphics/sane to 1.0.4 (fix ports/23830) Message-ID: <200102071823.f17INjG94748@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24931
>Category: ports
>Synopsis: Update port: graphics/sane to 1.0.4 (fix ports/23830)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 07 10:30:02 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.4
[sane-backends]
New file:
files/patch-ag
Remove file:
pkg-message
files/patch-ab files/patch-ac files/patch-af
[sane-frontends]
Add file:
files/patch-ag
Remove file:
files/patch-ab files/patch-ac files/patch-ad files/patch-ae
files/patch-af
Note:
SANE is split into sane-backends and sane-frontends from this version.
This PR supersedes ports/23830.
Since containts of those are merged, ports/23917 and ports/24685
should be superseded by this PR.
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# graphics_sane-backends.patch
# graphics_sane-frontends.patch
#
echo x - graphics_sane-backends.patch
sed 's/^X//' >graphics_sane-backends.patch << 'END-of-graphics_sane-backends.patch'
Xdiff -urN /usr/ports/graphics/sane/Makefile graphics/sane-backends/Makefile
X--- /usr/ports/graphics/sane/Makefile Tue Feb 6 02:55:41 2001
X+++ graphics/sane-backends/Makefile Wed Feb 7 00:39:38 2001
X@@ -1,13 +1,12 @@
X-# New ports collection makefile for: sane
X+# New ports collection makefile for: sane-backends
X # Date created: Sat Jul 19 16:23:10 MET DST 1997
X # Whom: gary@hotlava.com
X #
X # $FreeBSD: ports/graphics/sane/Makefile,v 1.30 2001/02/05 15:57:18 olgeni Exp $
X #
X
X-PORTNAME= sane
X-PORTVERSION= 1.0.3
X-PORTREVISION= 1
X+PORTNAME= sane-backends
X+PORTVERSION= 1.0.4
X CATEGORIES= graphics
X MASTER_SITES= ${MASTER_SITE_SUNSITE} \
X ftp://ftp.mostang.com/pub/sane/
X@@ -19,28 +18,18 @@
X
X USE_GMAKE= yes
X USE_LIBTOOL= yes
X-USE_GTK= yes
X-INSTALLS_SHLIB= yes
X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
X LIBS="-L${LOCALBASE}/lib"
X+INSTALLS_SHLIB= yes
X
X-MAN1= saned.1 scanimage.1 xcam.1 xscanimage.1
X+MAN1= saned.1 scanimage.1
X MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
X- sane-avision.5 sane-canon.5 sane-coolscan.5 sane-dc210.5 \
X- sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
X+ sane-as6e.5 sane-avision.5 sane-canon.5 sane-coolscan.5 \
X+ sane-dc210.5 sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
X sane-fujitsu.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
X- sane-mustek.5 sane-mustek_pp.5 sane-net.5 sane-pint.5 \
X- sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
X+ sane-mustek.5 sane-mustek_pp.5 sane-nec.5 sane-net.5 sane-pie.5 \
X+ sane-pint.5 sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
X sane-s9036.5 sane-scsi.5 sane-sharp.5 sane-snapscan.5 \
X sane-st400.5 sane-tamarack.5 sane-umax.5 sane-v4l.5
X-
X-pre-configure:
X- @${ECHO} "*** Note: SANE can be built with an X scanner interface"
X- @${ECHO} "*** (xscanimage) as well as a GIMP plug-in. If you wish"
X- @${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
X- @${ECHO} "*** the GIMP and GTK packages/ports."
X-
X-post-install:
X- @${CAT} ${PKGMESSAGE}
X
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/graphics/sane/distinfo graphics/sane-backends/distinfo
X--- /usr/ports/graphics/sane/distinfo Sun Sep 17 03:12:04 2000
X+++ graphics/sane-backends/distinfo Mon Dec 25 20:16:19 2000
X@@ -1 +1 @@
X-MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
X+MD5 (sane-backends-1.0.4.tar.gz) = 9c265548bc5b628e6cc614124d49b00e
Xdiff -urN /usr/ports/graphics/sane/files/patch-ab graphics/sane-backends/files/patch-ab
X--- /usr/ports/graphics/sane/files/patch-ab Sun Apr 30 08:44:19 2000
X+++ graphics/sane-backends/files/patch-ab Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X---- backend/artec.c.orig Sun Mar 5 22:40:43 2000
X-+++ backend/artec.c Wed Apr 19 06:00:00 2000
X-@@ -3238,7 +3238,11 @@
X- if (DBG_LEVEL == 101)
X- {
X- debug_fd = open ("artec.data.raw",
X-+#ifdef __FreeBSD__
X-+ O_WRONLY | O_CREAT | O_TRUNC, 0666);
X-+#else
X- O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666);
X-+#endif
X- if (debug_fd > -1)
X- DBG (101, "opened artec.data.raw output file\n");
X- }
Xdiff -urN /usr/ports/graphics/sane/files/patch-ac graphics/sane-backends/files/patch-ac
X--- /usr/ports/graphics/sane/files/patch-ac Sun Apr 30 08:44:20 2000
X+++ graphics/sane-backends/files/patch-ac Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X---- backend/Makefile.in.orig Sun Mar 5 22:40:35 2000
X-+++ backend/Makefile.in Wed Apr 19 06:00:00 2000
X-@@ -113,7 +113,7 @@
X- nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
X- (cd ..; $(LN_S) sane/$$n $$nn); \
X- done || exit 1
X-- $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
X-+ $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
X- @list="$(CONFIGS)"; for cfg in $$list; do \
X- if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
X- if test -f $(configdir)/$${cfg}; then \
Xdiff -urN /usr/ports/graphics/sane/files/patch-ae graphics/sane-backends/files/patch-ae
X--- /usr/ports/graphics/sane/files/patch-ae Sun Sep 17 03:12:05 2000
X+++ graphics/sane-backends/files/patch-ae Sat Dec 23 04:36:42 2000
X@@ -1,6 +1,6 @@
X---- sanei/sanei_scsi.c.orig Sat Aug 12 23:54:15 2000
X-+++ sanei/sanei_scsi.c Fri Sep 8 22:38:49 2000
X-@@ -2424,6 +2424,169 @@
X+--- sanei/sanei_scsi.c.orig Fri Dec 1 05:02:30 2000
X++++ sanei/sanei_scsi.c Sat Dec 23 04:14:27 2000
X+@@ -2425,6 +2425,169 @@
X cam_freeccb(ccb);
X return SANE_STATUS_GOOD;
X }
X@@ -169,12 +169,4 @@
X +
X #endif
X
X-
X-@@ -3722,6 +3885,7 @@
X- int findbus, int findchannel, int findid, int findlun,
X- SANE_Status (*attach) (const char *dev))
X- {
X-+ DBG_INIT();
X- DBG (1, "sanei_scsi_find_devices: not implemented for this platform\n");
X- }
X
Xdiff -urN /usr/ports/graphics/sane/files/patch-af graphics/sane-backends/files/patch-af
X--- /usr/ports/graphics/sane/files/patch-af Sat Nov 18 12:56:52 2000
X+++ graphics/sane-backends/files/patch-af Thu Jan 1 09:00:00 1970
X@@ -1,12 +0,0 @@
X---- frontend/xscanimage.c.orig Sun Oct 15 08:12:12 2000
X-+++ frontend/xscanimage.c Sun Oct 15 08:12:39 2000
X-@@ -57,6 +57,8 @@
X-
X- #ifdef HAVE_LIBGIMP_GIMP_H
X-
X-+#define GIMP_ENABLE_COMPAT_CRUFT
X-+
X- #include <libgimp/gimp.h>
X-
X- static void query (void);
X-
Xdiff -urN /usr/ports/graphics/sane/files/patch-ag graphics/sane-backends/files/patch-ag
X--- /usr/ports/graphics/sane/files/patch-ag Thu Jan 1 09:00:00 1970
X+++ graphics/sane-backends/files/patch-ag Wed Feb 7 00:28:38 2001
X@@ -0,0 +1,15 @@
X+--- sanei/sanei_pa4s2.c.orig Sun Oct 8 22:58:42 2000
X++++ sanei/sanei_pa4s2.c Wed Feb 7 00:28:27 2001
X+@@ -89,6 +89,12 @@
X+ #define IO_SUPPORT_MISSING
X+ #endif
X+
X++#if defined(__FreeBSD__) && defined(__i386__)
X++#define HAVE_IOPERM
X++#define ioperm i386_set_ioperm
X++#include <machine/sysarch.h>
X++#endif
X++
X+ #include "sane/sane.h"
X+ #include "sane/sanei.h"
X+ #include "sane/sanei_pa4s2.h"
Xdiff -urN /usr/ports/graphics/sane/pkg-descr graphics/sane-backends/pkg-descr
X--- /usr/ports/graphics/sane/pkg-descr Mon Feb 14 01:09:30 2000
X+++ graphics/sane-backends/pkg-descr Sat Dec 23 06:11:46 2000
X@@ -1,9 +1,14 @@
X-SANE is a universal scanner interface. The value of such a universal
X-interface is that it allows writing just one driver per image acquisition
X-device rather than one driver for each device and application. So, if you
X-have three applications and four devices, traditionally you'd have had to
X-write 12 different programs. With SANE, this number is reduced to seven:
X-the three applications plus the four drivers. Of course, the savings get
X-even bigger as more and more drivers and/or applications are added.
X+SANE ("Scanner Access Now Easy") is a universal scanner interface.
X+The value of such a universal interface is that it allows writing
X+just one driver per image acquisition device rather than one driver
X+for each device and application. So, if you have three applications
X+and four devices, traditionally you'd have had to write 12 different
X+programs. With SANE, this number is reduced to seven: the three
X+applications plus the four drivers. Of course, the savings get even
X+bigger as more and more drivers and/or applications are added.
X+
X+sane-backends cotains documentation, several backends, scanimage
X+command line frontend, and networking support. For other/graphical
X+frontends take a look at sane-frontends and/or xsane.
X
X WWW: http://www.mostang.com/sane/
Xdiff -urN /usr/ports/graphics/sane/pkg-message graphics/sane-backends/pkg-message
X--- /usr/ports/graphics/sane/pkg-message Sat Apr 3 23:55:01 1999
X+++ graphics/sane-backends/pkg-message Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X-Congratulations, SANE is now installed.
X-
X-If you built it with GIMP and GTK packages/ports installed, you can
X-use SANE as a GIMP plug-in. To do this, as root, type:
X-
X-ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/1.1/plug-ins/xscanimage
X-
X-Then run the GIMP, and a new "Acquire" menu item should appear in the
X-"Xtras" menu. Use this to access your scanner.
X-
X-Have fun!
Xdiff -urN /usr/ports/graphics/sane/pkg-plist graphics/sane-backends/pkg-plist
X--- /usr/ports/graphics/sane/pkg-plist Sun Sep 17 03:12:06 2000
X+++ graphics/sane-backends/pkg-plist Sat Dec 23 05:26:46 2000
X@@ -1,7 +1,5 @@
X bin/sane-config
X bin/scanimage
X-bin/xcam
X-bin/xscanimage
X etc/sane.d/abaton.conf
X etc/sane.d/agfafocus.conf
X etc/sane.d/apple.conf
X@@ -19,7 +17,9 @@
X etc/sane.d/microtek2.conf
X etc/sane.d/mustek.conf
X etc/sane.d/mustek_pp.conf
X+etc/sane.d/nec.conf
X etc/sane.d/net.conf
X+etc/sane.d/pie.conf
X etc/sane.d/plustek.conf
X etc/sane.d/ricoh.conf
X etc/sane.d/s9036.conf
X@@ -30,17 +30,7 @@
X etc/sane.d/st400.conf
X etc/sane.d/tamarack.conf
X etc/sane.d/umax.conf
X-include/sane/config.h
X include/sane/sane.h
X-include/sane/sanei.h
X-include/sane/sanei_backend.h
X-include/sane/sanei_codec_ascii.h
X-include/sane/sanei_codec_bin.h
X-include/sane/sanei_debug.h
X-include/sane/sanei_net.h
X-include/sane/sanei_pa4s2.h
X-include/sane/sanei_scsi.h
X-include/sane/sanei_wire.h
X include/sane/saneopts.h
X lib/libsane.a
X lib/libsane.so
X@@ -57,6 +47,9 @@
X lib/sane/libsane-artec.a
X lib/sane/libsane-artec.so
X lib/sane/libsane-artec.so.1
X+lib/sane/libsane-as6e.a
X+lib/sane/libsane-as6e.so
X+lib/sane/libsane-as6e.so.1
X lib/sane/libsane-avision.a
X lib/sane/libsane-avision.so
X lib/sane/libsane-avision.so.1
X@@ -99,9 +92,15 @@
X lib/sane/libsane-mustek_pp.a
X lib/sane/libsane-mustek_pp.so
X lib/sane/libsane-mustek_pp.so.1
X+lib/sane/libsane-nec.a
X+lib/sane/libsane-nec.so
X+lib/sane/libsane-nec.so.1
X lib/sane/libsane-net.a
X lib/sane/libsane-net.so
X lib/sane/libsane-net.so.1
X+lib/sane/libsane-pie.a
X+lib/sane/libsane-pie.so
X+lib/sane/libsane-pie.so.1
X lib/sane/libsane-plustek.a
X lib/sane/libsane-plustek.so
X lib/sane/libsane-plustek.so.1
X@@ -133,7 +132,6 @@
X lib/sane/libsane-umax.so
X lib/sane/libsane-umax.so.1
X sbin/saned
X-share/sane-style.rc
X @dirrm lib/sane
X @dirrm include/sane
X @dirrm etc/sane.d
END-of-graphics_sane-backends.patch
echo x - graphics_sane-frontends.patch
sed 's/^X//' >graphics_sane-frontends.patch << 'END-of-graphics_sane-frontends.patch'
Xdiff -urN /usr/ports/graphics/sane/Makefile graphics/sane-frontends/Makefile
X--- /usr/ports/graphics/sane/Makefile Tue Feb 6 02:55:41 2001
X+++ graphics/sane-frontends/Makefile Wed Feb 7 00:42:15 2001
X@@ -1,13 +1,12 @@
X-# New ports collection makefile for: sane
X+# New ports collection makefile for: sane-frontends
X # Date created: Sat Jul 19 16:23:10 MET DST 1997
X # Whom: gary@hotlava.com
X #
X # $FreeBSD: ports/graphics/sane/Makefile,v 1.30 2001/02/05 15:57:18 olgeni Exp $
X #
X
X-PORTNAME= sane
X-PORTVERSION= 1.0.3
X-PORTREVISION= 1
X+PORTNAME= sane-frontends
X+PORTVERSION= 1.0.4
X CATEGORIES= graphics
X MASTER_SITES= ${MASTER_SITE_SUNSITE} \
X ftp://ftp.mostang.com/pub/sane/
X@@ -15,30 +14,30 @@
X
X MAINTAINER= ports@FreeBSD.org
X
X-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
X+LIB_DEPENDS= sane.1:${PORTSDIR}/graphics/sane-backends
X
X-USE_GMAKE= yes
X-USE_LIBTOOL= yes
X USE_GTK= yes
X-INSTALLS_SHLIB= yes
X+USE_GMAKE= yes
X+GNU_CONFIGURE= yes
X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
X LIBS="-L${LOCALBASE}/lib"
X
X-MAN1= saned.1 scanimage.1 xcam.1 xscanimage.1
X-MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
X- sane-avision.5 sane-canon.5 sane-coolscan.5 sane-dc210.5 \
X- sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
X- sane-fujitsu.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
X- sane-mustek.5 sane-mustek_pp.5 sane-net.5 sane-pint.5 \
X- sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
X- sane-s9036.5 sane-scsi.5 sane-sharp.5 sane-snapscan.5 \
X- sane-st400.5 sane-tamarack.5 sane-umax.5 sane-v4l.5
X-
X-pre-configure:
X- @${ECHO} "*** Note: SANE can be built with an X scanner interface"
X- @${ECHO} "*** (xscanimage) as well as a GIMP plug-in. If you wish"
X- @${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
X- @${ECHO} "*** the GIMP and GTK packages/ports."
X+MAN1= xcam.1 xscanimage.1
X+
X+.if defined(WITH_GIMP)
X+LIB_DEPENDS+= gimp.1:${PORTSDIR}/graphics/gimp1
X+CONFIGURE_ARGS+= --enable-gimp
X+.else
X+CONFIGURE_ARGS+= --disable-gimp
X+.endif
X+
X+pre-everything:
X+.if !defined(WITH_GIMP)
X+ @${ECHO_MSG} "*** Note: xscanimage can be built with a standalone"
X+ @${ECHO_MSG} "*** X scanner interface as well as a GIMP plug-in."
X+ @${ECHO_MSG} "*** If you wish to do this, hit Ctrl-C now and use"
X+ @${ECHO_MSG} "*** \"WITH_GIMP=yes\""
X+.endif
X
X post-install:
X @${CAT} ${PKGMESSAGE}
Xdiff -urN /usr/ports/graphics/sane/distinfo graphics/sane-frontends/distinfo
X--- /usr/ports/graphics/sane/distinfo Sun Sep 17 03:12:04 2000
X+++ graphics/sane-frontends/distinfo Sat Dec 23 04:19:45 2000
X@@ -1 +1 @@
X-MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
X+MD5 (sane-frontends-1.0.4.tar.gz) = f8d1d0afba88f1d1604c67e14738b74d
Xdiff -urN /usr/ports/graphics/sane/files/patch-ab graphics/sane-frontends/files/patch-ab
X--- /usr/ports/graphics/sane/files/patch-ab Sun Apr 30 08:44:19 2000
X+++ graphics/sane-frontends/files/patch-ab Thu Jan 1 09:00:00 1970
X@@ -1,14 +0,0 @@
X---- backend/artec.c.orig Sun Mar 5 22:40:43 2000
X-+++ backend/artec.c Wed Apr 19 06:00:00 2000
X-@@ -3238,7 +3238,11 @@
X- if (DBG_LEVEL == 101)
X- {
X- debug_fd = open ("artec.data.raw",
X-+#ifdef __FreeBSD__
X-+ O_WRONLY | O_CREAT | O_TRUNC, 0666);
X-+#else
X- O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666);
X-+#endif
X- if (debug_fd > -1)
X- DBG (101, "opened artec.data.raw output file\n");
X- }
Xdiff -urN /usr/ports/graphics/sane/files/patch-ac graphics/sane-frontends/files/patch-ac
X--- /usr/ports/graphics/sane/files/patch-ac Sun Apr 30 08:44:20 2000
X+++ graphics/sane-frontends/files/patch-ac Thu Jan 1 09:00:00 1970
X@@ -1,11 +0,0 @@
X---- backend/Makefile.in.orig Sun Mar 5 22:40:35 2000
X-+++ backend/Makefile.in Wed Apr 19 06:00:00 2000
X-@@ -113,7 +113,7 @@
X- nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
X- (cd ..; $(LN_S) sane/$$n $$nn); \
X- done || exit 1
X-- $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
X-+ $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
X- @list="$(CONFIGS)"; for cfg in $$list; do \
X- if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
X- if test -f $(configdir)/$${cfg}; then \
Xdiff -urN /usr/ports/graphics/sane/files/patch-ad graphics/sane-frontends/files/patch-ad
X--- /usr/ports/graphics/sane/files/patch-ad Sun Apr 30 08:44:20 2000
X+++ graphics/sane-frontends/files/patch-ad Thu Jan 1 09:00:00 1970
X@@ -1,19 +0,0 @@
X---- tools/Makefile.in.orig Sun Mar 5 22:45:19 2000
X-+++ tools/Makefile.in Wed Apr 19 06:00:00 2000
X-@@ -25,6 +25,7 @@
X- MKDIR = $(top_srcdir)/mkinstalldirs
X- INSTALL = @INSTALL@
X- INSTALL_PROGRAM = @INSTALL_PROGRAM@
X-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
X- INSTALL_DATA = @INSTALL_DATA@
X- RANLIB = @RANLIB@
X-
X-@@ -65,7 +66,7 @@
X- all: $(DESTINATIONS)
X-
X- install: sane-config
X-- $(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
X-+ $(INSTALL_SCRIPT) sane-config $(bindir)/sane-config
X-
X- sane-config: sane-config.in $(top_builddir)/config.status
X- cd $(top_builddir) \
Xdiff -urN /usr/ports/graphics/sane/files/patch-ae graphics/sane-frontends/files/patch-ae
X--- /usr/ports/graphics/sane/files/patch-ae Sun Sep 17 03:12:05 2000
X+++ graphics/sane-frontends/files/patch-ae Thu Jan 1 09:00:00 1970
X@@ -1,180 +0,0 @@
X---- sanei/sanei_scsi.c.orig Sat Aug 12 23:54:15 2000
X-+++ sanei/sanei_scsi.c Fri Sep 8 22:38:49 2000
X-@@ -2424,6 +2424,169 @@
X- cam_freeccb(ccb);
X- return SANE_STATUS_GOOD;
X- }
X-+
X-+#define WE_HAVE_FIND_DEVICES
X-+
X-+int
X-+cam_compare_inquiry(int fd, path_id_t path_id,
X-+ target_id_t target_id, lun_id_t target_lun,
X-+ const char *vendor, const char *product, const char *type)
X-+{
X-+ struct ccb_dev_match cdm;
X-+ struct device_match_pattern *pattern;
X-+ struct scsi_inquiry_data *inq;
X-+ int retval = 0;
X-+
X-+ /* build ccb for device match */
X-+ bzero(&cdm, sizeof(cdm));
X-+ cdm.ccb_h.func_code = XPT_DEV_MATCH;
X-+
X-+ /* result buffer */
X-+ cdm.match_buf_len = sizeof(struct dev_match_result);
X-+ cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len);
X-+ cdm.num_matches = 0;
X-+
X-+ /* pattern buffer */
X-+ cdm.num_patterns = 1;
X-+ cdm.pattern_buf_len = sizeof(struct dev_match_pattern);
X-+ cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len);
X-+
X-+ /* assemble conditions */
X-+ cdm.patterns[0].type = DEV_MATCH_DEVICE;
X-+ pattern = &cdm.patterns[0].pattern.device_pattern;
X-+ pattern->flags = DEV_MATCH_PATH | DEV_MATCH_TARGET | DEV_MATCH_LUN;
X-+ pattern->path_id = path_id;
X-+ pattern->target_id = target_id;
X-+ pattern->target_lun = target_lun;
X-+
X-+ if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) {
X-+ DBG (1, "error sending CAMIOCOMMAND ioctl");
X-+ retval = -1;
X-+ goto ret;
X-+ }
X-+
X-+ if ((cdm.ccb_h.status != CAM_REQ_CMP)
X-+ || ((cdm.status != CAM_DEV_MATCH_LAST)
X-+ && (cdm.status != CAM_DEV_MATCH_MORE))) {
X-+ DBG (1, "got CAM error %#x, CDM error %d\n",
X-+ cdm.ccb_h.status, cdm.status);
X-+ retval = -1;
X-+ goto ret;
X-+ }
X-+
X-+ if (cdm.num_matches == 0) {
X-+ DBG (1, "not found\n");
X-+ retval = -1;
X-+ goto ret;
X-+ }
X-+
X-+ if (cdm.matches[0].type != DEV_MATCH_DEVICE) {
X-+ DBG (1, "no device match\n");
X-+ retval = -1;
X-+ goto ret;
X-+ }
X-+
X-+ inq = &cdm.matches[0].result.device_result.inq_data;
X-+ if ((vendor && cam_strmatch(inq->vendor, vendor, SID_VENDOR_SIZE)) ||
X-+ (product && cam_strmatch(inq->product, product, SID_PRODUCT_SIZE)))
X-+ retval = 1;
X-+
X-+ ret:
X-+ free(cdm.patterns);
X-+ free(cdm.matches);
X-+ return(retval);
X-+}
X-+
X-+void
X-+sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
X-+ const char *findtype,
X-+ int findbus, int findchannel, int findid, int findlun,
X-+ SANE_Status (*attach) (const char *dev))
X-+{
X-+ int fd;
X-+ struct ccb_dev_match cdm;
X-+ struct periph_match_pattern *pattern;
X-+ struct periph_match_result *result;
X-+ int i;
X-+ char devname[16];
X-+
X-+ DBG_INIT();
X-+
X-+ if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) {
X-+ DBG (1, "could not open %s\n", XPT_DEVICE);
X-+ return;
X-+ }
X-+
X-+ /* build ccb for device match */
X-+ bzero(&cdm, sizeof(cdm));
X-+ cdm.ccb_h.func_code = XPT_DEV_MATCH;
X-+
X-+ /* result buffer */
X-+ cdm.match_buf_len = sizeof(struct dev_match_result) * 100;
X-+ cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len);
X-+ cdm.num_matches = 0;
X-+
X-+ /* pattern buffer */
X-+ cdm.num_patterns = 1;
X-+ cdm.pattern_buf_len = sizeof(struct dev_match_pattern);
X-+ cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len);
X-+
X-+ /* assemble conditions ... findchannel is ignored */
X-+ cdm.patterns[0].type = DEV_MATCH_PERIPH;
X-+ pattern = &cdm.patterns[0].pattern.periph_pattern;
X-+ pattern->flags = PERIPH_MATCH_NAME;
X-+ strcpy(pattern->periph_name, "pass");
X-+ if (findbus != -1) {
X-+ pattern->path_id = findbus;
X-+ pattern->flags |= PERIPH_MATCH_PATH;
X-+ }
X-+ if (findid != -1) {
X-+ pattern->target_id = findid;
X-+ pattern->flags |= PERIPH_MATCH_TARGET;
X-+ }
X-+ if (findlun != -1) {
X-+ pattern->target_lun = findlun;
X-+ pattern->flags |= PERIPH_MATCH_LUN;
X-+ }
X-+
X-+ /* result loop */
X-+ do {
X-+ if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) {
X-+ DBG (1, "error sending CAMIOCOMMAND ioctl");
X-+ break;
X-+ }
X-+
X-+ if ((cdm.ccb_h.status != CAM_REQ_CMP)
X-+ || ((cdm.status != CAM_DEV_MATCH_LAST)
X-+ && (cdm.status != CAM_DEV_MATCH_MORE))) {
X-+ DBG (1, "got CAM error %#x, CDM error %d\n",
X-+ cdm.ccb_h.status, cdm.status);
X-+ break;
X-+ }
X-+
X-+ for (i = 0; i < cdm.num_matches; i++) {
X-+ if (cdm.matches[i].type != DEV_MATCH_PERIPH)
X-+ continue;
X-+ result = &cdm.matches[i].result.periph_result;
X-+ DBG (4, "%s%d on scbus%d %d:%d\n",
X-+ result->periph_name, result->unit_number,
X-+ result->path_id, result->target_id, result->target_lun);
X-+ if (cam_compare_inquiry(fd, result->path_id,
X-+ result->target_id, result->target_lun,
X-+ findvendor, findmodel, findtype) == 0) {
X-+ sprintf(devname, "/dev/%s%d", result->periph_name, result->unit_number);
X-+ (*attach) (devname);
X-+ }
X-+ }
X-+ } while ((cdm.ccb_h.status == CAM_REQ_CMP)
X-+ && (cdm.status == CAM_DEV_MATCH_MORE));
X-+
X-+ free(cdm.patterns);
X-+ free(cdm.matches);
X-+ close(fd);
X-+ return;
X-+}
X-+
X- #endif
X-
X-
X-@@ -3722,6 +3885,7 @@
X- int findbus, int findchannel, int findid, int findlun,
X- SANE_Status (*attach) (const char *dev))
X- {
X-+ DBG_INIT();
X- DBG (1, "sanei_scsi_find_devices: not implemented for this platform\n");
X- }
X-
Xdiff -urN /usr/ports/graphics/sane/files/patch-af graphics/sane-frontends/files/patch-af
X--- /usr/ports/graphics/sane/files/patch-af Sat Nov 18 12:56:52 2000
X+++ graphics/sane-frontends/files/patch-af Thu Jan 1 09:00:00 1970
X@@ -1,12 +0,0 @@
X---- frontend/xscanimage.c.orig Sun Oct 15 08:12:12 2000
X-+++ frontend/xscanimage.c Sun Oct 15 08:12:39 2000
X-@@ -57,6 +57,8 @@
X-
X- #ifdef HAVE_LIBGIMP_GIMP_H
X-
X-+#define GIMP_ENABLE_COMPAT_CRUFT
X-+
X- #include <libgimp/gimp.h>
X-
X- static void query (void);
X-
Xdiff -urN /usr/ports/graphics/sane/files/patch-ag graphics/sane-frontends/files/patch-ag
X--- /usr/ports/graphics/sane/files/patch-ag Thu Jan 1 09:00:00 1970
X+++ graphics/sane-frontends/files/patch-ag Wed Feb 7 00:14:10 2001
X@@ -0,0 +1,17 @@
X+--- src/Makefile.in.orig Fri Dec 1 04:58:38 2000
X++++ src/Makefile.in Wed Feb 7 00:14:03 2001
X+@@ -59,12 +59,12 @@
X+ all: $(PROGRAMS)
X+
X+ install: $(PROGRAMS)
X+- $(MKDIR) $(bindir) $(datadir)
X++ $(MKDIR) $(bindir) $(sanedatadir)
X+ @for program in $(BINPROGS); do \
X+ $(INSTALL_PROGRAM) $${program} \
X+ $(bindir)/$${program}; \
X+ done
X+- $(INSTALL_DATA) $(srcdir)/sane-style.rc $(datadir)/sane-style.rc
X++ $(INSTALL_DATA) $(srcdir)/sane-style.rc $(sanedatadir)/sane-style.rc
X+
X+ xscanimage: $(XSCAN_OBJS) $(LIBSANEI) $(LIBLIB)
X+ $(LINK) $(XSCAN_OBJS) $(LIBSANEI) \
Xdiff -urN /usr/ports/graphics/sane/pkg-comment graphics/sane-frontends/pkg-comment
X--- /usr/ports/graphics/sane/pkg-comment Sun Jun 27 02:45:46 1999
X+++ graphics/sane-frontends/pkg-comment Sat Dec 23 04:28:30 2000
X@@ -1 +1 @@
X-API for access to scanners, digitals camera, frame grabbers etc
X+Tools for access to scanners, digitals camera, frame grabbers etc
Xdiff -urN /usr/ports/graphics/sane/pkg-descr graphics/sane-frontends/pkg-descr
X--- /usr/ports/graphics/sane/pkg-descr Mon Feb 14 01:09:30 2000
X+++ graphics/sane-frontends/pkg-descr Sat Dec 23 04:45:40 2000
X@@ -1,9 +1,15 @@
X-SANE is a universal scanner interface. The value of such a universal
X-interface is that it allows writing just one driver per image acquisition
X-device rather than one driver for each device and application. So, if you
X-have three applications and four devices, traditionally you'd have had to
X-write 12 different programs. With SANE, this number is reduced to seven:
X-the three applications plus the four drivers. Of course, the savings get
X-even bigger as more and more drivers and/or applications are added.
X+SANE ("Scanner Access Now Easy") is a universal scanner interface.
X+The value of such a universal interface is that it allows writing
X+just one driver per image acquisition device rather than one driver
X+for each device and application. So, if you have three applications
X+and four devices, traditionally you'd have had to write 12 different
X+programs. With SANE, this number is reduced to seven: the three
X+applications plus the four drivers. Of course, the savings get even
X+bigger as more and more drivers and/or applications are added.
X+
X+sane-frontends contains frontends to SANE including xscanimage and
X+xcam. Xscanimage is a GTK-based application for scanning images that
X+can also be used as a GIMP-plugin, and Xcam is used to get images
X+from cameras supported by SANE.
X
X WWW: http://www.mostang.com/sane/
Xdiff -urN /usr/ports/graphics/sane/pkg-plist graphics/sane-frontends/pkg-plist
X--- /usr/ports/graphics/sane/pkg-plist Sun Sep 17 03:12:06 2000
X+++ graphics/sane-frontends/pkg-plist Wed Feb 7 00:11:22 2001
X@@ -1,139 +1,4 @@
X-bin/sane-config
X-bin/scanimage
X bin/xcam
X bin/xscanimage
X-etc/sane.d/abaton.conf
X-etc/sane.d/agfafocus.conf
X-etc/sane.d/apple.conf
X-etc/sane.d/artec.conf
X-etc/sane.d/avision.conf
X-etc/sane.d/coolscan.conf
X-etc/sane.d/dc210.conf
X-etc/sane.d/dc25.conf
X-etc/sane.d/dll.conf
X-etc/sane.d/dmc.conf
X-etc/sane.d/epson.conf
X-etc/sane.d/hp.conf
X-etc/sane.d/m3096g.conf
X-etc/sane.d/microtek.conf
X-etc/sane.d/microtek2.conf
X-etc/sane.d/mustek.conf
X-etc/sane.d/mustek_pp.conf
X-etc/sane.d/net.conf
X-etc/sane.d/plustek.conf
X-etc/sane.d/ricoh.conf
X-etc/sane.d/s9036.conf
X-etc/sane.d/saned.conf
X-etc/sane.d/sharp.conf
X-etc/sane.d/snapscan.conf
X-etc/sane.d/sp15c.conf
X-etc/sane.d/st400.conf
X-etc/sane.d/tamarack.conf
X-etc/sane.d/umax.conf
X-include/sane/config.h
X-include/sane/sane.h
X-include/sane/sanei.h
X-include/sane/sanei_backend.h
X-include/sane/sanei_codec_ascii.h
X-include/sane/sanei_codec_bin.h
X-include/sane/sanei_debug.h
X-include/sane/sanei_net.h
X-include/sane/sanei_pa4s2.h
X-include/sane/sanei_scsi.h
X-include/sane/sanei_wire.h
X-include/sane/saneopts.h
X-lib/libsane.a
X-lib/libsane.so
X-lib/libsane.so.1
X-lib/sane/libsane-abaton.a
X-lib/sane/libsane-abaton.so
X-lib/sane/libsane-abaton.so.1
X-lib/sane/libsane-agfafocus.a
X-lib/sane/libsane-agfafocus.so
X-lib/sane/libsane-agfafocus.so.1
X-lib/sane/libsane-apple.a
X-lib/sane/libsane-apple.so
X-lib/sane/libsane-apple.so.1
X-lib/sane/libsane-artec.a
X-lib/sane/libsane-artec.so
X-lib/sane/libsane-artec.so.1
X-lib/sane/libsane-avision.a
X-lib/sane/libsane-avision.so
X-lib/sane/libsane-avision.so.1
X-lib/sane/libsane-canon.a
X-lib/sane/libsane-canon.so
X-lib/sane/libsane-canon.so.1
X-lib/sane/libsane-coolscan.a
X-lib/sane/libsane-coolscan.so
X-lib/sane/libsane-coolscan.so.1
X-lib/sane/libsane-dc210.a
X-lib/sane/libsane-dc210.so
X-lib/sane/libsane-dc210.so.1
X-lib/sane/libsane-dc25.a
X-lib/sane/libsane-dc25.so
X-lib/sane/libsane-dc25.so.1
X-lib/sane/libsane-dll.a
X-lib/sane/libsane-dll.so
X-lib/sane/libsane-dll.so.1
X-lib/sane/libsane-dmc.a
X-lib/sane/libsane-dmc.so
X-lib/sane/libsane-dmc.so.1
X-lib/sane/libsane-epson.a
X-lib/sane/libsane-epson.so
X-lib/sane/libsane-epson.so.1
X-lib/sane/libsane-hp.a
X-lib/sane/libsane-hp.so
X-lib/sane/libsane-hp.so.1
X-lib/sane/libsane-m3096g.a
X-lib/sane/libsane-m3096g.so
X-lib/sane/libsane-m3096g.so.1
X-lib/sane/libsane-microtek.a
X-lib/sane/libsane-microtek.so
X-lib/sane/libsane-microtek.so.1
X-lib/sane/libsane-microtek2.a
X-lib/sane/libsane-microtek2.so
X-lib/sane/libsane-microtek2.so.1
X-lib/sane/libsane-mustek.a
X-lib/sane/libsane-mustek.so
X-lib/sane/libsane-mustek.so.1
X-lib/sane/libsane-mustek_pp.a
X-lib/sane/libsane-mustek_pp.so
X-lib/sane/libsane-mustek_pp.so.1
X-lib/sane/libsane-net.a
X-lib/sane/libsane-net.so
X-lib/sane/libsane-net.so.1
X-lib/sane/libsane-plustek.a
X-lib/sane/libsane-plustek.so
X-lib/sane/libsane-plustek.so.1
X-lib/sane/libsane-pnm.a
X-lib/sane/libsane-pnm.so
X-lib/sane/libsane-pnm.so.1
X-lib/sane/libsane-ricoh.a
X-lib/sane/libsane-ricoh.so
X-lib/sane/libsane-ricoh.so.1
X-lib/sane/libsane-s9036.a
X-lib/sane/libsane-s9036.so
X-lib/sane/libsane-s9036.so.1
X-lib/sane/libsane-sharp.a
X-lib/sane/libsane-sharp.so
X-lib/sane/libsane-sharp.so.1
X-lib/sane/libsane-snapscan.a
X-lib/sane/libsane-snapscan.so
X-lib/sane/libsane-snapscan.so.1
X-lib/sane/libsane-sp15c.a
X-lib/sane/libsane-sp15c.so
X-lib/sane/libsane-sp15c.so.1
X-lib/sane/libsane-st400.a
X-lib/sane/libsane-st400.so
X-lib/sane/libsane-st400.so.1
X-lib/sane/libsane-tamarack.a
X-lib/sane/libsane-tamarack.so
X-lib/sane/libsane-tamarack.so.1
X-lib/sane/libsane-umax.a
X-lib/sane/libsane-umax.so
X-lib/sane/libsane-umax.so.1
X-sbin/saned
X-share/sane-style.rc
X-@dirrm lib/sane
X-@dirrm include/sane
X-@dirrm etc/sane.d
X+share/sane/sane-style.rc
X+@dirrm share/sane
END-of-graphics_sane-frontends.patch
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102071823.f17INjG94748>