13 files changed, 87 insertions, 45 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%%