ports/179816: Update sysutils/puppet to 3.2.2.

[Mathieu Arnold]

>Number:         179816
>Category:       ports
>Synopsis:       Update sysutils/puppet to 3.2.2.
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 21 17:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Mathieu Arnold
>Release:        FreeBSD 9.1-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec 4 06:55:39 UTC 2012 root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386

>Description:
>How-To-Repeat:
>Fix:

Was pretty straightforward, I changed the PACKAGE_ORIGIN/PACKAGE_ROOT to be a
SINGLE choice as only one can be set.

--- puppet-3.2.2.diff begins here ---
Index: sysutils/puppet/Makefile
===================================================================
--- sysutils/puppet/Makefile	(revision 321469)
+++ sysutils/puppet/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -41,11 +40,14 @@
 	puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \
 	puppet.8
 
-OPTIONS_DEFINE=		MONGREL PACKAGE_ORIGIN PACKAGE_ROOT
+OPTIONS_DEFINE=		MONGREL
 OPTIONS_DEFAULT=	PACKAGE_ORIGIN
+OPTIONS_SINGLE=         PATCHES
+OPTIONS_SINGLE_PATCHES=	PACKAGE_ORIGIN PACKAGE_ROOT
 MONGREL_DESC=		Run puppet server as a mongrel service
 PACKAGE_ORIGIN_DESC=	Use port origin as package name
 PACKAGE_ROOT_DESC=	Use PACKAGEROOT insted of PACKAGESITE
+PATCHES_DESC=           Optional exclusive patches
 
 .include <bsd.port.options.mk>
 
Index: sysutils/puppet/distinfo
===================================================================
--- sysutils/puppet/distinfo	(revision 321469)
+++ sysutils/puppet/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.1.1.tar.gz) = 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d
-SIZE (puppet-3.1.1.tar.gz) = 1587190
+SHA256 (puppet-3.2.2.tar.gz) = c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d
+SIZE (puppet-3.2.2.tar.gz) = 1784340
Index: sysutils/puppet/files/patch-service-freebsd.rb
===================================================================
--- sysutils/puppet/files/patch-service-freebsd.rb	(revision 321469)
+++ sysutils/puppet/files/patch-service-freebsd.rb	(working copy)
@@ -1,11 +0,0 @@
---- lib/puppet/provider/service/freebsd.rb.orig	2013-04-28 02:55:36.017584743 +0000
-+++ lib/puppet/provider/service/freebsd.rb	2013-04-28 02:55:52.581583782 +0000
-@@ -41,7 +41,7 @@
-   def rcvar_name
-     name = self.rcvar[1]
-     self.error("No rcvar name found in rcvar") if name.nil?
--    name = name.gsub!(/(.*)(_enable)?=(.*)/, '\1')
-+    name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1')
-     self.error("rcvar name is empty") if name.nil?
-     self.debug("rcvar name is #{name}")
-     name
--- puppet-3.2.2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: