From owner-svn-ports-all@freebsd.org Wed Mar 30 00:52:42 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B631AE27B5; Wed, 30 Mar 2016 00:52:42 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 CC81F165B; Wed, 30 Mar 2016 00:52:41 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2U0qf9W028821; Wed, 30 Mar 2016 00:52:41 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2U0qfeU028820; Wed, 30 Mar 2016 00:52:41 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603300052.u2U0qfeU028820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 30 Mar 2016 00:52:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412146 - head/mail/sqlgrey 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.21 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: Wed, 30 Mar 2016 00:52:42 -0000 Author: amdmi3 Date: Wed Mar 30 00:52:40 2016 New Revision: 412146 URL: https://svnweb.freebsd.org/changeset/ports/412146 Log: - Clarify LICENSE - Add LICENSE_FILE - Add NO_ARCH - Cleanup etcdir handling - Switch to options helpers - Cosmetic fixes Modified: head/mail/sqlgrey/Makefile Modified: head/mail/sqlgrey/Makefile ============================================================================== --- head/mail/sqlgrey/Makefile Wed Mar 30 00:48:55 2016 (r412145) +++ head/mail/sqlgrey/Makefile Wed Mar 30 00:52:40 2016 (r412146) @@ -10,7 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Greylisting policy server for Postfix using an SQL backend -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \ p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \ @@ -23,57 +24,41 @@ SHEBANG_FILES= ${WRKSRC}/sqlgrey-logstat USE_PERL5= run USE_RC_SUBR= sqlgrey NO_BUILD= yes +NO_ARCH= yes ETCFILES= clients_fqdn_whitelist clients_ip_whitelist dyn_fqdn.regexp smtp_server.regexp sqlgrey.conf USERS= sqlgrey GROUPS= ${USERS} -ETCDIR?= etc/sqlgrey -SUB_LIST+= PERL=${PERL} USERS=${USERS} GROUPS=${GROUPS} +SUB_LIST= PERL=${PERL} USERS=${USERS} GROUPS=${GROUPS} PLIST_SUB= TOUCH=${TOUCH} +PORTDOCS= Changelog FAQ HOWTO README TODO + OPTIONS_DEFINE= PGSQL MYSQL SQLITE STATS DOCS OPTIONS_DEFAULT=PGSQL STATS_DESC= Depend on Date::Calc for logstats.pl script -.include - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= Changelog FAQ HOWTO README TODO -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite -.endif - -.if ${PORT_OPTIONS:MSTATS} -RUN_DEPENDS+= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc -.endif +PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg +MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql +SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite +STATS_RUN_DEPENDS= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc post-patch: - @${REINPLACE_CMD} -e 's!/etc/sqlgrey!${PREFIX}/${ETCDIR}!g' ${WRKSRC}/sqlgrey + @${REINPLACE_CMD} -e 's!/etc/sqlgrey!${ETCDIR}!g' ${WRKSRC}/sqlgrey do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${STAGEDIR}/${PREFIX}/sbin - ${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_config ${STAGEDIR}/${PREFIX}/sbin - @cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${STAGEDIR}/${MANPREFIX}/man/man1/sqlgrey.1 - @${MKDIR} ${STAGEDIR}/${PREFIX}/${ETCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_config ${STAGEDIR}${PREFIX}/sbin + cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${STAGEDIR}${MANPREFIX}/man/man1/sqlgrey.1 + @${MKDIR} ${STAGEDIR}${ETCDIR} .for i in ${ETCFILES} - ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}/${PREFIX}/${ETCDIR}/${i}.sample + ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${ETCDIR}/${i}.sample .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}/${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}/${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}/${DOCSDIR}." -.endif + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include