aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2014-03-24 23:00:23 +0800
committerswills <swills@FreeBSD.org>2014-03-24 23:00:23 +0800
commit4eb7d52aa995f970a8287bde1d78d5d2d26ed35a (patch)
tree9b6d578b137e117ec637c92f0de1a7e5e8265b0a
parentd3756fed0216f3365447b87db0e7facfff852fac (diff)
downloadfreebsd-ports-graphics-4eb7d52aa995f970a8287bde1d78d5d2d26ed35a.tar.gz
freebsd-ports-graphics-4eb7d52aa995f970a8287bde1d78d5d2d26ed35a.tar.zst
freebsd-ports-graphics-4eb7d52aa995f970a8287bde1d78d5d2d26ed35a.zip
- Update to 3.4.3
- Improve staging support - Pet portlint PR: ports/187701 Submitted by: Bartek Rutkowski <ports@robakdesign.com>
-rw-r--r--sysutils/puppet/Makefile6
-rw-r--r--sysutils/puppet/distinfo4
-rw-r--r--sysutils/puppet/pkg-descr2
-rw-r--r--sysutils/puppet/pkg-plist6
4 files changed, 10 insertions, 8 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 76e71909d6a..6c1baecda5b 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= puppet
-PORTVERSION= 3.4.2
-PORTREVISION= 2
+PORTVERSION= 3.4.3
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
MAINTAINER= swills@FreeBSD.org
-COMMENT= A configuration management framework written in Ruby
+COMMENT= Configuration management framework written in Ruby
LICENSE= APACHE20
@@ -27,6 +26,7 @@ USERS= puppet
GROUPS= puppet
SUB_FILES+= pkg-message
SUB_LIST= RUBY=${RUBY}
+PLIST_SUB+= RESETPREFIX=${PREFIX}
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_DEFAULT= PACKAGE_ORIGIN
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index 0037caf7f21..df93977d5aa 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210
-SIZE (puppet-3.4.2.tar.gz) = 1951200
+SHA256 (puppet-3.4.3.tar.gz) = 5f991b54b6a272914f4dda5aaafb86f08855d65adad46941a72192feefe2ba0f
+SIZE (puppet-3.4.3.tar.gz) = 1952505
diff --git a/sysutils/puppet/pkg-descr b/sysutils/puppet/pkg-descr
index a29c19f53ba..dc5a166fcd9 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: http://www.puppetlabs.com
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index 3f48dac10f2..e6877e0fad4 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -49,15 +49,17 @@ man/man8/puppet.8.gz
%%ETCDIR%%/auth.conf-dist
www/puppet/config.ru
@exec /usr/sbin/chown -Rh puppet:puppet %D/%F
+@exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
@dirrm www/puppet/public
@dirrm www/puppet
@dirrmtry etc/puppet/modules
@dirrmtry etc/puppet
-@unexec rmdir /var/puppet 2>/dev/null || :
-@exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
@dirrm %%RUBY_SITELIBDIR%%/hiera/backend
@dirrm %%RUBY_SITELIBDIR%%/hiera
@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers
@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs
@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppet
@dirrm %%RUBY_SITELIBDIR%%/puppetx
+@cwd /
+@dirrm var/puppet
+@cwd %%RESETPREFIX%%