Import Ruby/GNOME2 0.1 ports.

Newly added are devel/ruby-glib2 and graphics/ruby-gnomecanvas2, the
rest are updated after repocopy.

Approved by:	portmgr (implicitly)

37 files changed, 285 insertions, 224 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b1152649c3e5..d02d251ab9f3 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -724,11 +724,14 @@
     SUBDIR += ruby-filelock
     SUBDIR += ruby-flex_rb
     SUBDIR += ruby-gconf
+    SUBDIR += ruby-gconf2
     SUBDIR += ruby-gemfinder
     SUBDIR += ruby-gettext
+    SUBDIR += ruby-glib2
     SUBDIR += ruby-gnustep
     SUBDIR += ruby-intl
     SUBDIR += ruby-libglade
+    SUBDIR += ruby-libglade2
     SUBDIR += ruby-libgtop
     SUBDIR += ruby-locale
     SUBDIR += ruby-metaruby
diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 733aa6f1f2b5..a438f5c77a10 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -1,38 +1,34 @@
-# New ports collection makefile for:	ruby-gconf
+# New ports collection makefile for:	Ruby/GConf2
 # Date created:		20 October 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gconf
-PORTVERSION=	0.2
+PORTNAME=	gconf2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ruby-gnome
+MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
+DISTNAME=	${RUBY_GNOME_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	gconf-gtk-1.1:${PORTSDIR}/devel/gconf
+LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
 
-CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG}
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gconf
 INSTALL_TARGET=	site-install
 
-DOCS=	CREDITS \
-	ChangeLog \
-	INSTALL \
-	Makefile \
-	README \
-	README.DEV \
-	TODO
+DOCS=	ChangeLog \
+	README
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ruby-gconf2/pkg-comment b/devel/ruby-gconf2/pkg-comment
index 64cf14b53596..69548f8d31b5 100644
--- a/devel/ruby-gconf2/pkg-comment
+++ b/devel/ruby-gconf2/pkg-comment
@@ -1 +1 @@
-A Ruby interface to GConf (1.0.x)
+A Ruby interface to GConf2
diff --git a/devel/ruby-gconf2/pkg-descr b/devel/ruby-gconf2/pkg-descr
index d43b628789e8..b482b0862632 100644
--- a/devel/ruby-gconf2/pkg-descr
+++ b/devel/ruby-gconf2/pkg-descr
@@ -1,8 +1,3 @@
-This package allows Ruby developers to write applications that store
-their configuration data using GConf (1.0.x).  GConf is a
-configuration database system written by Havoc Pennington et al, and
-part of the GNOME application development framework (although it can
-be used separately).
+Ruby/GConf2 is a Ruby binding for GConf2.
 
-Author:	Neil Conway <neilconway@home.com>
-WWW:	http://ruby-gnome.sf.net/gconf.html
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/devel/ruby-gconf2/pkg-plist b/devel/ruby-gconf2/pkg-plist
index 0045cb1aac7a..2bae9b06bee9 100644
--- a/devel/ruby-gconf2/pkg-plist
+++ b/devel/ruby-gconf2/pkg-plist
@@ -1,9 +1,5 @@
-%%RUBY_SITEARCHLIBDIR%%/gconf.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CREDITS
+%%RUBY_SITEARCHLIBDIR%%/gconf2.so
+%%RUBY_SITELIBDIR%%/gconf2.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Makefile
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.DEV
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
new file mode 100644
index 000000000000..c35fe6f31905
--- /dev/null
+++ b/devel/ruby-glib2/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	Ruby/GLib2
+# Date created:		24 November 2002
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	glib2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+CATEGORIES=	x11-toolkits ruby
+MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTNAME=	${RUBY_GNOME_DISTNAME}
+DIST_SUBDIR=	ruby
+
+MAINTAINER=	knu@FreeBSD.org
+
+LIB_DEPENDS=    glib-2.0.0:${PORTSDIR}/devel/glib20
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/glib
+INSTALL_TARGET=	site-install
+
+DOCS=		ChangeLog \
+		README
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/ruby-glib2/pkg-comment b/devel/ruby-glib2/pkg-comment
new file mode 100644
index 000000000000..b89c5841256b
--- /dev/null
+++ b/devel/ruby-glib2/pkg-comment
@@ -0,0 +1 @@
+Ruby binding for GLib2
diff --git a/devel/ruby-glib2/pkg-descr b/devel/ruby-glib2/pkg-descr
new file mode 100644
index 000000000000..920d97c2126d
--- /dev/null
+++ b/devel/ruby-glib2/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/GLib2 is a Ruby binding for GLib2.
+
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
new file mode 100644
index 000000000000..aa02793ba5e3
--- /dev/null
+++ b/devel/ruby-glib2/pkg-plist
@@ -0,0 +1,4 @@
+%%RUBY_SITEARCHLIBDIR%%/glib2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 6405ce92cf69..c4dbfbcecd5d 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	Ruby-libglade
+# New ports collection makefile for:	Ruby/Libglade2
 # Date created:		8 February 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libglade
