Index: head/databases/puppetdb/Makefile =================================================================== --- head/databases/puppetdb/Makefile (revision 400384) +++ head/databases/puppetdb/Makefile (revision 400385) @@ -1,55 +1,52 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 2.3.4 +PORTVERSION= 2.3.8 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ MAINTAINER= xaque208@gmail.com 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 USE_RC_SUBR= puppetdb USES= shebangfix SHEBANG_FILES= ext/files/puppetdb \ ext/files/puppetdb-anonymize \ ext/files/puppetdb-export \ ext/files/puppetdb-foreground \ ext/files/puppetdb-import \ 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+ USERS= puppetdb GROUPS= puppetdb SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.include - post-patch: .for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \ ext/files/puppetdb-import ext/files/puppetdb-anonymize \ ext/files/database.ini ext/files/puppetdb-ssl-setup \ ext/files/puppetdb-export ext/files/puppetdb-foreground Rakefile @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} .endfor do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install -.include +.include Index: head/databases/puppetdb/distinfo =================================================================== --- head/databases/puppetdb/distinfo (revision 400384) +++ head/databases/puppetdb/distinfo (revision 400385) @@ -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 Index: head/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup =================================================================== --- head/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup (revision 400384) +++ head/databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup (revision 400385) @@ -1,17 +1,15 @@ ---- ./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 - puppetdb_confdir="/etc/puppetdb" + puppetdb_confdir="%%PREFIX%%/etc/puppetdb" user=puppetdb fi fi