From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 16:16:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D51FD44; Thu, 5 Jun 2014 16:16:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1C0D2F5C; Thu, 5 Jun 2014 16:16:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55GGRK7047347; Thu, 5 Jun 2014 16:16:27 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55GGRGM047345; Thu, 5 Jun 2014 16:16:27 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406051616.s55GGRGM047345@svn.freebsd.org> From: Pawel Pekala Date: Thu, 5 Jun 2014 16:16:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356648 - head/mail/popular X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 16:16:28 -0000 Author: pawel Date: Thu Jun 5 16:16:27 2014 New Revision: 356648 URL: http://svnweb.freebsd.org/changeset/ports/356648 QAT: https://qat.redports.org/buildarchive/r356648/ Log: - Add staging support - Use options helpers, subs - Convert to USES=libtool Modified: head/mail/popular/Makefile head/mail/popular/pkg-plist Modified: head/mail/popular/Makefile ============================================================================== --- head/mail/popular/Makefile Thu Jun 5 16:13:28 2014 (r356647) +++ head/mail/popular/Makefile Thu Jun 5 16:16:27 2014 (r356648) @@ -14,8 +14,7 @@ BUILD_DEPENDS= p5-XML-DOM>=0:${PORTSDIR} 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 .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 Modified: head/mail/popular/pkg-plist ============================================================================== --- head/mail/popular/pkg-plist Thu Jun 5 16:13:28 2014 (r356647) +++ head/mail/popular/pkg-plist Thu Jun 5 16:16:27 2014 (r356648) @@ -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