+PORTNAME=	libglade2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTEPOCH=	1
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -17,25 +16,28 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \
-		${RUBY_SITEARCHLIBDIR}/gnome.so:${PORTSDIR}/x11/ruby-gnome
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_GNOME=	yes
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/libglade
 INSTALL_TARGET=	site-install
 
+DOCS=		ChangeLog \
+		README
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-libglade2/pkg-comment b/devel/ruby-libglade2/pkg-comment
index 1f69e4855a9a..44a1af31671a 100644
--- a/devel/ruby-libglade2/pkg-comment
+++ b/devel/ruby-libglade2/pkg-comment
@@ -1 +1 @@
-A wrapper library of libglade for Ruby
+Ruby binding for Libglade2
diff --git a/devel/ruby-libglade2/pkg-descr b/devel/ruby-libglade2/pkg-descr
index 68e848fd5a72..5f747b3ba869 100644
--- a/devel/ruby-libglade2/pkg-descr
+++ b/devel/ruby-libglade2/pkg-descr
@@ -1,3 +1,3 @@
-Ruby-libglade -- A wrapper library of libglade for ruby
+Ruby/Libglade2 is a Ruby binding for Libglade2.
 
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index 9491c205aaeb..5c61d4ee7065 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -1,6 +1,8 @@
-%%RUBY_SITEARCHLIBDIR%%/lglade.so
+%%RUBY_SITEARCHLIBDIR%%/libglade2.so
+%%RUBY_SITELIBDIR%%/libglade2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.glade
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/Makefile b/graphics/Makefile
index 2407295617b8..57fcdccc05af 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -338,11 +338,14 @@
     SUBDIR += ruby-gdchart
     SUBDIR += ruby-gdk_imlib
     SUBDIR += ruby-gdk_pixbuf
+    SUBDIR += ruby-gdk_pixbuf2
     SUBDIR += ruby-gimp
+    SUBDIR += ruby-gnomecanvas2
     SUBDIR += ruby-graph
     SUBDIR += ruby-image_size
     SUBDIR += ruby-imlib2
     SUBDIR += ruby-libart
+    SUBDIR += ruby-libart2
     SUBDIR += ruby-libexif
     SUBDIR += ruby-libpng
     SUBDIR += ruby-ming
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 148db9c69250..bc8e6a521a87 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-gdk_pixbuf
+# New ports collection makefile for:	Ruby/GdkPixbuf2
 # Date created:		28 February 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gdk_pixbuf
