From 2845d4bf64abe9c8de75a150b939bc93aed3f07a Mon Sep 17 00:00:00 2001
From: pawel <pawel@FreeBSD.org>
Date: Thu, 5 Jun 2014 16:16:27 +0000
Subject: - Add staging support - Use options helpers, subs - Convert to
 USES=libtool

---
 mail/popular/Makefile  | 26 ++++++++++----------------
 mail/popular/pkg-plist | 19 +++++++++++++------
 2 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'mail')

diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 2ad4df0abdc0..16f56be282d5 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
 
 CONFLICTS=	pserv-[0-9]* synce-librapi2-[0-9]*
 
-USES=		perl5 gmake
-USE_AUTOTOOLS=	libtool
+USES=		libtool perl5 gmake
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 PDM_MODULES=	any master
@@ -26,30 +25,25 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
 
-MAN1=		pcheck.1 pcontrol.1 pdeliver.1 pstatus.1 ptestpdm.1
-MAN7=		popular-log.7
-MAN8=		pcheckd.8 pproxy.8 pserv.8 ringd.8
-
 OPTIONS_DEFINE=	DB4
 OPTIONS_DEFAULT=	DB4
+OPTIONS_SUB=	yes
+
 DB4_DESC=	Build db4 pdm module
+DB4_LIB_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDB4}
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-PLIST_SUB+=	WITH_DB4=""
 PDM_MODULES+=	db4
-.else
-PLIST_SUB+=	WITH_DB4="@comment "
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/popular
-	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${PREFIX}/etc/popular/pproxy.rc.sample
-	${INSTALL_DATA} ${WRKSRC}/conf/pserv.rc ${PREFIX}/etc/popular/pserv.rc.sample
-	${MKDIR} ${PREFIX}/include/popular
-	${FIND} ${WRKSRC}/src -name *.h | ${XARGS} -n 1 -J % ${INSTALL_DATA} % ${PREFIX}/include/popular
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample
+	${INSTALL_DATA} ${WRKSRC}/conf/pserv.rc ${STAGEDIR}${ETCDIR}/pserv.rc.sample
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/popular
+	${FIND} ${WRKSRC}/src -name *.h | ${XARGS} -n 1 -J % ${INSTALL_DATA} % \
+		${STAGEDIR}${PREFIX}/include/popular
 
 .include <bsd.port.mk>
diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist
index 5ae63426e658..152637add057 100644
--- a/mail/popular/pkg-plist
+++ b/mail/popular/pkg-plist
@@ -25,16 +25,23 @@ include/popular/util.h
 include/popular/xlog.h
 lib/popular/libpdm_any-1.5.5.so
 lib/popular/libpdm_any.a
-lib/popular/libpdm_any.la
 lib/popular/libpdm_any.so
 lib/popular/libpdm_master-1.5.5.so
 lib/popular/libpdm_master.a
-lib/popular/libpdm_master.la
 lib/popular/libpdm_master.so
-%%WITH_DB4%%lib/popular/libpdm_db4-1.5.5.so
-%%WITH_DB4%%lib/popular/libpdm_db4.a
-%%WITH_DB4%%lib/popular/libpdm_db4.la
-%%WITH_DB4%%lib/popular/libpdm_db4.so
+%%DB4%%lib/popular/libpdm_db4-1.5.5.so
+%%DB4%%lib/popular/libpdm_db4.a
+%%DB4%%lib/popular/libpdm_db4.so
+man/man1/pcheck.1.gz
+man/man1/pcontrol.1.gz
+man/man1/pdeliver.1.gz
+man/man1/pstatus.1.gz
+man/man1/ptestpdm.1.gz
+man/man7/popular-log.7.gz
+man/man8/pcheckd.8.gz
+man/man8/pproxy.8.gz
+man/man8/pserv.8.gz
+man/man8/ringd.8.gz
 sbin/pcheckd
 sbin/pproxy
 sbin/pserv
-- 
cgit