git: a725535f6c8b - main - sysutils/puppet8: Uptate to 8.8.1

From: Romain Tartière <romain_at_FreeBSD.org>
Date: Tue, 30 Jul 2024 12:21:26 UTC
The branch main has been updated by romain:

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

commit a725535f6c8b0a5a67300b9d764f4ccbba4ff3ce
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-07-30 12:13:20 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-07-30 12:20:53 +0000

    sysutils/puppet8: Uptate to 8.8.1
    
    Release notes:
    https://www.puppet.com/docs/puppet/8/release_notes_puppet#release_notes_puppet_x-8-8-1
    
    With hat:       puppet
---
 sysutils/puppet8/Makefile                   |  6 +++---
 sysutils/puppet8/distinfo                   |  6 +++---
 sysutils/puppet8/files/patch-puppet.gemspec | 11 -----------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
index 8a334133b376..ab2259d2b6c1 100644
--- a/sysutils/puppet8/Makefile
+++ b/sysutils/puppet8/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	puppet
-PORTVERSION=	8.7.0
-PORTREVISION=	1
+PORTVERSION=	8.8.1
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	8
@@ -79,11 +78,12 @@ post-patch:
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/public|/var/puppet/state|" \
+		-e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/vendor_modules|" \
+		-e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \
 		-e "s|/etc/puppetlabs/puppetserver/ca|/var/puppetserver/ca|" \
-		-e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \
 		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
diff --git a/sysutils/puppet8/distinfo b/sysutils/puppet8/distinfo
index 49f303463f11..8f23b61306b0 100644
--- a/sysutils/puppet8/distinfo
+++ b/sysutils/puppet8/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1718150284
+TIMESTAMP = 1721827328
 SHA256 (puppetlabs-augeas_core-1.5.0.tar.gz) = 470406981b7638869acb4ecc75e2fd079b5999b5aeeb8324b9b475fe07bca935
 SIZE (puppetlabs-augeas_core-1.5.0.tar.gz) = 26311
 SHA256 (puppetlabs-cron_core-1.3.0.tar.gz) = 2a7be4004acc3881357b2e11db1a8937f4d64d37d8ce38872cefe1c7c4a2a6ef
@@ -19,5 +19,5 @@ SHA256 (puppetlabs-zfs_core-1.5.0.tar.gz) = 54ddfee4aeea028ed4269cd9ffd89f8491cb
 SIZE (puppetlabs-zfs_core-1.5.0.tar.gz) = 20163
 SHA256 (puppetlabs-zone_core-1.2.0.tar.gz) = 7c722015b3d16b6a48bec1b6f79dd7369cfd0de70731f17b94c27553f7e08096
 SIZE (puppetlabs-zone_core-1.2.0.tar.gz) = 22000
-SHA256 (puppetlabs-puppet-8.7.0_GH0.tar.gz) = ace755cfea186cb20a4001508d11c21b57457c5ee01e85e85e27db5c539c2792
-SIZE (puppetlabs-puppet-8.7.0_GH0.tar.gz) = 3330348
+SHA256 (puppetlabs-puppet-8.8.1_GH0.tar.gz) = dede2af631d58208dd695fbb7c092b4552359c97bb03b530b4d3b5446d6b9bb8
+SIZE (puppetlabs-puppet-8.8.1_GH0.tar.gz) = 3333532
diff --git a/sysutils/puppet8/files/patch-puppet.gemspec b/sysutils/puppet8/files/patch-puppet.gemspec
deleted file mode 100644
index 93cd9cc75104..000000000000
--- a/sysutils/puppet8/files/patch-puppet.gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- puppet.gemspec.orig	2024-06-17 03:50:53 UTC
-+++ puppet.gemspec
-@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
-   spec.specification_version = 4
-   spec.add_runtime_dependency(%q<facter>, [">= 4.3.0", "< 5"])
-   spec.add_runtime_dependency(%q<semantic_puppet>, "~> 1.0")
--  spec.add_runtime_dependency(%q<fast_gettext>, ">= 2.1", "< 3")
-+  spec.add_runtime_dependency(%q<fast_gettext>, ">= 2.1", "< 4")
-   spec.add_runtime_dependency(%q<locale>, "~> 2.1")
-   spec.add_runtime_dependency(%q<multi_json>, "~> 1.13")
-   spec.add_runtime_dependency(%q<puppet-resource_api>, "~> 1.5")