From owner-svn-ports-head@freebsd.org Sat Jan 16 16:31:10 2016 Return-Path: Delivered-To: svn-ports-head@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 4CAEBA837D0; Sat, 16 Jan 2016 16:31:10 +0000 (UTC) (envelope-from pawel@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 F3CDC1A82; Sat, 16 Jan 2016 16:31:09 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0GGV8ku024124; Sat, 16 Jan 2016 16:31:08 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GGV8kC024123; Sat, 16 Jan 2016 16:31:08 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601161631.u0GGV8kC024123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sat, 16 Jan 2016 16:31:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406237 - head/sysutils/puppet X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2016 16:31:10 -0000 Author: pawel Date: Sat Jan 16 16:31:08 2016 New Revision: 406237 URL: https://svnweb.freebsd.org/changeset/ports/406237 Log: - Don't use deprecated @dirrm in plist generation - Add LICENSE_FILE, NO_ARCH - Use options helpers - There's no need to include bsd.port.pre.mk Approved by: portmgr blanket Modified: head/sysutils/puppet/Makefile Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Sat Jan 16 16:19:30 2016 (r406236) +++ head/sysutils/puppet/Makefile Sat Jan 16 16:31:08 2016 (r406237) @@ -11,6 +11,7 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Configuration management framework written in Ruby LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1 @@ -22,6 +23,7 @@ USES= cpe CPE_VENDOR= puppetlabs CONFLICTS_INSTALL= puppet37-* puppet4-* NO_BUILD= yes +NO_ARCH= yes USE_RUBY= yes USE_RC_SUBR= puppet puppetmaster PORTDOCS= LICENSE README.md @@ -33,8 +35,6 @@ SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES -.include - post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ @@ -71,14 +71,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 +.include