Date: Sun, 3 Jul 2011 16:09:24 GMT From: Steven Wills <swills@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158612: [patch] update audio/rubyripper to use rubygem-gettext instead of ruby-gettext Message-ID: <201107031609.p63G9OZ9092615@red.freebsd.org> Resent-Message-ID: <201107031610.p63GAAqN003001@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158612
>Category: ports
>Synopsis: [patch] update audio/rubyripper to use rubygem-gettext instead of ruby-gettext
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 03 16:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Steven Wills
>Release:
>Organization:
>Environment:
>Description:
The attached patch updates audio/rubyripper to use devel/rubygem-gettext instead of devel/ruby-gettext. devel/rubygem-gettext is a newer version of the software which works with Ruby 1.9. This change will allow using audio/rubyripper with Ruby 1.9.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/rubyripper/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 6 Nov 2010 19:13:24 -0000 1.1
+++ Makefile 3 Jul 2011 16:07:36 -0000
@@ -6,6 +6,7 @@
#
PORTNAME= rubyripper
+PORTREVISION= 1
DISTVERSION= 0.6.0
CATEGORIES= audio sysutils ruby
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -18,7 +19,7 @@
# cdparanoia is not really required for build, but it would not configure
# without it (ideally, configure script should be fixed instead of forcing
# superfluous build dependency)
-BUILD_DEPENDS= ${RUBY_SITELIBDIR}/gettext.rb:${PORTSDIR}/devel/ruby-gettext \
+BUILD_DEPENDS= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext \
cdparanoia:${PORTSDIR}/audio/cdparanoia
RUN_DEPENDS:= ${BUILD_DEPENDS} \
${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
Index: files/patch-rr_lib.rb
===================================================================
RCS file: /home/ncvs/ports/audio/rubyripper/files/patch-rr_lib.rb,v
retrieving revision 1.1
diff -u -r1.1 patch-rr_lib.rb
--- files/patch-rr_lib.rb 6 Nov 2010 19:13:24 -0000 1.1
+++ files/patch-rr_lib.rb 3 Jul 2011 15:05:01 -0000
@@ -1,6 +1,14 @@
---- rr_lib.rb.orig
-+++ rr_lib.rb
-@@ -70,6 +70,7 @@
+--- rr_lib.rb.orig 2010-06-18 19:36:16.000000000 +0000
++++ rr_lib.rb 2011-07-03 15:04:20.000000000 +0000
+@@ -22,6 +22,7 @@
+ $rr_version = '0.6.0' #application wide setting
+
+ begin
++ require 'rubygems'
+ require 'gettext'
+ include GetText
+ bindtextdomain("rubyripper")
+@@ -70,6 +71,7 @@
Thread.new do
if installed('eject') ; `eject #{cdrom}`
elsif installed('diskutil'); `diskutil eject #{cdrom}` #Mac users don't got eject, but diskutil
@@ -8,7 +16,7 @@
else puts _("No eject utility found!")
end
end
-@@ -573,15 +574,15 @@
+@@ -573,15 +575,15 @@
end
end
@@ -27,7 +35,7 @@
"for device %s on your system! These permissions are\n"\
"necessary for cdparanoia to scan your drive.\n\n%s\n"\
"You might want to add yourself to the necessary group in /etc/group")\
-@@ -605,13 +606,13 @@
+@@ -605,13 +607,13 @@
return true
end
@@ -43,7 +51,7 @@
"for device %s on your system! These permissions are\n"\
"necessary for cdparanoia to scan your drive.\n\n%s\n"\
"You might want to add yourself to the necessary group in /etc/group")\
-@@ -2524,7 +2525,7 @@
+@@ -2524,7 +2526,7 @@
# 6) is req_matches_all <= req_matches_errors
def checkConfig
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107031609.p63G9OZ9092615>