12 files changed, 26 insertions, 98 deletions

diff --git a/graphics/ruby-gdk_imlib/Makefile b/graphics/ruby-gdk_imlib/Makefile
index 5b47ad1dbff9..76f29faff8b5 100644
--- a/graphics/ruby-gdk_imlib/Makefile
+++ b/graphics/ruby-gdk_imlib/Makefile
@@ -28,8 +28,7 @@ USE_IMLIB=	yes
 
 WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
 INSTALL_TARGET=	site-install
-CONFIGURE_ARGS=	--with-glib-config="${GLIB_CONFIG}" \
-		--with-imlib-config="${IMLIB_CONFIG}"
+CONFIGURE_ARGS=	--with-imlib-config="${IMLIB_CONFIG}"
 
 DOCS_EN=	ChangeLog
 
diff --git a/graphics/ruby-gdk_imlib/files/patch-extconf.rb b/graphics/ruby-gdk_imlib/files/patch-extconf.rb
index 2af7fa76438f..a4c2e4bbbc8f 100644
--- a/graphics/ruby-gdk_imlib/files/patch-extconf.rb
+++ b/graphics/ruby-gdk_imlib/files/patch-extconf.rb
@@ -1,11 +1,10 @@
---- extconf.rb.orig	Sat Jun  3 23:56:38 2000
-+++ extconf.rb	Wed Feb 28 20:53:13 2001
-@@ -1,27 +1,26 @@
+--- 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]
-+glib_config = with_config("glib-config", "glib-config")
 +imlib_config = with_config("imlib-config", "imlib-config")
 +
 +while /^--/ =~ ARGV[0]
@@ -26,8 +25,8 @@
  
 -$CFLAGS = "-g -I#{rubygtk_dir}/src " + `imlib-config --cflags-gdk`.chomp
 -$LDFLAGS = `imlib-config --libs-gdk`.chomp
-+$CFLAGS += "-g -I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{imlib_config} --cflags-gdk`.chomp
-+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' +  `#{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") &&
diff --git a/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb b/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb
deleted file mode 100644
index e2e658733ba7..000000000000
--- a/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb
+++ /dev/null
@@ -1,42 +0,0 @@
---- extconf.rb.orig	Sat Oct  6 07:46:27 2001
-+++ extconf.rb	Wed Nov 21 01:17:41 2001
-@@ -1,26 +1,25 @@
- require 'mkmf'
- 
--rubygtk_dir = "../gtk"
--rubygtk_dir = ARGV[0] if ARGV[0]
-+glib_config = with_config("glib-config", "glib-config")
-+gdk_pixbuf_config = with_config("gdk-pixbuf-config", "gdk-pixbuf-config")
-+
-+while /^--/ =~ ARGV[0]
-+  ARGV.shift
-+end
-+
-+rubygtk_dir = ARGV.shift || "../gtk"
- unless FileTest.exist?(rubygtk_dir)
-   raise "Directory #{rubygtk_dir} not found.  Please specify Ruby/Gtk source dir."
- end
--gtklib_dir = []
--`gtk-config --libs`.split(' ').each do |e|
--  if e=~ /^-L/ then
--    gtklib_dir.push(e)
--  end
--end
- 
--$CFLAGS = "-I#{rubygtk_dir}/src " + `gdk-pixbuf-config --cflags`.chomp
--$LDFLAGS = `gdk-pixbuf-config --libs`.chomp
-+$CFLAGS += "-I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{gdk_pixbuf_config} --cflags`.chomp
-+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' + `#{gdk_pixbuf_config} --libs`.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_pixbuf", "gdk_pixbuf_new") &&
--
-+have_func("g_print") &&
-+have_func("gdk_init") &&
-+have_func("gdk_pixbuf_new") &&
- create_makefile('gdk_pixbuf')
diff --git a/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb b/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb
deleted file mode 100644
index e2e658733ba7..000000000000
--- a/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb
+++ /dev/null
@@ -1,42 +0,0 @@
---- extconf.rb.orig	Sat Oct  6 07:46:27 2001
-+++ extconf.rb	Wed Nov 21 01:17:41 2001
-@@ -1,26 +1,25 @@
- require 'mkmf'
- 
--rubygtk_dir = "../gtk"
--rubygtk_dir = ARGV[0] if ARGV[0]
-+glib_config = with_config("glib-config", "glib-config")
-+gdk_pixbuf_config = with_config("gdk-pixbuf-config", "gdk-pixbuf-config")
-+
-+while /^--/ =~ ARGV[0]
-+  ARGV.shift
-+end
-+
-+rubygtk_dir = ARGV.shift || "../gtk"
- unless FileTest.exist?(rubygtk_dir)
-   raise "Directory #{rubygtk_dir} not found.  Please specify Ruby/Gtk source dir."
- end
--gtklib_dir = []
--`gtk-config --libs`.split(' ').each do |e|
--  if e=~ /^-L/ then
--    gtklib_dir.push(e)
--  end
--end
- 
--$CFLAGS = "-I#{rubygtk_dir}/src " + `gdk-pixbuf-config --cflags`.chomp
--$LDFLAGS = `gdk-pixbuf-config --libs`.chomp
-+$CFLAGS += "-I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{gdk_pixbuf_config} --cflags`.chomp
-+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' + `#{gdk_pixbuf_config} --libs`.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_pixbuf", "gdk_pixbuf_new") &&
--
-+have_func("g_print") &&
-+have_func("gdk_init") &&
-+have_func("gdk_pixbuf_new") &&
- create_makefile('gdk_pixbuf')
diff --git a/x11-toolkits/ruby-gtk/pkg-plist b/x11-toolkits/ruby-gtk/pkg-plist
index 99f25b46c3bc..7e3cad5a2766 100644
--- a/x11-toolkits/ruby-gtk/pkg-plist
+++ b/x11-toolkits/ruby-gtk/pkg-plist
@@ -1,8 +1,12 @@
 %%RUBY_SITEARCHLIBDIR%%/gtk.so
 %%RUBY_SITELIBDIR%%/gtkcompat.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/calendar.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/cursor.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/dnd.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/drawing.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/helloworld.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/keyboard_grab.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/pointer_grab.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/gtkbrows.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_gtk.rb
