Index: head/sysutils/puppet6/Makefile =================================================================== --- head/sysutils/puppet6/Makefile (revision 499865) +++ head/sysutils/puppet6/Makefile (revision 499866) @@ -1,107 +1,108 @@ # $FreeBSD$ PORTNAME= puppet PORTVERSION= 6.4.1 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= 6 MAINTAINER= puppet@FreeBSD.org COMMENT= Configuration management framework written in Ruby LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to install: Could not load facter; cannot install BUILD_DEPENDS= facter>=3.0:sysutils/facter \ rubygem-hiera>=2.0:sysutils/rubygem-hiera \ rubygem-json_pure>=0:devel/rubygem-json_pure \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet RUN_DEPENDS= facter>=3.0:sysutils/facter \ rubygem-gettext-setup>=0:devel/rubygem-gettext-setup \ rubygem-hiera>=2.0:sysutils/rubygem-hiera \ rubygem-hocon>=0:devel/rubygem-hocon \ rubygem-json_pure>=0:devel/rubygem-json_pure \ rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet USES= cpe CPE_VENDOR= puppetlabs USE_GITHUB= yes GH_ACCOUNT= puppetlabs CONFLICTS_INSTALL= puppet4-* puppet5-* PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes USE_RUBY= yes USE_RC_SUBR= puppet PORTDOCS= LICENSE README.md PORTEXAMPLES= * USERS= puppet GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \ ${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \ ${WRKSRC}/lib/puppet/gettext/config.rb do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ --localedir=${RUBY_SITELIBDIR}/puppet/locales 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 ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ --logdir=/var/log/puppet \ --codedir=${ETCDIR} \ > ${STAGEDIR}${ETCDIR}/puppet.conf-dist @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications ${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec 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} .include Index: head/sysutils/puppet6/files/patch-.gemspec =================================================================== --- head/sysutils/puppet6/files/patch-.gemspec (nonexistent) +++ head/sysutils/puppet6/files/patch-.gemspec (revision 499866) @@ -0,0 +1,11 @@ +--- .gemspec.orig ++++ .gemspec +@@ -34,7 +34,7 @@ + s.add_runtime_dependency(%q, [">= 2.4.0", "< 4"]) + s.add_runtime_dependency(%q, [">= 3.2.1", "< 4"]) + s.add_runtime_dependency(%q, "~> 1.0") +- s.add_runtime_dependency(%q, "~> 1.1.2") ++ s.add_runtime_dependency(%q, "~> 1.1") + s.add_runtime_dependency(%q, "~> 2.1") + s.add_runtime_dependency(%q, "~> 1.13") + s.add_runtime_dependency(%q, "~> 2.8") Property changes on: head/sysutils/puppet6/files/patch-.gemspec ___________________________________________________________________ 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 Index: head/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb =================================================================== --- head/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb (nonexistent) +++ head/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb (revision 499866) @@ -0,0 +1,11 @@ +--- lib/puppet/provider/package/gem.rb.orig 2019-04-09 12:24:52 UTC ++++ lib/puppet/provider/package/gem.rb +@@ -128,7 +128,7 @@ Puppet::Type.type(:package).provide :gem, :parent => P + end + end + else +- command << "--no-rdoc" << "--no-ri" << resource[:name] ++ command << "--no-document" << resource[:name] + end + + output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}) Property changes on: head/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.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