Date: Thu, 13 Aug 2015 16:22:55 +0000 (UTC) From: Michael Moll <mmoll@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394071 - in head/sysutils: . puppet puppet37 rubygem-hiera rubygem-hiera-file rubygem-hiera1 Message-ID: <201508131622.t7DGMtAu015511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmoll Date: Thu Aug 13 16:22:54 2015 New Revision: 394071 URL: https://svnweb.freebsd.org/changeset/ports/394071 Log: sysutils/rubygem-hiera: update to 3.0.1 - this is paving the way for a Puppet 4.x port - preserve 1.3.4 as sysutils/rubygem-hiera1 - use sysutils/rubygem-hiera1 in dependent ports - change maintainer to ruby@ Approved by: robak (maintainer) Differential Revision: https://reviews.freebsd.org/D3359 Added: head/sysutils/rubygem-hiera1/ - copied from r394060, head/sysutils/rubygem-hiera/ Modified: head/sysutils/Makefile head/sysutils/puppet/Makefile head/sysutils/puppet37/Makefile head/sysutils/rubygem-hiera-file/Makefile head/sysutils/rubygem-hiera/Makefile head/sysutils/rubygem-hiera/distinfo head/sysutils/rubygem-hiera1/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -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 Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/puppet/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -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 @@ COMMENT= Configuration management framew 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 Modified: head/sysutils/puppet37/Makefile ============================================================================== --- head/sysutils/puppet37/Makefile Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/puppet37/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -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 @@ COMMENT= Configuration management framew 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 Modified: head/sysutils/rubygem-hiera-file/Makefile ============================================================================== --- head/sysutils/rubygem-hiera-file/Makefile Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/rubygem-hiera-file/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -3,6 +3,7 @@ PORTNAME= hiera-file PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -15,6 +16,6 @@ USE_RUBY= yes 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> Modified: head/sysutils/rubygem-hiera/Makefile ============================================================================== --- head/sysutils/rubygem-hiera/Makefile Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/rubygem-hiera/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -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_FILES= bin/hiera 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} Modified: head/sysutils/rubygem-hiera/distinfo ============================================================================== --- head/sysutils/rubygem-hiera/distinfo Thu Aug 13 15:55:37 2015 (r394070) +++ head/sysutils/rubygem-hiera/distinfo Thu Aug 13 16:22:54 2015 (r394071) @@ -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 Modified: head/sysutils/rubygem-hiera1/Makefile ============================================================================== --- head/sysutils/rubygem-hiera/Makefile Thu Aug 13 13:18:27 2015 (r394060) +++ head/sysutils/rubygem-hiera1/Makefile Thu Aug 13 16:22:54 2015 (r394071) @@ -3,8 +3,10 @@ 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 @@ -13,6 +15,8 @@ LICENSE= APACHE20 RUN_DEPENDS= ${PKGNAMEPREFIX}json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure +CONFLICTS_INSTALL= rubygem-hiera-* + NO_ARCH= yes USE_RUBY= yes @@ -23,13 +27,13 @@ PLIST_FILES= bin/hiera 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!/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}/spec/unit/backend_spec.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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508131622.t7DGMtAu015511>