@@ -45,6 +49,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/dnd.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/entry.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/filesel.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/fontselection.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/gammacurve.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/graypreview.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/handlebox.rb
@@ -91,6 +96,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testim.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/text.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/texthook.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/xbm_cursor.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/browser
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/test
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/testgtk
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 99f25b46c3bc..7e3cad5a2766 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,8 +1,12 @@
 %%RUBY_SITEARCHLIBDIR%%/gtk.so
 %%RUBY_SITELIBDIR%%/gtkcompat.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/calendar.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/cursor.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/dnd.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/drawing.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/helloworld.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/keyboard_grab.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/pointer_grab.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/gtkbrows.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_gtk.rb
@@ -45,6 +49,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/dnd.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/entry.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/filesel.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/fontselection.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/gammacurve.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/graypreview.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testgtk/handlebox.rb
@@ -91,6 +96,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/testim.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/text.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/texthook.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gtk/xbm_cursor.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/browser
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/test
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/testgtk
diff --git a/x11/ruby-gnome/Makefile.common b/x11/ruby-gnome/Makefile.common
index a00bb121c0c9..950919f83c2e 100644
--- a/x11/ruby-gnome/Makefile.common
+++ b/x11/ruby-gnome/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.26
+RUBY_GNOME_VERSION=		0.27
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
@@ -9,7 +9,7 @@ RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
 RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome
-RUBY_GNOME_DISTNAME=		ruby-gnome-${RUBY_GNOME_VERSION}
+RUBY_GNOME_DISTNAME=		ruby-gnome-all-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome/distinfo b/x11/ruby-gnome/distinfo
index 9a42c99e3be7..0ba976e35d5c 100644
--- a/x11/ruby-gnome/distinfo
+++ b/x11/ruby-gnome/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gnome-0.26.tar.gz) = 99e7afbe89ee2c74303563cd768b0e27
+MD5 (ruby/ruby-gnome-all-0.27.tar.gz) = d7663ba9ca6d3f4e91734879d7d58c4b
diff --git a/x11/ruby-gnome/pkg-plist b/x11/ruby-gnome/pkg-plist
index f36eb5ffad5a..34935e0cc4a0 100644
--- a/x11/ruby-gnome/pkg-plist
+++ b/x11/ruby-gnome/pkg-plist
@@ -19,6 +19,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/dateedit.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/dialog.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/file-entry.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/font-picker.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/href.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/icon-entry.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/less.rb
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index a00bb121c0c9..950919f83c2e 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.26
+RUBY_GNOME_VERSION=		0.27
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
@@ -9,7 +9,7 @@ RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
 RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome
-RUBY_GNOME_DISTNAME=		ruby-gnome-${RUBY_GNOME_VERSION}
+RUBY_GNOME_DISTNAME=		ruby-gnome-all-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 9a42c99e3be7..0ba976e35d5c 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gnome-0.26.tar.gz) = 99e7afbe89ee2c74303563cd768b0e27
+MD5 (ruby/ruby-gnome-all-0.27.tar.gz) = d7663ba9ca6d3f4e91734879d7d58c4b
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index f36eb5ffad5a..34935e0cc4a0 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -19,6 +19,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/dateedit.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/dialog.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/file-entry.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/font-picker.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/href.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/icon-entry.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/test-gnome/less.rb