Date: Sat, 16 Jan 2016 16:48:50 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406240 - head/sysutils/puppet4 Message-ID: <201601161648.u0GGmok3030234@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sat Jan 16 16:48:50 2016 New Revision: 406240 URL: https://svnweb.freebsd.org/changeset/ports/406240 Log: - Don't use deprecated @dirrm in plist generation - Use options helpers - There's no need to include bsd.port.pre.mk or bsd.port.options.mk Approved by: portmgr blanket Modified: head/sysutils/puppet4/Makefile Modified: head/sysutils/puppet4/Makefile ============================================================================== --- head/sysutils/puppet4/Makefile Sat Jan 16 16:45:34 2016 (r406239) +++ head/sysutils/puppet4/Makefile Sat Jan 16 16:48:50 2016 (r406240) @@ -46,10 +46,6 @@ RFACTER_RUN_DEPENDS= rubygem-facter>=2.0 CFACTER_BUILD_DEPENDS= facter>=3.0:${PORTSDIR}/sysutils/facter CFACTER_RUN_DEPENDS= facter>=3.0:${PORTSDIR}/sysutils/facter -.include <bsd.port.options.mk> - -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ @@ -99,14 +95,16 @@ post-install: ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601161648.u0GGmok3030234>