diff options
| author | taca <taca> | 2010-09-10 07:52:13 +0000 |
|---|---|---|
| committer | taca <taca> | 2010-09-10 07:52:13 +0000 |
| commit | a2d571f8d8e285f1a02c4b6cbae3a6e2649db8f6 (patch) | |
| tree | e6fc6905cca898b58db6793e82f773c4a175c190 /sysutils | |
| parent | d0b71ddccc05f2824ab6999d5050821573f730de (diff) | |
| download | pkgsrc-a2d571f8d8e285f1a02c4b6cbae3a6e2649db8f6.tar.gz | |
* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Comment out none existing MASTER_SITES. gem files are still available.
* Update HOMEPAGE.
* Remove default value of GEM_BUILD.
* Ajust new ruby package's framework.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/puppet/Makefile | 19 | ||||
| -rw-r--r-- | sysutils/puppet/PLIST | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 25fdddb3a24..10f4653d5f4 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2010/06/11 01:27:58 tonnerre Exp $ +# $NetBSD: Makefile,v 1.11 2010/09/10 07:52:13 taca Exp $ DISTNAME= puppet-0.25.5 CATEGORIES= sysutils -MASTER_SITES= http://reductivelabs.com/downloads/gems/ +#MASTER_SITES= http://puppetlabs.com/downloads/puppet/ MAINTAINER= tonnerre@NetBSD.org -HOMEPAGE= http://www.reductivelabs.com/projects/puppet/ +HOMEPAGE= http://www.puppetlabs.com/ COMMENT= Configuration management framework written in Ruby LICENSE= gnu-gpl-v2 @@ -13,8 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.3.8:../../sysutils/ruby-facter -GEM_BUILD= gemspec - PKG_SYSCONFSUBDIR= puppet RCD_SCRIPTS= puppetd puppetmasterd @@ -31,7 +29,7 @@ SUBST_FILES.prefix+= man/man8/puppetrun.8 man/man8/puppet.conf.8 SUBST_SED.prefix= -e "s|/etc/puppet|${PKG_SYSCONFDIR}|g" SUBST_SED.prefix+= -e "s|/opt/csw/lib|${PREFIX}/lib|g" -EGDIR= ${PREFIX}/share/examples/${PKGBASE} +EGDIR= share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/puppet.conf ${PKG_SYSCONFDIR}/puppet.conf ## Since these users are needed only for puppet server, @@ -49,6 +47,7 @@ CONF_FILES= ${EGDIR}/puppet.conf ${PKG_SYSCONFDIR}/puppet.conf #PKG_USERS= ${PUPPET_USER}:${PUPPET_GROUP} #PKG_GECOS.${PUPPET_USER}= Puppet configuration management pseudo-user +PLIST_SUBST+= EGDIR=${EGDIR} PLIST_VARS+= sunos BUILD_DEFS+= VARBASE @@ -79,17 +78,17 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/examples/puppet.conf \ - ${DESTDIR}${EGDIR} + ${DESTDIR}${PREFIX}/${EGDIR} .if ${OPSYS} == "SunOS" ${INSTALL_DATA} ${WRKSRC}/conf/solaris/smf/puppetd.xml \ - ${DESTDIR}${EGDIR}/svc + ${DESTDIR}${PREFIX}/${EGDIR}/svc ${INSTALL_DATA} ${WRKSRC}/conf/solaris/smf/puppetmasterd.xml \ - ${DESTDIR}${EGDIR}/svc + ${DESTDIR}${PREFIX}/${EGDIR}/svc ${INSTALL_SCRIPT} ${WRKSRC}/conf/solaris/smf/svc-puppetd \ ${DESTDIR}${PREFIX}/lib/svc/method ${INSTALL_SCRIPT} ${WRKSRC}/conf/solaris/smf/svc-puppetmasterd \ ${DESTDIR}${PREFIX}/lib/svc/method .endif -.include "../../misc/rubygems/rubygem.mk" +.include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/puppet/PLIST b/sysutils/puppet/PLIST index d2a56fabe2d..7ae318109ed 100644 --- a/sysutils/puppet/PLIST +++ b/sysutils/puppet/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2010/06/11 01:27:58 tonnerre Exp $ +@comment $NetBSD: PLIST,v 1.11 2010/09/10 07:52:13 taca Exp $ bin/filebucket bin/pi bin/puppet @@ -1221,7 +1221,7 @@ ${GEM_LIBDIR}/test/util/storage.rb ${GEM_LIBDIR}/test/util/subclass_loader.rb ${GEM_LIBDIR}/test/util/utiltest.rb ${GEM_HOME}/specifications/puppet-${PKGVERSION}.gemspec -share/examples/puppet/puppet.conf +${EGDIR}/puppet.conf share/examples/rc.d/puppetd share/examples/rc.d/puppetmasterd ${PLIST.sunos}share/examples/puppet/svc/puppetd.xml |