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)

5 files changed, 45 insertions, 77 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 598bd469aba..b774e1d3055 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 66f5def898a..4863ee7f808 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 e222b3da35c..ed0ee7e67d4 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 3e7da1021fa..cfcf53f7271 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 fe998bee645..6d80a13aad5 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%%