On Wed, May 12, 1999 at 10:28:45AM -0700, David O'Brien wrote:
> > > i got a new UMAX Atrsa 1220P scanner, i have no idea how to configure
> > > this in FreeBSD or Linux (or if i even can), im on 4.0-CURRENT.
> ..snip..
>
> > Have you tried /usr/ports/graphics/sane?
>
> It doesn't build under 4.0-CURRENT.
Had to fix this a few days ago anyway...
-Jeremy
--
| "I could be anything I wanted to, but one things true
--+-- Never gonna be as big as Jesus, never gonna hold the world in my hand
| Never gonna be as big as Jesus, never gonna build a promised land
| But that's, that's all right, OK with me..." -Audio Adrenaline
diff -urN -x CVS /usr/ports.ref/graphics/sane/patches/patch-01
graphics/sane/patches/patch-01
--- /usr/ports.ref/graphics/sane/patches/patch-01 Sun Dec 6 11:37:28 1998
+++ graphics/sane/patches/patch-01 Wed May 12 19:53:21 1999
@@ -5,7 +5,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_PROGRAM='${INSTALL}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
diff -urN -x CVS /usr/ports.ref/graphics/sane/patches/patch-02
graphics/sane/patches/patch-02
--- /usr/ports.ref/graphics/sane/patches/patch-02 Tue May 26 10:17:59 1998
+++ graphics/sane/patches/patch-02 Wed May 12 19:56:24 1999
@@ -9,13 +9,12 @@
# Don't delete any intermediate files.
.PRECIOUS: %-s.c %-s.lo %.lo dll-preload.c
-@@ -94,16 +94,16 @@
+@@ -94,16 +94,13 @@
file=libsane-$${be}.so.$(V_MAJOR); \
lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
- if test ! -f $${file} -a -n "$${lib}"; then \
+- if test ! -f $${file} -a -n "$${lib}"; then \
- ln -s $${lib} $${file}; \
-+ ln -sf $${lib} $${file}; \
- fi; \
+- fi; \
done
rm -f $(libdir)/libsane.a $(libdir)/libsane.so \
$(libdir)/libsane.so.$(V_MAJOR)*
diff -urN -x CVS /usr/ports.ref/graphics/sane/patches/patch-03
graphics/sane/patches/patch-03
--- /usr/ports.ref/graphics/sane/patches/patch-03 Wed Sep 16 23:37:56 1998
+++ graphics/sane/patches/patch-03 Wed May 12 19:52:36 1999
@@ -1,12 +0,0 @@
---- backend/Makefile.in.orig Thu Sep 17 05:03:21 1998
-+++ backend/Makefile.in Thu Sep 17 05:16:13 1998
-@@ -93,9 +93,6 @@
- @list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
- file=libsane-$${be}.so.$(V_MAJOR); \
- lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
-- if test ! -f $${file} -a -n "$${lib}"; then \
-- ln -sf $${lib} $${file}; \
-- fi; \
- done
- rm -f $(libdir)/libsane.a $(libdir)/libsane.so \
- $(libdir)/libsane.so.$(V_MAJOR)*
diff -urN -x CVS /usr/ports.ref/graphics/sane/patches/patch-04
graphics/sane/patches/patch-04
--- /usr/ports.ref/graphics/sane/patches/patch-04 Thu Jan 28 23:31:39 1999
+++ graphics/sane/patches/patch-04 Wed May 12 19:58:04 1999
@@ -17,28 +17,28 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
---- ltconfig.orig Tue Nov 24 17:04:26 1998
-+++ ltconfig Tue Nov 24 17:07:35 1998
-@@ -1123,10 +1123,21 @@
+--- ltconfig.orig Sun Nov 22 05:53:55 1998
++++ ltconfig Wed May 12 19:57:19 1999
+@@ -777,7 +777,7 @@
+ ;;
+
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+- freebsd3*)
++ freebsd*)
+ archive_cmds='$CC -shared -o $lib$libobjs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -1123,10 +1123,10 @@
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do
libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`;
test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib
${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)
|| exit 1; done'
;;
-freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd3* | freebsd4*)
+- version_type=sunos
++freebsd*)
+ version_type=freebsd
-+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m
$libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$PORTOBJFORMAT"'" ldconfig -m
$libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
diff -urN -x CVS /usr/ports.ref/graphics/sane/patches/patch-07
graphics/sane/patches/patch-07
--- /usr/ports.ref/graphics/sane/patches/patch-07 Thu Jan 1 02:00:00 1970
+++ graphics/sane/patches/patch-07 Wed May 12 19:59:31 1999
@@ -0,0 +1,11 @@
+--- backend/abaton.c.orig Wed May 12 19:58:28 1999
++++ backend/abaton.c Wed May 12 19:59:09 1999
+@@ -1113,7 +1113,7 @@
+
+ case OPT_Y_RESOLUTION:
+ if (s->val[OPT_PREVIEW].w || s->val[OPT_RESOLUTION_BIND].w) {
+- s->val[OPT_X_RESOLUTION] = *(SANE_Word *)val;
++ s->val[OPT_X_RESOLUTION].w = *(SANE_Word *)val;
+ if (info)
+ *info |= SANE_INFO_RELOAD_OPTIONS;
+ }
To Unsubscribe: send mail to majord...@freebsd.org
with "unsubscribe freebsd-current" in the body of the message
