ports/159263: [PATCH] switch sysutils/puppet to using rubygem-bzip2 instead of ruby-bz2 for Ruby 1.9 compatibility

[Steve Wills]

>Number:         159263
>Category:       ports
>Synopsis:       [PATCH] switch sysutils/puppet to using rubygem-bzip2 instead of ruby-bz2 for Ruby 1.9 compatibility
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 28 18:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Steve Wills
>Release:        
>Organization:
>Environment:
>Description:
sysutils/puppet doesn't currently work with Ruby 1.9 because it depends on archivers/ruby-bz2 which doesn't build with 1.9. The attached patch fixes the build issue. Functional testing is needed.
>How-To-Repeat:

>Fix:
see attached

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/puppet/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	10 Apr 2011 16:11:49 -0000	1.25
+++ Makefile	28 Jul 2011 15:54:09 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.puppetlabs.com/downloads/puppet/
 
@@ -14,13 +15,13 @@
 COMMENT=	A configuration management framework written in Ruby
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \
-		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \
-		${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
+		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
 
 CONFLICTS=	puppet-devel-[0-9]*
 
 NO_BUILD=	yes
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	iconv
 USE_RC_SUBR=	puppet puppetmaster
 PORTDOCS=	CHANGELOG README LICENSE COPYING
 PORTEXAMPLES=	*
@@ -50,7 +51,7 @@
 
 .if defined(WITH_PACKAGE_ORIGIN)
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2
+RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
 .endif
 
 .include <bsd.port.pre.mk>
Index: files/optpatch-package_origin
===================================================================
RCS file: /home/ncvs/ports/sysutils/puppet/files/optpatch-package_origin,v
retrieving revision 1.2
diff -u -r1.2 optpatch-package_origin
--- files/optpatch-package_origin	10 Apr 2011 16:11:49 -0000	1.2
+++ files/optpatch-package_origin	28 Jul 2011 18:14:09 -0000
@@ -11,7 +11,7 @@
 -    libraries."
 +require 'open-uri'
 +require 'net/ftp'
-+require 'bz2'
++require 'bzip2'
  
 -  commands :pkginfo => "/usr/sbin/pkg_info",
 -    :pkgadd => "/usr/sbin/pkg_add",


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