diff options
| author | swills <swills@FreeBSD.org> | 2015-02-22 03:15:58 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2015-02-22 03:15:58 +0800 |
| commit | 08646787d7258019d15c9f8736db053c80965e5f (patch) | |
| tree | 913dd522dd097e6ef9ea12dc20a1f13decaf7380 | |
| parent | cfb7269ea93a83599b0b30ee813e86c4eedefa03 (diff) | |
| download | freebsd-ports-gnome-08646787d7258019d15c9f8736db053c80965e5f.tar.gz freebsd-ports-gnome-08646787d7258019d15c9f8736db053c80965e5f.tar.zst freebsd-ports-gnome-08646787d7258019d15c9f8736db053c80965e5f.zip | |
sysutils/puppet: Update to 3.7.4
While here, mark it broken with Ruby 2.2.
PR: 197194
Submitted by: Rick <vmiller@hostileadmin.com>
Submitted by: Michael Moll <kvedulv@kvedulv.de>
| -rw-r--r-- | sysutils/puppet/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/puppet/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/puppet/pkg-descr | 2 | ||||
| -rw-r--r-- | sysutils/puppet/pkg-plist | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 3a5c91d2856e..89c9f86e4167 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.6.2 -PORTREVISION= 2 +PORTVERSION= 3.7.4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -44,12 +43,17 @@ PATCHES_DESC= Optional exclusive patches .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 <bsd.port.pre.mk> +# 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 @@ -75,10 +79,11 @@ 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 \ diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index c79e26b50b74..1cc58cfc6c8d 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -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 diff --git a/sysutils/puppet/pkg-descr b/sysutils/puppet/pkg-descr index dc5a166fcd9a..89a2fce63e8d 100644 --- a/sysutils/puppet/pkg-descr +++ b/sysutils/puppet/pkg-descr @@ -4,4 +4,4 @@ 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 diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist index 01d763a1a497..f30dc22f382b 100644 --- a/sysutils/puppet/pkg-plist +++ b/sysutils/puppet/pkg-plist @@ -46,5 +46,7 @@ man/man8/puppet.8.gz %%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 |