diff options
| author | taca <taca@pkgsrc.org> | 2016-01-03 06:44:40 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-01-03 06:44:40 +0000 |
| commit | a62ac3c8d17df3421aa5a3fa22e5289c32980131 (patch) | |
| tree | ee840fb96e520d9ab6b728fc36b796e9602c3f92 | |
| parent | c9e4b453b8baac2e1f3a1fb2b24ea325fbbcc8ab (diff) | |
| download | pkgsrc-a62ac3c8d17df3421aa5a3fa22e5289c32980131.tar.gz | |
Some package clea up.
* Add pkg_alternatives support.
* Since ruby-io-console is included in ruby{200,21}-base, no need to depend
it.
* Utilize lang/ruby/json.mk.
Bump PKGREVISION.
| -rw-r--r-- | sysutils/puppet/ALTERNATIVES | 1 | ||||
| -rw-r--r-- | sysutils/puppet/Makefile | 20 | ||||
| -rw-r--r-- | sysutils/puppet/PLIST | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/sysutils/puppet/ALTERNATIVES b/sysutils/puppet/ALTERNATIVES new file mode 100644 index 00000000000..cbb44826139 --- /dev/null +++ b/sysutils/puppet/ALTERNATIVES @@ -0,0 +1 @@ +bin/puppet @PREFIX@/bin/puppet@RUBY_SUFFIX@ diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 0774ee4849f..5e00b98a98f 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2015/11/23 15:46:59 taca Exp $ +# $NetBSD: Makefile,v 1.22 2016/01/03 06:44:40 taca Exp $ DISTNAME= puppet-3.8.4 +PKGREVISION= 1 CATEGORIES= sysutils #MASTER_SITES= http://puppetlabs.com/downloads/puppet/ @@ -9,16 +10,17 @@ HOMEPAGE= http://www.puppetlabs.com/ COMMENT= Configuration management framework written in Ruby LICENSE= apache-2.0 -DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter -DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera -DEPENDS+= ${RUBY_PKGPREFIX}-io-console>=0.3:../../devel/ruby-io-console -DEPENDS+= ${RUBY_PKGPREFIX}-json-pure>=0:../../textproc/ruby-json-pure -DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest -DEPENDS+= ${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow +DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter +DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera +DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest +DEPENDS+= ${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow +# io-console is bundled in ruby base package. +#DEPENDS+= ${RUBY_PKGPREFIX}-io-console>=0.3:../../devel/ruby-io-console RUBY_VERSION_SUPPORTED= 200 21 - -CONFLICTS+= ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]* +RUBY_JSON_REQD= 1.7.0 +RUBY_JSON_TYPE= pure +RUBYGEM_OPTIONS+= --format-executable PKG_SYSCONFSUBDIR= puppet RCD_SCRIPTS= puppetd puppetmasterd diff --git a/sysutils/puppet/PLIST b/sysutils/puppet/PLIST index e2c99427c76..b1808a23ebf 100644 --- a/sysutils/puppet/PLIST +++ b/sysutils/puppet/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.15 2015/08/17 13:20:43 fhajny Exp $ -bin/puppet +@comment $NetBSD: PLIST,v 1.16 2016/01/03 06:44:40 taca Exp $ +bin/puppet${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/COMMITTERS.md ${GEM_LIBDIR}/CONTRIBUTING.md |