mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Perform extconf.rb cleanup with no functional change.
This commit is contained in:
Akinori MUSHA
parent
e023b98694
commit
b165f8eb6a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=56386
6 changed files with 114 additions and 22 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
32
x11-toolkits/ruby-gtk/files/patch-extconf.rb
Normal file
32
x11-toolkits/ruby-gtk/files/patch-extconf.rb
Normal file
|
|
@ -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'
|
||||
|
|
@ -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 \
|
||||
|
|
|
|||
32
x11-toolkits/ruby-gtk2/files/patch-extconf.rb
Normal file
32
x11-toolkits/ruby-gtk2/files/patch-extconf.rb
Normal file
|
|
@ -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'
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue