diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-10-28 12:57:32 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-10-28 12:57:32 +0000 |
| commit | 7a83f672430f7d76b052ef2307d3a877855a26bb (patch) | |
| tree | 9eccbe6c066d5ca42c365411569a73f0295a8a21 /databases/puppetdb | |
| parent | 9060fd7dda5656551fffc2057a67bf054175aed8 (diff) | |
| download | ports-7a83f672430f7d76b052ef2307d3a877855a26bb.tar.gz ports-7a83f672430f7d76b052ef2307d3a877855a26bb.zip | |
Update to 2.3.8
PR: 204077
Submitted by: maintainer
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=400385
Diffstat (limited to 'databases/puppetdb')
| -rw-r--r-- | databases/puppetdb/Makefile | 9 | ||||
| -rw-r--r-- | databases/puppetdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup | 10 |
3 files changed, 9 insertions, 14 deletions
diff --git a/databases/puppetdb/Makefile b/databases/puppetdb/Makefile index 84f62552b5c0..e655e1c51968 100644 --- a/databases/puppetdb/Makefile +++ b/databases/puppetdb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 2.3.4 +PORTVERSION= 2.3.8 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ @@ -11,7 +11,7 @@ COMMENT= PuppetDB storeconfigs backend LICENSE= APACHE20 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ - puppet>=0:${PORTSDIR}/sysutils/puppet + puppet:${PORTSDIR}/sysutils/puppet BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake @@ -26,7 +26,6 @@ SHEBANG_FILES= ext/files/puppetdb \ ext/files/puppetdb-legacy \ ext/files/puppetdb-ssl-setup USE_JAVA= yes -USE_RUBY= yes USE_RAKE= yes NO_BUILD= yes JAVA_VERSION= 1.7+ @@ -39,8 +38,6 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.include <bsd.port.pre.mk> - post-patch: .for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \ ext/files/puppetdb-import ext/files/puppetdb-anonymize \ @@ -52,4 +49,4 @@ post-patch: do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/puppetdb/distinfo b/databases/puppetdb/distinfo index 87821da7338c..e3a9bc549074 100644 --- a/databases/puppetdb/distinfo +++ b/databases/puppetdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppetdb-2.3.4.tar.gz) = bb48d7b8b26a54f814a8d35019392fc1414375080592884af1734ad72a594630 -SIZE (puppetdb-2.3.4.tar.gz) = 23814293 +SHA256 (puppetdb-2.3.8.tar.gz) = d17c942a9bf6ffca65d8afa253741df98cc7d11195819daa980743543a69263d +SIZE (puppetdb-2.3.8.tar.gz) = 23815881 diff --git a/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup b/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup index 04e0b12abca5..074f930759c5 100644 --- a/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup +++ b/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup @@ -1,12 +1,10 @@ ---- ./ext/files/puppetdb-ssl-setup.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-ssl-setup 2014-09-01 19:04:54.653139914 +0000 -@@ -226,11 +226,11 @@ - agent_confdir=`puppet agent --configprint confdir` +--- ext/files/puppetdb-ssl-setup.orig 2015-10-28 11:03:42 UTC ++++ ext/files/puppetdb-ssl-setup +@@ -227,10 +227,10 @@ else agent_vardir=`puppet agent --configprint vardir` -- if [ -d "/etc/puppetlabs/puppetdb" ] ; then + if id -u pe-puppetdb > /dev/null 2>&1; then - puppetdb_confdir="/etc/puppetlabs/puppetdb" -+ if [ -d "%%PREFIX%%/etc/puppetlabs/puppetdb" ] ; then + puppetdb_confdir="%%PREFIX%%/etc/puppetlabs/puppetdb" user=pe-puppetdb else |