git: 0453ab862ef6 - main - sysutils/rubygem-hiera: Update to 3.7.0

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

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

commit 0453ab862ef6beb664706501c89c428b274886fa
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-07-18 21:46:49 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-07-18 22:07:21 +0000

    sysutils/rubygem-hiera: Update to 3.7.0
    
    - Remove outdated CONFLICTS_INSTALL: rubygem-hiera1 has been removed over 3 years ago
    
    Changes:        https://github.com/puppetlabs/hiera/commits/main
---
 sysutils/rubygem-hiera/Makefile | 14 ++++++--------
 sysutils/rubygem-hiera/distinfo |  6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sysutils/rubygem-hiera/Makefile b/sysutils/rubygem-hiera/Makefile
index 1dfc69cc60bf..6563ddebe3d8 100644
--- a/sysutils/rubygem-hiera/Makefile
+++ b/sysutils/rubygem-hiera/Makefile
@@ -1,7 +1,7 @@
 # Created by: Greg Larkin <glarkin at FreeBSD.org>
 
 PORTNAME=	hiera
-PORTVERSION=	3.4.5
+PORTVERSION=	3.7.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -11,24 +11,22 @@ COMMENT=	Pluggable data store for hierarchical data
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL=	rubygem-hiera1-*
+USES=		gem
+USE_RUBY=	yes
 
 NO_ARCH=	yes
-USE_RUBY=	yes
-USES=		gem
 
-HIERA_DBDIR=	/var/db/hiera
+PLIST_DIRS=	/var/db/hiera
 PLIST_FILES=	bin/hiera
-PLIST_DIRS=	${HIERA_DBDIR}
 
 post-install:
-	${REINPLACE_CMD} 's|/etc/puppetlabs/code/environments/%{environment}/hieradata|${HIERA_DBDIR}|' \
+	${REINPLACE_CMD} 's|/etc/puppetlabs/code/environments/%{environment}/hieradata|/var/db/hiera|' \
 		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera/util.rb \
 		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/spec/unit/util_spec.rb
 	${REINPLACE_CMD} 's|/etc/puppetlabs/code|${PREFIX}/etc|' \
 		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera/util.rb \
 		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/spec/unit/util_spec.rb
 	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -name \*.bak -delete
-	${MKDIR} ${STAGEDIR}${HIERA_DBDIR}
+	${MKDIR} ${STAGEDIR}/var/db/hiera
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-hiera/distinfo b/sysutils/rubygem-hiera/distinfo
index 3ddc138eb427..7f2e1c96dc41 100644
--- a/sysutils/rubygem-hiera/distinfo
+++ b/sysutils/rubygem-hiera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537366745
-SHA256 (rubygem/hiera-3.4.5.gem) = 51f67f7dcf43261e8e1b2601c0b8fa2fdc02482b536b7a218bce3c3ed0857df9
-SIZE (rubygem/hiera-3.4.5.gem) = 41472
+TIMESTAMP = 1626542110
+SHA256 (rubygem/hiera-3.7.0.gem) = 0a5dd57f260a7fb86d1326c060a7c0061e9dd9a6dee3fbc8187a53b2d6532bbc
+SIZE (rubygem/hiera-3.7.0.gem) = 40960