diff options
| author | knu <knu@FreeBSD.org> | 2002-03-20 13:24:30 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2002-03-20 13:24:30 +0000 |
| commit | f1ab26c7c6de5cc6ad433455416a4a70f1d27900 (patch) | |
| tree | fd0181bc1f0580cb6863576f079a9e19102a8887 /x11 | |
| parent | 40e21db275ca77942c803b0387c21a1a94806311 (diff) | |
| download | FreeBSD-ports-f1ab26c7c6de5cc6ad433455416a4a70f1d27900.zip FreeBSD-ports-f1ab26c7c6de5cc6ad433455416a4a70f1d27900.tar.gz | |
Perform extconf.rb cleanup with no functional change.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/ruby-gnome/files/patch-extconf.rb | 34 | ||||
| -rw-r--r-- | x11/ruby-gnome2/files/patch-extconf.rb | 34 |
2 files changed, 48 insertions, 20 deletions
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 |
