Date: Tue, 5 May 1998 02:14:24 -0700 (PDT) From: dburr@POBoxes.com To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6523: Update port graphics/sane to 0.72 Message-ID: <199805050914.CAA29621@colossus.dyn.ml.org>
next in thread | raw e-mail | index | archive | help
>Number: 6523
>Category: ports
>Synopsis: Update port graphics/sane to 0.72
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 5 02:20:00 PDT 1998
>Last-Modified:
>Originator: Donald Burr
>Organization:
Computer Help
>Release: FreeBSD 2.2.6-RELEASE i386
>Environment:
Built and tested (successfully) on:
FreeBSD 2.2.6-RELEASE
Adaptec AHA-2940AU PCI SCSI
UMAX Astra 1200S scanner
with: GIMP 0.99.28, GTK 1.0.0
>Description:
SANE has been updated to version 0.72. This version fixes many bugs and
adds some new supported scanners.
>How-To-Repeat:
>Fix:
#!/bin/sh
# This is a shell archive (produced by GNU sharutils 4.1.4).
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
#
# Made on 1998-05-05 02:12 PDT by <dburr@control.colossus.dyn.ml.org>.
# Source directory was `/usr/ports/graphics'.
#
# Existing files will *not* be overwritten unless `-c' is specified.
#
# This shar contains:
# length mode name
# ------ ---------- ------------------------------------------
# 58 -rw-r--r-- sane/files/md5
# 80 -rw-r--r-- sane/pkg/COMMENT
# 599 -rw-r--r-- sane/pkg/DESCR
# 2552 -rw-r--r-- sane/pkg/PLIST
# 341 -rw-r--r-- sane/patches/patch-aa
# 553 -rw-r--r-- sane/patches/patch-ab
# 529 -rw-r--r-- sane/patches/patch-ac
# 352 -rw-r--r-- sane/patches/patch-ad
# 1424 -rw-r--r-- sane/Makefile
#
touch -am 1231235999 $$.touch >/dev/null 2>&1
if test ! -f 1231235999 && test -f $$.touch; then
shar_touch=touch
else
shar_touch=:
echo
echo 'WARNING: not restoring timestamps. Consider getting and'
echo "installing GNU \`touch', distributed in GNU File Utilities..."
echo
fi
rm -f 1231235999 $$.touch
#
# ============= sane/files/md5 ==============
if test ! -d 'sane'; then
echo 'x - creating directory sane'
mkdir 'sane'
fi
if test ! -d 'sane/files'; then
echo 'x - creating directory sane/files'
mkdir 'sane/files'
fi
if test -f 'sane/files/md5' && test X"$1" != X"-c"; then
echo 'x - skipping sane/files/md5 (file already exists)'
else
echo 'x - extracting sane/files/md5 (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/files/md5' &&
MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
SHAR_EOF
$shar_touch -am 0421011098 'sane/files/md5' &&
chmod 0644 'sane/files/md5' ||
echo 'restore of sane/files/md5 failed'
shar_count="`wc -c < 'sane/files/md5'`"
test 58 -eq "$shar_count" ||
echo "sane/files/md5: original size 58, current size $shar_count"
fi
# ============= sane/pkg/COMMENT ==============
if test ! -d 'sane/pkg'; then
echo 'x - creating directory sane/pkg'
mkdir 'sane/pkg'
fi
if test -f 'sane/pkg/COMMENT' && test X"$1" != X"-c"; then
echo 'x - skipping sane/pkg/COMMENT (file already exists)'
else
echo 'x - extracting sane/pkg/COMMENT (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/pkg/COMMENT' &&
Scanner Access Now Easy, allows you to acquire images from scanners and cameras
SHAR_EOF
$shar_touch -am 0303201998 'sane/pkg/COMMENT' &&
chmod 0644 'sane/pkg/COMMENT' ||
echo 'restore of sane/pkg/COMMENT failed'
shar_count="`wc -c < 'sane/pkg/COMMENT'`"
test 80 -eq "$shar_count" ||
echo "sane/pkg/COMMENT: original size 80, current size $shar_count"
fi
# ============= sane/pkg/DESCR ==============
if test -f 'sane/pkg/DESCR' && test X"$1" != X"-c"; then
echo 'x - skipping sane/pkg/DESCR (file already exists)'
else
echo 'x - extracting sane/pkg/DESCR (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/pkg/DESCR' &&
SANE (Scanner Access Now Easy) is a set of tools that allows you to
acquire images from scanners, video cameras, digital cameras, or other
sources attached to your computer. This is done using the `scanimage'
(command line based) and `xscanimage' (X-based) programs. SANE also
includes a GIMP plug-in that will allow you to acquire images directly
from the GIMP program.
X
Many (mostly SCSI) scanners and digital cameras are currently supported.
The program is authored around an open, plug-in architecture, so that it
is possible to easily write a driver to support a new device if you so
desire.
SHAR_EOF
$shar_touch -am 0303202498 'sane/pkg/DESCR' &&
chmod 0644 'sane/pkg/DESCR' ||
echo 'restore of sane/pkg/DESCR failed'
shar_count="`wc -c < 'sane/pkg/DESCR'`"
test 599 -eq "$shar_count" ||
echo "sane/pkg/DESCR: original size 599, current size $shar_count"
fi
# ============= sane/pkg/PLIST ==============
if test -f 'sane/pkg/PLIST' && test X"$1" != X"-c"; then
echo 'x - skipping sane/pkg/PLIST (file already exists)'
else
echo 'x - extracting sane/pkg/PLIST (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/pkg/PLIST' &&
bin/scanimage
bin/xscanimage
bin/xcam
etc/sane.d/apple.conf
etc/sane.d/artec.conf
etc/sane.d/coolscan.conf
etc/sane.d/dmc.conf
etc/sane.d/epson.conf
etc/sane.d/hp.conf
etc/sane.d/microtek.conf
etc/sane.d/mustek.conf
etc/sane.d/net.conf
etc/sane.d/s9036.conf
etc/sane.d/snapscan.conf
etc/sane.d/tamarack.conf
etc/sane.d/umax.conf
etc/sane.d/dll.conf
@dirrm etc/sane.d
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_scsi.h
include/sane/sanei_wire.h
include/sane/saneopts.h
include/sane/config.h
@dirrm include/sane
lib/libsane-apple.so.0.72
lib/libsane-apple.so
lib/libsane-apple.la
lib/libsane-apple.a
lib/libsane-artec.so.0.72
lib/libsane-artec.so
lib/libsane-artec.la
lib/libsane-artec.a
lib/libsane-canon.so.0.72
lib/libsane-canon.so
lib/libsane-canon.la
lib/libsane-canon.a
lib/libsane-coolscan.so
lib/libsane-dmc.so
lib/libsane-coolscan.so.0.72
lib/libsane-coolscan.la
lib/libsane.a
lib/libsane-coolscan.a
lib/libsane-dmc.so.0.72
lib/libsane-dmc.la
lib/libsane-dmc.a
lib/libsane-epson.so.0.72
lib/libsane-epson.so
lib/libsane-epson.la
lib/libsane-epson.a
lib/libsane-hp.so.0.72
lib/libsane-hp.so
lib/libsane-hp.la
lib/libsane-hp.a
lib/libsane-microtek.so.0.72
lib/libsane-microtek.so
lib/libsane-microtek.la
lib/libsane-microtek.a
lib/libsane-mustek.so.0.72
lib/libsane-mustek.so
lib/libsane-mustek.la
lib/libsane-mustek.a
lib/libsane-net.so.0.72
lib/libsane-net.so
lib/libsane-net.la
lib/libsane-net.a
lib/libsane-pnm.so.0.72
lib/libsane-pnm.so
lib/libsane-pnm.la
lib/libsane-pnm.a
lib/libsane-s9036.so.0.72
lib/libsane-s9036.so
lib/libsane-s9036.la
lib/libsane-s9036.a
lib/libsane-snapscan.so.0.72
lib/libsane-snapscan.so
lib/libsane-snapscan.la
lib/libsane-snapscan.a
lib/libsane-umax.so
lib/libsane-tamarack.so.0.72
lib/libsane-tamarack.so
lib/libsane-tamarack.la
lib/libsane-tamarack.a
lib/libsane-umax.so.0.72
lib/libsane-umax.la
lib/libsane-umax.a
lib/libsane-dll.so.0.72
lib/libsane-dll.so
lib/libsane-dll.la
lib/libsane-dll.a
lib/libsane.so
lib/libsane.so.0.72
@exec /sbin/ldconfig -m %D/lib
man/man1/scanimage.1.gz
man/man1/xscanimage.1.gz
man/man1/saned.1.gz
man/man5/sane-dmc.5.gz
man/man5/sane-net.5.gz
man/man5/sane-mustek.5.gz
man/man5/sane-qcam.5.gz
man/man5/sane-pnm.5.gz
man/man5/sane-pint.5.gz
man/man5/sane-umax.5.gz
man/man5/sane-epson.5.gz
man/man5/sane-microtek.5.gz
man/man5/sane-scsi.5.gz
man/man5/sane-dll.5.gz
man/man5/sane-hp.5.gz
sbin/saned
share/sane-style.rc
SHAR_EOF
$shar_touch -am 0505010098 'sane/pkg/PLIST' &&
chmod 0644 'sane/pkg/PLIST' ||
echo 'restore of sane/pkg/PLIST failed'
shar_count="`wc -c < 'sane/pkg/PLIST'`"
test 2552 -eq "$shar_count" ||
echo "sane/pkg/PLIST: original size 2552, current size $shar_count"
fi
# ============= sane/patches/patch-aa ==============
if test ! -d 'sane/patches'; then
echo 'x - creating directory sane/patches'
mkdir 'sane/patches'
fi
if test -f 'sane/patches/patch-aa' && test X"$1" != X"-c"; then
echo 'x - skipping sane/patches/patch-aa (file already exists)'
else
echo 'x - extracting sane/patches/patch-aa (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/patches/patch-aa' &&
--- tools/Makefile.in.old Tue May 5 00:03:16 1998
+++ tools/Makefile.in Tue May 5 00:03:11 1998
@@ -65,7 +65,7 @@
X find-scanner: find-scanner.o \
X ../sanei/sanei_scsi.lo ../sanei/sanei_init_debug.lo
X @$(LIBTOOL) $(MLINK) $(LINK) find-scanner.o $(LIBSANEI) $(LIBLIB) \
- $(LIBS)
+ $(LIBS) -lscsi
X
X depend:
X makedepend $(INCLUDES) *.c
SHAR_EOF
$shar_touch -am 0505000398 'sane/patches/patch-aa' &&
chmod 0644 'sane/patches/patch-aa' ||
echo 'restore of sane/patches/patch-aa failed'
shar_count="`wc -c < 'sane/patches/patch-aa'`"
test 341 -eq "$shar_count" ||
echo "sane/patches/patch-aa: original size 341, current size $shar_count"
fi
# ============= sane/patches/patch-ab ==============
if test -f 'sane/patches/patch-ab' && test X"$1" != X"-c"; then
echo 'x - skipping sane/patches/patch-ab (file already exists)'
else
echo 'x - extracting sane/patches/patch-ab (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/patches/patch-ab' &&
--- ltconfig.old Tue May 5 00:06:31 1998
+++ ltconfig Tue May 5 00:07:54 1998
@@ -760,10 +760,11 @@
X # does not break anything, and helps significantly (at the cost of a little
X # extra space).
X freebsd2.2*)
- archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o'
+ runpath_var=LD_RUN_PATH
+ archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
X hardcode_libdir_flag_spec='-R$libdir'
X hardcode_direct=yes
- hardcode_minus_L=yes
+ hardcode_minus_L=no
X hardcode_shlibpath_var=no
X ;;
X
SHAR_EOF
$shar_touch -am 0505000898 'sane/patches/patch-ab' &&
chmod 0644 'sane/patches/patch-ab' ||
echo 'restore of sane/patches/patch-ab failed'
shar_count="`wc -c < 'sane/patches/patch-ab'`"
test 553 -eq "$shar_count" ||
echo "sane/patches/patch-ab: original size 553, current size $shar_count"
fi
# ============= sane/patches/patch-ac ==============
if test -f 'sane/patches/patch-ac' && test X"$1" != X"-c"; then
echo 'x - skipping sane/patches/patch-ac (file already exists)'
else
echo 'x - extracting sane/patches/patch-ac (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/patches/patch-ac' &&
--- frontend/xscanimage.c.old Tue May 5 00:09:37 1998
+++ frontend/xscanimage.c Tue May 5 00:10:49 1998
@@ -59,6 +59,10 @@
X
X #include <libgimp/gimp.h>
X
+#ifdef __FreeBSD__
+# include <floatingpoint.h>
+#endif
+
X static void query (void);
X static void run (char *name, int nparams, GParam * param,
X int *nreturn_vals, GParam ** return_vals);
@@ -1714,6 +1718,11 @@
X ++prog_name;
X else
X prog_name = argv[0];
+
+#ifdef __FreeBSD__
+ fpsetround(FP_RN);
+ fpsetmask(0L);
+#endif
X
X #ifdef HAVE_LIBGIMP_GIMP_H
X {
SHAR_EOF
$shar_touch -am 0505001198 'sane/patches/patch-ac' &&
chmod 0644 'sane/patches/patch-ac' ||
echo 'restore of sane/patches/patch-ac failed'
shar_count="`wc -c < 'sane/patches/patch-ac'`"
test 529 -eq "$shar_count" ||
echo "sane/patches/patch-ac: original size 529, current size $shar_count"
fi
# ============= sane/patches/patch-ad ==============
if test -f 'sane/patches/patch-ad' && test X"$1" != X"-c"; then
echo 'x - skipping sane/patches/patch-ad (file already exists)'
else
echo 'x - extracting sane/patches/patch-ad (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/patches/patch-ad' &&
--- sanei/sanei_pio.c.old Tue May 5 00:18:24 1998
+++ sanei/sanei_pio.c Tue May 5 00:20:27 1998
@@ -522,10 +522,10 @@
X
X #else /* !HAVE_IOPERM */
X
-int
-sanei_pio_open (const char *dev, SANE_Status * status)
+SANE_Status
+sanei_pio_open (const char *dev, int *fdp)
X {
- *status = SANE_STATUS_INVAL;
+ *fdp = SANE_STATUS_INVAL;
X return -1;
X }
X
SHAR_EOF
$shar_touch -am 0505002098 'sane/patches/patch-ad' &&
chmod 0644 'sane/patches/patch-ad' ||
echo 'restore of sane/patches/patch-ad failed'
shar_count="`wc -c < 'sane/patches/patch-ad'`"
test 352 -eq "$shar_count" ||
echo "sane/patches/patch-ad: original size 352, current size $shar_count"
fi
# ============= sane/Makefile ==============
if test -f 'sane/Makefile' && test X"$1" != X"-c"; then
echo 'x - skipping sane/Makefile (file already exists)'
else
echo 'x - extracting sane/Makefile (text)'
sed 's/^X//' << 'SHAR_EOF' > 'sane/Makefile' &&
# New ports collection makefile for: sane
# Version required: 0.72
# Date created: Sat Jul 19 16:23:10 MET DST 1997
# Whom: gary@hotlava.com
# obrien@FreeBSD.org
#
# $Id: Makefile,v 1.1.1.1 1998/03/01 00:44:58 obrien Exp $
#
X
DISTNAME= sane-0.72
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mostang.com/pub/sane/
X
MAINTAINER= gary@hotlava.com
X
GNU_CONFIGURE= yes
USE_GMAKE= yes
X
MAN1= saned.1 \
X scanimage.1 \
X xscanimage.1
X
MAN5= sane-dmc.5 \
X sane-epson.5 \
X sane-microtek.5 \
X sane-net.5 \
X sane-qcam.5 \
X sane-umax.5 \
X sane-scsi.5 \
X sane-dll.5 \
X sane-hp.5 \
X sane-mustek.5 \
X sane-pnm.5 \
X sane-pint.5
X
pre-configure:
X @${ECHO} "(Note: to build the X-based scanner software and GIMP plugin"
X @${ECHO} "(xscanimage), you must build and install gtk-1.0.0 (look in"
X @${ECHO} "${PORTSDIR}/x11/gtk). Interrupt now if you wish to do this.)"
X
# GIMP 0.99.18 puts their plugins in ${X11BASE}/libexec/gimp.
# GIMP 0.99.21 puts them in ${X11BASE}/lib/gimp.
post-install:
X ${LDCONFIG} -m ${PREFIX}/lib
X if [ -d ${X11BASE}/lib/gimp/0.99 ]; then rm -f ${X11BASE}/lib/gimp/0.99/plug-ins/xscanimage && ln -s ${PREFIX}/bin/xscanimage ${X11BASE}/lib/gimp/0.99/plug-ins/xscanimage; fi
X if [ -d ${X11BASE}/libexec/gimp/0.99 ]; then rm -f ${X11BASE}/libexec/gimp/0.99/plug-ins/xscanimage && ln -s ${PREFIX}/bin/xscanimage ${X11BASE}/libexec/gimp/0.99/plug-ins/xscanimage; fi
X
X.include <bsd.port.mk>
SHAR_EOF
$shar_touch -am 0505021198 'sane/Makefile' &&
chmod 0644 'sane/Makefile' ||
echo 'restore of sane/Makefile failed'
shar_count="`wc -c < 'sane/Makefile'`"
test 1424 -eq "$shar_count" ||
echo "sane/Makefile: original size 1424, current size $shar_count"
fi
exit 0
>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?199805050914.CAA29621>