Index: head/sysutils/puppet/Makefile =================================================================== --- head/sysutils/puppet/Makefile (revision 379541) +++ head/sysutils/puppet/Makefile (revision 379542) @@ -1,103 +1,108 @@ # Created by: Tomoyuki Sakurai # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.6.2 -PORTREVISION= 2 +PORTVERSION= 3.7.4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org COMMENT= Configuration management framework written in Ruby LICENSE= APACHE20 BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera CONFLICTS= puppet-2* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv USE_RC_SUBR= puppet puppetmaster PORTDOCS= LICENSE README.md PORTEXAMPLES= * USERS= puppet GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= PACKAGE_ORIGIN OPTIONS_SINGLE= PATCHES OPTIONS_SINGLE_PATCHES= PACKAGE_ORIGIN PACKAGE_ROOT PACKAGE_ORIGIN_DESC= Use port origin as package name PACKAGE_ROOT_DESC= Use PACKAGEROOT instead of PACKAGESITE PATCHES_DESC= Optional exclusive patches .include .if ${PORT_OPTIONS:MPACKAGE_ROOT} .if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root .else -BROKEN= PACKAGE_ROOT option patch is incompatable with PACKAGE_ORIGIN patch. +BROKEN= PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch. .endif .endif .include +# puppet 4.x should support ruby 2.2.x +.if ${RUBY_VER} >= 2.2 +BROKEN= Does not work with Ruby 2.2 +.endif + .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin RUN_DEPENDS+= rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby .endif post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/defaults.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/var/lib/puppet|/var/puppet|" \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$vardir/run|/var/run/puppet|" \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ ${WRKSRC}/ext/rack/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} post-install: + ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \ + ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ --logdir=/var/log/puppet \ > ${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}/,@dirrm ,' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} .include Index: head/sysutils/puppet/distinfo =================================================================== --- head/sysutils/puppet/distinfo (revision 379541) +++ head/sysutils/puppet/distinfo (revision 379542) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.6.2.tar.gz) = 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 -SIZE (puppet-3.6.2.tar.gz) = 2252186 +SHA256 (puppet-3.7.4.tar.gz) = 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 +SIZE (puppet-3.7.4.tar.gz) = 2600191 Index: head/sysutils/puppet/pkg-descr =================================================================== --- head/sysutils/puppet/pkg-descr (revision 379541) +++ head/sysutils/puppet/pkg-descr (revision 379542) @@ -1,7 +1,7 @@ Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the separate elements normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. -WWW: http://www.puppetlabs.com +WWW: https://puppetlabs.com/puppet/puppet-open-source Index: head/sysutils/puppet/pkg-plist =================================================================== --- head/sysutils/puppet/pkg-plist (revision 379541) +++ head/sysutils/puppet/pkg-plist (revision 379542) @@ -1,50 +1,52 @@ bin/extlookup2hiera bin/puppet man/man5/puppet.conf.5.gz man/man8/extlookup2hiera.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 %%RUBY_SITELIBDIR%%/hiera/backend/puppet_backend.rb %%RUBY_SITELIBDIR%%/hiera/scope.rb %%RUBY_SITELIBDIR%%/hiera_puppet.rb %%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers/json.rb %%RUBY_SITELIBDIR%%/puppetx/puppet/syntax_checker.rb %%RUBY_SITELIBDIR%%/puppetx/puppet/bindings_scheme_handler.rb %%RUBY_SITELIBDIR%%/puppetx.rb %%ETCDIR%%/puppet.conf-dist %%ETCDIR%%/auth.conf-dist +@dir(puppet,puppet,) %%ETCDIR%%/manifests +@dir(puppet,puppet,) %%ETCDIR%%/modules @(puppet,puppet,) www/puppet/config.ru @dir(puppet,puppet,) /var/puppet