diff options
| author | pav <pav@FreeBSD.org> | 2006-01-14 21:25:43 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-01-14 21:25:43 +0800 |
| commit | e0301bec12728ccd0fd8493161e0bfce59c55374 (patch) | |
| tree | c80abe20fafc2fd714d6b387c7f1c677b55ff712 /lang/ruby18/files | |
| parent | aec45d9cbe499057ffaf6797bedac9e30c52b06c (diff) | |
| download | freebsd-ports-gnome-e0301bec12728ccd0fd8493161e0bfce59c55374.tar.gz freebsd-ports-gnome-e0301bec12728ccd0fd8493161e0bfce59c55374.tar.zst freebsd-ports-gnome-e0301bec12728ccd0fd8493161e0bfce59c55374.zip | |
- Update to 1.8.4
PR: ports/91556
Submitted by: Alexander Wittig <alexander@wittig.name>
Diffstat (limited to 'lang/ruby18/files')
| -rw-r--r-- | lang/ruby18/files/patch-ext+dl+extconf.rb | 19 | ||||
| -rw-r--r-- | lang/ruby18/files/patch-ext_extmk.rb | 25 | ||||
| -rw-r--r-- | lang/ruby18/files/patch-mkmf.rb | 11 |
3 files changed, 11 insertions, 44 deletions
diff --git a/lang/ruby18/files/patch-ext+dl+extconf.rb b/lang/ruby18/files/patch-ext+dl+extconf.rb deleted file mode 100644 index 359d1ee34af3..000000000000 --- a/lang/ruby18/files/patch-ext+dl+extconf.rb +++ /dev/null @@ -1,19 +0,0 @@ ---- ext/dl/extconf.rb.orig Mon Oct 21 23:52:24 2002 -+++ ext/dl/extconf.rb Sun Jul 20 00:55:25 2003 -@@ -183,6 +183,16 @@ - ] - - create_makefile('dl') -+ -+if (Config::CONFIG['CC'] =~ /gcc/) && (Config::CONFIG['arch'] =~ /i.86/) -+ open('Makefile', 'r+') {|f| -+ s = f.read -+ f.rewind -+ f.print s.gsub(/^(CFLAGS\s*=.*\s)-m(cpu|arch)=\S+/, "\\1") -+ f.truncate f.tell -+ } -+end -+ - rescue SystemExit - # do nothing - end diff --git a/lang/ruby18/files/patch-ext_extmk.rb b/lang/ruby18/files/patch-ext_extmk.rb deleted file mode 100644 index 2055d6b4cd7c..000000000000 --- a/lang/ruby18/files/patch-ext_extmk.rb +++ /dev/null @@ -1,25 +0,0 @@ ---- ext/extmk.rb 6 Feb 2005 15:13:50 -0000 1.44.2.8 -+++ ext/extmk.rb 2 Mar 2005 10:53:20 -0000 1.44.2.9 -@@ -157,6 +157,10 @@ def parse_args() - grep(/\A-(?!-).*#{'%c' % flag}/i) { return true } - false - end -+ def $mflags.defined?(var) -+ grep(/\A#{var}=(.*)/) {return $1} -+ false -+ end - - if $mflags.set?(?n) - $dryrun = true -@@ -165,7 +169,10 @@ def parse_args() - end - - $continue = $mflags.set?(?k) -- $mflags |= ["DESTDIR=#{$destdir}"] -+ if !$destdir.to_s.empty? -+ $destdir = File.expand_path($destdir) -+ $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" -+ end - end - - parse_args() diff --git a/lang/ruby18/files/patch-mkmf.rb b/lang/ruby18/files/patch-mkmf.rb new file mode 100644 index 000000000000..65e6903f6cad --- /dev/null +++ b/lang/ruby18/files/patch-mkmf.rb @@ -0,0 +1,11 @@ +--- lib/mkmf.rb.orig Mon Nov 28 01:22:53 2005 ++++ lib/mkmf.rb Thu Jan 12 01:35:31 2006 +@@ -1153,7 +1153,7 @@ + + mfile.print <<-SITEINSTALL + +-site-install: site-install-so site-install-rb ++site-install: site-install-so site-install-rb install + site-install-so: install-so + site-install-rb: install-rb + |