summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-toolkits/ruby-gtk/Makefile2
-rw-r--r--x11-toolkits/ruby-gtk/files/patch-extconf.rb32
-rw-r--r--x11-toolkits/ruby-gtk2/Makefile2
-rw-r--r--x11-toolkits/ruby-gtk2/files/patch-extconf.rb32
-rw-r--r--x11/ruby-gnome/files/patch-extconf.rb34
-rw-r--r--x11/ruby-gnome2/files/patch-extconf.rb34
6 files changed, 114 insertions, 22 deletions
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 7a9feca..2cf5d8f5 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -24,7 +24,7 @@ USE_GTK= yes
.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
WRKSRC= ${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS= ${GTK_CONFIG}
+CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG}
INSTALL_TARGET= site-install
DOCS_EN= BUGS \
diff --git a/x11-toolkits/ruby-gtk/files/patch-extconf.rb b/x11-toolkits/ruby-gtk/files/patch-extconf.rb
new file mode 100644
index 0000000..8134afd
--- /dev/null
+++ b/x11-toolkits/ruby-gtk/files/patch-extconf.rb
@@ -0,0 +1,32 @@
+--- extconf.rb.orig Wed Jan 9 05:21:22 2002
++++ extconf.rb Wed Mar 20 22:12:37 2002
+@@ -8,24 +8,13 @@
+ # detect GTK+ configurations
+ #
+ if /mswin32/ !~ PLATFORM
+- config_cmds = ["gtk-config"]
+- while /^--/ =~ ARGV[0]
+- ARGV.shift
+- end
+- if ARGV.size > 0
+- config_cmds.unshift(ARGV[0])
+- end
++ config_cmd = with_config("gtk-config", "gtk-config")
+
+ begin
+- config_cmds.each do |config_cmd|
+- version = `#{config_cmd} --version`
+- if not version.chomp.empty?
+- config_libs, config_cflags = "--libs", "--cflags"
+- $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
+- $libs = libs.join(' ') + ' ' + $libs
+- $CFLAGS = `#{config_cmd} #{config_cflags}`.chomp
+- break
+- end
++ version = `#{config_cmd} --version`
++ if not version.chomp.empty?
++ $LDFLAGS += ' ' + `#{config_cmd} --libs`.chomp
++ $CFLAGS += ' ' + `#{config_cmd} --cflags`.chomp
+ end
+ rescue
+ $LDFLAGS = '-L/usr/X11R6/lib -L/usr/local/lib'
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 7a9feca..2cf5d8f5 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -24,7 +24,7 @@ USE_GTK= yes
.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
WRKSRC= ${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS= ${GTK_CONFIG}
+CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG}
INSTALL_TARGET= site-install
DOCS_EN= BUGS \
diff --git a/x11-toolkits/ruby-gtk2/files/patch-extconf.rb b/x11-toolkits/ruby-gtk2/files/patch-extconf.rb
new file mode 100644
index 0000000..8134afd
--- /dev/null
+++ b/x11-toolkits/ruby-gtk2/files/patch-extconf.rb
@@ -0,0 +1,32 @@
+--- extconf.rb.orig Wed Jan 9 05:21:22 2002
++++ extconf.rb Wed Mar 20 22:12:37 2002
+@@ -8,24 +8,13 @@
+ # detect GTK+ configurations
+ #
+ if /mswin32/ !~ PLATFORM
+- config_cmds = ["gtk-config"]
+- while /^--/ =~ ARGV[0]
+- ARGV.shift
+- end
+- if ARGV.size > 0
+- config_cmds.unshift(ARGV[0])
+- end
++ config_cmd = with_config("gtk-config", "gtk-config")
+
+ begin
+- config_cmds.each do |config_cmd|
+- version = `#{config_cmd} --version`
+- if not version.chomp.empty?
+- config_libs, config_cflags = "--libs", "--cflags"
+- $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
+- $libs = libs.join(' ') + ' ' + $libs
+- $CFLAGS = `#{config_cmd} #{config_cflags}`.chomp
+- break
+- end
++ version = `#{config_cmd} --version`
++ if not version.chomp.empty?
++ $LDFLAGS += ' ' + `#{config_cmd} --libs`.chomp
++ $CFLAGS += ' ' + `#{config_cmd} --cflags`.chomp
+ end
+ rescue
+ $LDFLAGS = '-L/usr/X11R6/lib -L/usr/local/lib'
diff --git a/x11/ruby-gnome/files/patch-extconf.rb b/x11/ruby-gnome/files/patch-extconf.rb
index 6881c14..efad8e9 100644
--- a/x11/ruby-gnome/files/patch-extconf.rb
+++ b/x11/ruby-gnome/files/patch-extconf.rb
@@ -1,18 +1,32 @@
---- extconf.rb.orig Sat Sep 23 06:00:02 2000
-+++ extconf.rb Wed Feb 28 20:59:59 2001
-@@ -21,11 +21,12 @@
+--- extconf.rb.orig Mon Feb 4 13:00:24 2002
++++ extconf.rb Wed Mar 20 22:03:22 2002
+@@ -7,25 +7,17 @@
+ #
+ # detect Gnome configurations
+ #
+-config_cmds = [
+- ["gnome-config", "--libs", "--cflags", "gnome", "gnomeui"],
+-]
+-if ARGV.size > 0
+- config_cmds.unshift([ARGV[0], "--libs", "--cflags"])
+-end
+
+ begin
+- config_cmd = "gnome-config"
++ config_cmd = with_config("gnome-config", "gnome-config")
+ config_libs = "--libs"
+ config_cflags = "--cflags"
config_library = "gnomeui"
version = `#{config_cmd} --version`
if not version.chomp.empty? then
- $LDFLAGS, *libs =
-+ ldflags, *libs =
- `#{config_cmd} #{config_libs} #{config_library}`.chomp.split(/(-l.*)/)
-+ $LDFLAGS += ldflags
- $libs = libs.join(' ') + ' ' + $libs
+- `#{config_cmd} #{config_libs} #{config_library}`.chomp.split(/(-l.*)/)
+- $libs = libs.join(' ') + ' ' + $libs
- $CFLAGS = `#{config_cmd} #{config_cflags} #{config_library}`.chomp
- $CFLAGS = $CFLAGS + " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib"
-+ $CFLAGS += `#{config_cmd} #{config_cflags} #{config_library}`.chomp
-+ $CFLAGS += " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib"
++ $LDFLAGS += ' ' + `#{config_cmd} #{config_libs} #{config_library}`.chomp
++ $CFLAGS += " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib " +
++ `#{config_cmd} #{config_cflags} #{config_library}`.chomp
else
- raise "can't find a config command"
+ raise "Can't find a config command"
end
diff --git a/x11/ruby-gnome2/files/patch-extconf.rb b/x11/ruby-gnome2/files/patch-extconf.rb
index 6881c14..efad8e9 100644
--- a/x11/ruby-gnome2/files/patch-extconf.rb
+++ b/x11/ruby-gnome2/files/patch-extconf.rb
@@ -1,18 +1,32 @@
---- extconf.rb.orig Sat Sep 23 06:00:02 2000
-+++ extconf.rb Wed Feb 28 20:59:59 2001
-@@ -21,11 +21,12 @@
+--- extconf.rb.orig Mon Feb 4 13:00:24 2002
++++ extconf.rb Wed Mar 20 22:03:22 2002
+@@ -7,25 +7,17 @@
+ #
+ # detect Gnome configurations
+ #
+-config_cmds = [
+- ["gnome-config", "--libs", "--cflags", "gnome", "gnomeui"],
+-]
+-if ARGV.size > 0
+- config_cmds.unshift([ARGV[0], "--libs", "--cflags"])
+-end
+
+ begin
+- config_cmd = "gnome-config"
++ config_cmd = with_config("gnome-config", "gnome-config")
+ config_libs = "--libs"
+ config_cflags = "--cflags"
config_library = "gnomeui"
version = `#{config_cmd} --version`
if not version.chomp.empty? then
- $LDFLAGS, *libs =
-+ ldflags, *libs =
- `#{config_cmd} #{config_libs} #{config_library}`.chomp.split(/(-l.*)/)
-+ $LDFLAGS += ldflags
- $libs = libs.join(' ') + ' ' + $libs
+- `#{config_cmd} #{config_libs} #{config_library}`.chomp.split(/(-l.*)/)
+- $libs = libs.join(' ') + ' ' + $libs
- $CFLAGS = `#{config_cmd} #{config_cflags} #{config_library}`.chomp
- $CFLAGS = $CFLAGS + " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib"
-+ $CFLAGS += `#{config_cmd} #{config_cflags} #{config_library}`.chomp
-+ $CFLAGS += " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib"
++ $LDFLAGS += ' ' + `#{config_cmd} #{config_libs} #{config_library}`.chomp
++ $CFLAGS += " -DHAVE_GDKIMLIB -I../../gtk/src -I../../gdkimlib " +
++ `#{config_cmd} #{config_cflags} #{config_library}`.chomp
else
- raise "can't find a config command"
+ raise "Can't find a config command"
end
OpenPOWER on IntegriCloud