mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- A better fix for Ruby 1.9 compilation

Browse Source
This commit is contained in:
Steve Wills 2011-07-28 03:54:14 +00:00
parent 9bc9c50770
commit f76149e484
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=278441
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/liblastfm/Makefile
View File

@ -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>

36
audio/liblastfm/files/patch-no-ftools Normal file
View File

@ -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