diff options
| author | Steve Wills <swills@FreeBSD.org> | 2013-06-02 11:16:49 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2013-06-02 11:16:49 +0000 |
| commit | 0b6e23d2c376d8c92640bb2f928d621baa7d580c (patch) | |
| tree | 1dc08a05893d2e9c8a60d119f76648380e725c65 /multimedia | |
| parent | Explicitly use another name for the distfile. (diff) | |
- Fix with Ruby 1.9
PR: ports/179068
Submitted by: Phil Oleson <oz@nixil.net>
Approved by: gslin@gslin.org (maintainer)
Notes
Notes:
svn path=/head/; revision=319648
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ruby-flvtool2/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/ruby-flvtool2/files/patch-setup.rb | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/multimedia/ruby-flvtool2/Makefile b/multimedia/ruby-flvtool2/Makefile index 54a41fe384b1..232e4b65826d 100644 --- a/multimedia/ruby-flvtool2/Makefile +++ b/multimedia/ruby-flvtool2/Makefile @@ -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 --git a/multimedia/ruby-flvtool2/files/patch-setup.rb b/multimedia/ruby-flvtool2/files/patch-setup.rb new file mode 100644 index 000000000000..bce17aefafcc --- /dev/null +++ b/multimedia/ruby-flvtool2/files/patch-setup.rb @@ -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 |