Sun Jan 17 02:45:00 2010 UTC ()
Update tokyocabinet to 1.4.41.

2009-12-07  Mikio Hirabayashi  <hirarin@gmail.com>

	* tctdb.c (tctdbidxputtoken, tctdbidxputqgram): domain overflow checking was added.

	- Release: 1.4.41

2009-11-24  Mikio Hirabayashi  <hirarin@gmail.com>

	* tchdb.c (tchdbputimpl): efficiency of using the free block pool was improved.

	* tchdb.c (tchdboptimizeimpl): the behaviour in no lock mode was modified.

	- Release: 1.4.40

2009-11-11  Mikio Hirabayashi  <hirarin@gmail.com>

	* tcutil.h (TCALIGNOF, tcgeneric_t): new macros.

	* tcutil.h (TCALIGNPAD): the alignment is now calculated by the generic union.

	* myconf.h (_alignof, _issigned, _maxof): new macros.

	- Release: 1.4.39

2009-11-09  Mikio Hirabayashi  <hirarin@gmail.com>

	* tcutil.c (tcsysinfo): FreeBSD and Mac OS X are now supported.

	* tcutil.c (tcmpoolclear): new function.

	* tchdb.c (tchdbputproc): a potential bug of memory aligment violation was fixed.

	* tcbdb.c (tcbdbputproc): a potential bug of memory aligment violation was fixed.

	* tcfdb.c (tcfdbputproc): a potential bug of memory aligment violation was fixed.

	- Release: 1.4.38

2009-10-27  Mikio Hirabayashi  <hirarin@gmail.com>

	* tctdb.c (tctdbcacheclear, tctdbcacheclearimpl): new functions.

	* tcadb.c (tcadbmisc): "getpart", "cacheclear", and "regex" functions were added.

	- Release: 1.4.37

2009-10-26  Mikio Hirabayashi  <hirarin@gmail.com>

	* tcutil.c (tcwwwformdecode2): a bug related to multiple cookie handling was fixed.

	* tcadb.c (tcadbmisc): the "error" functions were added.

	- Release: 1.4.36

2009-10-06  Mikio Hirabayashi  <hirarin@gmail.com>

	* tchdb.c (tchdbseekwrite): a bug related to emulation of the UBC was fixed.

	* tchdb.c (tchdbvanishimpl): potential memory leak was removed.

	* tcfdb.c (tcfdbvanishimpl): potential memory leak was removed.

	* tcadb.c (tcadbsetskelmulti, tcadbmulnew, tcadbmuldel): new functions.

	* tcadb.c (tcadbmisc): "range" sub function for B+ tree was added.

	* tcamgr.c (setskeltran): new function.

	* tcamttest.c: new file.

	- Release: 1.4.35

2009-09-11  Mikio Hirabayashi  <hirarin@gmail.com>

	* myconf.h: a macro for environment without "nanl" was added.

	* tctdbmetasearch (tctdbmetasearch): a bug related to the limit parameters was fixed.

	- Release: 1.4.34

2009-08-31  Mikio Hirabayashi  <hirarin@gmail.com>

	* tcutil.h, tchdb.h, tcbdb.h, tcfdb.h, tctdb.h, tcadb.h: including stdbool.h was wrapped.

	* tcutil.c (tccmpdecimal): accuracy was improved and now real number is supported.

	* tctdb.c (tctdbqrycondmatch): accuracy of decimal operators was improved.

	- Release: 1.4.33


(obache)
diff -r1.36 -r1.37 pkgsrc/databases/tokyocabinet/Makefile
diff -r1.34 -r1.35 pkgsrc/databases/tokyocabinet/PLIST
diff -r1.34 -r1.35 pkgsrc/databases/tokyocabinet/distinfo
diff -r1.6 -r1.7 pkgsrc/databases/tokyocabinet/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/databases/tokyocabinet/patches/patch-aa
cvs diff -r1.36 -r1.37 pkgsrc/databases/tokyocabinet/Makefile (switch to unified diff)

