Index: head/databases/kyotocabinet/Makefile
===================================================================
--- head/databases/kyotocabinet/Makefile	(revision 398593)
+++ head/databases/kyotocabinet/Makefile	(revision 398594)
@@ -1,40 +1,38 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	kyotocabinet
 PORTVERSION=	1.2.76
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Straightforward implementation of DBM
 
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
 CPPFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	PCDIR=${PREFIX}/libdata/pkgconfig
 REINPLACE_ARGS=	-i ''
+TEST_TARGET=	check
 USE_LDCONFIG=	yes
 USES=		gmake
 
 NOT_FOR_ARCHS=	powerpc
 NOT_FOR_ARCHS_REASON=	does not link
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile ${WRKSRC}/lab/kcdict/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libkyotocabinet.so.16.13.0
 	${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} ${BINMODE} '{}' \;
 	${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} ${DOCMODE} '{}' \;
-
-regression-test test: build
-	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check
 
 .include <bsd.port.mk>
Index: head/databases/kyotocabinet/files/patch-kccommon.h
===================================================================
--- head/databases/kyotocabinet/files/patch-kccommon.h	(revision 398593)
+++ head/databases/kyotocabinet/files/patch-kccommon.h	(revision 398594)
@@ -1,11 +1,11 @@
---- kccommon.h.orig	2012-05-25 00:27:59.000000000 +0800
-+++ kccommon.h	2013-12-28 01:25:49.838357594 +0800
+--- kccommon.h.orig	2012-05-24 16:27:59 UTC
++++ kccommon.h
 @@ -82,7 +82,7 @@
  using ::snprintf;
  }
  
 -#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_MSC_VER)
 +#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_MSC_VER) || defined(_LIBCPP_VERSION)
  
  #include <unordered_map>
  #include <unordered_set>