From raj@csub.edu  Mon Aug  6 07:27:13 2007
Return-Path: <raj@csub.edu>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF34F16A417
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Aug 2007 07:27:13 +0000 (UTC)
	(envelope-from raj@csub.edu)
Received: from mh0.csub.edu (mh0.csub.edu [136.168.1.94])
	by mx1.freebsd.org (Postfix) with ESMTP id C497013C45A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Aug 2007 07:27:13 +0000 (UTC)
	(envelope-from raj@csub.edu)
Received: from cserv65.csub.edu (cserv65.csub.edu [136.168.10.65])
	by mh0.csub.edu (8.13.8/8.13.8) with ESMTP id l7677FvW011415
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 Aug 2007 00:07:15 -0700 (PDT)
	(envelope-from raj@csub.edu)
Received: from cserv65.csub.edu (localhost [127.0.0.1])
	by cserv65.csub.edu (8.13.8/8.13.8) with ESMTP id l7677Dc3037079
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 Aug 2007 00:07:13 -0700 (PDT)
	(envelope-from raj@cserv65.csub.edu)
Received: (from raj@localhost)
	by cserv65.csub.edu (8.13.8/8.13.8/Submit) id l7677Dru037078;
	Mon, 6 Aug 2007 00:07:13 -0700 (PDT)
	(envelope-from raj)
Message-Id: <200708060707.l7677Dru037078@cserv65.csub.edu>
Date: Mon, 6 Aug 2007 00:07:13 -0700 (PDT)
From: Russell Jackson <raj@csub.edu>
Reply-To: Russell Jackson <raj@csub.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update port: sysutils/puppet
X-Send-Pr-Version: 3.113
X-GNATS-Notify: cherry@trombik.org

>Number:         115236
>Category:       ports
>Synopsis:       update port: sysutils/puppet
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 06 07:30:01 GMT 2007
>Closed-Date:    Wed Sep 12 17:55:18 GMT 2007
>Last-Modified:  Wed Sep 12 17:55:18 GMT 2007
>Originator:     Russell Jackson
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
CSU, Bakersfield
>Environment:
System: FreeBSD cserv65.csub.edu 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 28 14:41:14 PST 2007 raj@cserv65.csub.edu:/usr/src/sys/i386/compile/CSERV65 i386
>Description:
Update port from puppet 0.22.4 to 0.23.0
>How-To-Repeat:
>Fix:

New files:
	puppet/files/patch-provider_ports

Removed files:
	puppet/files/patch-define_batch
	puppet/files/patch-package-name-with-dash

diff -ruN puppet/Makefile puppet-new/Makefile
--- puppet/Makefile	Sun May 27 04:31:25 2007
+++ puppet-new/Makefile	Sun Aug  5 23:35:34 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	puppet
-PORTVERSION=	0.22.4
+PORTVERSION=	0.23.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
 EXTRACT_SUFX=	.tgz
@@ -21,12 +21,13 @@
 USE_RUBY=	yes
 USE_RC_SUBR=	puppetmasterd puppetd
 
