ports/119963: [UPDATE] databases/tokyocabinet

Fri Jan 25 03:40:03 UTC 2008

>Number:         119963
>Category:       ports
>Synopsis:       [UPDATE] databases/tokyocabinet
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 25 03:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Felippe de Meirelles Motta
>Release:        FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
    lippe at shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC

>Description:
- Updated to 1.1.10;
- Now respect PORTDOCS;
- Fix pkg-plist, installing PORTDOCS in DOCSDIR instead DATADIR.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/tokyocabinet/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile

--- Makefile	25 Dec 2007 03:06:43 -0000	1.1
+++ Makefile	20 Jan 2008 05:56:59 -0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	tokyocabinet
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.10
 CATEGORIES=	databases
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gslin at gslin.org
 COMMENT=	A modern implementation of DBM
@@ -19,9 +18,57 @@
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		tcbmgr.1 tcbmttest.1 tcbtest.1 tchmgr.1 tchmttest.1 \
-		tchtest.1 tcucodec.1 tcumttest.1 tcutest.1
-MAN3=		tcbdb.3 tchdb.3 tcutil.3 tokyocabinet.3
+MAN1=		tcamgr.1 tcatest.1 tcbmgr.1 tcbmttest.1 tcbtest.1 \
+		tchmgr.1 tchmttest.1 tchtest.1 tcucodec.1 tcumttest.1 \
+		tcutest.1
+MAN3=		tcadb.3 tcbdb.3 tchdb.3 tcutil.3 tokyocabinet.3
+PORTDOCS=	COPYING ChangeLog README THANKS
+EXAMPLES=	benchmark.pdf common.css icon16.png index.html index.ja.html \
+		logo-ja.png logo.png spex-en.html spex-ja.html
+
+OPTIONS=	DEBUG "Debugging support" off \
+		DEVEL "Development build" off \
+		PROFILE "Profiling build" off \
+		OFF64 "Use to compile on 64-bit system" off \
+		FASTEST "Fastest run" off \
+		SWAB "Swapping byte-orders build" off \
+		UYIELD "Detecting race conditions" off \
+		ZLIB "Disable ZLIB compression" off \
+		PTHREAD "Disable POSIX thread support" off \
+		SHARED "Avoid to build shared libraries" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+.if defined(WITH_DEVEL)
+CONFIGURE_ARGS+=	--enable-devel
+.endif
+.if defined(WITH_PROFILE)
+CONFIGURE_ARGS+=	--enable-profile
+.endif
+.if defined(WITH_OFF64)
+CONFIGURE_ARGS+=	--enable-off64
+.endif
+.if defined(WITH_FASTEST)
+CONFIGURE_ARGS+=	--enable-fastest
+.endif
+.if defined(WITH_SWAB)
+CONFIGURE_ARGS+=	--enable-swab
+.endif
+.if defined(WITH_UYIELD)
+CONFIGURE_ARGS+=	--enable-uyield
+.endif
+.if defined(WITH_ZLIB)
+CONFIGURE_ARGS+=	--disable-zlib
+.endif
+.if defined(WITH_PTHREAD)
+CONFIGURE_ARGS+=	--disable-pthread
+.endif
+.if defined(WITH_SHARED)
+CONFIGURE_ARGS+=	--disable-shared
+.endif
 
 # Because gnomehack use "(libdir)" and it doesn't work, we need to patch
 # it manually.
@@ -29,4 +76,11 @@
 	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+do-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/doc
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/doc
+.endif
+
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/databases/tokyocabinet/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	25 Dec 2007 03:06:43 -0000	1.1
+++ distinfo	20 Jan 2008 05:56:59 -0000
@@ -1,3 +1,3 @@
-MD5 (tokyocabinet-1.1.6.tar.gz) = 25b86778713ef89d13570b2787815ea3
-SHA256 (tokyocabinet-1.1.6.tar.gz) = 188cecb014935de2fd11aa2e9ca13487378a3f18e35a4a9546489a85f8effa1a
-SIZE (tokyocabinet-1.1.6.tar.gz) = 312557
+MD5 (tokyocabinet-1.1.10.tar.gz) = 9be899393ff4cf8c63649594ac361ad6
+SHA256 (tokyocabinet-1.1.10.tar.gz) = 8e8adfa063f2bde2c403bfd4da0729fbc25c1e664dd60b4b9dee7d33964e5aca
+SIZE (tokyocabinet-1.1.10.tar.gz) = 339472
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/databases/tokyocabinet/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	25 Dec 2007 03:06:43 -0000	1.1
+++ pkg-plist	20 Jan 2008 05:56:59 -0000
@@ -1,16 +1,19 @@
 @comment $FreeBSD: ports/databases/tokyocabinet/pkg-plist,v 1.1 2007/12/25 03:06:43 clsung Exp $
-%%DATADIR%%/COPYING
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/THANKS
-%%DATADIR%%/doc/benchmark.pdf
-%%DATADIR%%/doc/common.css
-%%DATADIR%%/doc/icon16.png
-%%DATADIR%%/doc/index.html
-%%DATADIR%%/doc/index.ja.html
-%%DATADIR%%/doc/logo-ja.png
-%%DATADIR%%/doc/logo.png
-%%DATADIR%%/doc/spex-en.html
-%%DATADIR%%/doc/spex-ja.html
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/doc/benchmark.pdf
+%%PORTDOCS%%%%DOCSDIR%%/doc/common.css
+%%PORTDOCS%%%%DOCSDIR%%/doc/icon16.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/logo-ja.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/spex-en.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/spex-ja.html
+bin/tcamgr
+bin/tcatest
 bin/tcbmgr
 bin/tcbmttest
 bin/tcbtest
@@ -26,7 +29,7 @@
 lib/libtokyocabinet.a
 lib/libtokyocabinet.so
 lib/libtokyocabinet.so.1
-lib/libtokyocabinet.so.1.25.0
+lib/libtokyocabinet.so.1.29.0
 libdata/pkgconfig/tokyocabinet.pc
- at dirrmtry %%DATADIR%%/doc
- at dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:

