svn commit: r351173 - head/sysutils/puppet27
Steve Wills
swills at FreeBSD.org
Sun Apr 13 02:15:39 UTC 2014
Author: swills
Date: Sun Apr 13 02:15:38 2014
New Revision: 351173
URL: http://svnweb.freebsd.org/changeset/ports/351173
QAT: https://qat.redports.org/buildarchive/r351173/
Log:
- Update to 2.7.25
- Add LICENSE
- Pet portlint
- Stage
PR: ports/188435
Submitted by: Bartek Rutkowski <ports at robakdesign.com>
Modified:
head/sysutils/puppet27/Makefile
head/sysutils/puppet27/distinfo
head/sysutils/puppet27/pkg-descr
head/sysutils/puppet27/pkg-plist
Modified: head/sysutils/puppet27/Makefile
==============================================================================
--- head/sysutils/puppet27/Makefile Sun Apr 13 02:10:02 2014 (r351172)
+++ head/sysutils/puppet27/Makefile Sun Apr 13 02:15:38 2014 (r351173)
@@ -2,19 +2,21 @@
# $FreeBSD$
PORTNAME= puppet
-PORTVERSION= 2.7.23
-PORTREVISION= 1
+PORTVERSION= 2.7.25
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
+PKGNAMESUFFIX= 27
MAINTAINER= swills at FreeBSD.org
-COMMENT= A configuration management framework written in Ruby
+COMMENT= Configuration management framework written in Ruby
+
+LICENSE= APACHE20
RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
LATEST_LINK= puppet27
-CONFLICTS= puppet-2.6* puppet-3*
+CONFLICTS= puppet-2.6* puppet-3*
NO_BUILD= yes
USE_RUBY= yes
USE_RUBY_FEATURES= iconv
@@ -24,26 +26,11 @@ PORTEXAMPLES= *
USERS= puppet
GROUPS= puppet
SUB_FILES+= pkg-message
+PLIST_SUB+= RESETPREFIX=${PREFIX}
PORTSCOUT= limit:^2\.7\.
-PKGNAMESUFFIX= 27
-
MANCOMPRESSED= yes
-MAN5= puppet.conf.5
-MAN8= filebucket.8 pi.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \
- puppet-catalog.8 puppet-cert.8 puppet-certificate.8 \
- puppet-certificate_request.8 puppet-certificate_revocation_list.8 \
- puppet-config.8 puppet-describe.8 puppet-device.8 puppet-doc.8 \
- puppet-facts.8 puppet-file.8 puppet-filebucket.8 puppet-help.8 \
- puppet-inspect.8 puppet-instrumentation_data.8 \
- puppet-instrumentation_listener.8 puppet-instrumentation_probe.8 \
- puppet-key.8 puppet-kick.8 puppet-man.8 puppet-master.8 \
- puppet-module.8 puppet-node.8 puppet-parser.8 puppet-plugin.8 \
- puppet-queue.8 puppet-report.8 puppet-resource.8 \
- puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \
- puppet.8 puppetca.8 puppetd.8 puppetdoc.8 puppetmasterd.8 \
- puppetqd.8 puppetrun.8 ralsh.8
OPTIONS_DEFAULT= PACKAGE_ORIGIN
OPTIONS_SINGLE= PATCHES
@@ -52,8 +39,6 @@ PACKAGE_ORIGIN_DESC= Use port origin as
PACKAGE_ROOT_DESC= Use PACKAGEROOT insted of PACKAGESITE
PATCHES_DESC= Optional exclusive patches
-NO_STAGE= yes
-
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
@@ -88,33 +73,33 @@ post-patch:
${WRKSRC}/lib/puppet/defaults.rb
do-install:
- @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs
+ @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
post-install:
- ${INSTALL} -d ${ETCDIR}
- ${INSTALL} -m 0755 -o puppet -g puppet -d /var/puppet
- ${INSTALL} -m 0755 -o puppet -g puppet -d /var/run/puppet
- ${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${ETCDIR}/auth.conf-dist
- ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppet --genconfig \
+ ${INSTALL} -d ${STAGEDIR}${ETCDIR}
+ ${MKDIR} ${STAGEDIR}/var/puppet
+ ${MKDIR} ${STAGEDIR}/var/run/puppet
+ ${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
+ ${RUBY} -I ${STAGEDIR}${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet --genconfig \
--confdir=${ETCDIR} \
--rundir=/var/run/puppet | \
${SED} -e 's/genconfig = true/# genconfig = false/' | \
${SED} -e 's/factdest =/# factdest =/' \
- > ${ETCDIR}/puppet.conf-dist
- @${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
- ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \
- ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
- ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
- ${SED} 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
+ > ${STAGEDIR}${ETCDIR}/puppet.conf-dist
+ @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \
+ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+ @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/semver.rb | \
+ ${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}/, at dirrm ,' >> ${TMPPLIST}
.if ${PORT_OPTIONS:MDOCS}
- ${INSTALL} -d ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
- cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+ cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
Modified: head/sysutils/puppet27/distinfo
==============================================================================
--- head/sysutils/puppet27/distinfo Sun Apr 13 02:10:02 2014 (r351172)
+++ head/sysutils/puppet27/distinfo Sun Apr 13 02:15:38 2014 (r351173)
@@ -1,2 +1,2 @@
-SHA256 (puppet-2.7.23.tar.gz) = 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490
-SIZE (puppet-2.7.23.tar.gz) = 2025639
+SHA256 (puppet-2.7.25.tar.gz) = daf6eb2e05cab13f40c520ca6777038f052082ace7d69708ec7fd97ab53cb13c
+SIZE (puppet-2.7.25.tar.gz) = 2020161
Modified: head/sysutils/puppet27/pkg-descr
==============================================================================
--- head/sysutils/puppet27/pkg-descr Sun Apr 13 02:10:02 2014 (r351172)
+++ head/sysutils/puppet27/pkg-descr Sun Apr 13 02:15:38 2014 (r351173)
@@ -4,4 +4,4 @@ elements normally aggregated in differen
hosts, along with obviously discrete elements like packages, services, and
files.
-WWW: http://www.puppetlabs.com
+WWW: http://www.puppetlabs.com
Modified: head/sysutils/puppet27/pkg-plist
==============================================================================
--- head/sysutils/puppet27/pkg-plist Sun Apr 13 02:10:02 2014 (r351172)
+++ head/sysutils/puppet27/pkg-plist Sun Apr 13 02:15:38 2014 (r351173)
@@ -8,12 +8,55 @@ sbin/puppetd
sbin/puppetmasterd
sbin/puppetqd
sbin/puppetrun
+man/man5/puppet.conf.5.gz
+man/man8/filebucket.8.gz
+man/man8/pi.8.gz
+man/man8/puppet-agent.8.gz
+man/man8/puppet-apply.8.gz
+man/man8/puppet-ca.8.gz
+man/man8/puppet-catalog.8.gz
+man/man8/puppet-cert.8.gz
+man/man8/puppet-certificate.8.gz
+man/man8/puppet-certificate_request.8.gz
+man/man8/puppet-certificate_revocation_list.8.gz
+man/man8/puppet-config.8.gz
+man/man8/puppet-describe.8.gz
+man/man8/puppet-device.8.gz
+man/man8/puppet-doc.8.gz
+man/man8/puppet-facts.8.gz
+man/man8/puppet-file.8.gz
+man/man8/puppet-filebucket.8.gz
+man/man8/puppet-help.8.gz
+man/man8/puppet-inspect.8.gz
+man/man8/puppet-instrumentation_data.8.gz
+man/man8/puppet-instrumentation_listener.8.gz
+man/man8/puppet-instrumentation_probe.8.gz
+man/man8/puppet-key.8.gz
+man/man8/puppet-kick.8.gz
+man/man8/puppet-man.8.gz
+man/man8/puppet-master.8.gz
+man/man8/puppet-module.8.gz
+man/man8/puppet-node.8.gz
+man/man8/puppet-parser.8.gz
+man/man8/puppet-plugin.8.gz
+man/man8/puppet-queue.8.gz
+man/man8/puppet-report.8.gz
+man/man8/puppet-resource.8.gz
+man/man8/puppet-resource_type.8.gz
+man/man8/puppet-secret_agent.8.gz
+man/man8/puppet-status.8.gz
+man/man8/puppet.8.gz
+man/man8/puppetca.8.gz
+man/man8/puppetd.8.gz
+man/man8/puppetdoc.8.gz
+man/man8/puppetmasterd.8.gz
+man/man8/puppetqd.8.gz
+man/man8/puppetrun.8.gz
+man/man8/ralsh.8.gz
%%ETCDIR%%/puppet.conf-dist
%%ETCDIR%%/auth.conf-dist
@dirrmtry etc/puppet
- at unexec rmdir /var/puppet 2>/dev/null || true
- at unexec rmdir /var/run/puppet 2>/dev/null || true
- at exec /bin/mkdir -p /var/run/puppet
- at exec /usr/sbin/chown -Rh puppet:puppet /var/run/puppet
- at exec /bin/mkdir -p /var/puppet
- at exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
+ at cwd /
+ at dirrm var/puppet
+ at dirrm var/run/puppet
+ at cwd %%RESETPREFIX%%
More information about the svn-ports-all
mailing list