diff options
-rw-r--r-- | devel/ruby-libglade/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | devel/ruby-libglade/pkg-plist | 1 | ||||
-rw-r--r-- | devel/ruby-libglade2/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | devel/ruby-libglade2/pkg-plist | 1 | ||||
-rw-r--r-- | graphics/ruby-gdk_imlib/files/patch-extconf.rb | 42 | ||||
-rw-r--r-- | x11-toolkits/ruby-gtk/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | x11-toolkits/ruby-gtk/pkg-plist | 1 | ||||
-rw-r--r-- | x11-toolkits/ruby-gtk2/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | x11-toolkits/ruby-gtk2/pkg-plist | 1 | ||||
-rw-r--r-- | x11/ruby-gnome/Makefile.common | 2 | ||||
-rw-r--r-- | x11/ruby-gnome/distinfo | 2 | ||||
-rw-r--r-- | x11/ruby-gnome/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | x11/ruby-gnome/pkg-descr | 8 | ||||
-rw-r--r-- | x11/ruby-gnome2/Makefile.common | 2 | ||||
-rw-r--r-- | x11/ruby-gnome2/distinfo | 2 | ||||
-rw-r--r-- | x11/ruby-gnome2/files/patch-extconf.rb | 32 | ||||
-rw-r--r-- | x11/ruby-gnome2/pkg-descr | 8 |
17 files changed, 12 insertions, 250 deletions
diff --git a/devel/ruby-libglade/files/patch-extconf.rb b/devel/ruby-libglade/files/patch-extconf.rb deleted file mode 100644 index eb21d0573920..000000000000 --- a/devel/ruby-libglade/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- extconf.rb.orig Wed Dec 12 10:24:28 2001 -+++ extconf.rb Wed Mar 20 21:25:58 2002 -@@ -9,24 +9,16 @@ - # - # detect libglade configurations - # --config_cmds = ["libglade-config"] -+config_cmd = with_config("libglade-config", "libglade-config") - while /^--/ =~ ARGV[0] - ARGV.shift - end --if ARGV.size > 0 -- config_cmds.unshift(ARGV[0]) --end - - 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? -+ $CFLAGS += ' ' + `#{config_cmd} --cflags`.chomp -+ $LDFLAGS += ' ' + `#{config_cmd} --libs`.chomp - end - rescue - $LDFLAGS = '-L/usr/X11R6/lib -L/usr/local/lib' diff --git a/devel/ruby-libglade/pkg-plist b/devel/ruby-libglade/pkg-plist index 02d26c97edaf..331700550447 100644 --- a/devel/ruby-libglade/pkg-plist +++ b/devel/ruby-libglade/pkg-plist @@ -1,5 +1,4 @@ %%RUBY_SITEARCHLIBDIR%%/lglade.so -%%RUBY_SITELIBDIR%%/libglade.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.glade %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.rb %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libglade diff --git a/devel/ruby-libglade2/files/patch-extconf.rb b/devel/ruby-libglade2/files/patch-extconf.rb deleted file mode 100644 index eb21d0573920..000000000000 --- a/devel/ruby-libglade2/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- extconf.rb.orig Wed Dec 12 10:24:28 2001 -+++ extconf.rb Wed Mar 20 21:25:58 2002 -@@ -9,24 +9,16 @@ - # - # detect libglade configurations - # --config_cmds = ["libglade-config"] -+config_cmd = with_config("libglade-config", "libglade-config") - while /^--/ =~ ARGV[0] - ARGV.shift - end --if ARGV.size > 0 -- config_cmds.unshift(ARGV[0]) --end - - 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? -+ $CFLAGS += ' ' + `#{config_cmd} --cflags`.chomp -+ $LDFLAGS += ' ' + `#{config_cmd} --libs`.chomp - end - rescue - $LDFLAGS = '-L/usr/X11R6/lib -L/usr/local/lib' diff --git a/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist index 02d26c97edaf..331700550447 100644 --- a/devel/ruby-libglade2/pkg-plist +++ b/devel/ruby-libglade2/pkg-plist @@ -1,5 +1,4 @@ %%RUBY_SITEARCHLIBDIR%%/lglade.so -%%RUBY_SITELIBDIR%%/libglade.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.glade %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.rb %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libglade diff --git a/graphics/ruby-gdk_imlib/files/patch-extconf.rb b/graphics/ruby-gdk_imlib/files/patch-extconf.rb deleted file mode 100644 index a4c2e4bbbc8f..000000000000 --- a/graphics/ruby-gdk_imlib/files/patch-extconf.rb +++ /dev/null @@ -1,42 +0,0 @@ ---- extconf.rb.orig Thu Oct 4 11:13:45 2001 -+++ extconf.rb Wed Mar 20 20:59:11 2002 -@@ -1,27 +1,25 @@ - require 'mkmf' - --rubygtk_dir = "../gtk" --rubygtk_dir = ARGV[0] if ARGV[0] -+imlib_config = with_config("imlib-config", "imlib-config") -+ -+while /^--/ =~ ARGV[0] -+ ARGV.shift -+end -+ -+rubygtk_dir = ARGV.shift || "../gtk" - unless FileTest.exist?(rubygtk_dir) - print "directry '#{rubygtk_dir}' not found. Please specify Ruby/Gtk source dir.\n" - exit - end --gtklib_dir = [] --`imlib-config --libs-gdk`.split(' ').each do |e| -- if e=~ /^-L/ then -- gtklib_dir.push(e) -- end --end - --$CFLAGS = "-g -I#{rubygtk_dir}/src " + `imlib-config --cflags-gdk`.chomp --$LDFLAGS = `imlib-config --libs-gdk`.chomp -+$CFLAGS += "-g -I#{rubygtk_dir}/src " + `#{imlib_config} --cflags-gdk`.chomp -+$LDFLAGS += `#{imlib_config} --libs-gdk`.chomp - - have_library("X11", "XOpenDisplay") && - have_library("Xi", "XOpenDevice") && - have_library("Xext", "XextFindDisplay") && - have_library("Xmu", "XmuInternAtom") && --have_library("glib", "g_print") && --have_library("gdk", "gdk_init") && --have_library("gdk_imlib", "gdk_imlib_init") && -- -+have_func("g_print") && -+have_func("gdk_init") && -+have_func("gdk_imlib_init") && - create_makefile('gdk_imlib') diff --git a/x11-toolkits/ruby-gtk/files/patch-extconf.rb b/x11-toolkits/ruby-gtk/files/patch-extconf.rb deleted file mode 100644 index 8134afd73c31..000000000000 --- a/x11-toolkits/ruby-gtk/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- 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-gtk/pkg-plist b/x11-toolkits/ruby-gtk/pkg-plist index 7e3cad5a2766..dbf8bf0660cb 100644 --- a/x11-toolkits/ruby-gtk/pkg-plist +++ b/x11-toolkits/ruby-gtk/pkg-plist @@ -5,6 +5,7 @@ %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/dnd.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/drawing.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/helloworld.rb +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/item_factory.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/keyboard_grab.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/pointer_grab.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/gtkbrows.rb diff --git a/x11-toolkits/ruby-gtk2/files/patch-extconf.rb b/x11-toolkits/ruby-gtk2/files/patch-extconf.rb deleted file mode 100644 index 8134afd73c31..000000000000 --- a/x11-toolkits/ruby-gtk2/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist index 7e3cad5a2766..dbf8bf0660cb 100644 --- a/x11-toolkits/ruby-gtk2/pkg-plist +++ b/x11-toolkits/ruby-gtk2/pkg-plist @@ -5,6 +5,7 @@ %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/dnd.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/drawing.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/helloworld.rb +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/item_factory.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/keyboard_grab.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/pointer_grab.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/gtkbrows.rb diff --git a/x11/ruby-gnome/Makefile.common b/x11/ruby-gnome/Makefile.common index 950919f83c2e..8d0f2882cb44 100644 --- a/x11/ruby-gnome/Makefile.common +++ b/x11/ruby-gnome/Makefile.common @@ -1,6 +1,6 @@ # $FreeBSD$ -RUBY_GNOME_VERSION= 0.27 +RUBY_GNOME_VERSION= 0.28 #RUBY_GNOME_SNAPSHOTDATE= 20010224 .if defined(RUBY_GNOME_SNAPSHOTDATE) RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE} diff --git a/x11/ruby-gnome/distinfo b/x11/ruby-gnome/distinfo index 0ba976e35d5c..6c1fdcce647e 100644 --- a/x11/ruby-gnome/distinfo +++ b/x11/ruby-gnome/distinfo @@ -1 +1 @@ -MD5 (ruby/ruby-gnome-all-0.27.tar.gz) = d7663ba9ca6d3f4e91734879d7d58c4b +MD5 (ruby/ruby-gnome-all-0.28.tar.gz) = 64714d5abc3c1d20ead3f1906f21e8bf diff --git a/x11/ruby-gnome/files/patch-extconf.rb b/x11/ruby-gnome/files/patch-extconf.rb deleted file mode 100644 index efad8e98b4f3..000000000000 --- a/x11/ruby-gnome/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 = -- `#{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" -+ $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" - end diff --git a/x11/ruby-gnome/pkg-descr b/x11/ruby-gnome/pkg-descr index 00a4f60380bb..7d27ac671f6e 100644 --- a/x11/ruby-gnome/pkg-descr +++ b/x11/ruby-gnome/pkg-descr @@ -1,6 +1,4 @@ -Ruby/GNOME is a set of Ruby bindings for GNOME which includes gnome, -gtk, gdk_imlib, and gdk_pixbuf modules. The last three modules are -provided as separate ports. +Ruby/GNOME is a set of Ruby bindings for GNOME which consists of +gnome, gtk, gdk_imlib, gdk_pixbuf, libglade, and panel-applet modules. -Author: Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp> -WWW: http://www.ruby-lang.org/gtk/en/ +WWW: http://ruby-gnome.sourceforge.net/ diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common index 950919f83c2e..8d0f2882cb44 100644 --- a/x11/ruby-gnome2/Makefile.common +++ b/x11/ruby-gnome2/Makefile.common @@ -1,6 +1,6 @@ # $FreeBSD$ -RUBY_GNOME_VERSION= 0.27 +RUBY_GNOME_VERSION= 0.28 #RUBY_GNOME_SNAPSHOTDATE= 20010224 .if defined(RUBY_GNOME_SNAPSHOTDATE) RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE} diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo index 0ba976e35d5c..6c1fdcce647e 100644 --- a/x11/ruby-gnome2/distinfo +++ b/x11/ruby-gnome2/distinfo @@ -1 +1 @@ -MD5 (ruby/ruby-gnome-all-0.27.tar.gz) = d7663ba9ca6d3f4e91734879d7d58c4b +MD5 (ruby/ruby-gnome-all-0.28.tar.gz) = 64714d5abc3c1d20ead3f1906f21e8bf diff --git a/x11/ruby-gnome2/files/patch-extconf.rb b/x11/ruby-gnome2/files/patch-extconf.rb deleted file mode 100644 index efad8e98b4f3..000000000000 --- a/x11/ruby-gnome2/files/patch-extconf.rb +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 = -- `#{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" -+ $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" - end diff --git a/x11/ruby-gnome2/pkg-descr b/x11/ruby-gnome2/pkg-descr index 00a4f60380bb..7d27ac671f6e 100644 --- a/x11/ruby-gnome2/pkg-descr +++ b/x11/ruby-gnome2/pkg-descr @@ -1,6 +1,4 @@ -Ruby/GNOME is a set of Ruby bindings for GNOME which includes gnome, -gtk, gdk_imlib, and gdk_pixbuf modules. The last three modules are -provided as separate ports. +Ruby/GNOME is a set of Ruby bindings for GNOME which consists of +gnome, gtk, gdk_imlib, gdk_pixbuf, libglade, and panel-applet modules. -Author: Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp> -WWW: http://www.ruby-lang.org/gtk/en/ +WWW: http://ruby-gnome.sourceforge.net/ |