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

[wahwah at users.sourceforge.net]

Revision: 10987
          http://gar.svn.sourceforge.net/gar/?rev=10987&view=rev
Author:   wahwah
Date:     2010-09-16 21:11:48 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
puppet-2.6: The package builds now.

Modified Paths:
--------------
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums

Modified: csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2010-09-16 20:46:33 UTC (rev 10986)
+++ csw/mgar/pkg/puppet/branches/puppet-2.6.x/Makefile	2010-09-16 21:11:48 UTC (rev 10987)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 GARNAME = puppet
-GARVERSION = 0.25.5
+GARVERSION = 2.6.1
 CATEGORIES = apps
 
 define BLURB
@@ -36,11 +36,9 @@
 # Disabling SMF support for puppetd.  There are problems with it.  It's a
 # better choice to run it from cron.
 # INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
-INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd
+INITSMF += /etc$(prefix)/init\.d/cswpuppetmasterd
 USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
 
-CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/cswpuppetd|class=none
-
 # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
 # service isn't started upon the installation of CSWpuppet.
 PACKAGES += CSWpuppetmaster
@@ -77,6 +75,8 @@
 
 CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
 CRONTABS = $(CRONDIR)/root
+CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none
+CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby
 
 include gar/category.mk
 
@@ -84,14 +84,14 @@
 	ginstall -m 755 -d $(DESTDIR)
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/puppet/run
-	ginstall -m 755 -d $(DESTDIR)$(prefix)/etc/init.d
+	ginstall -m 755 -d $(DESTDIR)/etc$(prefix)/init.d
 	# $(sysconfdir)/pkg/<pkgname>/crontabs
 	ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
 	ginstall -m 644 \
 		$(FILEDIR)/CSWpuppet.cron.root \
 		$(DESTDIR)$(CRONDIR)/root
-	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(prefix)/etc/init.d
-	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(prefix)/etc/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)/etc$(prefix)/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
 	(cd $(WORKSRC) && \
 	gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
 	gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \

Modified: csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums	2010-09-16 20:46:33 UTC (rev 10986)
+++ csw/mgar/pkg/puppet/branches/puppet-2.6.x/checksums	2010-09-16 21:11:48 UTC (rev 10987)
@@ -1,7 +1 @@
-abaa404420106f9f28e9e1218b4e365b  0001-pkgutil-support.patch
-9c27c0cdca051eae986b56b91ef889ca  0002-Using-the-single-option-of-pkgutil.patch
-e3557aa5762e540cfe98b077c671dc54  CSWpuppet.cron.root
-0af8b2be6a2c9ecc6bb4a1878fcbefec  cswpuppetd
-aba2c79e589b9bd1c881a22aa663a213  cswpuppetmasterd
-3ab0d4f9801075bc78b68b766b496fc7  cswusergroup
-2988385801c967f7262cdf08640c9e07  puppet-0.25.5.tar.gz
+5cbdc667722ae60bbc24acca2e3494d6  puppet-2.6.1.tar.gz


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