From owner-svn-ports-head@FreeBSD.ORG  Sun Jun  2 11:16:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8B0F1677;
 Sun,  2 Jun 2013 11:16:50 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7BD6D1F1F;
 Sun,  2 Jun 2013 11:16:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52BGn8n036606;
 Sun, 2 Jun 2013 11:16:49 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52BGnMS036604;
 Sun, 2 Jun 2013 11:16:49 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201306021116.r52BGnMS036604@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Sun, 2 Jun 2013 11:16:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319648 - in head/multimedia/ruby-flvtool2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Jun 2013 11:16:50 -0000

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@nixil.net>
  Approved by:	gslin@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@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