summaryrefslogtreecommitdiff
path: root/sysutils/puppet
diff options
context:
space:
mode:
authortaca <taca>2010-09-13 14:39:30 +0000
committertaca <taca>2010-09-13 14:39:30 +0000
commit079e01746d87ccb85cb55cbb7410d4c6691be1c3 (patch)
treebfbdc830ee2637706dabc8d80cd3047835c8a956 /sysutils/puppet
parentcc318726a478b9917c66293d56b5eb2f84edafcf (diff)
downloadpkgsrc-079e01746d87ccb85cb55cbb7410d4c6691be1c3.tar.gz
* Add two CONFLICTS patterns:
- matches previous package name without "${RUBY_PKGPREFIX}-" - matches current "ruby18-" and "ruby19-" packages * Since these packages aren't update its version during update of Ruby package's framework, bump PKGREVISION for safe update. Noted by obache@ on tech-pkg.
Diffstat (limited to 'sysutils/puppet')
-rw-r--r--sysutils/puppet/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 10f4653d5f4..094c0382933 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/09/10 07:52:13 taca Exp $
+# $NetBSD: Makefile,v 1.12 2010/09/13 14:39:30 taca Exp $
DISTNAME= puppet-0.25.5
+PKGREVISION= 1
CATEGORIES= sysutils
#MASTER_SITES= http://puppetlabs.com/downloads/puppet/
@@ -13,6 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.3.8:../../sysutils/ruby-facter
+CONFLICTS+= ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]*
+
PKG_SYSCONFSUBDIR= puppet
RCD_SCRIPTS= puppetd puppetmasterd