Index: head/sysutils/puppet/Makefile =================================================================== --- head/sysutils/puppet/Makefile (revision 388161) +++ head/sysutils/puppet/Makefile (revision 388162) @@ -1,111 +1,110 @@ # Created by: Tomoyuki Sakurai # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.7.5 -PORTREVISION= 1 +PORTVERSION= 3.8.1 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-ruby-augeas \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera USES= cpe CPE_VENDOR= puppetlabs 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_RADIO= PATCHES OPTIONS_RADIO_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 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 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 388161) +++ head/sysutils/puppet/distinfo (revision 388162) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.7.5.tar.gz) = 72e878b86faa456943e2ac0c4a118979f8a5edee13f2abe7c2b1d9ee7c33c673 -SIZE (puppet-3.7.5.tar.gz) = 2613427 +SHA256 (puppet-3.8.1.tar.gz) = 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 +SIZE (puppet-3.8.1.tar.gz) = 2633982 Index: head/sysutils/puppet/files/patch-lib_puppet_provider_service_freebsd.rb =================================================================== --- head/sysutils/puppet/files/patch-lib_puppet_provider_service_freebsd.rb (nonexistent) +++ head/sysutils/puppet/files/patch-lib_puppet_provider_service_freebsd.rb (revision 388162) @@ -0,0 +1,11 @@ +--- lib/puppet/provider/service/freebsd.rb.orig 2015-05-30 18:06:50 UTC ++++ lib/puppet/provider/service/freebsd.rb +@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :fre + + # Extract service name + def service_name +- extract_value_name('service', 0, /# (.*)/, '\1') ++ extract_value_name('service', 0, /# (\S+).*/, '\1') + end + + # Extract rcvar name Property changes on: head/sysutils/puppet/files/patch-lib_puppet_provider_service_freebsd.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property