4 files changed, 18 insertions, 31 deletions

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%%