Index: head/databases/tokyocabinet/Makefile
===================================================================
--- head/databases/tokyocabinet/Makefile	(revision 413149)
+++ head/databases/tokyocabinet/Makefile	(revision 413150)
@@ -1,95 +1,85 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	tokyocabinet
 PORTVERSION=	1.4.48
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/kuriyama \
 		http://fallabs.com/${PORTNAME}/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Modern implementation of DBM
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_LDCONFIG=	yes
 
+PORTDOCS=	*
+
 OPTIONS_DEFINE=	DEBUG DEVEL FASTEST LZMA LZO PTHREAD PROFILE SHARED SWAB UYIELD DOCS
 OPTIONS_DEFAULT=	PTHREAD SHARED
+OPTIONS_SUB=	yes
+
 DEBUG_DESC=	Debugging support
 DEVEL_DESC=	Development build
 FASTEST_DESC=	Fastest run
 LZMA_DESC=	LZMA codec
 LZO_DESC=	LZO codec
 PTHREAD_DESC=	Enable POSIX thread support
 PROFILE_DESC=	Profiling build
 SHARED_DESC=	Shared build
 SWAB_DESC=	Swapping byte-orders build
 UYIELD_DESC=	Detecting race conditions
 
-.include <bsd.port.options.mk>
+DEBUG_CONFIGURE_ENABLE=		debug
+DEBUG_PREVENTS=			LZMA
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.in
-.endif
+DEVEL_CONFIGURE_ENABLE=		devel
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.if ${PORT_OPTIONS:MDEVEL}
-CONFIGURE_ARGS+=	--enable-devel
-.endif
-.if ${PORT_OPTIONS:MFASTEST}
-CONFIGURE_ARGS+=	--enable-fastest
-.endif
+FASTEST_CONFIGURE_ENABLE=	fastest
+
 # to not confuse with system liblzma
-.if ${PORT_OPTIONS:MLZMA}
-CONFIGURE_ARGS+=	--enable-exlzma
-LIB_DEPENDS+=		liblzma.so.1:archivers/lzmalib
-.else
-CONFIGURE_ARGS+=	--disable-exlzma
-.endif
-.if ${PORT_OPTIONS:MLZO}
-CONFIGURE_ARGS+=	--enable-exlzo
-LIB_DEPENDS+=		liblzo2.so:archivers/lzo2
-.else
-CONFIGURE_ARGS+=	--disable-exlzo
-.endif
-.if ! ${PORT_OPTIONS:MPTHREAD}
-CONFIGURE_ARGS+=	--disable-pthread
-.endif
-.if ${PORT_OPTIONS:MPROFILE}
-CONFIGURE_ARGS+=	--enable-profile
-.endif
-.if ! ${PORT_OPTIONS:MSHARED}
-CONFIGURE_ARGS+=	--disable-shared
-.endif
-.if ${PORT_OPTIONS:MSWAB}
-CONFIGURE_ARGS+=	--enable-swab
-.endif
-.if ${PORT_OPTIONS:MUYIELD}
-CONFIGURE_ARGS+=	--enable-uyield
-.endif
+LZMA_CONFIGURE_ENABLE=		exlzma
+LZMA_LIB_DEPENDS=		liblzma.so.1:archivers/lzmalib
+LZMA_PREVENTS=			DEBUG
 
+LZO_CONFIGURE_ENABLE=		exlzo
+LZO_LIB_DEPENDS=		liblzo2.so:archivers/lzo2
+
+PTHREAD_CONFIGURE_ENABLE=	pthread
+
+PROFILE_CONFIGURE_ENABLE=	profile
+PROFILE_PREVENTS=		SHARED
+
+SHARED_CONFIGURE_ENABLE=	shared
+SHARED_PREVENTS=		PROFILE
+
+SWAB_CONFIGURE_ENABLE=		swab
+
+UYIELD_CONFIGURE_ENABLE=	uyield
+
 SHLIB_VER=	9.11.0
 SHLIB_VER_MAJ=	9
 
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ}
 
 # Because gnomehack will search "(libdir)" and it doesn't work, we need
 # to patch it manually.
 post-patch:
 	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
 		-e 's|@datarootdir@|@datarootdir@/doc|' \
 		${WRKSRC}/Makefile.in
 
+post-patch-FASTEST-on:
+	${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure
+
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so \
-		${STAGEDIR}${PREFIX}/libexec/tcawmgr.cgi
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/libexec/tcawmgr.cgi
+
+post-install-SHARED-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
Index: head/databases/tokyocabinet/pkg-plist
===================================================================
--- head/databases/tokyocabinet/pkg-plist	(revision 413149)
+++ head/databases/tokyocabinet/pkg-plist	(revision 413150)
@@ -1,61 +1,61 @@
 bin/tcamgr
 bin/tcamttest
 bin/tcatest
 bin/tcbmgr
 bin/tcbmttest
 bin/tcbtest
 bin/tcfmgr
 bin/tcfmttest
 bin/tcftest
 bin/tchmgr
 bin/tchmttest
 bin/tchtest
 bin/tctmgr
 bin/tctmttest
 bin/tcttest
 bin/tcucodec
 bin/tcumttest
 bin/tcutest
 include/tcadb.h
 include/tcbdb.h
 include/tcfdb.h
 include/tchdb.h
 include/tcutil.h
 include/tctdb.h
 lib/libtokyocabinet.a
-lib/libtokyocabinet.so
-lib/libtokyocabinet.so.%%SHLIB_VER_MAJ%%
-lib/libtokyocabinet.so.%%SHLIB_VER%%
+%%SHARED%%lib/libtokyocabinet.so
+%%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER_MAJ%%
+%%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER%%
 libdata/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
 man/man1/tcamgr.1.gz
 man/man1/tcamttest.1.gz
 man/man1/tcatest.1.gz
 man/man1/tcbmgr.1.gz
 man/man1/tcbmttest.1.gz
 man/man1/tcbtest.1.gz
 man/man1/tcfmgr.1.gz
 man/man1/tcfmttest.1.gz
 man/man1/tcftest.1.gz
 man/man1/tchmgr.1.gz
 man/man1/tchmttest.1.gz
 man/man1/tchtest.1.gz
 man/man1/tctmgr.1.gz
 man/man1/tctmttest.1.gz
 man/man1/tcttest.1.gz
 man/man1/tcucodec.1.gz
 man/man1/tcumttest.1.gz
 man/man1/tcutest.1.gz
 man/man3/tcadb.3.gz
 man/man3/tcbdb.3.gz
 man/man3/tcfdb.3.gz
 man/man3/tchdb.3.gz
 man/man3/tclist.3.gz
 man/man3/tcmap.3.gz
 man/man3/tcmdb.3.gz
 man/man3/tcmpool.3.gz
 man/man3/tctdb.3.gz
 man/man3/tctree.3.gz
 man/man3/tcutil.3.gz
 man/man3/tcxstr.3.gz
 man/man3/tokyocabinet.3.gz