--- pkgsrc/databases/tokyocabinet/Makefile 2009/12/19 12:56:45 1.36
+++ pkgsrc/databases/tokyocabinet/Makefile 2010/01/17 02:45:00 1.37
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1# $NetBSD: Makefile,v 1.36 2009/12/19 12:56:45 obache Exp $ 1# $NetBSD: Makefile,v 1.37 2010/01/17 02:45:00 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-1.4.32 4DISTNAME= tokyocabinet-1.4.41
5PKGREVISION= 1 
6CATEGORIES= databases 5CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 6MASTER_SITES= ${HOMEPAGE}
8 7
9MAINTAINER= obache@NetBSD.org 8MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://1978th.net/tokyocabinet/ 9HOMEPAGE= http://1978th.net/tokyocabinet/
11COMMENT= Modern implementation of DBM 10COMMENT= Modern implementation of DBM
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
18USE_LANGUAGES= c99 17USE_LANGUAGES= c99
19 18
20PKGCONFIG_OVERRIDE+= tokyocabinet.pc.in 19PKGCONFIG_OVERRIDE+= tokyocabinet.pc.in
21 20
22.include "options.mk" 21.include "options.mk"
23 22
24TEST_TARGET= check 23TEST_TARGET= check
25 24
26.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
27PTHREAD_AUTO_VARS= yes 26PTHREAD_AUTO_VARS= yes
28.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" 27.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
29CONFIGURE_ARGS+= --disable-pthread 28CONFIGURE_ARGS+= --disable-pthread
30.else 29.else
31CONFIGURE_ARGS+= --enable-pthread 30CONFIGURE_ARGS+= --enable-pthread
32SUBST_CLASSES+= pthread 31SUBST_CLASSES+= pthread
33SUBST_STAGE.pthread= pre-configure 32SUBST_STAGE.pthread= pre-configure
34SUBST_FILES.pthread= configure 33SUBST_FILES.pthread= configure
35SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|' 34SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
36.endif 35.endif
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/databases/tokyocabinet/PLIST (switch to unified diff)

--- pkgsrc/databases/tokyocabinet/PLIST 2009/08/22 06:42:35 1.34
+++ pkgsrc/databases/tokyocabinet/PLIST 2010/01/17 02:45:00 1.35
@@ -1,74 +1,76 @@ @@ -1,74 +1,76 @@
1@comment $NetBSD: PLIST,v 1.34 2009/08/22 06:42:35 obache Exp $ 1@comment $NetBSD: PLIST,v 1.35 2010/01/17 02:45:00 obache Exp $
2bin/tcamgr 2bin/tcamgr
 3bin/tcamttest
3bin/tcatest 4bin/tcatest
4bin/tcbmgr 5bin/tcbmgr
5bin/tcbmttest 6bin/tcbmttest
6bin/tcbtest 7bin/tcbtest
7bin/tcfmgr 8bin/tcfmgr
8bin/tcfmttest 9bin/tcfmttest
9bin/tcftest 10bin/tcftest
10bin/tchmgr 11bin/tchmgr
11bin/tchmttest 12bin/tchmttest
12bin/tchtest 13bin/tchtest
13bin/tctmgr 14bin/tctmgr
14bin/tctmttest 15bin/tctmttest
15bin/tcttest 16bin/tcttest
16bin/tcucodec 17bin/tcucodec
17bin/tcumttest 18bin/tcumttest
18bin/tcutest 19bin/tcutest
19include/tcadb.h 20include/tcadb.h
20include/tcbdb.h 21include/tcbdb.h
21include/tcfdb.h 22include/tcfdb.h
22include/tchdb.h 23include/tchdb.h
23include/tctdb.h 24include/tctdb.h
24include/tcutil.h 25include/tcutil.h
25lib/libtokyocabinet.a 26lib/libtokyocabinet.a
26lib/libtokyocabinet.so 27lib/libtokyocabinet.so
27lib/libtokyocabinet.so.8 28lib/libtokyocabinet.so.9
28lib/libtokyocabinet.so.8.23.0 29lib/libtokyocabinet.so.9.4.0
29lib/pkgconfig/tokyocabinet.pc 30lib/pkgconfig/tokyocabinet.pc
30libexec/tcawmgr.cgi 31libexec/tcawmgr.cgi
31man/man1/tcamgr.1 32man/man1/tcamgr.1
 33man/man1/tcamttest.1
