diff options
| author | swills <swills@FreeBSD.org> | 2011-07-28 11:54:14 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2011-07-28 11:54:14 +0800 |
| commit | f3c20aab3ed54d8eaf93e959c5d126853a485af0 (patch) | |
| tree | 994f1be862083a10ac32770fd05f46be9fcdcbf0 | |
| parent | b01652362e35dd9c27afc570c10eb208006cbb58 (diff) | |
| download | freebsd-ports-gnome-f3c20aab3ed54d8eaf93e959c5d126853a485af0.tar.gz freebsd-ports-gnome-f3c20aab3ed54d8eaf93e959c5d126853a485af0.tar.zst freebsd-ports-gnome-f3c20aab3ed54d8eaf93e959c5d126853a485af0.zip | |
- A better fix for Ruby 1.9 compilation
| -rw-r--r-- | audio/liblastfm/Makefile | 5 | ||||
| -rw-r--r-- | audio/liblastfm/files/patch-no-ftools | 36 |
2 files changed, 36 insertions, 5 deletions
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile index 7f21c1465fa8..4647c47228f2 100644 --- a/audio/liblastfm/Makefile +++ b/audio/liblastfm/Makefile @@ -41,10 +41,5 @@ post-extract: -e 's|linux:|unix:|' ${WRKSRC}/.qmake.cache ${FIND} ${WRKSRC}/admin -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${RUBY_WITH_SUFFIX}|' -.if ${RUBY_VER} == 1.9 - ${REINPLACE_CMD} -e "s|'ftools'|'fileutils'|" ${WRKSRC}/admin/qpp ${WRKSRC}/admin/Makefile.rb - ${REINPLACE_CMD} -e "s|require \"#{cwd}/platform.rb\"|require_relative \"platform.rb\"|" ${WRKSRC}/admin/Makefile.rb - ${REINPLACE_CMD} -e "s|ruby admin/lastfm.h.rb|${RUBY_WITH_SUFFIX} admin/lastfm.h.rb|" ${WRKSRC}/admin/Makefile.rb -.endif .include <bsd.port.post.mk> diff --git a/audio/liblastfm/files/patch-no-ftools b/audio/liblastfm/files/patch-no-ftools new file mode 100644 index 000000000000..3488045085c4 --- /dev/null +++ b/audio/liblastfm/files/patch-no-ftools @@ -0,0 +1,36 @@ +--- admin/findsrc.rb.orig 2010-09-19 10:35:34.783333338 +0200 ++++ admin/findsrc.rb 2010-09-19 10:35:57.730000003 +0200 +@@ -1,6 +1,6 @@ + #!/usr/bin/ruby + require 'find' +-require "#{File.dirname __FILE__}/platform" ++require "#{Dir.getwd}/admin/platform.rb" + + def findsrc dir='.' + excludes = ['.svn','.git','_include','tests','_build'] +--- admin/qpp.orig 2010-09-19 10:36:09.276666670 +0200 ++++ admin/qpp 2010-09-19 10:36:16.926666670 +0200 +@@ -2,9 +2,8 @@ + # Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and + # RESOURCES under each argument to ARGV as directories + +-cwd=File.dirname __FILE__ + require 'find' +-require "#{cwd}/findsrc" ++require "#{Dir.getwd}/admin/findsrc.rb" + + sources = Array.new + headers = Array.new +--- admin/Makefile.rb.orig 2010-09-19 10:35:38.086666671 +0200 ++++ admin/Makefile.rb 2010-09-19 10:36:05.816666671 +0200 +@@ -4,9 +4,8 @@ + # and then creates the directory _include and creates files named after the + # class names in there which #include the file that contains the class + +-cwd = File.dirname( __FILE__ ) + require 'find' +-require "#{cwd}/platform.rb" ++require "#{Dir.getwd}/admin/platform.rb" + + + ######################################################################### defs |