[csw-devel] SF.net SVN: gar:[9645] csw/mgar/pkg/puppet/branches/puppet-0.25.x

[wahwah at users.sourceforge.net]

Revision: 9645
          http://gar.svn.sourceforge.net/gar/?rev=9645&view=rev
Author:   wahwah
Date:     2010-04-15 15:20:15 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
puppet: puppet-0.25.x with classutils

Modified Paths:
--------------
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd

Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile	2010-04-15 06:28:41 UTC (rev 9644)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile	2010-04-15 15:20:15 UTC (rev 9645)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 GARNAME = puppet
-GARVERSION = 0.24.8
+GARVERSION = 0.25.4
 CATEGORIES = apps
 
 define BLURB
@@ -21,9 +21,9 @@
 endef
 
 MASTER_SITES = http://reductivelabs.com/downloads/puppet/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/
 
 INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
@@ -40,6 +40,7 @@
 RUNTIME_DEP_PKGS                  = CSWfacter
 RUNTIME_DEP_PKGS                 += CSWruby
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
+RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby
 
 PKGFILES_CSWpuppetmaster  = $(sysconfdir)/init\.d/cswpuppetmasterd
 PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd
@@ -59,6 +60,9 @@
 PATCHFILES  = 0001-pkgutil-support.patch
 PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch
 
+CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
+
 include gar/category.mk
 
 install-puppet:
@@ -85,3 +89,11 @@
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
 		$(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup
 	@$(MAKECOOKIE)
+
+post-merge:
+	# For this file to run, CSWpuppet would need to depend on CSWpython,
+	# and we don't want that. It could be split off to another package, but
+	# this file doesn't seem to be of any use on Solaris, so we can safely
+	# remove it.
+	rm $(PKGROOT)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums	2010-04-15 06:28:41 UTC (rev 9644)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums	2010-04-15 15:20:15 UTC (rev 9645)
@@ -1,6 +1,6 @@
 abaa404420106f9f28e9e1218b4e365b  0001-pkgutil-support.patch
 9c27c0cdca051eae986b56b91ef889ca  0002-Using-the-single-option-of-pkgutil.patch
-ee39853fe02ec20eae7847bcb2822ed4  cswpuppetd
+6d2a43142b64401159b357e5b055bece  cswpuppetd
 aba2c79e589b9bd1c881a22aa663a213  cswpuppetmasterd
 3ab0d4f9801075bc78b68b766b496fc7  cswusergroup
-288d46dee00acad64d0f3ecc6d8ba6fa  puppet-0.24.8.tgz
+69c97019fda5620f9f45f6ad64407e3b  puppet-0.25.4.tar.gz

Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd	2010-04-15 06:28:41 UTC (rev 9644)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd	2010-04-15 15:20:15 UTC (rev 9645)
@@ -27,7 +27,7 @@
 start_puppetd() {
   cd /
   # Start daemons.
-  ${bindir}/puppetd
+  ${sbindir}/puppetd
 }
 
 reload_puppetd() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.