32man/man1/tcatest.1 34man/man1/tcatest.1
33man/man1/tcbmgr.1 35man/man1/tcbmgr.1
34man/man1/tcbmttest.1 36man/man1/tcbmttest.1
35man/man1/tcbtest.1 37man/man1/tcbtest.1
36man/man1/tcfmgr.1 38man/man1/tcfmgr.1
37man/man1/tcfmttest.1 39man/man1/tcfmttest.1
38man/man1/tcftest.1 40man/man1/tcftest.1
39man/man1/tchmgr.1 41man/man1/tchmgr.1
40man/man1/tchmttest.1 42man/man1/tchmttest.1
41man/man1/tchtest.1 43man/man1/tchtest.1
42man/man1/tctmgr.1 44man/man1/tctmgr.1
43man/man1/tctmttest.1 45man/man1/tctmttest.1
44man/man1/tcttest.1 46man/man1/tcttest.1
45man/man1/tcucodec.1 47man/man1/tcucodec.1
46man/man1/tcumttest.1 48man/man1/tcumttest.1
47man/man1/tcutest.1 49man/man1/tcutest.1
48man/man3/tcadb.3 50man/man3/tcadb.3
49man/man3/tcbdb.3 51man/man3/tcbdb.3
50man/man3/tcfdb.3 52man/man3/tcfdb.3
51man/man3/tchdb.3 53man/man3/tchdb.3
52man/man3/tclist.3 54man/man3/tclist.3
53man/man3/tcmap.3 55man/man3/tcmap.3
54man/man3/tcmdb.3 56man/man3/tcmdb.3
55man/man3/tcmpool.3 57man/man3/tcmpool.3
56man/man3/tctdb.3 58man/man3/tctdb.3
57man/man3/tctree.3 59man/man3/tctree.3
58man/man3/tcutil.3 60man/man3/tcutil.3
59man/man3/tcxstr.3 61man/man3/tcxstr.3
60man/man3/tokyocabinet.3 62man/man3/tokyocabinet.3
61share/tokyocabinet/COPYING 63share/tokyocabinet/COPYING
62share/tokyocabinet/ChangeLog 64share/tokyocabinet/ChangeLog
63share/tokyocabinet/THANKS 65share/tokyocabinet/THANKS
64share/tokyocabinet/doc/benchmark.pdf 66share/tokyocabinet/doc/benchmark.pdf
65share/tokyocabinet/doc/common.css 67share/tokyocabinet/doc/common.css
66share/tokyocabinet/doc/icon16.png 68share/tokyocabinet/doc/icon16.png
67share/tokyocabinet/doc/index.html 69share/tokyocabinet/doc/index.html
68share/tokyocabinet/doc/index.ja.html 70share/tokyocabinet/doc/index.ja.html
69share/tokyocabinet/doc/logo-ja.png 71share/tokyocabinet/doc/logo-ja.png
70share/tokyocabinet/doc/logo.png 72share/tokyocabinet/doc/logo.png
71share/tokyocabinet/doc/spex-en.html 73share/tokyocabinet/doc/spex-en.html
72share/tokyocabinet/doc/spex-ja.html 74share/tokyocabinet/doc/spex-ja.html
73share/tokyocabinet/doc/tokyoproducts.pdf 75share/tokyocabinet/doc/tokyoproducts.pdf
74share/tokyocabinet/doc/tokyoproducts.ppt 76share/tokyocabinet/doc/tokyoproducts.ppt
cvs diff -r1.34 -r1.35 pkgsrc/databases/tokyocabinet/distinfo (switch to unified diff)

--- pkgsrc/databases/tokyocabinet/distinfo 2009/08/22 06:42:35 1.34
+++ pkgsrc/databases/tokyocabinet/distinfo 2010/01/17 02:45:00 1.35
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.34 2009/08/22 06:42:35 obache Exp $ 1$NetBSD: distinfo,v 1.35 2010/01/17 02:45:00 obache Exp $
2 2
3SHA1 (tokyocabinet-1.4.32.tar.gz) = 9b2b2774beaa91735502ffbc10b7344dace8ce33 3SHA1 (tokyocabinet-1.4.41.tar.gz) = aefd98f86cd86141254978574e10ca58228902a6
4RMD160 (tokyocabinet-1.4.32.tar.gz) = a213d5e4e7625978186fb05f16b3fae205e0bc74 4RMD160 (tokyocabinet-1.4.41.tar.gz) = 104f3e3c83caf7f510a64537e8815a7e41fd8e24
5Size (tokyocabinet-1.4.32.tar.gz) = 950225 bytes 5Size (tokyocabinet-1.4.41.tar.gz) = 991669 bytes
6SHA1 (patch-aa) = f81f4ff8d80f632e0b06e2aad6050b95a4819c97 6SHA1 (patch-aa) = da66f5289c3e3e5fcbc306422ca69fb46c90b9dd
cvs diff -r1.6 -r1.7 pkgsrc/databases/tokyocabinet/buildlink3.mk (switch to unified diff)

