svn commit: r319648 - in head/multimedia/ruby-flvtool2: . files

[Steve Wills]

Author: swills
Date: Sun Jun  2 11:16:49 2013
New Revision: 319648
URL: http://svnweb.freebsd.org/changeset/ports/319648

Log:
  - Fix with Ruby 1.9
  
  PR:		ports/179068
  Submitted by:	Phil Oleson <oz at nixil.net>
  Approved by:	gslin at gslin.org (maintainer)

Added:
  head/multimedia/ruby-flvtool2/files/
  head/multimedia/ruby-flvtool2/files/patch-setup.rb   (contents, props changed)
Modified:
  head/multimedia/ruby-flvtool2/Makefile

Modified: head/multimedia/ruby-flvtool2/Makefile
==============================================================================
--- head/multimedia/ruby-flvtool2/Makefile	Sun Jun  2 10:21:14 2013	(r319647)
+++ head/multimedia/ruby-flvtool2/Makefile	Sun Jun  2 11:16:49 2013	(r319648)
@@ -12,14 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	gslin at 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>

Added: head/multimedia/ruby-flvtool2/files/patch-setup.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/ruby-flvtool2/files/patch-setup.rb	Sun Jun  2 11:16:49 2013	(r319648)
@@ -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