svn commit: r316771 - in head/sysutils/puppet: . files

[Steve Wills]

Author: swills
Date: Mon Apr 29 01:49:03 2013
New Revision: 316771
URL: http://svnweb.freebsd.org/changeset/ports/316771

Log:
  - Add patch to fix puppet service provier [1]
  - While here, fix build with Ruby 2.0
  
  PR:		ports/178138
  Submitted by:	Bogdan <bogdan at neant.ro>
  Obtained from:	upstream

Added:
  head/sysutils/puppet/files/patch-service-freebsd.rb   (contents, props changed)
Modified:
  head/sysutils/puppet/Makefile

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Sun Apr 28 23:25:25 2013	(r316770)
+++ head/sysutils/puppet/Makefile	Mon Apr 29 01:49:03 2013	(r316771)
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -53,11 +53,6 @@ PACKAGE_ROOT_DESC=	Use PACKAGEROOT inste
 RUN_DEPENDS+=	rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel
 .endif
 
-.if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
-EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
-.endif
-
 .if ${PORT_OPTIONS:MPACKAGE_ROOT}
 .if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_root
@@ -68,6 +63,13 @@ BROKEN=	PACKAGE_ROOT option patch is inc
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
+EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
+.if ${RUBY_VER} == 1.8 || ${RUBY_VER} == 1.9
+RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
+.endif
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
 		${WRKSRC}/install.rb \

Added: head/sysutils/puppet/files/patch-service-freebsd.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/puppet/files/patch-service-freebsd.rb	Mon Apr 29 01:49:03 2013	(r316771)
@@ -0,0 +1,11 @@
+--- 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