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)

6 files changed, 54 insertions, 72 deletions

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