--- pkgsrc/databases/tokyocabinet/buildlink3.mk 2009/12/19 12:56:45 1.6
+++ pkgsrc/databases/tokyocabinet/buildlink3.mk 2010/01/17 02:45:00 1.7
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.6 2009/12/19 12:56:45 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2010/01/17 02:45:00 obache Exp $
2 2
3BUILDLINK_TREE+= tokyocabinet 3BUILDLINK_TREE+= tokyocabinet
4 4
5.if !defined(TOKYOCABINET_BUILDLINK3_MK) 5.if !defined(TOKYOCABINET_BUILDLINK3_MK)
6TOKYOCABINET_BUILDLINK3_MK:= 6TOKYOCABINET_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.7 8BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.7
9BUILDLINK_ABI_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.32nb1 9BUILDLINK_ABI_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.41
10BUILDLINK_PKGSRCDIR.tokyocabinet?= ../../databases/tokyocabinet 10BUILDLINK_PKGSRCDIR.tokyocabinet?= ../../databases/tokyocabinet
11 11
12pkgbase := tokyocabinet 12pkgbase := tokyocabinet
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2) 15.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
16.include "../../archivers/bzip2/buildlink3.mk" 16.include "../../archivers/bzip2/buildlink3.mk"
17.endif 17.endif
18 18
19.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzma) 19.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzma)
20.include "../../archivers/lzmalib/buildlink3.mk" 20.include "../../archivers/lzmalib/buildlink3.mk"
21.endif 21.endif
22 22
23.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzo) 23.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzo)
24.include "../../archivers/lzo/buildlink3.mk" 24.include "../../archivers/lzo/buildlink3.mk"
25.endif 25.endif
26 26
27.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib) 27.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
28.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
29.endif 29.endif
30 30
31.include "../../mk/pthread.buildlink3.mk" 31.include "../../mk/pthread.buildlink3.mk"
32.endif # TOKYOCABINET_BUILDLINK3_MK 32.endif # TOKYOCABINET_BUILDLINK3_MK
33 33
34BUILDLINK_TREE+= -tokyocabinet 34BUILDLINK_TREE+= -tokyocabinet
cvs diff -r1.10 -r1.11 pkgsrc/databases/tokyocabinet/patches/patch-aa (switch to unified diff)

--- pkgsrc/databases/tokyocabinet/patches/patch-aa 2009/05/07 10:55:07 1.10
+++ pkgsrc/databases/tokyocabinet/patches/patch-aa 2010/01/17 02:45:00 1.11
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-aa,v 1.10 2009/05/07 10:55:07 obache Exp $ 1$NetBSD: patch-aa,v 1.11 2010/01/17 02:45:00 obache Exp $
2 2
3--- configure.orig 2009-04-30 09:20:57.000000000 +0000 3--- configure.orig 2009-12-07 03:03:56.000000000 +0000
4+++ configure 4+++ configure
5@@ -1853,22 +1853,19 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK 5@@ -1855,22 +1855,19 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
6 MYPCFILES="tokyocabinet.pc" 6 MYPCFILES="tokyocabinet.pc"
7  7
8 # Building flags 8 # Building flags
9-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" 9-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
10-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" 10-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
11+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char" 11+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
12+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" 12+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
13 MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" 13 MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
14-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" 14-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
15+MYLDFLAGS="-L. -L\$(LIBDIR)" 15+MYLDFLAGS="-L. -L\$(LIBDIR)"
16 MYCMDLDFLAGS="" 16 MYCMDLDFLAGS=""
17 MYRUNPATH="\$(LIBDIR)" 17 MYRUNPATH="\$(LIBDIR)"
18 MYLDLIBPATHENV="LD_LIBRARY_PATH" 18 MYLDLIBPATHENV="LD_LIBRARY_PATH"
19 MYPOSTCMD="true" 19 MYPOSTCMD="true"
20  20
21 # Building paths 21 # Building paths
22-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" 22-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
23-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" 23-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
24 CPATH="$HOME/include:/usr/local/include:$CPATH" 24 CPATH="$HOME/include:/usr/local/include:$CPATH"
25 LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" 25 LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
26 LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" 26 LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
27-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" 27-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
28 export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH 28 export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
29  29
30  30