Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31571
Modified Files:
sane-backends.info
Added Files:
sane-backends.patch
Log Message:
Prevent multiple definition error. Libtool does silly thing...
--- NEW FILE: sane-backends.patch ---
diff -Naur sane-backends-1.0.15.orig/frontend/Makefile.in
sane-backends-1.0.15/frontend/Makefile.in
--- sane-backends-1.0.15.orig/frontend/Makefile.in 2003-07-26
21:40:06.000000000 +0000
+++ sane-backends-1.0.15/frontend/Makefile.in 2006-03-21 12:27:20.000000000
+0000
@@ -55,7 +55,7 @@
SBINPROGS = $(SANED)
PROGRAMS = $(BINPROGS) $(SBINPROGS)
TESTPROGRAMS = test
-LIBLIB = ../lib/liblib.a
+LIBLIB = ../lib/getopt.o ../lib/getopt1.o ../lib/liblib.a
LIBSANE = ../backend/libsane.la
LIBSANEI = ../sanei/libsanei.a
diff -Naur sane-backends-1.0.15.orig/lib/Makefile.in
sane-backends-1.0.15/lib/Makefile.in
--- sane-backends-1.0.15.orig/lib/Makefile.in 2003-04-02 22:05:26.000000000
+0000
+++ sane-backends-1.0.15/lib/Makefile.in 2006-03-21 12:46:09.000000000
+0000
@@ -48,10 +48,10 @@
@SET_MAKE@
-LIBLIB_OBJS = @LIBOBJS@ @ALLOCA@ getopt.o getopt1.o md5.o
-LIBLIB_LTOBJS = $(addsuffix .lo,$(basename $(LIBLIB_OBJS)))
+LIBLIB_OBJS = @LIBOBJS@ @ALLOCA@ md5.o
+LIBLIB_LTOBJS = $(addsuffix .lo,$(basename $(LIBLIB_OBJS))) getopt.lo
getopt1.lo
-TARGETS = liblib.a $(LIBLIB_LTOBJS)
+TARGETS = liblib.a getopt.o getopt1.o $(LIBLIB_LTOBJS)
DISTFILES = Makefile.in alloca.c getenv.c getopt.c getopt1.c \
inet_ntop.c inet_pton.c isfdtype.c md5.c sigprocmask.c snprintf.c strdup.c \
diff -Naur sane-backends-1.0.15.orig/tools/Makefile.in
sane-backends-1.0.15/tools/Makefile.in
--- sane-backends-1.0.15.orig/tools/Makefile.in 2004-10-03 17:25:03.000000000
+0000
+++ sane-backends-1.0.15/tools/Makefile.in 2006-03-21 12:26:57.000000000
+0000
@@ -61,7 +61,7 @@
LIBSANEI = ../sanei/libsanei.a
# Library routines that should be part of libc, but aren't on some systems:
-LIBLIB = ../lib/liblib.a
+LIBLIB = ../lib/getopt.o ../lib/getopt1.o ../lib/liblib.a
DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \
mustek600iin-off.c sane-config.in sane-desc.c check-usb-chip.c \
Index: sane-backends.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/sane-backends.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sane-backends.info 21 Mar 2006 04:39:08 -0000 1.5
+++ sane-backends.info 21 Mar 2006 13:13:36 -0000 1.6
@@ -1,6 +1,6 @@
Package: sane-backends
Version: 1.0.15
-Revision: 1004
+Revision: 1005
Source: ftp://ftp.mostang.com/pub/sane/%n-%v/%n-%v.tar.gz
Source-MD5: 3b804f35cdfbc5ad2d201ffe078bbac9
ConfigureParams: --mandir=%p/share/man --without-gphoto2
@@ -9,8 +9,8 @@
SetCPPFLags: -no-cpp-precomp -DOSX_ONLY_10_2_API=1
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-##Patch: %f.patch
PatchScript: <<
+patch -p1 < %a/%n.patch
perl -pi.bak -e 's/\$\(STANDARD\)//' doc/Makefile.in
perl -pi -e 's,(#include <sys/socket.h>),#include <sys/types.h>\n\1,' configure
perl -pi -e 's/-framework CoreFoundation -framework
IOKit/-Wl,-framework,CoreFoundation -Wl,-framework,IOKit/,g' configure
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
