Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jun 2024 04:52:24 GMT
From:      Romain =?utf-8?Q?Tarti=C3=A8re?= <romain@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6b98d694934f - main - sysutils/puppet8: Allow latest fast_gettext
Message-ID:  <202406200452.45K4qOHT047160@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by romain:

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

commit 6b98d694934fe409cde1527efe0f6da6928f106e
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-06-20 03:42:52 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-06-20 04:27:43 +0000

    sysutils/puppet8: Allow latest fast_gettext
    
    While here, revert unexpected removal of a fix of the location of the
    main configuration file.
    
    Pointy hat to:  me
    With hat:       puppet
---
 sysutils/puppet8/Makefile                   |  4 +++-
 sysutils/puppet8/files/patch-puppet.gemspec | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
index ce96cd519e0e..8a334133b376 100644
--- a/sysutils/puppet8/Makefile
+++ b/sysutils/puppet8/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	puppet
 PORTVERSION=	8.7.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	8
@@ -61,7 +62,8 @@ DISTFILES+=	puppetlabs-${module:C/=.*//}-${module:C/.*=//}.tar.gz:forge
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/reference/configuration.rb
+		${WRKSRC}/lib/puppet/reference/configuration.rb \
+		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
diff --git a/sysutils/puppet8/files/patch-puppet.gemspec b/sysutils/puppet8/files/patch-puppet.gemspec
new file mode 100644
index 000000000000..93cd9cc75104
--- /dev/null
+++ b/sysutils/puppet8/files/patch-puppet.gemspec
@@ -0,0 +1,11 @@
+--- 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")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406200452.45K4qOHT047160>