Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6620
Modified Files:
tokyocabinet.patch tokyocabinet9.info
Log Message:
tokyocabinet 1.4.46, with fix for powerpc build
Index: tokyocabinet.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/tokyocabinet.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tokyocabinet.patch 6 Jan 2009 08:10:01 -0000 1.2
+++ tokyocabinet.patch 3 Sep 2010 22:57:48 -0000 1.3
@@ -1,9 +1,8 @@
-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 @@
+@@ -37,8 +37,8 @@ datarootdir = @datarootdir@
INCLUDEDIR = @includedir@
LIBDIR = @libdir@
BINDIR = @bindir@
@@ -14,18 +13,8 @@
MAN1DIR = @mandir@/man1
MAN3DIR = @mandir@/man3
PCDIR = @libdir@/pkgconfig
-@@ -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 @l...@\""
- CFLAGS = @MYCFLAGS@
--LDFLAGS = @MYLDFLAGS@
-+LDFLAGS = -L. -L$(LIBDIR)
+@@ -54,8 +54,8 @@ CFLAGS = @MYCFLAGS@
+ LDFLAGS = @MYLDFLAGS@
CMDLDFLAGS = @MYCMDLDFLAGS@
LIBS = @LIBS@
-LDENV =
LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
@@ -35,3 +24,19 @@
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"
Index: tokyocabinet9.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/tokyocabinet9.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tokyocabinet9.info 4 Jul 2010 18:27:41 -0000 1.3
+++ tokyocabinet9.info 3 Sep 2010 22:57:48 -0000 1.4
@@ -1,8 +1,8 @@
Package: tokyocabinet9
-Version: 1.4.39
+Version: 1.4.46
Revision: 1
-Source: http://1978th.net/tokyocabinet/tokyocabinet-%v.tar.gz
-Source-MD5: 0cc77e1eeea1e767d6ffbfd9a640602a
+Source: http://fallabs.com/tokyocabinet/tokyocabinet-%v.tar.gz
+Source-MD5: 341dadd1f3d68760e350f7e731111786
BuildDependsOnly: True
BuildDepends: bzip2-dev, fink (>= 0.24.12)
Depends: %n-shlibs (= %v-%r)
@@ -10,7 +10,7 @@
Replaces: tokyocabinet
PatchFile: tokyocabinet.patch
-PatchFile-MD5: 78e328976e81c2c24a76e2541772fa8b
+PatchFile-MD5: 4db6d1458c829fb5fa502ca33a51d40e
ConfigureParams: --mandir=%p/share/man --datadir=%p/share/doc/%n
InstallScript: make DESTDIR=%d install
DocFiles: README
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
