4 files changed, 36 insertions, 44 deletions

diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 829e947e7371..8e186bd39ad4 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tokyocabinet
-PORTVERSION=	1.2.11
+PORTVERSION=	1.3.2
 CATEGORIES=	databases
 MASTER_SITES=	http://tokyocabinet.sourceforge.net/
 
@@ -18,17 +18,16 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.if !defined (NO_INSTALL_MANPAGES)
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.in
+.endif
+
 MAN1=		tcamgr.1 tcatest.1 tcbmgr.1 tcbmttest.1 tcbtest.1 \
+		tcfmgr.1 tcfmttest.1 tcftest.1 \
 		tchmgr.1 tchmttest.1 tchtest.1 tcucodec.1 tcumttest.1 \
 		tcutest.1
-MAN3=		tcadb.3 tcbdb.3 tchdb.3 tcutil.3 tokyocabinet.3
-.endif
-DOCS=		COPYING ChangeLog README THANKS
-BINS=		tcamgr tcatest tcbmgr tcbmttest tcbtest tchmgr tchmttest \
-		tchtest tcucodec tcumttest tcutest
-LIBS=		libtokyocabinet.a
-INCLUDES=	tcbdb.h tchdb.h tcutil.h
+MAN3=		tcadb.3 tcbdb.3 tcfdb.3 tchdb.3 tclist.3 tcmap.3 \
+		tcmdb.3 tcmpool.3 tcutil.3 tcxstr.3 tokyocabinet.3
 
 OPTIONS=	DEBUG "Debugging support" off \
 		DEVEL "Development build" off \
@@ -42,6 +41,10 @@ OPTIONS=	DEBUG "Debugging support" off \
 
 .include <bsd.port.pre.mk>
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -77,23 +80,7 @@ CONFIGURE_ARGS+=	--disable-shared
 # to patch it manually.
 post-patch:
 	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
+		-e 's|@datarootdir@|@datarootdir@/doc|' \
 		${WRKSRC}/Makefile.in
 
-do-install:
-	@${INSTALL_PROGRAM} ${BINS:S,^,${WRKSRC}/,} ${PREFIX}/bin/
-	@${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man/,} ${MAN1PREFIX}/man/man1
-	@${INSTALL_MAN} ${MAN3:S,^,${WRKSRC}/man/,} ${MAN3PREFIX}/man/man3
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${DOCSDIR}/)
-.endif
-.for i in ${LIBS}
-	@${CP} ${WRKSRC}/${i} ${PREFIX}/lib/
-.endfor
-.for j in ${INCLUDES}
-	@${CP} ${WRKSRC}/${j} ${PREFIX}/include/
-.endfor
-	@${CP} ${WRKSRC}/tokyocabinet.pc ${PREFIX}/libdata/pkgconfig/
-
 .include <bsd.port.post.mk>
diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo
index eadcdf55bfb5..819a77ec0535 100644
--- a/databases/tokyocabinet/distinfo
+++ b/databases/tokyocabinet/distinfo
@@ -1,3 +1,3 @@
-MD5 (tokyocabinet-1.2.11.tar.gz) = da34814c547e21ae1dc48fae3b4b47e7
-SHA256 (tokyocabinet-1.2.11.tar.gz) = 1e39b6aa69f1392e719a62eafdecd1efc2b77e649b243a0d281492c78bd0ae68
-SIZE (tokyocabinet-1.2.11.tar.gz) = 416034
+MD5 (tokyocabinet-1.3.2.tar.gz) = 1f3e55677089bd17686984e7d4700fb1
+SHA256 (tokyocabinet-1.3.2.tar.gz) = 0555848ad0ca346d6c5fd5970fe1c2a79b0a8eff1183c36523031f6a58bd0cbf
+SIZE (tokyocabinet-1.3.2.tar.gz) = 434415
diff --git a/databases/tokyocabinet/files/extra-patch-Makefile.in b/databases/tokyocabinet/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..01257294ff8e
--- /dev/null
+++ b/databases/tokyocabinet/files/extra-patch-Makefile.in
@@ -0,0 +1,11 @@
+--- ./Makefile.in.orig	2008-08-19 03:29:34.000000000 +0000
++++ ./Makefile.in	2008-08-19 03:29:52.000000000 +0000
+@@ -115,8 +115,6 @@
+ 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ 	cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
+-	mkdir -p $(DESTDIR)$(DATADIR)
+-	cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
+ 	mkdir -p $(DESTDIR)$(MAN1DIR)
+ 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
+ 	mkdir -p $(DESTDIR)$(MAN3DIR)
diff --git a/databases/tokyocabinet/pkg-plist b/databases/tokyocabinet/pkg-plist
index 2ebca6ec9600..cdc4237af6fb 100644
--- a/databases/tokyocabinet/pkg-plist
+++ b/databases/tokyocabinet/pkg-plist
@@ -4,29 +4,23 @@ bin/tcatest
 bin/tcbmgr
 bin/tcbmttest
 bin/tcbtest
+bin/tcfmgr
+bin/tcfmttest
+bin/tcftest
 bin/tchmgr
 bin/tchmttest
 bin/tchtest
 bin/tcucodec
 bin/tcumttest
 bin/tcutest
+include/tcadb.h
 include/tcbdb.h
+include/tcfdb.h
 include/tchdb.h
 include/tcutil.h
 lib/libtokyocabinet.a
+lib/libtokyocabinet.so
+lib/libtokyocabinet.so.4
+lib/libtokyocabinet.so.4.3.0
 libdata/pkgconfig/tokyocabinet.pc
-%%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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+libexec/tcawmgr.cgi