Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv31995
Modified Files:
tokyocabinet.patch
Log Message:
revive older tokyocabinet.patch that matches MD5 in tokyocabinet.info (cf.
different one that matches tokyocabinet9.info)
Index: tokyocabinet.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/tokyocabinet.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tokyocabinet.patch 3 Sep 2010 22:57:48 -0000 1.3
+++ tokyocabinet.patch 9 Jun 2011 23:55:19 -0000 1.4
@@ -1,8 +1,9 @@
+Fix doc installation target.
+
diff --git a/Makefile.in b/Makefile.in
-index 408b58e..842e268 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -37,8 +37,8 @@ datarootdir = @datarootdir@
+@@ -37,8 +37,8 @@
INCLUDEDIR = @includedir@
LIBDIR = @libdir@
BINDIR = @bindir@
@@ -13,8 +14,18 @@
MAN1DIR = @mandir@/man1
MAN3DIR = @mandir@/man3
PCDIR = @libdir@/pkgconfig
-@@ -54,8 +54,8 @@ CFLAGS = @MYCFLAGS@
- LDFLAGS = @MYLDFLAGS@
+@@ -46,16 +46,16 @@
+
+ # Building configuration
+ CC = @CC@
+-CPPFLAGS = @MYCPPFLAGS@ \
++CPPFLAGS = -I. -I$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1 \
+ -D_TC_PREFIX="\"$(prefix)\"" -D_TC_INCLUDEDIR="\"$(INCLUDEDIR)\"" \
+ -D_TC_LIBDIR="\"$(LIBDIR)\"" -D_TC_BINDIR="\"$(BINDIR)\""
-D_TC_LIBEXECDIR="\"$(LIBEXECDIR)\"" \
+ -D_TC_APPINC="\"-I$(INCLUDEDIR)\"" -D_TC_APPLIBS="\"-L$(LIBDIR)
-ltokyocabinet @LIBS@\""
+ CFLAGS = @MYCFLAGS@
+-LDFLAGS = @MYLDFLAGS@
++LDFLAGS = -L. -L$(LIBDIR)
CMDLDFLAGS = @MYCMDLDFLAGS@
LIBS = @LIBS@
-LDENV =
LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
@@ -24,19 +35,3 @@
POSTCMD = @MYPOSTCMD@
-diff --git a/configure b/configure
-index bb0e147..9aa8512 100755
---- a/configure
-+++ b/configure
-@@ -1856,9 +1856,9 @@ MYPCFILES="tokyocabinet.pc"
-
- # Building flags
- MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
-+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
- MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT
-D__EXTENSIONS__"
--MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
-+MYLDFLAGS="-L. -L\$(LIBDIR)"
- MYCMDLDFLAGS=""
- MYRUNPATH="\$(LIBDIR)"
- MYLDLIBPATHENV="LD_LIBRARY_PATH"
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
