Bug 179068

Summary: multimedia/ruby-flvtool2 - make it work with ruby19
Product: Ports & Packages Reporter: oz
Component: Individual Port(s)Assignee: Steve Wills <swills>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
ruby-flvtool2.patch none

Description oz 2013-05-29 00:20:00 UTC
	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.

Fix: Patch attached..
How-To-Repeat: 	Install..
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-29 00:20:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ruby

ruby@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-29 00:20:09 UTC
Maintainer of multimedia/ruby-flvtool2,

Please note that PR ports/179068 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179068

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-29 00:20:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Steve Wills freebsd_committer freebsd_triage 2013-06-01 19:13:07 UTC
Responsible Changed
From-To: ruby->swills

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-06-02 12:16:58 UTC
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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Steve Wills freebsd_committer freebsd_triage 2013-06-02 12:18:19 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!