git: 459ff474565e - main - sysutils/puppetserver7: Update to 7.9.0

The branch main has been updated by romain:

URL: https://cgit.FreeBSD.org/ports/commit/?id=459ff474565e5a6cc3a8d936363ae0900d37f0d2

commit 459ff474565e5a6cc3a8d936363ae0900d37f0d2
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2022-08-06 01:58:10 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2022-08-06 03:04:10 +0000

    sysutils/puppetserver7: Update to 7.9.0
    
    Release notes:
    https://puppet.com/docs/puppet/7/server/release_notes.html#puppet-server-790
    
    With hat:       puppet
---
 sysutils/puppetserver7/Makefile           | 16 +++++-----------
 sysutils/puppetserver7/distinfo           |  8 +++-----
 sysutils/puppetserver7/files/patch-ffi.rb | 19 -------------------
 sysutils/puppetserver7/pkg-plist          |  1 -
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile
index 0fe4ae0d146f..917ab6b93bad 100644
--- a/sysutils/puppetserver7/Makefile
+++ b/sysutils/puppetserver7/Makefile
@@ -1,11 +1,9 @@
 PORTNAME=	puppetserver
-PORTVERSION=	7.8.0
+PORTVERSION=	7.9.0
 CATEGORIES=	sysutils java
-MASTER_SITES=	https://downloads.puppetlabs.com/puppet/:upstream \
-		https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi
+MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	7
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:upstream \
-		ffi.rb:ffi
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	puppet@FreeBSD.org
@@ -40,9 +38,6 @@ GROUPS=		puppet
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
-pre-patch:
-	${CP} ${_DISTDIR}/ffi.rb ${WRKSRC}
-
 post-patch:
 .for file in ext/config/logback.xml ext/config/request-logging.xml \
 	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
@@ -59,11 +54,11 @@ post-patch:
 		${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \
-		${WRKSRC}/ext/cli/ca
+		${WRKSRC}/ext/cli/ca \
+		${WRKSRC}/ext/cli/dropsonde
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/services.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
@@ -94,6 +89,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop
 	${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh
-	${INSTALL_DATA} ${WRKSRC}/ffi.rb ${STAGEDIR}${DATADIR}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/puppetserver7/distinfo b/sysutils/puppetserver7/distinfo
index 54fed208e5ca..1e3195e4cd8f 100644
--- a/sysutils/puppetserver7/distinfo
+++ b/sysutils/puppetserver7/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1654893281
-SHA256 (puppetserver-7.8.0.tar.gz) = d73e5ba5eb8b1645e683b15f621286073f0a5e2d0b01a1994459f8cbc84a9903
-SIZE (puppetserver-7.8.0.tar.gz) = 64651673
-SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
-SIZE (ffi.rb) = 5893
+TIMESTAMP = 1659750164
+SHA256 (puppetserver-7.9.0.tar.gz) = b34ada1f4fde42b24af53a10c3726ee6f1c627b9f49afc4a3a44d055bed532aa
+SIZE (puppetserver-7.9.0.tar.gz) = 66386534
diff --git a/sysutils/puppetserver7/files/patch-ffi.rb b/sysutils/puppetserver7/files/patch-ffi.rb
deleted file mode 100644
index 927fe2523bf2..000000000000
--- a/sysutils/puppetserver7/files/patch-ffi.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- ffi.rb.orig	2019-09-22 21:04:46 UTC
-+++ ffi.rb
-@@ -125,7 +125,7 @@ module FFI
-   # Load all the platform dependent types/consts/struct members
-   class Config
-     CONFIG = Hash.new
--    begin
-+    if File.exist?(File.join(Platform::CONF_DIR, 'platform.conf'))
-       File.open(File.join(Platform::CONF_DIR, 'platform.conf'), "r") do |f|
-         typedef = "rbx.platform.typedef."
-         f.each_line { |line|
-@@ -138,7 +138,6 @@ module FFI
-           end
-         }
-       end
--    rescue Errno::ENOENT
-     end
-   end
- end
diff --git a/sysutils/puppetserver7/pkg-plist b/sysutils/puppetserver7/pkg-plist
index 4decae04a2cc..329a3c5f8901 100644
--- a/sysutils/puppetserver7/pkg-plist
+++ b/sysutils/puppetserver7/pkg-plist
@@ -21,7 +21,6 @@
 @(,,755) %%DATADIR%%/cli/apps/stop
 @(,,755) %%DATADIR%%/cli/cli-defaults.sh
 @(,,755) %%DATADIR%%/ezbake-functions.sh
-%%DATADIR%%/lib/ffi.rb
 @dir(puppet,puppet,750) /var/log/puppetserver
 @dir(puppet,puppet,755) /var/puppet
 @dir(puppet,puppet,750) /var/puppet/server