From owner-svn-ports-all@freebsd.org Wed Aug 29 18:52:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4A5710925A1; Wed, 29 Aug 2018 18:52:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6444E7A1BD; Wed, 29 Aug 2018 18:52:28 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CFCB211F0; Wed, 29 Aug 2018 18:52:28 +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 w7TIqSbv059227; Wed, 29 Aug 2018 18:52:28 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7TIqS6K059226; Wed, 29 Aug 2018 18:52:28 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201808291852.w7TIqS6K059226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 29 Aug 2018 18:52:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478366 - head/net-mgmt/flowd X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/net-mgmt/flowd X-SVN-Commit-Revision: 478366 X-SVN-Commit-Repository: ports 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.27 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, 29 Aug 2018 18:52:29 -0000 Author: amdmi3 Date: Wed Aug 29 18:52:27 2018 New Revision: 478366 URL: https://svnweb.freebsd.org/changeset/ports/478366 Log: - Switch to options helpers - Use shebangfix instead of manually fixing shebangs - Add LICENSE Modified: head/net-mgmt/flowd/Makefile Modified: head/net-mgmt/flowd/Makefile ============================================================================== --- head/net-mgmt/flowd/Makefile Wed Aug 29 18:45:44 2018 (r478365) +++ head/net-mgmt/flowd/Makefile Wed Aug 29 18:52:27 2018 (r478366) @@ -10,67 +10,59 @@ MASTER_SITES= http://www2.mindrot.org/files/flowd/ MAINTAINER= ports@FreeBSD.org COMMENT= Small, fast, and secure NetFlow collector -OPTIONS_SUB= yes -OPTIONS_DEFINE= PERL PYTHON -OPTIONS_DEFAULT=PERL +LICENSE= MIT BSD2CLAUSE BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/LICENSE -PERL_DESC= Install flowd perl module -PYTHON_DESC= Install flowd Python support - -USES= gmake +USES= gmake shebangfix +SHEBANG_FILES= tools/*.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var USE_RC_SUBR= flowd PORTDOCS= README INSTALL + FLOWD_USER= _flowd + USERS= ${FLOWD_USER} GROUPS= ${FLOWD_USER} -.include +OPTIONS_DEFINE= PERL PYTHON DOCS EXAMPLES +OPTIONS_DEFAULT=PERL +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -USE_PERL5+= build run -.endif +PERL_DESC= Install flowd perl module +PERL_USES= perl5 +PYTHON_DESC= Install flowd Python support +PYTHON_USES= python:2.7 +PYTHON_PLIST_SUB= PYTHON_VER=${PYTHON_VER} -.if ${PORT_OPTIONS:MPYTHON} -USES+= python:2.7 -PLIST_SUB+= PYTHON_VER=${PYTHON_VER} -.endif - post-patch: @${REINPLACE_CMD} -e "s;%%FLOWD_USER%%;${FLOWD_USER};g" \ ${WRKSRC}/flowd.h - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|' \ - ${WRKSRC}/tools/flowinsert.pl \ - ${WRKSRC}/tools/wormsuspects.pl -post-build: -.if ${PORT_OPTIONS:MPERL} +post-build-PERL-on: (cd ${WRKSRC}/Flowd-perl && ${PERL} Makefile.PL \ INSTALLSITEMAN3DIR=${PERL5_MAN3} \ DESTDIR=${STAGEDIR} PREFIX=${PREFIX} && \ ${MAKE_CMD}) -.endif -.if ${PORT_OPTIONS:MPYTHON} +post-build-PYTHON-on: ( cd ${WRKSRC} && ${PYTHON_CMD} setup.py build ) -.endif -pre-install: +pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + +pre-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ( cd ${WRKSRC}/tools && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ) -.if ${PORT_OPTIONS:MPERL} +pre-install-PERL-on: ( cd ${WRKSRC}/Flowd-perl && ${MAKE_CMD} install ) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so -.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so -.if ${PORT_OPTIONS:MPYTHON} +pre-install-PYTHON-on: ( cd ${WRKSRC} && ${PYTHON_CMD} setup.py install --root "${STAGEDIR}" ) - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/flowd.so -.endif + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/flowd.so .include