MFH: r337639

- Use USE_GCC=any
- Add missing USES=pkgconfig
- Remove deprecated PTHREAD_*
- Strip binary executable and shared library
- Support STAGEDIR

Approved by:	portmgr (mat, via IRC)

2 files changed, 23 insertions, 19 deletions

diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile
index 6006410decf9..69f621fcf87c 100644
--- a/databases/kyototycoon/Makefile
+++ b/databases/kyototycoon/Makefile
@@ -17,39 +17,35 @@ LIB_DEPENDS=	libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet
 OPTIONS_DEFINE=	DOCS
 
 CONFIGURE_ARGS=	--enable-profile --enable-uyield
+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
+USES=		gmake pkgconfig
 
-MAN1=		ktremotemgr.1 \
-		ktremotetest.1 \
-		ktserver.1 \
-		kttimedmgr.1 \
-		kttimedtest.1 \
-		ktutilmgr.1 \
-		ktutilserv.1 \
-		ktutiltest.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile
+post-build:
+	@cd ${WRKSRC}/ && ${STRIP_CMD} ktplugdbvoid.so ktplugservmemc.so \
+		ktremotemgr ktremotetest ktserver kttimedmgr kttimedtest \
+		ktutilmgr ktutilserv ktutiltest
 
 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}/
+	${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \;
+	${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \;
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/kyototycoon/pkg-plist b/databases/kyototycoon/pkg-plist
index 8c271e1071ef..d7817c3de8ce 100644
--- a/databases/kyototycoon/pkg-plist
+++ b/databases/kyototycoon/pkg-plist
@@ -23,6 +23,14 @@ lib/libkyototycoon.a
 libdata/pkgconfig/kyototycoon.pc
 libexec/ktplugdbvoid.so
 libexec/ktplugservmemc.so
+man/man1/ktremotemgr.1.gz
+man/man1/ktremotetest.1.gz
+man/man1/ktserver.1.gz
+man/man1/kttimedmgr.1.gz
+man/man1/kttimedtest.1.gz
+man/man1/ktutilmgr.1.gz
+man/man1/ktutilserv.1.gz
+man/man1/ktutiltest.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/doc/api/annotated.html