MFH: r337638

- Use USE_GCC=any
- Change -lpthread to -pthread
- Strip binary executable and shared library
- Use NOT_FOR_ARCHS
- Remove outdated ARCH check and pkg-message
- Support STAGEDIR

Approved by:	portmgr (bapt, via IRC)

3 files changed, 33 insertions, 42 deletions

diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile
index d8ad7cefaf5c..cf10c56c06ef 100644
--- a/databases/kyotocabinet/Makefile
+++ b/databases/kyotocabinet/Makefile
@@ -14,57 +14,36 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
+CPPFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	PCDIR="${PREFIX}/libdata/pkgconfig"
+MAKE_ARGS=	PCDIR=${PREFIX}/libdata/pkgconfig
+REINPLACE_ARGS=	-i ''
+USE_GCC=	any
 USE_LDCONFIG=	yes
 USES=		gmake
 
-MAN1=		kccachetest.1 \
-		kcdirmgr.1 \
-		kcdirtest.1 \
-		kcforestmgr.1 \
-		kcforesttest.1 \
-		kcgrasstest.1 \
-		kchashmgr.1 \
-		kchashtest.1 \
-		kclangctest.1 \
-		kcpolymgr.1 \
-		kcpolytest.1 \
-		kcprototest.1 \
-		kcstashtest.1 \
-		kctreemgr.1 \
-		kctreetest.1 \
-		kcutilmgr.1 \
-		kcutiltest.1
+NOT_FOR_ARCHS=	powerpc
+NOT_FOR_ARCHS_REASON=	does not link
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && !defined(CPUTYPE)
-CONFIGURE_TARGET=	i586-portbld-freebsd${OSREL}
-CPUTYPE=	i586
-PKGMESSAGE=	${FILESDIR}/pkg-message.${ARCH}
-# _CPUCFLAGS will somehow show up twice in CFLAGS but who cares..
-.include <bsd.cpu.mk>
-.endif
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not link on powerpc
-.endif
-
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in
 .endif
 
+post-build:
+	@cd ${WRKSRC}/ && ${STRIP_CMD} libkyotocabinet.so.16.13.0 kccachetest \
+		kcdirmgr kcdirtest kcforestmgr kcforesttest kcgrasstest \
+		kchashmgr kchashtest kclangctest kcpolymgr kcpolytest \
+		kcprototest kcstashtest kctreemgr kctreetest kcutilmgr \
+		kcutiltest
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${FIND} ${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \;
-	${FIND} ${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \;
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/
-.endif
-.if exists(${PKGMESSAGE})
-	@${CAT} ${PKGMESSAGE}
+	${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \;
+	${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \;
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/kyotocabinet/files/pkg-message.i386 b/databases/kyotocabinet/files/pkg-message.i386
deleted file mode 100644
index e2731fcea01e..000000000000
--- a/databases/kyotocabinet/files/pkg-message.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-========================================================================
-This binary package is built for i586 and higher, because Kyoto Cabinet
-relies on some kinds of CPU instructions that i386 and i486 do not have.
-Do not use this package on those CPUs.
-========================================================================
diff --git a/databases/kyotocabinet/pkg-plist b/databases/kyotocabinet/pkg-plist
index 9616155c5de9..1163842a6f86 100644
--- a/databases/kyotocabinet/pkg-plist
+++ b/databases/kyotocabinet/pkg-plist
@@ -39,6 +39,23 @@ lib/libkyotocabinet.so
 lib/libkyotocabinet.so.16
 lib/libkyotocabinet.so.16.13.0
 libdata/pkgconfig/kyotocabinet.pc
+man/man1/kccachetest.1.gz
+man/man1/kcdirmgr.1.gz
+man/man1/kcdirtest.1.gz
+man/man1/kcforestmgr.1.gz
+man/man1/kcforesttest.1.gz
+man/man1/kcgrasstest.1.gz
+man/man1/kchashmgr.1.gz
+man/man1/kchashtest.1.gz
+man/man1/kclangctest.1.gz
+man/man1/kcpolymgr.1.gz
+man/man1/kcpolytest.1.gz
+man/man1/kcprototest.1.gz
+man/man1/kcstashtest.1.gz
+man/man1/kctreemgr.1.gz
+man/man1/kctreetest.1.gz
+man/man1/kcutilmgr.1.gz
+man/man1/kcutiltest.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FOSSEXCEPTION