Date: Tue, 28 May 2013 17:11:29 -0600 (MDT) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/179068: multimedia/ruby-flvtool2 - make it work with ruby19 Message-ID: <201305282311.r4SNBT9Y083242@nixil.net> Resent-Message-ID: <201305282320.r4SNK0rC056877@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179068
>Category: ports
>Synopsis: multimedia/ruby-flvtool2 - make it work with ruby19
>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: Tue May 28 23:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Phil Oleson
>Release: FreeBSD 6.4-RELEASE-p8 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 6.4-RELEASE-p8 FreeBSD 6.4-RELEASE-p8 #1 r101746: Mon Aug 30 10:34:40 MDT 2010 root@nixil:/usr/src/sys/i386/compile/nixil i386
>Description:
As dvd-slideshow depends on flvtool2 and I noticed it was slated for removal,
I checked into patches on the internet.. and found: http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/flvtool2/flvtool2-ruby19.patch?revision=1.2&view=markup
I've ported this patch and I've checked it out.. seems to work.
>How-To-Repeat:
Install..
>Fix:
Patch attached..
--- ruby-flvtool2.patch begins here ---
diff -rNup ruby-flvtool2.orig/Makefile ruby-flvtool2/Makefile
--- ruby-flvtool2.orig/Makefile 2013-05-28 16:02:26.000000000 -0600
+++ ruby-flvtool2/Makefile 2013-05-28 15:55:02.000000000 -0600
@@ -12,14 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gslin@gslin.org
COMMENT= Manipulation tool for Macromedia Flash Video files
-DEPRECATED= Does not work with Ruby 1.9
-EXPIRATION_DATE= 2013-05-02
-
USE_RUBY= yes
USE_RUBY_SETUP= yes
-.include <bsd.port.pre.mk>
-.if ${RUBY_VER} == 1.9
-BROKEN= does not build with ruby 1.9
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -rNup ruby-flvtool2.orig/files/patch-setup.rb ruby-flvtool2/files/patch-setup.rb
--- ruby-flvtool2.orig/files/patch-setup.rb 1969-12-31 17:00:00.000000000 -0700
+++ ruby-flvtool2/files/patch-setup.rb 2013-05-28 15:54:42.000000000 -0600
@@ -0,0 +1,12 @@
+--- setup.rb.orig 2013-05-28 15:52:34.000000000 -0600
++++ setup.rb 2013-05-28 15:54:12.000000000 -0600
+@@ -1311,6 +1311,9 @@ class Installer
+ File.open(path) {|f|
+ line = f.gets
+ }
++ if RUBY_VERSION >= "1.9"
++ line.force_encoding('ASCII-8BIT')
++ end
+ return nil unless /\A#!/ =~ line
+ parse(line)
+ end
--- ruby-flvtool2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305282311.r4SNBT9Y083242>