diff options
| -rw-r--r-- | sysutils/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/puppetserver5/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/puppetserver6/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/puppetserver6/pkg-plist | 1 | ||||
| -rw-r--r-- | sysutils/puppetserver7/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/puppetserver7/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/puppetserver7/pkg-plist | 1 |
7 files changed, 15 insertions, 9 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 7d84b42d1c94..7128c846a22c 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -969,6 +969,7 @@ SUBDIR += puppet7 SUBDIR += puppetserver5 SUBDIR += puppetserver6 + SUBDIR += puppetserver7 SUBDIR += pv SUBDIR += pwd_unmkdb SUBDIR += pwgen diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile index 2baa90953c74..e2111c472423 100644 --- a/sysutils/puppetserver5/Makefile +++ b/sysutils/puppetserver5/Makefile @@ -26,7 +26,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver-* puppetserver6-* +CONFLICTS_INSTALL= puppetserver6-* puppetserver7-* SHEBANG_FILES= ext/bin/puppetserver diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index c6371102d211..2258f0b218c3 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 6.14.1 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \ https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi @@ -30,7 +31,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver-* puppetserver5-* +CONFLICTS_INSTALL= puppetserver5-* puppetserver7-* SHEBANG_FILES= ext/bin/puppetserver @@ -70,6 +71,7 @@ do-install: @${MKDIR} ${STAGEDIR}/var/log/puppetserver @${MKDIR} ${STAGEDIR}/var/puppet/server @${MKDIR} ${STAGEDIR}/var/puppet/server/data + @${MKDIR} ${STAGEDIR}/var/puppetserver @${MKDIR} ${STAGEDIR}/var/run/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample diff --git a/sysutils/puppetserver6/pkg-plist b/sysutils/puppetserver6/pkg-plist index 569e25345e6b..4decae04a2cc 100644 --- a/sysutils/puppetserver6/pkg-plist +++ b/sysutils/puppetserver6/pkg-plist @@ -26,4 +26,5 @@ @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server @dir(puppet,puppet,750) /var/puppet/server/data +@dir(puppet,puppet,750) /var/puppetserver @dir(puppet,puppet,750) /var/run/puppetserver diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index c6371102d211..c9ffaec27f23 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 6.14.1 +PORTVERSION= 7.0.0 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \ https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi -PKGNAMESUFFIX= 6 +PKGNAMESUFFIX= 7 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:upstream \ ffi.rb:ffi EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -16,7 +16,7 @@ COMMENT= Puppet Server running in the JVM LICENSE= APACHE20 RUN_DEPENDS= bash>=0:shells/bash \ - puppet6>=0:sysutils/puppet6 \ + puppet7>=0:sysutils/puppet7 \ rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ sudo>=1:security/sudo @@ -30,7 +30,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver-* puppetserver5-* +CONFLICTS_INSTALL= puppetserver5-* puppetserver6-* SHEBANG_FILES= ext/bin/puppetserver @@ -70,6 +70,7 @@ do-install: @${MKDIR} ${STAGEDIR}/var/log/puppetserver @${MKDIR} ${STAGEDIR}/var/puppet/server @${MKDIR} ${STAGEDIR}/var/puppet/server/data + @${MKDIR} ${STAGEDIR}/var/puppetserver @${MKDIR} ${STAGEDIR}/var/run/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample diff --git a/sysutils/puppetserver7/distinfo b/sysutils/puppetserver7/distinfo index 44b76ea4756b..076c170bf401 100644 --- a/sysutils/puppetserver7/distinfo +++ b/sysutils/puppetserver7/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1604551702 -SHA256 (puppetserver-6.14.1.tar.gz) = 82bfa2306f990dd75e011b00d51406e92f0cac173a9fca9cdba2e7d1949b6436 -SIZE (puppetserver-6.14.1.tar.gz) = 61960154 +TIMESTAMP = 1605813620 +SHA256 (puppetserver-7.0.0.tar.gz) = 709988ac64c50e0ae0f51f9fc850e608327ac327ccac29828b76e84e746974da +SIZE (puppetserver-7.0.0.tar.gz) = 61949278 SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93 SIZE (ffi.rb) = 5893 diff --git a/sysutils/puppetserver7/pkg-plist b/sysutils/puppetserver7/pkg-plist index 569e25345e6b..4decae04a2cc 100644 --- a/sysutils/puppetserver7/pkg-plist +++ b/sysutils/puppetserver7/pkg-plist @@ -26,4 +26,5 @@ @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server @dir(puppet,puppet,750) /var/puppet/server/data +@dir(puppet,puppet,750) /var/puppetserver @dir(puppet,puppet,750) /var/run/puppetserver |