[csw-devel] SF.net SVN: gar:[18408] csw/mgar/pkg/tokyocabinet/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Thu Jun 14 22:47:00 CEST 2012
Revision: 18408
http://gar.svn.sourceforge.net/gar/?rev=18408&view=rev
Author: guengel
Date: 2012-06-14 20:47:00 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
tokyocabinet/trunk: Revived package
Modified Paths:
--------------
csw/mgar/pkg/tokyocabinet/trunk/Makefile
csw/mgar/pkg/tokyocabinet/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch
csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch
csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch
csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch
Removed Paths:
-------------
csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch
Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-14 20:14:16 UTC (rev 18407)
+++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-14 20:47:00 UTC (rev 18408)
@@ -1,26 +1,37 @@
-# $Id
-: Makefile 13420 2011-02-20 21:04:03Z bdwalton $
+# $Id$
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = tokyocabinet
VERSION = 1.4.47
GARTYPE = v2
-CATEGORIES = utils
+CATEGORIES = lib
+GARCOMPILER = SOS12U1
-DESCRIPTION = Tokyo Cabinet is a library of routines for managing a database.
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+DESCRIPTION = Brief description
define BLURB
- Tokyo Cabinet is a library of routines for managing a database. The database is a
- simple data file containing records, each is a pair of a key and a value.
- Every key and value is serial bytes with variable length. Both binary data and
- character string can be used as a key and a value. There is neither concept of
- data tables nor data types. Records are organized in hash table, B+ tree,
- or fixed-length array.
+ Tokyo Cabinet is a library of routines for managing a database. The
+ database is a simple data file containing records, each is a pair
+ of a key and a value. Every key and value is serial bytes with variable
+ length. Both binary data and character string can be used as a key and
+ a value. There is neither concept of data tables nor data types. Records
+ are organized in hash table, B+ tree, or fixed-length array.
endef
-MASTER_SITES = http://fallabs.com/tokyocabinet/
+MASTER_SITES = http://fallabs.com/tokyocabinet
DISTFILES = $(DISTNAME).tar.gz
+# Disables installation of CGI component and fixes
+# installation of libraries.
+PATCHFILES += 0001-Adjust-Makefile.in.patch
+
+# Use $(MAKE) in Makefile
+PATCHFILES += 0002-Use-make-variable.patch
+
+# Adjust man page
+PATCHFILES += 0003-adjust-man-page-for-csw.patch
+
# File name regex to get notifications about upstream software releases
# NOTE: Use this only if the automatic regex creation
# does not work for your package
@@ -30,41 +41,57 @@
# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
# UPSTREAM_MASTER_SITES =
-PATCHFILES += 0001-updated-paths-for-csw.patch
-CONFIGURE_ARGS = $(DIRPATHS)
-GARCOMPILER = GCC4
-BUILD64 = 1
+PACKAGES = CSWlibtokyocabinet9
+SPKG_DESC_CSWlibtokyocabinet9 = Tokyocabinet - library
+PKGFILES_CSWlibtokyocabinet9 = $(call pkgfiles_lib,libtokyocabinet.so.9)
+RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1
+# I have no freaking idea where this is comming from
+CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/libtokyocabinet.so.9.10.0
+CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libtokyocabinet.so.9.10.0
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-SKIP_MODULATIONS = isa-sparcv8
+PACKAGES += CSWlibtokyocabinet-dev
+SPKG_DESC_CSWlibtokyocabinet-dev = Tokyocabinet - development files
+PKGFILES_CSWlibtokyocabinet-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibtokyocabinet-dev += .*/doc/libtokyocabinet_dev/tokyocabinet.idl
+RUNTIME_DEP_PKGS_CSWlibtokyocabinet-dev = CSWlibtokyocabinet9
+PACKAGES += CSWtokyocabinet-bin
+SPKG_DESC_CSWtokyocabinet-bin = Tokyocabinet - utilities
+PKGFILES_CSWtokyocabinet-bin = .*/bin/.*
+PKGFILES_CSWtokyocabinet-bin += .*/man/man/.*
+RUNTIME_DEP_PKGS_CSWtokyocabinet-bin = CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibz1
+RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibtokyocabinet9
-EXTRA_CPPFLAGS += -DLOG_PERROR=0x00
-EXTRA_CPPFLAGS += -D__EXTENSIONS__
+PACKAGES += CSWtokyocabinet-doc
+ARCHALL_CSWtokyocabinet-doc = 1
+SPKG_DESC_CSWtokyocabinet-doc = Tokyocabinet - documentation
+PKGFILES_CSWtokyocabinet-doc = .*/doc/tokyocabinet_doc/.*
+# That's ok, it's in the howto build section
+CHECKPKG_OVERRIDES_CSWtokyocabinet-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tokyocabinet_doc/doc/spex-en.html
+CHECKPKG_OVERRIDES_CSWtokyocabinet-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tokyocabinet_doc/doc/spex-ja.html
-PACKAGES += CSWlibtokyocabinet9
-PACKAGES += CSWtokyocabinet-dev
+BUILD64 = 1
-CATALOGNAME_CSWlibtokyocabinet9 = libtokyocabinet9
-CATALOGNAME_CSWtokyocabinet-dev = tokyocabinet_dev
+EXTRA_CFLAGS = -xc99=all -Kpic
+EXTRA_CPPFLAGS = -DPIC
-RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWtokyocabinet-dev += CSWlibtokyocabinet9
-RUNTIME_DEP_PKGS_CSWtokyocabinet += CSWlibtokyocabinet9
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-bzip=$(prefix)
+CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --enable-shared
-PKGFILES_CSWlibtokyocabinet9 += $(call pkgfiles_lib,libtokyocabinet.so.9)
-PKGFILES_CSWtokyocabinet-dev += $(PKGFILES_DEVEL)
-
-SPKG_DESC_CSWlibtokyocabinet9 += $(DESCRIPTION), libtokyocabinet.so.9
-SPKG_DESC_CSWtokyocabinet-dev += $(DESCRIPTION), development files
-
-#######################
-# Tests are disk intensive. uncomment to skip tests if need be.
-#######################
-#TEST_SCRIPTS =
-
include gar/category.mk
-PATH:=/opt/csw/gnu:$(PATH)
+post-merge:
+ install -d $(PKGROOT)$(docdir)/libtokyocabinet_dev
+ install -d $(PKGROOT)$(docdir)/tokyocabinet_doc
+ mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/tokyocabinet.idl $(PKGROOT)$(docdir)/libtokyocabinet_dev/
+ mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/COPYING \
+ $(PKGROOT)$(sharedstatedir)/tokyocabinet/ChangeLog \
+ $(PKGROOT)$(docdir)/libtokyocabinet_dev/
+ mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/doc $(PKGROOT)$(docdir)/tokyocabinet_doc/
+ rm -rf $(PKGROOT)$(sharedstatedir)/tokyocabinet
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/tokyocabinet/trunk/checksums
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/checksums 2012-06-14 20:14:16 UTC (rev 18407)
+++ csw/mgar/pkg/tokyocabinet/trunk/checksums 2012-06-14 20:47:00 UTC (rev 18408)
@@ -1 +1 @@
-3922632835 1002443 tokyocabinet-1.4.47.tar.gz
+3d94fe2aebf5d9ff0478ed895bc46fc9 tokyocabinet-1.4.47.tar.gz
Added: csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch (rev 0)
+++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch 2012-06-14 20:47:00 UTC (rev 18408)
@@ -0,0 +1,32 @@
+From fe5caa8e5e281e1feea1770a07da292bc71e36b2 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 12 Jun 2012 22:09:07 +0200
+Subject: [PATCH] Adjust Makefile.in
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8846c38..5282ec2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -112,11 +112,12 @@ install :
+ mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ cp -Rf $(HEADERFILES) $(DESTDIR)$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+- cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR)
++ cp -RPf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR)
+ mkdir -p $(DESTDIR)$(BINDIR)
+ cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
+- mkdir -p $(DESTDIR)$(LIBEXECDIR)
+- cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
++# We don't want this
++# mkdir -p $(DESTDIR)$(LIBEXECDIR)
++# cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
+ mkdir -p $(DESTDIR)$(DATADIR)
+ cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
+ mkdir -p $(DESTDIR)$(MAN1DIR)
+--
+1.7.10.3
+
Deleted: csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:14:16 UTC (rev 18407)
+++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408)
@@ -1,220 +0,0 @@
-From c032fb31ec09d251f675bdd4d064cc868b771d99 Mon Sep 17 00:00:00 2001
-From: Shawn McDermott <sgtmcd at opencsw.org>
-Date: Tue, 20 Sep 2011 14:43:37 +0200
-Subject: [PATCH] updated paths for csw
-
----
- doc/spex-en.html | 72 ++++++++++++++++++++++++++--------------------------
- doc/spex-ja.html | 72 ++++++++++++++++++++++++++--------------------------
- man/tokyocabinet.3 | 4 +-
- 3 files changed, 74 insertions(+), 74 deletions(-)
-
-diff --git a/doc/spex-en.html b/doc/spex-en.html
-index 26c40ee..60ff06c 100644
---- a/doc/spex-en.html
-+++ b/doc/spex-en.html
-@@ -192,39 +192,39 @@
-
- <p>When a series of work finishes, the following files will be installed.</p>
-
--<pre>/usr/local/include/tcutil.h
--/usr/local/include/tchdb.h
--/usr/local/include/tcbdb.h
--/usr/local/include/tcfdb.h
--/usr/local/include/tctdb.h
--/usr/local/include/tcadb.h
--/usr/local/lib/libtokyocabinet.a
--/usr/local/lib/libtokyocabinet.so.x.y.z
--/usr/local/lib/libtokyocabinet.so.x
--/usr/local/lib/libtokyocabinet.so
--/usr/local/lib/pkgconfig/tokyocabinet.pc
--/usr/local/bin/tcutest
--/usr/local/bin/tcumttest
--/usr/local/bin/tcucodec
--/usr/local/bin/tchtest
--/usr/local/bin/tchmttest
--/usr/local/bin/tchmgr
--/usr/local/bin/tcbmgr
--/usr/local/bin/tcbtest
--/usr/local/bin/tcbmttest
--/usr/local/bin/tcftest
--/usr/local/bin/tcfmttest
--/usr/local/bin/tcfmgr
--/usr/local/bin/tcttest
--/usr/local/bin/tctmttest
--/usr/local/bin/tctmgr
--/usr/local/bin/tcatest
--/usr/local/bin/tcamttest
--/usr/local/bin/tcamgr
--/usr/local/libexec/tcawmgr.cgi
--/usr/local/share/tokyocabinet/...
--/usr/local/man/man1/...
--/usr/local/man/man3/...
-+<pre>/opt/csw/include/tcutil.h
-+/opt/csw/include/tchdb.h
-+/opt/csw/include/tcbdb.h
-+/opt/csw/include/tcfdb.h
-+/opt/csw/include/tctdb.h
-+/opt/csw/include/tcadb.h
-+/opt/csw/lib/libtokyocabinet.a
-+/opt/csw/lib/libtokyocabinet.so.x.y.z
-+/opt/csw/lib/libtokyocabinet.so.x
-+/opt/csw/lib/libtokyocabinet.so
-+/opt/csw/lib/pkgconfig/tokyocabinet.pc
-+/opt/csw/bin/tcutest
-+/opt/csw/bin/tcumttest
-+/opt/csw/bin/tcucodec
-+/opt/csw/bin/tchtest
-+/opt/csw/bin/tchmttest
-+/opt/csw/bin/tchmgr
-+/opt/csw/bin/tcbmgr
-+/opt/csw/bin/tcbtest
-+/opt/csw/bin/tcbmttest
-+/opt/csw/bin/tcftest
-+/opt/csw/bin/tcfmttest
-+/opt/csw/bin/tcfmgr
-+/opt/csw/bin/tcttest
-+/opt/csw/bin/tctmttest
-+/opt/csw/bin/tctmgr
-+/opt/csw/bin/tcatest
-+/opt/csw/bin/tcamttest
-+/opt/csw/bin/tcamgr
-+/opt/csw/libexec/tcawmgr.cgi
-+/opt/csw/share/tokyocabinet/...
-+/opt/csw/man/man1/...
-+/opt/csw/man/man3/...
- </pre>
-
- <h3 id="installation_option">Options of Configure</h3>
-@@ -246,14 +246,14 @@
- <li><code>--disable-shared</code> : avoid to build shared libraries.</li>
- </ul>
-
--<p>`<code>--prefix</code>' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `<code>/usr</code>' not `<code>/usr/local</code>', specify `<code>--prefix=/usr</code>'. As well, the library search path does not include `<code>/usr/local/lib</code>', it is necessary to set the environment variable `<code>LD_LIBRARY_PATH</code>' to include `<code>/usr/local/lib</code>' before running applications of Tokyo Cabinet.</p>
-+<p>`<code>--prefix</code>' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `<code>/usr</code>' not `<code>/opt/csw</code>', specify `<code>--prefix=/usr</code>'. As well, the library search path does not include `<code>/opt/csw/lib</code>', it is necessary to set the environment variable `<code>LD_LIBRARY_PATH</code>' to include `<code>/opt/csw/lib</code>' before running applications of Tokyo Cabinet.</p>
-
- <h3 id="installation_library">How to Use the Library</h3>
-
- <p>Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `<code>tcutil.h</code>', `<code>tchdb.h</code>', `<code>tcbdb.h</code>', and `<code>tcadb.h</code>', applications should include one or more of them accordingly to use the API. As the library is provided as `<code>libtokyocabinet.a</code>' and `<code>libtokyocabinet.so</code>' and they depend on `<code>libz.so</code>', `<code>libbz2.so</code>', `<code>librt.so</code>', `<code>libpthread.so</code>', `<code>libm.so</code>', and `<code>libc.so</code>', linker options corresponding to them are required by the build command. The typical build command is the following.</p>
-
--<pre>gcc -I/usr/local/include tc_example.c -o tc_example \
-- -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
-+<pre>gcc -I/opt/csw/include tc_example.c -o tc_example \
-+ -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
- </pre>
-
- <p>You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`<code>extern "C"</code>' block), you can simply include them into your C++ programs.</p>
-diff --git a/doc/spex-ja.html b/doc/spex-ja.html
-index 7ab9cd4..1fd4a9d 100644
---- a/doc/spex-ja.html
-+++ b/doc/spex-ja.html
-@@ -194,39 +194,39 @@
-
- <p>一連の作業が終ると、以下のファイルがインストールされます。</p>
-
--<pre>/usr/local/include/tcutil.h
--/usr/local/include/tchdb.h
--/usr/local/include/tcbdb.h
--/usr/local/include/tcfdb.h
--/usr/local/include/tctdb.h
--/usr/local/include/tcadb.h
--/usr/local/lib/libtokyocabinet.a
--/usr/local/lib/libtokyocabinet.so.x.y.z
--/usr/local/lib/libtokyocabinet.so.x
--/usr/local/lib/libtokyocabinet.so
--/usr/local/lib/pkgconfig/tokyocabinet.pc
--/usr/local/bin/tcutest
--/usr/local/bin/tcumttest
--/usr/local/bin/tcucodec
--/usr/local/bin/tchtest
--/usr/local/bin/tchmttest
--/usr/local/bin/tchmgr
--/usr/local/bin/tcbmgr
--/usr/local/bin/tcbtest
--/usr/local/bin/tcbmttest
--/usr/local/bin/tcftest
--/usr/local/bin/tcfmttest
--/usr/local/bin/tcfmgr
--/usr/local/bin/tcttest
--/usr/local/bin/tctmttest
--/usr/local/bin/tctmgr
--/usr/local/bin/tcatest
--/usr/local/bin/tcamttest
--/usr/local/bin/tcamgr
--/usr/local/libexec/tcawmgr.cgi
--/usr/local/share/tokyocabinet/...
--/usr/local/man/man1/...
--/usr/local/man/man3/...
-+<pre>/opt/csw/include/tcutil.h
-+/opt/csw/include/tchdb.h
-+/opt/csw/include/tcbdb.h
-+/opt/csw/include/tcfdb.h
-+/opt/csw/include/tctdb.h
-+/opt/csw/include/tcadb.h
-+/opt/csw/lib/libtokyocabinet.a
-+/opt/csw/lib/libtokyocabinet.so.x.y.z
-+/opt/csw/lib/libtokyocabinet.so.x
-+/opt/csw/lib/libtokyocabinet.so
-+/opt/csw/lib/pkgconfig/tokyocabinet.pc
-+/opt/csw/bin/tcutest
-+/opt/csw/bin/tcumttest
-+/opt/csw/bin/tcucodec
-+/opt/csw/bin/tchtest
-+/opt/csw/bin/tchmttest
-+/opt/csw/bin/tchmgr
-+/opt/csw/bin/tcbmgr
-+/opt/csw/bin/tcbtest
-+/opt/csw/bin/tcbmttest
-+/opt/csw/bin/tcftest
-+/opt/csw/bin/tcfmttest
-+/opt/csw/bin/tcfmgr
-+/opt/csw/bin/tcttest
-+/opt/csw/bin/tctmttest
-+/opt/csw/bin/tctmgr
-+/opt/csw/bin/tcatest
-+/opt/csw/bin/tcamttest
-+/opt/csw/bin/tcamgr
-+/opt/csw/libexec/tcawmgr.cgi
-+/opt/csw/share/tokyocabinet/...
-+/opt/csw/man/man1/...
-+/opt/csw/man/man3/...
- </pre>
-
- <h3 id="installation_option">configureのオプション</h3>
-@@ -248,14 +248,14 @@
- <li><code>--disable-shared</code> : 共有ライブラリのビルドを行わない。</li>
- </ul>
-
--<p>`<code>--prefix</code>' などのオプションも一般的なUNIXソフトウェアのパッケージと同様に利用可能です。`<code>/usr/local</code>' 以下ではなく '<code>/usr</code>' 以下にインストールしたい場合は `<code>--prefix=/usr</code>' を指定してください。なお、ライブラリ検索パスに `<code>/usr/local/lib</code>' が入っていない環境では、Tokyo Cabinetのアプリケーションを実行する際に環境変数 `<code>LD_LIBRARY_PATH</code>' の値に `<code>/usr/local/lib</code>' を含めておくようにしてください。</p>
-+<p>`<code>--prefix</code>' などのオプションも一般的なUNIXソフトウェアのパッケージと同様に利用可能です。`<code>/opt/csw</code>' 以下ではなく '<code>/usr</code>' 以下にインストールしたい場合は `<code>--prefix=/usr</code>' を指定してください。なお、ライブラリ検索パスに `<code>/opt/csw/lib</code>' が入っていない環境では、Tokyo Cabinetのアプリケーションを実行する際に環境変数 `<code>LD_LIBRARY_PATH</code>' の値に `<code>/opt/csw/lib</code>' を含めておくようにしてください。</p>
-
- <h3 id="installation_library">ライブラリの使い方</h3>
-
- <p>Tokyo CabinetはC言語のAPIを提供し、それはC89標準（ANSI C）またはC99標準に準拠したプログラムから利用することができます。Tokyo Cabinetヘッダは `<code>tcutil.h</code>'、`<code>tchdb.h</code>'、`<code>tcbdb.h</code>'、`<code>tcadb.h</code>' として提供されますので、適宜それらをアプリケーションのソースコード中でインクルードした上で、APIの各種機能を利用してください。ライブラリは `<code>libtokyocabinet.a</code>' および `<code>libtokyocabinet.so</code>' として提供され、それらは `<code>libz.so</code>'、`<code>libbz2.so</code>', `<code>librt.so</code>', `<code>libpthread.so</code>'、`<code>libm.so</code>'、`<code>libc.so</code>' に依存しますので、アプリケーションプログラムをビルドする際にはそれらに対応するリンカオプションをつけてください。最も典型的なビルド手順は以下のように
なります。</p>
-
--<pre>gcc -I/usr/local/include tc_example.c -o tc_example \
-- -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
-+<pre>gcc -I/opt/csw/include tc_example.c -o tc_example \
-+ -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
- </pre>
-
- <p>Tokyo CabinetはC++言語のプログラムからも利用することができます。各ヘッダは暗黙的にCリンケージ（「<code>extern "C"</code>」ブロック）で包まれているので、単にインクルードするだけで利用することができます。</p>
-diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3
-index d050da5..ce275ce 100644
---- a/man/tokyocabinet.3
-+++ b/man/tokyocabinet.3
-@@ -101,9 +101,9 @@ In cases that multiple processes access a database at the same time or some proc
- Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following.
- .PP
- .RS
--gcc \-I/usr/local/include tc_example.c \-o tc_example \\
-+gcc \-I/opt/csw/include tc_example.c \-o tc_example \\
- .br
-- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
-+ \-L/opt/csw/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
- .RE
- .PP
- You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs.
---
-1.7.6.1
-
Added: csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch (rev 0)
+++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408)
@@ -0,0 +1,220 @@
+From c032fb31ec09d251f675bdd4d064cc868b771d99 Mon Sep 17 00:00:00 2001
+From: Shawn McDermott <sgtmcd at opencsw.org>
+Date: Tue, 20 Sep 2011 14:43:37 +0200
+Subject: [PATCH] updated paths for csw
+
+---
+ doc/spex-en.html | 72 ++++++++++++++++++++++++++--------------------------
+ doc/spex-ja.html | 72 ++++++++++++++++++++++++++--------------------------
+ man/tokyocabinet.3 | 4 +-
+ 3 files changed, 74 insertions(+), 74 deletions(-)
+
+diff --git a/doc/spex-en.html b/doc/spex-en.html
+index 26c40ee..60ff06c 100644
+--- a/doc/spex-en.html
++++ b/doc/spex-en.html
+@@ -192,39 +192,39 @@
+
+ <p>When a series of work finishes, the following files will be installed.</p>
+
+-<pre>/usr/local/include/tcutil.h
+-/usr/local/include/tchdb.h
+-/usr/local/include/tcbdb.h
+-/usr/local/include/tcfdb.h
+-/usr/local/include/tctdb.h
+-/usr/local/include/tcadb.h
+-/usr/local/lib/libtokyocabinet.a
+-/usr/local/lib/libtokyocabinet.so.x.y.z
+-/usr/local/lib/libtokyocabinet.so.x
+-/usr/local/lib/libtokyocabinet.so
+-/usr/local/lib/pkgconfig/tokyocabinet.pc
+-/usr/local/bin/tcutest
+-/usr/local/bin/tcumttest
+-/usr/local/bin/tcucodec
+-/usr/local/bin/tchtest
+-/usr/local/bin/tchmttest
+-/usr/local/bin/tchmgr
+-/usr/local/bin/tcbmgr
+-/usr/local/bin/tcbtest
+-/usr/local/bin/tcbmttest
+-/usr/local/bin/tcftest
+-/usr/local/bin/tcfmttest
+-/usr/local/bin/tcfmgr
+-/usr/local/bin/tcttest
+-/usr/local/bin/tctmttest
+-/usr/local/bin/tctmgr
+-/usr/local/bin/tcatest
+-/usr/local/bin/tcamttest
+-/usr/local/bin/tcamgr
+-/usr/local/libexec/tcawmgr.cgi
+-/usr/local/share/tokyocabinet/...
+-/usr/local/man/man1/...
+-/usr/local/man/man3/...
++<pre>/opt/csw/include/tcutil.h
++/opt/csw/include/tchdb.h
++/opt/csw/include/tcbdb.h
++/opt/csw/include/tcfdb.h
++/opt/csw/include/tctdb.h
++/opt/csw/include/tcadb.h
++/opt/csw/lib/libtokyocabinet.a
++/opt/csw/lib/libtokyocabinet.so.x.y.z
++/opt/csw/lib/libtokyocabinet.so.x
++/opt/csw/lib/libtokyocabinet.so
++/opt/csw/lib/pkgconfig/tokyocabinet.pc
++/opt/csw/bin/tcutest
++/opt/csw/bin/tcumttest
++/opt/csw/bin/tcucodec
++/opt/csw/bin/tchtest
++/opt/csw/bin/tchmttest
++/opt/csw/bin/tchmgr
++/opt/csw/bin/tcbmgr
++/opt/csw/bin/tcbtest
++/opt/csw/bin/tcbmttest
++/opt/csw/bin/tcftest
++/opt/csw/bin/tcfmttest
++/opt/csw/bin/tcfmgr
++/opt/csw/bin/tcttest
++/opt/csw/bin/tctmttest
++/opt/csw/bin/tctmgr
++/opt/csw/bin/tcatest
++/opt/csw/bin/tcamttest
++/opt/csw/bin/tcamgr
++/opt/csw/libexec/tcawmgr.cgi
++/opt/csw/share/tokyocabinet/...
++/opt/csw/man/man1/...
++/opt/csw/man/man3/...
+ </pre>
+
+ <h3 id="installation_option">Options of Configure</h3>
+@@ -246,14 +246,14 @@
+ <li><code>--disable-shared</code> : avoid to build shared libraries.</li>
+ </ul>
+
+-<p>`<code>--prefix</code>' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `<code>/usr</code>' not `<code>/usr/local</code>', specify `<code>--prefix=/usr</code>'. As well, the library search path does not include `<code>/usr/local/lib</code>', it is necessary to set the environment variable `<code>LD_LIBRARY_PATH</code>' to include `<code>/usr/local/lib</code>' before running applications of Tokyo Cabinet.</p>
++<p>`<code>--prefix</code>' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `<code>/usr</code>' not `<code>/opt/csw</code>', specify `<code>--prefix=/usr</code>'. As well, the library search path does not include `<code>/opt/csw/lib</code>', it is necessary to set the environment variable `<code>LD_LIBRARY_PATH</code>' to include `<code>/opt/csw/lib</code>' before running applications of Tokyo Cabinet.</p>
+
+ <h3 id="installation_library">How to Use the Library</h3>
+
+ <p>Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `<code>tcutil.h</code>', `<code>tchdb.h</code>', `<code>tcbdb.h</code>', and `<code>tcadb.h</code>', applications should include one or more of them accordingly to use the API. As the library is provided as `<code>libtokyocabinet.a</code>' and `<code>libtokyocabinet.so</code>' and they depend on `<code>libz.so</code>', `<code>libbz2.so</code>', `<code>librt.so</code>', `<code>libpthread.so</code>', `<code>libm.so</code>', and `<code>libc.so</code>', linker options corresponding to them are required by the build command. The typical build command is the following.</p>
+
+-<pre>gcc -I/usr/local/include tc_example.c -o tc_example \
+- -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
++<pre>gcc -I/opt/csw/include tc_example.c -o tc_example \
++ -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
+ </pre>
+
+ <p>You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`<code>extern "C"</code>' block), you can simply include them into your C++ programs.</p>
+diff --git a/doc/spex-ja.html b/doc/spex-ja.html
+index 7ab9cd4..1fd4a9d 100644
+--- a/doc/spex-ja.html
++++ b/doc/spex-ja.html
+@@ -194,39 +194,39 @@
+
+ <p>一連の作業が終ると、以下のファイルがインストールされます。</p>
+
+-<pre>/usr/local/include/tcutil.h
+-/usr/local/include/tchdb.h
+-/usr/local/include/tcbdb.h
+-/usr/local/include/tcfdb.h
+-/usr/local/include/tctdb.h
+-/usr/local/include/tcadb.h
+-/usr/local/lib/libtokyocabinet.a
+-/usr/local/lib/libtokyocabinet.so.x.y.z
+-/usr/local/lib/libtokyocabinet.so.x
+-/usr/local/lib/libtokyocabinet.so
+-/usr/local/lib/pkgconfig/tokyocabinet.pc
+-/usr/local/bin/tcutest
+-/usr/local/bin/tcumttest
+-/usr/local/bin/tcucodec
+-/usr/local/bin/tchtest
+-/usr/local/bin/tchmttest
+-/usr/local/bin/tchmgr
+-/usr/local/bin/tcbmgr
+-/usr/local/bin/tcbtest
+-/usr/local/bin/tcbmttest
+-/usr/local/bin/tcftest
+-/usr/local/bin/tcfmttest
+-/usr/local/bin/tcfmgr
+-/usr/local/bin/tcttest
+-/usr/local/bin/tctmttest
+-/usr/local/bin/tctmgr
+-/usr/local/bin/tcatest
+-/usr/local/bin/tcamttest
+-/usr/local/bin/tcamgr
+-/usr/local/libexec/tcawmgr.cgi
+-/usr/local/share/tokyocabinet/...
+-/usr/local/man/man1/...
+-/usr/local/man/man3/...
++<pre>/opt/csw/include/tcutil.h
++/opt/csw/include/tchdb.h
++/opt/csw/include/tcbdb.h
++/opt/csw/include/tcfdb.h
++/opt/csw/include/tctdb.h
++/opt/csw/include/tcadb.h
++/opt/csw/lib/libtokyocabinet.a
++/opt/csw/lib/libtokyocabinet.so.x.y.z
++/opt/csw/lib/libtokyocabinet.so.x
++/opt/csw/lib/libtokyocabinet.so
++/opt/csw/lib/pkgconfig/tokyocabinet.pc
++/opt/csw/bin/tcutest
++/opt/csw/bin/tcumttest
++/opt/csw/bin/tcucodec
++/opt/csw/bin/tchtest
++/opt/csw/bin/tchmttest
++/opt/csw/bin/tchmgr
++/opt/csw/bin/tcbmgr
++/opt/csw/bin/tcbtest
++/opt/csw/bin/tcbmttest
++/opt/csw/bin/tcftest
++/opt/csw/bin/tcfmttest
++/opt/csw/bin/tcfmgr
++/opt/csw/bin/tcttest
++/opt/csw/bin/tctmttest
++/opt/csw/bin/tctmgr
++/opt/csw/bin/tcatest
++/opt/csw/bin/tcamttest
++/opt/csw/bin/tcamgr
++/opt/csw/libexec/tcawmgr.cgi
++/opt/csw/share/tokyocabinet/...
++/opt/csw/man/man1/...
++/opt/csw/man/man3/...
+ </pre>
+
+ <h3 id="installation_option">configureのオプション</h3>
+@@ -248,14 +248,14 @@
+ <li><code>--disable-shared</code> : 共有ライブラリのビルドを行わない。</li>
+ </ul>
+
+-<p>`<code>--prefix</code>' などのオプションも一般的なUNIXソフトウェアのパッケージと同様に利用可能です。`<code>/usr/local</code>' 以下ではなく '<code>/usr</code>' 以下にインストールしたい場合は `<code>--prefix=/usr</code>' を指定してください。なお、ライブラリ検索パスに `<code>/usr/local/lib</code>' が入っていない環境では、Tokyo Cabinetのアプリケーションを実行する際に環境変数 `<code>LD_LIBRARY_PATH</code>' の値に `<code>/usr/local/lib</code>' を含めておくようにしてください。</p>
++<p>`<code>--prefix</code>' などのオプションも一般的なUNIXソフトウェアのパッケージと同様に利用可能です。`<code>/opt/csw</code>' 以下ではなく '<code>/usr</code>' 以下にインストールしたい場合は `<code>--prefix=/usr</code>' を指定してください。なお、ライブラリ検索パスに `<code>/opt/csw/lib</code>' が入っていない環境では、Tokyo Cabinetのアプリケーションを実行する際に環境変数 `<code>LD_LIBRARY_PATH</code>' の値に `<code>/opt/csw/lib</code>' を含めておくようにしてください。</p>
+
+ <h3 id="installation_library">ライブラリの使い方</h3>
+
+ <p>Tokyo CabinetはC言語のAPIを提供し、それはC89標準（ANSI C）またはC99標準に準拠したプログラムから利用することができます。Tokyo Cabinetヘッダは `<code>tcutil.h</code>'、`<code>tchdb.h</code>'、`<code>tcbdb.h</code>'、`<code>tcadb.h</code>' として提供されますので、適宜それらをアプリケーションのソースコード中でインクルードした上で、APIの各種機能を利用してください。ライブラリは `<code>libtokyocabinet.a</code>' および `<code>libtokyocabinet.so</code>' として提供され、それらは `<code>libz.so</code>'、`<code>libbz2.so</code>', `<code>librt.so</code>', `<code>libpthread.so</code>'、`<code>libm.so</code>'、`<code>libc.so</code>' に依存しますので、アプリケーションプログラムをビルドする際にはそれらに対応するリンカオプションをつけてください。最も典型的なビルド手順は以下のように
なります。</p>
+
+-<pre>gcc -I/usr/local/include tc_example.c -o tc_example \
+- -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
++<pre>gcc -I/opt/csw/include tc_example.c -o tc_example \
++ -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
+ </pre>
+
+ <p>Tokyo CabinetはC++言語のプログラムからも利用することができます。各ヘッダは暗黙的にCリンケージ（「<code>extern "C"</code>」ブロック）で包まれているので、単にインクルードするだけで利用することができます。</p>
+diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3
+index d050da5..ce275ce 100644
+--- a/man/tokyocabinet.3
++++ b/man/tokyocabinet.3
+@@ -101,9 +101,9 @@ In cases that multiple processes access a database at the same time or some proc
+ Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following.
+ .PP
+ .RS
+-gcc \-I/usr/local/include tc_example.c \-o tc_example \\
++gcc \-I/opt/csw/include tc_example.c \-o tc_example \\
+ .br
+- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
++ \-L/opt/csw/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
+ .RE
+ .PP
+ You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs.
+--
+1.7.6.1
+
Added: csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch (rev 0)
+++ csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch 2012-06-14 20:47:00 UTC (rev 18408)
@@ -0,0 +1,93 @@
+From eee3e782fa7694aa0f03a4995b41419ee51878e0 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 12 Jun 2012 22:30:30 +0200
+Subject: [PATCH] Use make variable
+
+---
+ Makefile.in | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5282ec2..a6e4f01 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -134,7 +134,7 @@ install :
+
+
+ install-strip :
+- make DESTDIR=$(DESTDIR) install
++ $(MAKE) DESTDIR=$(DESTDIR) install
+ cd $(DESTDIR)$(BINDIR) && strip $(COMMANDFILES)
+
+
+@@ -151,26 +151,26 @@ uninstall :
+
+
+ dist :
+- make version
+- make untabify
+- make distclean
++ $(MAKE) version
++ $(MAKE) untabify
++ $(MAKE) distclean
+ cd .. && tar cvf - $(PACKAGEDIR) | gzip -c > $(PACKAGETGZ)
+ sync ; sync
+
+
+ distclean : clean
+- cd example && make clean
+- cd bros && make clean
++ cd example && $(MAKE) clean
++ cd bros && $(MAKE) clean
+ rm -rf Makefile tokyocabinet.pc config.cache config.log config.status autom4te.cache
+
+
+ check :
+- make check-util
+- make check-hdb
+- make check-bdb
+- make check-fdb
+- make check-tdb
+- make check-adb
++ $(MAKE) check-util
++ $(MAKE) check-hdb
++ $(MAKE) check-bdb
++ $(MAKE) check-fdb
++ $(MAKE) check-tdb
++ $(MAKE) check-adb
+ rm -rf casket*
+ @printf '\n'
+ @printf '#================================================================\n'
+@@ -586,7 +586,7 @@ check-adb :
+
+
+ check-valgrind :
+- make RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check
++ $(MAKE) RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check
+ grep ERROR *.vlog | grep -v ' 0 errors' ; true
+ grep 'at exit' *.vlog | grep -v ' 0 bytes' ; true
+
+@@ -630,13 +630,13 @@ check-race :
+ check-forever :
+ while true ; \
+ do \
+- make check || break ; \
+- make check || break ; \
+- make check-thread || break ; \
+- make check-race || break ; \
+- make check-race || break ; \
+- make check-compare || break ; \
+- make check-compare || break ; \
++ $(MAKE) check || break ; \
++ $(MAKE) check || break ; \
++ $(MAKE) check-thread || break ; \
++ $(MAKE) check-race || break ; \
++ $(MAKE) check-race || break ; \
++ $(MAKE) check-compare || break ; \
++ $(MAKE) check-compare || break ; \
+ done
+
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch
===================================================================
--- csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch (rev 0)
+++ csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408)
@@ -0,0 +1,30 @@
+From 4a5ab50424e83a4148a961b48b25587f7325d675 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Tue, 12 Jun 2012 23:08:08 +0200
+Subject: [PATCH] adjust man page for csw
+
+---
+ man/tokyocabinet.3 | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3
+index d050da5..fa67266 100644
+--- a/man/tokyocabinet.3
++++ b/man/tokyocabinet.3
+@@ -101,9 +101,11 @@ In cases that multiple processes access a database at the same time or some proc
+ Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following.
+ .PP
+ .RS
+-gcc \-I/usr/local/include tc_example.c \-o tc_example \\
++cc \-I/opt/csw/include tc_example.c \-o tc_example \\
+ .br
+- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
++ \-L/opt/csw/lib \-R/opt/csw/lib \-ltokyocabinet \\
++.br
++ \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc
+ .RE
+ .PP
+ You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs.
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list