+PORTNAME=	gdk_pixbuf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,24 +16,20 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
+LIB_DEPENDS=    gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	glib12 libcapplet gdkpixbuf
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gdkpixbuf
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README
-
-post-extract:
-	${MV} ${WRKSRC:S/gdk_pixbuf$/gdkpixbuf/} ${WRKSRC}
+DOCS_EN=	ChangeLog \
+		README
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-comment b/graphics/ruby-gdk_pixbuf2/pkg-comment
index 8e0acee39b67..8dd85e332627 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-comment
+++ b/graphics/ruby-gdk_pixbuf2/pkg-comment
@@ -1 +1 @@
-Ruby binding for Gdkpixbuf
+Ruby binding for GdkPixbuf2
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-descr b/graphics/ruby-gdk_pixbuf2/pkg-descr
index def5bdee0bac..9067e7aa3f1d 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-descr
+++ b/graphics/ruby-gdk_pixbuf2/pkg-descr
@@ -1,3 +1,3 @@
-Ruby/Gdkpixbuf is a Ruby binding for Gdkpixbuf.
+Ruby/GdkPixbuf2 is a Ruby binding for GdkPixbuf2.
 
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index ee96f305cb44..7611a8ef10db 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -1,8 +1,13 @@
-%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf.so
-%%RUBY_SITELIBDIR%%/gdk_pixbuf.rb
+%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
+%%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/save.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/to_drawable.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
new file mode 100644
index 000000000000..2043241a7b8d
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	Ruby/GnomeCanvas2
+# Date created:		24 November 2002
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomecanvas2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+CATEGORIES=	graphics ruby gnome
+MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTNAME=	${RUBY_GNOME_DISTNAME}
+DIST_SUBDIR=	ruby
+
+MAINTAINER=	knu@FreeBSD.org
+
+LIB_DEPENDS=    gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
+		${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+USE_XLIB=	yes
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gnomecanvas
+INSTALL_TARGET=	site-install
+
+DOCS_EN=	ChangeLog \
+		README
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/ruby-gnomecanvas2/pkg-comment b/graphics/ruby-gnomecanvas2/pkg-comment
new file mode 100644
index 000000000000..098b14564226
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-comment
@@ -0,0 +1 @@
+Ruby binding for GnomeCanvas2
diff --git a/graphics/ruby-gnomecanvas2/pkg-descr b/graphics/ruby-gnomecanvas2/pkg-descr
new file mode 100644
index 000000000000..fe4ce07931f4
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/GnomeCanvas2 is a Ruby binding for GnomeCanvas2.
+
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-gnomecanvas2/pkg-plist b/graphics/ruby-gnomecanvas2/pkg-plist
new file mode 100644
index 000000000000..2a304534b551
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-plist
@@ -0,0 +1,15 @@
+%%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
+%%RUBY_SITELIBDIR%%/gnomecanvas2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-arrowhead.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-curve.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-features.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-fifteen.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-primitives.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-rich-text.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flower.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index 819c73fe4962..9519b23a2d49 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-libart
+# New ports collection makefile for:	Ruby/libart2
 # Date created:		1 September 2002
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libart
+PORTNAME=	libart2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,24 +16,25 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	art_lgpl.5:${PORTSDIR}/graphics/libart
+LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/libart
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README
+DOCS=		ChangeLog \
+		README
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
+.for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
diff --git a/graphics/ruby-libart2/pkg-comment b/graphics/ruby-libart2/pkg-comment
index 3274af612f95..a44c970744d3 100644
--- a/graphics/ruby-libart2/pkg-comment
+++ b/graphics/ruby-libart2/pkg-comment
@@ -1 +1 @@
-Ruby binding for libart
+Ruby binding for Libart2
diff --git a/graphics/ruby-libart2/pkg-descr b/graphics/ruby-libart2/pkg-descr
index 620974f6e7b4..a1b7bc6b448a 100644
--- a/graphics/ruby-libart2/pkg-descr
+++ b/graphics/ruby-libart2/pkg-descr
@@ -1,4 +1,3 @@
-Ruby/libart is a Ruby binding for libart.
+Ruby/Libart2 is a Ruby binding for Libart2.
 
-Author:	KUBO Takehiro <kubo@jiubao.org>, Ruby-GNOME Project Team
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 66c25d5499fb..559c2b207a67 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,4 +1,4 @@
-%%RUBY_SITEARCHLIBDIR%%/libart.so
+%%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 598bd469abaa..b774e1d30556 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -141,6 +141,7 @@
     SUBDIR += ruby-fltk
     SUBDIR += ruby-fox
     SUBDIR += ruby-gtk
+    SUBDIR += ruby-gtk2
     SUBDIR += ruby-qt2
     SUBDIR += ruby-qt2canvas
     SUBDIR += ruby-qt2iconview
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 66f5def898a0..4863ee7f8080 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-gtk
+# New ports collection makefile for:	Ruby/GTK2
 # Date created:		19 April 1999
 # Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gtk
+PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,42 +16,29 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=    gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gtk
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	BUGS \
-		ChangeLog \
-		NEWS \
-		README \
-		README.EXT \
-		ToDo
-DOCS_JA=	README.EXT.ja
-
-post-extract:
-	${MKDIR} ${WRKSRC}/sample/browser
-	${MV} ${WRKSRC}/doc/*.rb ${WRKSRC}/sample/browser/
+DOCS=		ChangeLog \
+		README
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/gtkcompat.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
+	${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-gtk2/pkg-comment b/x11-toolkits/ruby-gtk2/pkg-comment
index e222b3da35cc..ed0ee7e67d43 100644
--- a/x11-toolkits/ruby-gtk2/pkg-comment
+++ b/x11-toolkits/ruby-gtk2/pkg-comment
@@ -1 +1 @@
-Ruby binding for GTK+
+Ruby binding for GTK+2
diff --git a/x11-toolkits/ruby-gtk2/pkg-descr b/x11-toolkits/ruby-gtk2/pkg-descr
index 3e7da1021fa0..cfcf53f72710 100644
--- a/x11-toolkits/ruby-gtk2/pkg-descr
+++ b/x11-toolkits/ruby-gtk2/pkg-descr
@@ -1,3 +1,3 @@
-Ruby/GTK is a Ruby binding for Gtk+.
+Ruby/GTK2 is a Ruby binding for GTK+2.
 
 WWW:	http://ruby-gnome.sourceforge.net/
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index fe998bee6452..6d80a13aad54 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,37 +1,31 @@
-%%RUBY_SITEARCHLIBDIR%%/gtk.so
-%%RUBY_SITELIBDIR%%/gtkcompat.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calendar.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dnd.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/drawing.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/helloworld.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/item_factory.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/keyboard_grab.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pointer_grab.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/t-gtkplug.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/t-gtksocket.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/gtkbrows.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr_gtk.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr_rb.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbdump.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test.xpm
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test0.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test3.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test4.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test5.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test6.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test7.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test8.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test9.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/testa.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/testb.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/testc.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/testd.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/teste.rb
+%%RUBY_SITEARCHLIBDIR%%/gtk2.so
+%%RUBY_SITELIBDIR%%/gtk2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/buttonbox.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/calendar.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/checkbutton.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/combo_check.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/cursor.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/dnd.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/drawing.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/entry.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/fileselection.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/frame.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/helloworld.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/image.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/keyboard_grab.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/listview.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/menu.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/stock.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtkplug.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtksocket.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/test.xpm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/window.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/xbm_cursor.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/3DRings.xpm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/FilesQueue.xpm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/Modeller.xpm
@@ -43,10 +37,8 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/checkbutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/circles.xbm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/circles.xpm
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/clist.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/colorpreview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/colorselect.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/ctree.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/cursors.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/dialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/dnd.rb
@@ -61,7 +53,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/layout.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/line-arrow.xbm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/line-wrap.xbm
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/list.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/liststore.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/mainloop.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/marble.xpm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/menu.rb
@@ -85,31 +77,19 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/testgtk.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/testgtkrc
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/testgtkrc2
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/text.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/timeout.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/togglebutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/toolbar.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tooltips.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tree.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tree_minus.xbm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tree_minus.xpm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tree_plus.xbm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/tree_plus.xpm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/treestore.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testgtk/wmhints.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testim.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/texthook.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xbm_cursor.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/browser
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/testgtk
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/misc
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.EXT
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.EXT.ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/x11/Makefile b/x11/Makefile
index 6f1176744009..bcb2e270678a 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -91,6 +91,8 @@
     SUBDIR += ruby-X11
     SUBDIR += ruby-gnome
     SUBDIR += ruby-gnome-all
+    SUBDIR += ruby-gnome2
+    SUBDIR += ruby-gnome2-all
     SUBDIR += ruby-panel-applet
     SUBDIR += rxvt
     SUBDIR += rxvt-devel
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 726662f35027..2fcb4c178a35 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	Ruby-GNOME-all
+# New ports collection makefile for:	Ruby/GNOME2-all
 # Date created:		3 June 2002
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnome-all
+PORTNAME=	gnome2-all
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	x11 ruby gnome
 MASTER_SITES=	# none
@@ -15,23 +15,25 @@ EXTRACT_ONLY=	# none
 
 MAINTAINER=	knu@FreeBSD.org
 
-#RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/lglade.so:${PORTSDIR}/devel/ruby-libglade
-#RUN_DEPENDS+=	${RUBY_SITELIBDIR}/gdk_imlib.rb:${PORTSDIR}/graphics/ruby-gdk_imlib
-RUN_DEPENDS+=	${RUBY_SITELIBDIR}/gdk_pixbuf.rb:${PORTSDIR}/graphics/ruby-gdk_pixbuf
-#RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnome.so:${PORTSDIR}/x11/ruby-gnome
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/panel_applet.so:${PORTSDIR}/x11/ruby-panel-applet
-#RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/libart.so:${PORTSDIR}/graphics/ruby-libart
-
-# libglade	depends on gtk, gnome
-# gdk_imlib	depends on gtk
-# gdk_pixbuf	depends on gtk
-# gnome		depends on gtk, gdk_imlib, libart
-# panel-applet	depends on gtk, gnome
-
-USE_RUBY=	yes
-
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2
+
+# gtk2          depends on glib2
+# gdk_pixbuf2   depends on gtk2
+# gnome2        depends on gtk2, gnomecanvas2
+# gnomecanvas2  depends on glib2, gtk2 and libart2
+# libglade2     depends on gtk2 and gnome2 (optional)
+# gconf2        depends on glib2
+
+USE_RUBY=       yes
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
 NO_BUILD=	yes
 
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index ce539df0fe76..25d2ae8cd6fc 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-gnome
+# New ports collection makefile for:	Ruby-GNOME2
 # Date created:		28 February 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnome
+PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,29 +16,27 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \
-		${RUBY_SITELIBDIR}/gdk_imlib.rb:${PORTSDIR}/graphics/ruby-gdk_imlib \
-		${RUBY_SITEARCHLIBDIR}/libart.so:${PORTSDIR}/graphics/ruby-libart
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
+		${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GNOME=	yes
 
 .include "${.CURDIR}/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS=	${GNOME_CONFIG}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gnome
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog \
-		NEWS \
+DOCS_EN=	AUTHORS \
+		ChangeLog \
 		README \
-		ToDo
+		README.gnome2-all
 
 post-extract:
-	${MKDIR} ${WRKSRC}/sample/browser
-	${MV} ${WRKSRC}/doc/*.rb ${WRKSRC}/sample/browser
+	${CP} ${RUBY_GNOME_WRKSRC}/AUTHORS ${WRKSRC}/AUTHORS
+	${CP} ${RUBY_GNOME_WRKSRC}/README ${WRKSRC}/README.gnome2-all
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 450d648f50de..fd5f04e9b7bf 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.30
+RUBY_GNOME_VERSION=		0.1
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
-RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}p1
+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-all-${RUBY_GNOME_VERSION}
+RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
+RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
-RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
+RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome2-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_WRKSRC=	${WRKDIR}/${RUBY_GNOME_DISTNAME}
 .endif
 
-RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome
+RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome2
 
 MD5_FILE=	${RUBY_GNOME_PORTDIR}/distinfo
 
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 51ab86da1ece..ee8558ee25a1 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gnome-all-0.30.tar.gz) = d072ec17dcb72653409c37c61e47631d
+MD5 (ruby/refe-0.5.0.tar.gz) = 0b7c9aef76ae8f15cdbcf4158b06b4d7
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index c5399425b29b..198147b96362 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -1,47 +1,27 @@
-%%RUBY_SITEARCHLIBDIR%%/gnome.so
-%%RUBY_SITELIBDIR%%/gnome.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/animator_demo.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/gnobrows.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr_gnome.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbbr_rb.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/browser/rbdump.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-init-popt.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/README.ja
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/gnoconfig.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/gnome-hello-0-basic.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/gnome-hello-1-menus.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/gnome-hello-2-i18n.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-hello/gnome-hello-4-SM.rb
+%%RUBY_SITEARCHLIBDIR%%/gnome2.so
+%%RUBY_SITELIBDIR%%/gnome2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-app-helper.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-config.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-druid.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-program.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/about.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/app-helper.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/calculator.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/canvas-arrowhead.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/canvas-features.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/canvas-fifteen.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/canvas-primitives.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/canvas.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/clock.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/bomb.xpm
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/color-picker.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/dateedit.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/dialog.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/entry.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/file-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/flower.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/font-picker.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/href.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/less.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/number-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/paper-selector.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-list.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/pixmap-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/sample.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome-app.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/toroid.png
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test-gnome
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/gnome-hello
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/browser
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.gnome2-all
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%