Index: head/sysutils/Makefile
===================================================================
--- head/sysutils/Makefile
+++ head/sysutils/Makefile
@@ -864,6 +864,7 @@
     SUBDIR += rubygem-hammer_cli_foreman_salt
     SUBDIR += rubygem-hammer_cli_foreman_ssh
     SUBDIR += rubygem-hiera
+    SUBDIR += rubygem-hiera1
     SUBDIR += rubygem-hiera-file
     SUBDIR += rubygem-librarian-puppet
     SUBDIR += rubygem-log4r
Index: head/sysutils/puppet/Makefile
===================================================================
--- head/sysutils/puppet/Makefile
+++ head/sysutils/puppet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.8.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -12,10 +13,10 @@
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera
+		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
 RUN_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
 		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas \
-		rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera
+		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
Index: head/sysutils/puppet37/Makefile
===================================================================
--- head/sysutils/puppet37/Makefile
+++ head/sysutils/puppet37/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.7.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	37
@@ -13,10 +14,10 @@
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera
+		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
 RUN_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
 		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas \
-		rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera
+		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
Index: head/sysutils/rubygem-hiera-file/Makefile
===================================================================
--- head/sysutils/rubygem-hiera-file/Makefile
+++ head/sysutils/rubygem-hiera-file/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hiera-file
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -15,6 +16,6 @@
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera
+RUN_DEPENDS=	${PKGNAMEPREFIX}hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
 
 .include <bsd.port.mk>
Index: head/sysutils/rubygem-hiera/Makefile
===================================================================
--- head/sysutils/rubygem-hiera/Makefile
+++ head/sysutils/rubygem-hiera/Makefile
@@ -2,17 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	hiera
-PORTVERSION=	1.3.4
+PORTVERSION=	3.0.1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	robak@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Pluggable data store for hierarchical data
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
 
+CONFLICTS_INSTALL=	rubygem-hiera1-*
+
 NO_ARCH=	yes
 
 USE_RUBY=	yes
@@ -23,13 +25,12 @@
 PLIST_DIRS=	${HIERA_DBDIR}
 
 post-install:
-	@${REINPLACE_CMD} "s!/etc/hiera.yaml!${STAGEDIR}${PREFIX}/etc/hiera.yaml!" \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/hiera \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera.rb \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/spec/unit/hiera_spec.rb
-	@${REINPLACE_CMD} "s!/var/lib/hiera!${HIERA_DBDIR}!" \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera/backend.rb \
-		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/spec/unit/backend_spec.rb
+	@${REINPLACE_CMD} "s!/etc/puppetlabs/code/environments/%{environment}/hieradata!${HIERA_DBDIR}!" \
+		${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}
 
Index: head/sysutils/rubygem-hiera/distinfo
===================================================================
--- head/sysutils/rubygem-hiera/distinfo
+++ head/sysutils/rubygem-hiera/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hiera-1.3.4.gem) = a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020
-SIZE (rubygem/hiera-1.3.4.gem) = 30208
+SHA256 (rubygem/hiera-3.0.1.gem) = 8e0c8f1f9fc2200c7a5d4a5d70c7b1524f071d41cb1b0667f4398a0601954acc
+SIZE (rubygem/hiera-3.0.1.gem) = 35328
Index: head/sysutils/rubygem-hiera1/Makefile
===================================================================
--- head/sysutils/rubygem-hiera1/Makefile
+++ head/sysutils/rubygem-hiera1/Makefile
@@ -0,0 +1,40 @@
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	hiera
+PORTVERSION=	1.3.4
+PORTREVISION=	1
+CATEGORIES=	sysutils rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	1
+
+MAINTAINER=	robak@FreeBSD.org
+COMMENT=	Pluggable data store for hierarchical data
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PKGNAMEPREFIX}json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
+
+CONFLICTS_INSTALL=	rubygem-hiera-*
+
+NO_ARCH=	yes
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=	yes
+HIERA_DBDIR=	/var/db/hiera
+PLIST_FILES=	bin/hiera
+PLIST_DIRS=	${HIERA_DBDIR}
+
+post-install:
+	@${REINPLACE_CMD} "s!/etc!${PREFIX}/etc!" \
+		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera/util.rb \
+		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/spec/unit/util_spec.rb
+	@${REINPLACE_CMD} "s!/var/lib/hiera!${HIERA_DBDIR}!" \
+		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/hiera/backend.rb \
+		${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}
+
+.include <bsd.port.mk>
Index: head/sysutils/rubygem-hiera1/distinfo
===================================================================
--- head/sysutils/rubygem-hiera1/distinfo
+++ head/sysutils/rubygem-hiera1/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/hiera-1.3.4.gem) = a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020
+SIZE (rubygem/hiera-1.3.4.gem) = 30208
Index: head/sysutils/rubygem-hiera1/pkg-descr
===================================================================
--- head/sysutils/rubygem-hiera1/pkg-descr
+++ head/sysutils/rubygem-hiera1/pkg-descr
@@ -0,0 +1,4 @@
+Hiera is a pluggable (YAML, JSON, Puppet) hierarchical database for
+storing infrastructure representation data.
+
+WWW: http://projects.puppetlabs.com/projects/hiera