From nobody@FreeBSD.org  Thu Jul 28 18:20:02 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16AE5106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 Jul 2011 18:20:02 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id DDC368FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 Jul 2011 18:20:01 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SIK1lO088030
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 Jul 2011 18:20:01 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p6SIK1Ir088029;
	Thu, 28 Jul 2011 18:20:01 GMT
	(envelope-from nobody)
Message-Id: <201107281820.p6SIK1Ir088029@red.freebsd.org>
Date: Thu, 28 Jul 2011 18:20:01 GMT
From: Steve Wills <swills@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] switch sysutils/puppet to using rubygem-bzip2 instead of ruby-bz2 for Ruby 1.9 compatibility
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: raj@csub.edu

>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:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 28 18:20:08 UTC 2011
>Closed-Date:    Sat Aug 13 13:58:51 UTC 2011
>Last-Modified:  Sat Aug 13 13:58:51 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jul 28 18:20:17 UTC 2011 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159263 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jul 28 18:20:21 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: raj@csub.edu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/159263: [PATCH] switch sysutils/puppet to using rubygem-bzip2 instead of ruby-bz2 for Ruby 1.9 compatibility
Date: Thu, 28 Jul 2011 18:20:19 UT

 Maintainer of sysutils/puppet,
 
 Please note that PR ports/159263 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/159263
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Russell Jackson <raj@csub.edu>
To: bug-followup@FreeBSD.ORG
Cc: Edwin Groothuis <edwin@FreeBSD.ORG>
Subject: Re: ports/159263: [PATCH] switch sysutils/puppet to using rubygem-bzip2
 instead of ruby-bz2 for Ruby 1.9 compatibility
Date: Thu, 28 Jul 2011 12:04:49 -0700

 On Thu 28 Jul 2011 11:20:19 AM PDT, Edwin Groothuis wrote:
 > Maintainer of sysutils/puppet,
 > 
 > Please note that PR ports/159263 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >      http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/159263
 
 I generate the package origin patch from a git branch[1] on github. 
 I'll integrate the patch there
 and submit a new version of the patch in a maintainer update to 2.7.1.
 
 I also maintain the port[2] on github as well.
 
 1. 
 https://github.com/xraj/puppet/commits/feature/2.7.x/freebsd-package-origin
 2. https://github.com/xraj/freebsd-ports-category-sysutils
 
 -- 
 Russell A Jackson <raj@csub.edu>
 Network Analyst
 California State University, Bakersfield
State-Changed-From-To: feedback->closed 
State-Changed-By: swills 
State-Changed-When: Sat Aug 13 13:58:50 UTC 2011 
State-Changed-Why:  
Issue was fixed by PR 159670 

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