Date: Fri, 21 Apr 2000 12:06:36 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18141: Update port: graphics/sane to 1.0.2 Message-ID: <200004211906.MAA27112@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18141
>Category: ports
>Synopsis: Update port: graphics/sane to 1.0.2
>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: Fri Apr 21 12:10:06 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.2
New file:
patches/patch-aa patches/patch-ab patches/patch-ac patches/patch-ad
Remove file:
patches/patch-01 patches/patch-04
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/sane/Makefile graphics/sane/Makefile
--- /usr/ports/graphics/sane/Makefile Sat Apr 15 00:25:38 2000
+++ graphics/sane/Makefile Wed Apr 19 04:19:04 2000
@@ -6,7 +6,7 @@
#
PORTNAME= sane
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.mostang.com/pub/sane/
@@ -19,40 +19,18 @@
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-.include <bsd.port.pre.mk>
-
USE_GMAKE= yes
USE_LIBTOOL= yes
-.if ${OSVERSION} < 300000
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- GTK_CONFIG="${GTK_CONFIG}"
-.else
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lcam" \
- GTK_CONFIG="${GTK_CONFIG}"
-.endif
-
-MAN1= scanimage.1 \
- xscanimage.1 \
- saned.1
-MAN5= sane-abaton.5 \
- sane-agfafocus.5 \
- sane-apple.5 \
- sane-dc25.5 \
- sane-dll.5 \
- sane-dmc.5 \
- sane-epson.5 \
- sane-hp.5 \
- sane-microtek.5 \
- sane-microtek2.5 \
- sane-mustek.5 \
- sane-net.5 \
- sane-pint.5 \
- sane-pnm.5 \
- sane-qcam.5 \
- sane-scsi.5 \
- sane-umax.5
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ GTK_CONFIG="${GTK_CONFIG}" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-gtktest
+
+MAN1= saned.1 scanimage.1 xscanimage.1
+MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-dll.5 sane-dc25.5 \
+ sane-dmc.5 sane-epson.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
+ sane-mustek.5 sane-net.5 sane-pint.5 sane-pnm.5 sane-umax.5 \
+ sane-qcam.5 sane-scsi.5 sane-artec.5 sane-fujitsu.5 sane-sharp.5
pre-configure:
@${ECHO} "*** Note: SANE can be built with an X scanner interface"
@@ -61,6 +39,6 @@
@${ECHO} "*** the GIMP and GTK packages/ports."
post-install:
- @${CAT} ${PKGDIR}/MESSAGE
+ @${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/sane/files/md5 graphics/sane/files/md5
--- /usr/ports/graphics/sane/files/md5 Sat May 22 13:36:08 1999
+++ graphics/sane/files/md5 Tue Mar 7 21:13:53 2000
@@ -1 +1 @@
-MD5 (sane-1.0.1.tar.gz) = d7989b2b18505c72b8568d11b56bb97a
+MD5 (sane-1.0.2.tar.gz) = 8cd5d092225f98032db88a221a1d6efe
diff -urN /usr/ports/graphics/sane/patches/patch-01 graphics/sane/patches/patch-01
--- /usr/ports/graphics/sane/patches/patch-01 Sat May 22 13:36:10 1999
+++ graphics/sane/patches/patch-01 Thu Jan 1 09:00:00 1970
@@ -1,29 +0,0 @@
---- configure Sat Apr 17 13:22:38 1999
-+++ configure.new Thu May 13 12:46:14 1999
-@@ -2712,22 +2712,22 @@
- echo "$ac_t""$NM" 1>&6
-
-
--echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-+echo $ac_n "checking whether ln -sf works""... $ac_c" 1>&6
- echo "configure:2717: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- rm -f conftestdata
--if ln -s X conftestdata 2>/dev/null
-+if ln -sf X conftestdata 2>/dev/null
- then
- rm -f conftestdata
-- ac_cv_prog_LN_S="ln -s"
-+ ac_cv_prog_LN_S="ln -sf"
- else
- ac_cv_prog_LN_S=ln
- fi
- fi
- LN_S="$ac_cv_prog_LN_S"
--if test "$ac_cv_prog_LN_S" = "ln -s"; then
-+if test "$ac_cv_prog_LN_S" = "ln -sf"; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
diff -urN /usr/ports/graphics/sane/patches/patch-04 graphics/sane/patches/patch-04
--- /usr/ports/graphics/sane/patches/patch-04 Sat Jan 15 05:49:55 2000
+++ graphics/sane/patches/patch-04 Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- frontend/xscanimage.c.orig Fri Jan 14 12:44:19 2000
-+++ frontend/xscanimage.c Fri Jan 14 12:44:30 2000
-@@ -75,7 +75,7 @@
-
- enum
- {
-- STANDALONE, GIMP_EXTENSION
-+ STANDALONE
- };
-
- static struct
diff -urN /usr/ports/graphics/sane/patches/patch-aa graphics/sane/patches/patch-aa
--- /usr/ports/graphics/sane/patches/patch-aa Thu Jan 1 09:00:00 1970
+++ graphics/sane/patches/patch-aa Thu Apr 20 02:04:18 2000
@@ -0,0 +1,11 @@
+--- frontend/xscanimage.c.orig Sun Mar 5 22:44:52 2000
++++ frontend/xscanimage.c Wed Apr 19 06:00:00 2000
+@@ -75,7 +75,7 @@
+
+ enum
+ {
+- STANDALONE, SANE_GIMP_EXTENSION
++ STANDALONE
+ };
+
+ static struct
diff -urN /usr/ports/graphics/sane/patches/patch-ab graphics/sane/patches/patch-ab
--- /usr/ports/graphics/sane/patches/patch-ab Thu Jan 1 09:00:00 1970
+++ graphics/sane/patches/patch-ab Wed Apr 19 06:41:39 2000
@@ -0,0 +1,14 @@
+--- backend/artec.c.orig Sun Mar 5 22:40:43 2000
++++ backend/artec.c Wed Apr 19 06:00:00 2000
+@@ -3238,7 +3238,11 @@
+ if (DBG_LEVEL == 101)
+ {
+ debug_fd = open ("artec.data.raw",
++#ifdef __FreeBSD__
++ O_WRONLY | O_CREAT | O_TRUNC, 0666);
++#else
+ O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666);
++#endif
+ if (debug_fd > -1)
+ DBG (101, "opened artec.data.raw output file\n");
+ }
diff -urN /usr/ports/graphics/sane/patches/patch-ac graphics/sane/patches/patch-ac
--- /usr/ports/graphics/sane/patches/patch-ac Thu Jan 1 09:00:00 1970
+++ graphics/sane/patches/patch-ac Wed Apr 19 06:41:50 2000
@@ -0,0 +1,11 @@
+--- backend/Makefile.in.orig Sun Mar 5 22:40:35 2000
++++ backend/Makefile.in Wed Apr 19 06:00:00 2000
+@@ -113,7 +113,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
++ $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) 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 -urN /usr/ports/graphics/sane/patches/patch-ad graphics/sane/patches/patch-ad
--- /usr/ports/graphics/sane/patches/patch-ad Thu Jan 1 09:00:00 1970
+++ graphics/sane/patches/patch-ad Wed Apr 19 06:42:07 2000
@@ -0,0 +1,19 @@
+--- tools/Makefile.in.orig Sun Mar 5 22:45:19 2000
++++ tools/Makefile.in Wed Apr 19 06:00:00 2000
+@@ -25,6 +25,7 @@
+ MKDIR = $(top_srcdir)/mkinstalldirs
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ RANLIB = @RANLIB@
+
+@@ -65,7 +66,7 @@
+ all: $(DESTINATIONS)
+
+ install: sane-config
+- $(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
++ $(INSTALL_SCRIPT) sane-config $(bindir)/sane-config
+
+ sane-config: sane-config.in $(top_builddir)/config.status
+ cd $(top_builddir) \
diff -urN /usr/ports/graphics/sane/pkg/PLIST graphics/sane/pkg/PLIST
--- /usr/ports/graphics/sane/pkg/PLIST Mon Feb 14 01:09:30 2000
+++ graphics/sane/pkg/PLIST Wed Apr 19 06:27:36 2000
@@ -5,6 +5,7 @@
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/dc210.conf
etc/sane.d/dc25.conf
@@ -12,6 +13,7 @@
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
@@ -21,6 +23,7 @@
etc/sane.d/saned.conf
etc/sane.d/sharp.conf
etc/sane.d/snapscan.conf
+etc/sane.d/sp15c.conf
etc/sane.d/tamarack.conf
etc/sane.d/umax.conf
include/sane/config.h
@@ -49,6 +52,9 @@
lib/sane/libsane-artec.a
lib/sane/libsane-artec.so
lib/sane/libsane-artec.so.1
+lib/sane/libsane-avision.a
+lib/sane/libsane-avision.so
+lib/sane/libsane-avision.so.1
lib/sane/libsane-canon.a
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
@@ -73,6 +79,9 @@
lib/sane/libsane-hp.a
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
+lib/sane/libsane-m3096g.a
+lib/sane/libsane-m3096g.so
+lib/sane/libsane-m3096g.so.1
lib/sane/libsane-microtek.a
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek.so.1
@@ -100,14 +109,17 @@
lib/sane/libsane-snapscan.a
lib/sane/libsane-snapscan.so
lib/sane/libsane-snapscan.so.1
+lib/sane/libsane-sp15c.a
+lib/sane/libsane-sp15c.so
+lib/sane/libsane-sp15c.so.1
lib/sane/libsane-tamarack.a
lib/sane/libsane-tamarack.so
lib/sane/libsane-tamarack.so.1
lib/sane/libsane-umax.a
lib/sane/libsane-umax.so
lib/sane/libsane-umax.so.1
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+@unexec /sbin/ldconfig -R
sbin/saned
share/sane-style.rc
@dirrm lib/sane
>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?200004211906.MAA27112>