-DOCS=	CHANGELOG TODO README LICENSE COPYING
+DOCS=	CHANGELOG README LICENSE COPYING
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${RM} ${WRKSRC}/bin/*.orig || true
+	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
+		${WRKSRC}/lib/puppet/configuration.rb
 
 do-install:
 	cd ${WRKSRC} && \
@@ -52,6 +53,6 @@
 		--rundir=/var/run \
 		--genconfig | \
 		${SED} -e 's/genconfig = true/# genconfig = false/' \
-		> ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
+		> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
 
 .include <bsd.port.post.mk>
diff -ruN puppet/distinfo puppet-new/distinfo
--- puppet/distinfo	Sun May 27 04:31:25 2007
+++ puppet-new/distinfo	Sun Aug  5 21:18:19 2007
@@ -1,3 +1,3 @@
-MD5 (puppet-0.22.4.tgz) = 9bb853104f2616c7f2c8fa4e2f39b537
-SHA256 (puppet-0.22.4.tgz) = 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
-SIZE (puppet-0.22.4.tgz) = 642077
+MD5 (puppet-0.23.0.tgz) = c43342d7d24f1fe881ec97b59e7ea02d
+SHA256 (puppet-0.23.0.tgz) = cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a
+SIZE (puppet-0.23.0.tgz) = 670293
diff -ruN puppet/files/patch-define_batch puppet-new/files/patch-define_batch
--- puppet/files/patch-define_batch	Sun May 27 04:31:25 2007
+++ puppet-new/files/patch-define_batch	Wed Dec 31 16:00:00 1969
@@ -1,13 +0,0 @@
-always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
-http://reductivelabs.com/trac/puppet/ticket/624
---- lib/puppet/provider/package/ports.rb.orig	Tue May  8 14:55:34 2007
-+++ lib/puppet/provider/package/ports.rb	Tue May  8 14:55:57 2007
-@@ -19,7 +19,7 @@
-         # -p: create a package
-         # -N: install if the package is missing, otherwise upgrade
-         # -P: prefer binary packages
--        cmd = %w{-p -N -P} << @model[:name]
-+        cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
- 
-         output = portupgrade(*cmd)
-         if output =~ /\*\* No such /
diff -ruN puppet/files/patch-package-name-with-dash puppet-new/files/patch-package-name-with-dash
--- puppet/files/patch-package-name-with-dash	Sun May 27 04:31:25 2007
+++ puppet-new/files/patch-package-name-with-dash	Wed Dec 31 16:00:00 1969
@@ -1,13 +0,0 @@
-support package that contains '-' in its name, like syslog-ng
-http://reductivelabs.com/trac/puppet/ticket/628
---- lib/puppet/provider/package/ports.rb.orig       Wed May  9 17:12:39 2007
-+++ lib/puppet/provider/package/ports.rb    Wed May  9 17:13:57 2007
-@@ -47,7 +47,7 @@
-         match = $2
-         info = $3
-
--        unless pkgstuff =~ /^(\w+)-([0-9].+)$/
-+        unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
-             raise Puppet::PackageError,
-                 "Could not match package info '%s'" % pkgstuff
-         end
diff -ruN puppet/files/patch-provider_ports puppet-new/files/patch-provider_ports
--- puppet/files/patch-provider_ports	Wed Dec 31 16:00:00 1969
+++ puppet-new/files/patch-provider_ports	Sun Aug  5 23:13:02 2007
@@ -0,0 +1,15 @@
+--- lib/puppet/provider/package/ports.rb.orig	Tue Jun 19 16:07:35 2007
++++ lib/puppet/provider/package/ports.rb	Sun Aug  5 23:10:36 2007
+@@ -17,11 +17,10 @@
+     end
+ 
+     def install
+-        # -p: create a package
+         # -N: install if the package is missing, otherwise upgrade
+         # -P: prefer binary packages
+         # -M: yes, we're a batch, so don't ask any questions
+-        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
++        cmd = %w{-N -P  -M BATCH=yes} << @resource[:name]
+ 
+         output = portupgrade(*cmd)
+         if output =~ /\*\* No such /
diff -ruN puppet/pkg-plist puppet-new/pkg-plist
--- puppet/pkg-plist	Sun Aug  5 21:49:53 2007
+++ puppet-new/pkg-plist	Sun Aug  5 23:40:09 2007
@@ -1,13 +1,14 @@
+bin/filebucket
 bin/puppet
 bin/puppetca
 bin/puppetd
 bin/puppetdoc
 bin/puppetmasterd
 bin/puppetrun
-etc/puppet/puppetmasterd.conf-dist
-etc/rc.d/puppetd
-etc/rc.d/puppetmasterd
+bin/ralsh
+etc/puppet/puppet.conf-dist
 lib/ruby/site_ruby/1.8/puppet.rb
+lib/ruby/site_ruby/1.8/puppet/config_stores/rest.rb
 lib/ruby/site_ruby/1.8/puppet/configuration.rb
 lib/ruby/site_ruby/1.8/puppet/daemon.rb
 lib/ruby/site_ruby/1.8/puppet/dsl.rb
@@ -40,6 +41,7 @@
 lib/ruby/site_ruby/1.8/puppet/external/gratr/strong_components.rb
 lib/ruby/site_ruby/1.8/puppet/external/gratr/undirected_graph.rb
 lib/ruby/site_ruby/1.8/puppet/external/lock.rb
+lib/ruby/site_ruby/1.8/puppet/fact_stores/yaml.rb
 lib/ruby/site_ruby/1.8/puppet/feature/base.rb
 lib/ruby/site_ruby/1.8/puppet/feature/rails.rb
 lib/ruby/site_ruby/1.8/puppet/metatype/attributes.rb
@@ -61,7 +63,6 @@
 lib/ruby/site_ruby/1.8/puppet/network/client/ca.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/dipper.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/file.rb
-lib/ruby/site_ruby/1.8/puppet/network/client/logger.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/master.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/proxy.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/report.rb
@@ -71,9 +72,9 @@
 lib/ruby/site_ruby/1.8/puppet/network/client_request.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/ca.rb
+lib/ruby/site_ruby/1.8/puppet/network/handler/facts.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/filebucket.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/fileserver.rb
-lib/ruby/site_ruby/1.8/puppet/network/handler/logger.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/master.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/report.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/resource.rb
@@ -136,6 +137,8 @@
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/netinfo.rb
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/objectadd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/pw.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/appdmg.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/apple.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/apt.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/aptitude.rb
@@ -143,6 +146,7 @@
 lib/ruby/site_ruby/1.8/puppet/provider/package/blastwave.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/darwinport.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/dpkg.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/fink.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/freebsd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/gem.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/openbsd.rb
@@ -154,6 +158,7 @@
 lib/ruby/site_ruby/1.8/puppet/provider/package/sun.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/sunfreeware.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/up2date.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/urpmi.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/yum.rb
 lib/ruby/site_ruby/1.8/puppet/provider/parsedfile.rb
 lib/ruby/site_ruby/1.8/puppet/provider/port/parsed.rb
@@ -169,7 +174,6 @@
 lib/ruby/site_ruby/1.8/puppet/provider/user/useradd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/zone/solaris.rb
 lib/ruby/site_ruby/1.8/puppet/rails.rb
-lib/ruby/site_ruby/1.8/puppet/rails/database/001_add_indexes.rb
 lib/ruby/site_ruby/1.8/puppet/rails/database/schema.rb
 lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/acts_as_taggable.rb
 lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/init.rb
@@ -181,8 +185,16 @@
 lib/ruby/site_ruby/1.8/puppet/rails/param_name.rb
 lib/ruby/site_ruby/1.8/puppet/rails/param_value.rb
 lib/ruby/site_ruby/1.8/puppet/rails/puppet_class.rb
+lib/ruby/site_ruby/1.8/puppet/rails/puppet_tag.rb
 lib/ruby/site_ruby/1.8/puppet/rails/resource.rb
+lib/ruby/site_ruby/1.8/puppet/rails/resource_tag.rb
 lib/ruby/site_ruby/1.8/puppet/rails/source_file.rb
+lib/ruby/site_ruby/1.8/puppet/reference/configuration.rb
+lib/ruby/site_ruby/1.8/puppet/reference/function.rb
+lib/ruby/site_ruby/1.8/puppet/reference/network.rb
+lib/ruby/site_ruby/1.8/puppet/reference/providers.rb
+lib/ruby/site_ruby/1.8/puppet/reference/report.rb
+lib/ruby/site_ruby/1.8/puppet/reference/type.rb
 lib/ruby/site_ruby/1.8/puppet/relationship.rb
 lib/ruby/site_ruby/1.8/puppet/reports/log.rb
 lib/ruby/site_ruby/1.8/puppet/reports/rrdgraph.rb
@@ -205,7 +217,6 @@
 lib/ruby/site_ruby/1.8/puppet/type/mount.rb
 lib/ruby/site_ruby/1.8/puppet/type/notify.rb
 lib/ruby/site_ruby/1.8/puppet/type/package.rb
-lib/ruby/site_ruby/1.8/puppet/type/parsedtype.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile/checksum.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile/content.rb
@@ -231,14 +242,17 @@
 lib/ruby/site_ruby/1.8/puppet/util/autoload.rb
 lib/ruby/site_ruby/1.8/puppet/util/classgen.rb
 lib/ruby/site_ruby/1.8/puppet/util/config.rb
+lib/ruby/site_ruby/1.8/puppet/util/config_store.rb
 lib/ruby/site_ruby/1.8/puppet/util/docs.rb
 lib/ruby/site_ruby/1.8/puppet/util/errors.rb
 lib/ruby/site_ruby/1.8/puppet/util/execution.rb
+lib/ruby/site_ruby/1.8/puppet/util/fact_store.rb
 lib/ruby/site_ruby/1.8/puppet/util/feature.rb
 lib/ruby/site_ruby/1.8/puppet/util/fileparsing.rb
 lib/ruby/site_ruby/1.8/puppet/util/filetype.rb
 lib/ruby/site_ruby/1.8/puppet/util/graph.rb
 lib/ruby/site_ruby/1.8/puppet/util/inifile.rb
+lib/ruby/site_ruby/1.8/puppet/util/instance_loader.rb
 lib/ruby/site_ruby/1.8/puppet/util/loadedfile.rb
 lib/ruby/site_ruby/1.8/puppet/util/log.rb
 lib/ruby/site_ruby/1.8/puppet/util/logging.rb
@@ -253,6 +267,7 @@
 lib/ruby/site_ruby/1.8/puppet/util/posix.rb
 lib/ruby/site_ruby/1.8/puppet/util/provider_features.rb
 lib/ruby/site_ruby/1.8/puppet/util/rails/collection_merger.rb
+lib/ruby/site_ruby/1.8/puppet/util/reference.rb
 lib/ruby/site_ruby/1.8/puppet/util/storage.rb
 lib/ruby/site_ruby/1.8/puppet/util/subclass_loader.rb
 lib/ruby/site_ruby/1.8/puppet/util/suidmanager.rb
@@ -262,7 +277,6 @@
 share/doc/puppet/COPYING
 share/doc/puppet/LICENSE
 share/doc/puppet/README
-share/doc/puppet/TODO
 share/examples/puppet/code/allatonce
 share/examples/puppet/code/assignments
 share/examples/puppet/code/components
@@ -293,3 +307,55 @@
 share/examples/puppet/root/etc/puppet/puppetd.conf
 share/examples/puppet/root/etc/puppet/puppetmasterd.conf
 share/examples/puppet/root/etc/puppet/tagmail.conf
+@dirrm share/examples/puppet/root/etc/puppet
+@dirrm share/examples/puppet/root/etc/init.d
+@dirrm share/examples/puppet/root/etc
+@dirrm share/examples/puppet/root/bin
+@dirrm share/examples/puppet/root
+@dirrm share/examples/puppet/code
+@dirrm share/examples/puppet
+@dirrm share/doc/puppet
+@dirrm lib/ruby/site_ruby/1.8/puppet/util/rails
+@dirrm lib/ruby/site_ruby/1.8/puppet/util/plist
+@dirrm lib/ruby/site_ruby/1.8/puppet/util
+@dirrm lib/ruby/site_ruby/1.8/puppet/type/pfile
+@dirrm lib/ruby/site_ruby/1.8/puppet/type
+@dirrm lib/ruby/site_ruby/1.8/puppet/transaction
+@dirrm lib/ruby/site_ruby/1.8/puppet/sslcertificates
+@dirrm lib/ruby/site_ruby/1.8/puppet/reports
+@dirrm lib/ruby/site_ruby/1.8/puppet/reference
+@dirrm lib/ruby/site_ruby/1.8/puppet/rails/external/tagging
+@dirrm lib/ruby/site_ruby/1.8/puppet/rails/external
+@dirrm lib/ruby/site_ruby/1.8/puppet/rails/database
+@dirrm lib/ruby/site_ruby/1.8/puppet/rails
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/zone
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/user
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/sshkey
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/service
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/port
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/package
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/nameservice
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/mount
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/host
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/group
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider/cron
+@dirrm lib/ruby/site_ruby/1.8/puppet/provider
+@dirrm lib/ruby/site_ruby/1.8/puppet/parser/resource
+@dirrm lib/ruby/site_ruby/1.8/puppet/parser/ast
+@dirrm lib/ruby/site_ruby/1.8/puppet/parser
+@dirrm lib/ruby/site_ruby/1.8/puppet/network/xmlrpc
+@dirrm lib/ruby/site_ruby/1.8/puppet/network/server
+@dirrm lib/ruby/site_ruby/1.8/puppet/network/handler
+@dirrm lib/ruby/site_ruby/1.8/puppet/network/client
+@dirrm lib/ruby/site_ruby/1.8/puppet/network
+@dirrm lib/ruby/site_ruby/1.8/puppet/metatype
+@dirrm lib/ruby/site_ruby/1.8/puppet/feature
+@dirrm lib/ruby/site_ruby/1.8/puppet/fact_stores
+@dirrm lib/ruby/site_ruby/1.8/puppet/external/gratr
+@dirrm lib/ruby/site_ruby/1.8/puppet/external/event-loop
+@dirrm lib/ruby/site_ruby/1.8/puppet/external
+@dirrm lib/ruby/site_ruby/1.8/puppet/config_stores
+@dirrm lib/ruby/site_ruby/1.8/puppet
+@dirrmtry etc/puppet/ssl
+@dirrmtry etc/puppet/manifests
+@dirrmtry etc/puppet

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Aug 6 07:30:17 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115236 

From: Russell Jackson <raj@csub.edu>
To: bug-followup@FreeBSD.org, raj@csub.edu
Cc:  
Subject: Re: ports/115236: update port: sysutils/puppet
Date: Tue, 07 Aug 2007 19:44:02 -0700

 This is a multi-part message in MIME format.
 --------------090405000502070905010506
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 new patch for 0.23.2
 
 Files added/removed the same as before.
 -- 
 Russell A. Jackson <raj@csub.edu>
 Network Analyst
 California State University, Bakersfield
 
 QOTD:
 	"It's been Monday all week today."
 
 --------------090405000502070905010506
 Content-Type: text/x-patch;
  name="puppet-ports-0.23.2.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="puppet-ports-0.23.2.patch"
 
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 2515)
 +++ distinfo	(revision 2557)
 @@ -1,3 +1,3 @@
 -MD5 (puppet-0.22.4.tgz) = 9bb853104f2616c7f2c8fa4e2f39b537
 -SHA256 (puppet-0.22.4.tgz) = 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
 -SIZE (puppet-0.22.4.tgz) = 642077
 +MD5 (puppet-0.23.2.tgz) = 496373ce2a7affbb639f85bcff38da0b
 +SHA256 (puppet-0.23.2.tgz) = eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
 +SIZE (puppet-0.23.2.tgz) = 698593
 Index: files/patch-define_batch
 ===================================================================
 --- files/patch-define_batch	(revision 2515)
 +++ files/patch-define_batch	(revision 2557)
 @@ -1,13 +0,0 @@
 -always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
 -http://reductivelabs.com/trac/puppet/ticket/624
 ---- lib/puppet/provider/package/ports.rb.orig	Tue May  8 14:55:34 2007
 -+++ lib/puppet/provider/package/ports.rb	Tue May  8 14:55:57 2007
 -@@ -19,7 +19,7 @@
 -         # -p: create a package
 -         # -N: install if the package is missing, otherwise upgrade
 -         # -P: prefer binary packages
 --        cmd = %w{-p -N -P} << @model[:name]
 -+        cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
 - 
 -         output = portupgrade(*cmd)
 -         if output =~ /\*\* No such /
 Index: files/patch-package-name-with-dash
 ===================================================================
 --- files/patch-package-name-with-dash	(revision 2515)
 +++ files/patch-package-name-with-dash	(revision 2557)
 @@ -1,13 +0,0 @@
 -support package that contains '-' in its name, like syslog-ng
 -http://reductivelabs.com/trac/puppet/ticket/628
 ---- lib/puppet/provider/package/ports.rb.orig       Wed May  9 17:12:39 2007
 -+++ lib/puppet/provider/package/ports.rb    Wed May  9 17:13:57 2007
 -@@ -47,7 +47,7 @@
 -         match = $2
 -         info = $3
 -
 --        unless pkgstuff =~ /^(\w+)-([0-9].+)$/
 -+        unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
 -             raise Puppet::PackageError,
 -                 "Could not match package info '%s'" % pkgstuff
 -         end
 Index: files/patch-provider_ports
 ===================================================================
 --- files/patch-provider_ports	(revision 0)
 +++ files/patch-provider_ports	(revision 2557)
 @@ -0,0 +1,15 @@
 +--- lib/puppet/provider/package/ports.rb.orig	Tue Jun 19 16:07:35 2007
 ++++ lib/puppet/provider/package/ports.rb	Sun Aug  5 23:10:36 2007
 +@@ -17,11 +17,10 @@
 +     end
 + 
 +     def install
 +-        # -p: create a package
 +         # -N: install if the package is missing, otherwise upgrade
 +         # -P: prefer binary packages
 +         # -M: yes, we're a batch, so don't ask any questions
 +-        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
 ++        cmd = %w{-N -P  -M BATCH=yes} << @resource[:name]
 + 
 +         output = portupgrade(*cmd)
 +         if output =~ /\*\* No such /
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 2515)
 +++ pkg-plist	(revision 2557)
 @@ -1,3 +1,4 @@
 +bin/filebucket
  bin/puppet
  bin/puppetca
  bin/puppetd
 @@ -4,14 +5,13 @@
  bin/puppetdoc
  bin/puppetmasterd
  bin/puppetrun
 -etc/puppet/puppetmasterd.conf-dist
 -etc/rc.d/puppetd
 -etc/rc.d/puppetmasterd
 +bin/ralsh
 +etc/puppet/puppet.conf-dist
  lib/ruby/site_ruby/1.8/puppet.rb
 +lib/ruby/site_ruby/1.8/puppet/config_stores/rest.rb
  lib/ruby/site_ruby/1.8/puppet/configuration.rb
  lib/ruby/site_ruby/1.8/puppet/daemon.rb
  lib/ruby/site_ruby/1.8/puppet/dsl.rb
 -lib/ruby/site_ruby/1.8/puppet/element.rb
  lib/ruby/site_ruby/1.8/puppet/error.rb
  lib/ruby/site_ruby/1.8/puppet/event.rb
  lib/ruby/site_ruby/1.8/puppet/external/base64.rb
 @@ -40,6 +40,7 @@
  lib/ruby/site_ruby/1.8/puppet/external/gratr/strong_components.rb
  lib/ruby/site_ruby/1.8/puppet/external/gratr/undirected_graph.rb
  lib/ruby/site_ruby/1.8/puppet/external/lock.rb
 +lib/ruby/site_ruby/1.8/puppet/fact_stores/yaml.rb
  lib/ruby/site_ruby/1.8/puppet/feature/base.rb
  lib/ruby/site_ruby/1.8/puppet/feature/rails.rb
  lib/ruby/site_ruby/1.8/puppet/metatype/attributes.rb
 @@ -53,7 +54,7 @@
  lib/ruby/site_ruby/1.8/puppet/metatype/relationships.rb
  lib/ruby/site_ruby/1.8/puppet/metatype/schedules.rb
  lib/ruby/site_ruby/1.8/puppet/metatype/tags.rb
 -lib/ruby/site_ruby/1.8/puppet/modules.rb
 +lib/ruby/site_ruby/1.8/puppet/module.rb
  lib/ruby/site_ruby/1.8/puppet/network/authconfig.rb
  lib/ruby/site_ruby/1.8/puppet/network/authorization.rb
  lib/ruby/site_ruby/1.8/puppet/network/authstore.rb
 @@ -61,7 +62,6 @@
  lib/ruby/site_ruby/1.8/puppet/network/client/ca.rb
  lib/ruby/site_ruby/1.8/puppet/network/client/dipper.rb
  lib/ruby/site_ruby/1.8/puppet/network/client/file.rb
 -lib/ruby/site_ruby/1.8/puppet/network/client/logger.rb
  lib/ruby/site_ruby/1.8/puppet/network/client/master.rb
  lib/ruby/site_ruby/1.8/puppet/network/client/proxy.rb
  lib/ruby/site_ruby/1.8/puppet/network/client/report.rb
 @@ -71,9 +71,9 @@
  lib/ruby/site_ruby/1.8/puppet/network/client_request.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/ca.rb
 +lib/ruby/site_ruby/1.8/puppet/network/handler/facts.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/filebucket.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/fileserver.rb
 -lib/ruby/site_ruby/1.8/puppet/network/handler/logger.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/master.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/report.rb
  lib/ruby/site_ruby/1.8/puppet/network/handler/resource.rb
 @@ -115,27 +115,37 @@
  lib/ruby/site_ruby/1.8/puppet/parser/interpreter.rb
  lib/ruby/site_ruby/1.8/puppet/parser/lexer.rb
  lib/ruby/site_ruby/1.8/puppet/parser/parser.rb
 +lib/ruby/site_ruby/1.8/puppet/parser/parser_support.rb
  lib/ruby/site_ruby/1.8/puppet/parser/resource.rb
  lib/ruby/site_ruby/1.8/puppet/parser/resource/param.rb
  lib/ruby/site_ruby/1.8/puppet/parser/resource/reference.rb
  lib/ruby/site_ruby/1.8/puppet/parser/scope.rb
  lib/ruby/site_ruby/1.8/puppet/parser/templatewrapper.rb
  lib/ruby/site_ruby/1.8/puppet/pgraph.rb
 +lib/ruby/site_ruby/1.8/puppet/property.rb
  lib/ruby/site_ruby/1.8/puppet/propertychange.rb
  lib/ruby/site_ruby/1.8/puppet/provider.rb
  lib/ruby/site_ruby/1.8/puppet/provider/cron/crontab.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/group/directoryservice.rb
  lib/ruby/site_ruby/1.8/puppet/provider/group/groupadd.rb
  lib/ruby/site_ruby/1.8/puppet/provider/group/netinfo.rb
  lib/ruby/site_ruby/1.8/puppet/provider/group/pw.rb
  lib/ruby/site_ruby/1.8/puppet/provider/host/netinfo.rb
  lib/ruby/site_ruby/1.8/puppet/provider/host/parsed.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/interface/redhat.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/interface/sunos.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/mailalias/aliases.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/maillist/mailman.rb
  lib/ruby/site_ruby/1.8/puppet/provider/mount.rb
  lib/ruby/site_ruby/1.8/puppet/provider/mount/netinfo.rb
  lib/ruby/site_ruby/1.8/puppet/provider/mount/parsed.rb
  lib/ruby/site_ruby/1.8/puppet/provider/nameservice.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/nameservice/directoryservice.rb
  lib/ruby/site_ruby/1.8/puppet/provider/nameservice/netinfo.rb
  lib/ruby/site_ruby/1.8/puppet/provider/nameservice/objectadd.rb
  lib/ruby/site_ruby/1.8/puppet/provider/nameservice/pw.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/package.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/package/appdmg.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/apple.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/apt.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/aptitude.rb
 @@ -143,6 +153,7 @@
  lib/ruby/site_ruby/1.8/puppet/provider/package/blastwave.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/darwinport.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/dpkg.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/package/fink.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/freebsd.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/gem.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/openbsd.rb
 @@ -154,6 +165,7 @@
  lib/ruby/site_ruby/1.8/puppet/provider/package/sun.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/sunfreeware.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/up2date.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/package/urpmi.rb
  lib/ruby/site_ruby/1.8/puppet/provider/package/yum.rb
  lib/ruby/site_ruby/1.8/puppet/provider/parsedfile.rb
  lib/ruby/site_ruby/1.8/puppet/provider/port/parsed.rb
 @@ -164,12 +176,12 @@
  lib/ruby/site_ruby/1.8/puppet/provider/service/redhat.rb
  lib/ruby/site_ruby/1.8/puppet/provider/service/smf.rb
  lib/ruby/site_ruby/1.8/puppet/provider/sshkey/parsed.rb
 +lib/ruby/site_ruby/1.8/puppet/provider/user/directoryservice.rb
  lib/ruby/site_ruby/1.8/puppet/provider/user/netinfo.rb
  lib/ruby/site_ruby/1.8/puppet/provider/user/pw.rb
  lib/ruby/site_ruby/1.8/puppet/provider/user/useradd.rb
  lib/ruby/site_ruby/1.8/puppet/provider/zone/solaris.rb
  lib/ruby/site_ruby/1.8/puppet/rails.rb
 -lib/ruby/site_ruby/1.8/puppet/rails/database/001_add_indexes.rb
  lib/ruby/site_ruby/1.8/puppet/rails/database/schema.rb
  lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/acts_as_taggable.rb
  lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/init.rb
 @@ -181,8 +193,16 @@
  lib/ruby/site_ruby/1.8/puppet/rails/param_name.rb
  lib/ruby/site_ruby/1.8/puppet/rails/param_value.rb
  lib/ruby/site_ruby/1.8/puppet/rails/puppet_class.rb
 +lib/ruby/site_ruby/1.8/puppet/rails/puppet_tag.rb
  lib/ruby/site_ruby/1.8/puppet/rails/resource.rb
 +lib/ruby/site_ruby/1.8/puppet/rails/resource_tag.rb
  lib/ruby/site_ruby/1.8/puppet/rails/source_file.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/configuration.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/function.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/network.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/providers.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/report.rb
 +lib/ruby/site_ruby/1.8/puppet/reference/type.rb
  lib/ruby/site_ruby/1.8/puppet/relationship.rb
  lib/ruby/site_ruby/1.8/puppet/reports/log.rb
  lib/ruby/site_ruby/1.8/puppet/reports/rrdgraph.rb
 @@ -202,10 +222,12 @@
  lib/ruby/site_ruby/1.8/puppet/type/exec.rb
  lib/ruby/site_ruby/1.8/puppet/type/group.rb
  lib/ruby/site_ruby/1.8/puppet/type/host.rb
 +lib/ruby/site_ruby/1.8/puppet/type/interface.rb
 +lib/ruby/site_ruby/1.8/puppet/type/mailalias.rb
 +lib/ruby/site_ruby/1.8/puppet/type/maillist.rb
  lib/ruby/site_ruby/1.8/puppet/type/mount.rb
  lib/ruby/site_ruby/1.8/puppet/type/notify.rb
  lib/ruby/site_ruby/1.8/puppet/type/package.rb
 -lib/ruby/site_ruby/1.8/puppet/type/parsedtype.rb
  lib/ruby/site_ruby/1.8/puppet/type/pfile.rb
  lib/ruby/site_ruby/1.8/puppet/type/pfile/checksum.rb
  lib/ruby/site_ruby/1.8/puppet/type/pfile/content.rb
 @@ -218,7 +240,6 @@
  lib/ruby/site_ruby/1.8/puppet/type/pfile/type.rb
  lib/ruby/site_ruby/1.8/puppet/type/pfilebucket.rb
  lib/ruby/site_ruby/1.8/puppet/type/port.rb
 -lib/ruby/site_ruby/1.8/puppet/type/property.rb
  lib/ruby/site_ruby/1.8/puppet/type/resources.rb
  lib/ruby/site_ruby/1.8/puppet/type/schedule.rb
  lib/ruby/site_ruby/1.8/puppet/type/service.rb
 @@ -231,16 +252,20 @@
  lib/ruby/site_ruby/1.8/puppet/util/autoload.rb
  lib/ruby/site_ruby/1.8/puppet/util/classgen.rb
  lib/ruby/site_ruby/1.8/puppet/util/config.rb
 +lib/ruby/site_ruby/1.8/puppet/util/config_store.rb
  lib/ruby/site_ruby/1.8/puppet/util/docs.rb
  lib/ruby/site_ruby/1.8/puppet/util/errors.rb
  lib/ruby/site_ruby/1.8/puppet/util/execution.rb
 +lib/ruby/site_ruby/1.8/puppet/util/fact_store.rb
  lib/ruby/site_ruby/1.8/puppet/util/feature.rb
  lib/ruby/site_ruby/1.8/puppet/util/fileparsing.rb
  lib/ruby/site_ruby/1.8/puppet/util/filetype.rb
  lib/ruby/site_ruby/1.8/puppet/util/graph.rb
  lib/ruby/site_ruby/1.8/puppet/util/inifile.rb
 +lib/ruby/site_ruby/1.8/puppet/util/instance_loader.rb
  lib/ruby/site_ruby/1.8/puppet/util/loadedfile.rb
  lib/ruby/site_ruby/1.8/puppet/util/log.rb
 +lib/ruby/site_ruby/1.8/puppet/util/log_paths.rb
  lib/ruby/site_ruby/1.8/puppet/util/logging.rb
  lib/ruby/site_ruby/1.8/puppet/util/metaid.rb
  lib/ruby/site_ruby/1.8/puppet/util/methodhelper.rb
 @@ -253,6 +278,7 @@
  lib/ruby/site_ruby/1.8/puppet/util/posix.rb
  lib/ruby/site_ruby/1.8/puppet/util/provider_features.rb
  lib/ruby/site_ruby/1.8/puppet/util/rails/collection_merger.rb
 +lib/ruby/site_ruby/1.8/puppet/util/reference.rb
  lib/ruby/site_ruby/1.8/puppet/util/storage.rb
  lib/ruby/site_ruby/1.8/puppet/util/subclass_loader.rb
  lib/ruby/site_ruby/1.8/puppet/util/suidmanager.rb
 @@ -262,7 +288,6 @@
  share/doc/puppet/COPYING
  share/doc/puppet/LICENSE
  share/doc/puppet/README
 -share/doc/puppet/TODO
  share/examples/puppet/code/allatonce
  share/examples/puppet/code/assignments
  share/examples/puppet/code/components
 @@ -276,6 +301,10 @@
  share/examples/puppet/code/head
  share/examples/puppet/code/importing
  share/examples/puppet/code/mac_automount.pp
 +share/examples/puppet/code/mac_dscl.pp
 +share/examples/puppet/code/mac_dscl_revert.pp
 +share/examples/puppet/code/mac_netinfo.pp
 +share/examples/puppet/code/mac_pkgdmg.pp
  share/examples/puppet/code/nodes
  share/examples/puppet/code/one
  share/examples/puppet/code/relationships
 @@ -293,3 +322,58 @@
  share/examples/puppet/root/etc/puppet/puppetd.conf
  share/examples/puppet/root/etc/puppet/puppetmasterd.conf
  share/examples/puppet/root/etc/puppet/tagmail.conf
 +@dirrm share/examples/puppet/root/etc/puppet
 +@dirrm share/examples/puppet/root/etc/init.d
 +@dirrm share/examples/puppet/root/etc
 +@dirrm share/examples/puppet/root/bin
 +@dirrm share/examples/puppet/root
 +@dirrm share/examples/puppet/code
 +@dirrm share/examples/puppet
 +@dirrm share/doc/puppet
 +@dirrm lib/ruby/site_ruby/1.8/puppet/util/rails
 +@dirrm lib/ruby/site_ruby/1.8/puppet/util/plist
 +@dirrm lib/ruby/site_ruby/1.8/puppet/util
 +@dirrm lib/ruby/site_ruby/1.8/puppet/type/pfile
 +@dirrm lib/ruby/site_ruby/1.8/puppet/type
 +@dirrm lib/ruby/site_ruby/1.8/puppet/transaction
 +@dirrm lib/ruby/site_ruby/1.8/puppet/sslcertificates
 +@dirrm lib/ruby/site_ruby/1.8/puppet/reports
 +@dirrm lib/ruby/site_ruby/1.8/puppet/reference
 +@dirrm lib/ruby/site_ruby/1.8/puppet/rails/external/tagging
 +@dirrm lib/ruby/site_ruby/1.8/puppet/rails/external
 +@dirrm lib/ruby/site_ruby/1.8/puppet/rails/database
 +@dirrm lib/ruby/site_ruby/1.8/puppet/rails
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/zone
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/user
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/sshkey
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/service
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/port
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/package
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/nameservice
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/mount
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/maillist
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/mailalias
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/interface
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/host
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/group
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider/cron
 +@dirrm lib/ruby/site_ruby/1.8/puppet/provider
 +@dirrm lib/ruby/site_ruby/1.8/puppet/parser/resource
 +@dirrm lib/ruby/site_ruby/1.8/puppet/parser/ast
 +@dirrm lib/ruby/site_ruby/1.8/puppet/parser
 +@dirrm lib/ruby/site_ruby/1.8/puppet/network/xmlrpc
 +@dirrm lib/ruby/site_ruby/1.8/puppet/network/server
 +@dirrm lib/ruby/site_ruby/1.8/puppet/network/handler
 +@dirrm lib/ruby/site_ruby/1.8/puppet/network/client
 +@dirrm lib/ruby/site_ruby/1.8/puppet/network
 +@dirrm lib/ruby/site_ruby/1.8/puppet/metatype
 +@dirrm lib/ruby/site_ruby/1.8/puppet/feature
 +@dirrm lib/ruby/site_ruby/1.8/puppet/fact_stores
 +@dirrm lib/ruby/site_ruby/1.8/puppet/external/gratr
 +@dirrm lib/ruby/site_ruby/1.8/puppet/external/event-loop
 +@dirrm lib/ruby/site_ruby/1.8/puppet/external
 +@dirrm lib/ruby/site_ruby/1.8/puppet/config_stores
 +@dirrm lib/ruby/site_ruby/1.8/puppet
 +@dirrmtry etc/puppet/ssl
 +@dirrmtry etc/puppet/manifests
 +@dirrmtry etc/puppet
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 2515)
 +++ Makefile	(revision 2557)
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	puppet
 -PORTVERSION=	0.22.4
 +PORTVERSION=	0.23.2
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
  EXTRACT_SUFX=	.tgz
 @@ -21,12 +21,13 @@
  USE_RUBY=	yes
  USE_RC_SUBR=	puppetmasterd puppetd
  
 -DOCS=	CHANGELOG TODO README LICENSE COPYING
 +DOCS=	CHANGELOG README LICENSE COPYING
  
  .include <bsd.port.pre.mk>
  
  post-patch:
 -	${RM} ${WRKSRC}/bin/*.orig || true
 +	${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
 +		${WRKSRC}/lib/puppet/configuration.rb
  
  do-install:
  	cd ${WRKSRC} && \
 @@ -52,6 +53,6 @@
  		--rundir=/var/run \
  		--genconfig | \
  		${SED} -e 's/genconfig = true/# genconfig = false/' \
 -		> ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
 +		> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
  
  .include <bsd.port.post.mk>
 
 --------------090405000502070905010506--
State-Changed-From-To: feedback->closed 
State-Changed-By: alepulver 
State-Changed-When: Wed Sep 12 17:55:16 UTC 2007 
State-Changed-Why:  
Obsoleted by 116007. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115236 
>Unformatted:
