aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2005-05-30 15:14:35 +0000
committerMax Khon <fjoe@FreeBSD.org>2005-05-30 15:14:35 +0000
commit6127b7c922a50dfd350c26a35f8f469a4bb5a877 (patch)
tree444e319d755050c6ceb755bbcd150a801f4fe818
parentb804c3fea90ffb69e89bfcaadef492aa18c9dab7 (diff)
downloadports-6127b7c922a50dfd350c26a35f8f469a4bb5a877.tar.gz
ports-6127b7c922a50dfd350c26a35f8f469a4bb5a877.zip
Ooops. Backout previous commit. pav has provided a different
fix in Makefile rev. 1.5. Pointy hat to: fjoe
Notes
Notes: svn path=/head/; revision=136440
-rw-r--r--x11-toolkits/ruby-wx/Makefile2
-rw-r--r--x11-toolkits/ruby-wx/files/patch-extconf.rb16
2 files changed, 7 insertions, 11 deletions
diff --git a/x11-toolkits/ruby-wx/Makefile b/x11-toolkits/ruby-wx/Makefile
index dddedf65035e..ea19dbb3c26f 100644
--- a/x11-toolkits/ruby-wx/Makefile
+++ b/x11-toolkits/ruby-wx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= http://rubyforge.org/frs/download.php/1983/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/x11-toolkits/ruby-wx/files/patch-extconf.rb b/x11-toolkits/ruby-wx/files/patch-extconf.rb
index 8efacb0c6bd1..b018405af9f1 100644
--- a/x11-toolkits/ruby-wx/files/patch-extconf.rb
+++ b/x11-toolkits/ruby-wx/files/patch-extconf.rb
@@ -1,19 +1,15 @@
---- extconf.rb.orig Wed Nov 17 20:56:22 2004
-+++ extconf.rb Mon May 30 21:50:18 2005
+--- extconf.rb.orig Wed Nov 17 15:56:22 2004
++++ extconf.rb Fri Feb 11 00:42:43 2005
@@ -32,13 +32,16 @@
end
-if /linux/ =~ RUBY_PLATFORM or /i386-freebsd/ =~ RUBY_PLATFORM
-- CONFIG['CC'] = `wx-config --cxx`
-- CONFIG['LDSHARED'].gsub!("gcc",`wx-config --cxx`.strip)
-- $CFLAGS += " `wx-config --cxxflags`"
-- $LDFLAGS += " `wx-config --libs` -Wl,--version-script,./version-script "
+if /linux/ =~ RUBY_PLATFORM or /freebsd/ =~ RUBY_PLATFORM
-+ CONFIG['CC'] = `wxgtk2-2.4-config --cxx`
-+ CONFIG['LDSHARED'].gsub!("gcc",`wxgtk2-2.4-config --cxx`.strip)
-+ $CFLAGS += " `wxgtk2-2.4-config --cxxflags`"
-+ $LDFLAGS += " `wxgtk2-2.4-config --libs` -Wl,--version-script,./version-script "
+ CONFIG['CC'] = `wx-config --cxx`
+ CONFIG['LDSHARED'].gsub!("gcc",`wx-config --cxx`.strip)
+ $CFLAGS += " `wx-config --cxxflags`"
+ $LDFLAGS += " `wx-config --libs` -Wl,--version-script,./version-script "
["htmlprocessor.o", "htmlwindow.o", "htmleasyprinting.o"].each do |str|
$objs.delete(str)
+ end