Update the Ruby/GNOME2 suite to 0.3.0.

Add ruby-pango, a Ruby binding for Pango.

17 files changed, 87 insertions, 18 deletions

diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index 2ae178d2dffc..67e04eb8c2b1 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	glib2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index bc8e6a521a87..e5b1f03c31fd 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 LIB_DEPENDS=    gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index 7611a8ef10db..82ba3cd72010 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -3,9 +3,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-foot.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/loader.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/save.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/to_drawable.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 559c2b207a67..26edd85253c3 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,5 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rose.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testlibart2.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 0b7134165770..91a96745ea07 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -144,6 +144,7 @@
     SUBDIR += ruby-fox
     SUBDIR += ruby-gtk
     SUBDIR += ruby-gtk2
+    SUBDIR += ruby-pango
     SUBDIR += ruby-qt2
     SUBDIR += ruby-qt2canvas
     SUBDIR += ruby-qt2iconview
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index f3d0065a13ce..ee31c1c1479f 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -18,7 +17,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 LIB_DEPENDS=    gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \
+		${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/x11-toolkits/ruby-gtk2/pkg-descr b/x11-toolkits/ruby-gtk2/pkg-descr
index cfcf53f72710..22254b85a2fe 100644
--- a/x11-toolkits/ruby-gtk2/pkg-descr
+++ b/x11-toolkits/ruby-gtk2/pkg-descr
@@ -1,3 +1,3 @@
 Ruby/GTK2 is a Ruby binding for GTK+2.
 
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index d42fa55470f4..d13d63d5a56f 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -10,10 +10,12 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/dialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/dialog2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/dnd.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/dndtreeview.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/gc.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/gnome-logo-icon.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/helloworld.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/image.rb
@@ -29,6 +31,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtkplug.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtksocket.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/test.xpm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treeview.rb
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
new file mode 100644
index 000000000000..8c02fde4621e
--- /dev/null
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:	Ruby/Pango
+# Date created:		9 February
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	pango
+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=	pango-1.0.200:${PORTSDIR}/x11-toolkits/pango
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+USE_XLIB=	yes
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+INSTALL_TARGET=	site-install
+
+DOCS=		ChangeLog \
+		README
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-pango/pkg-comment b/x11-toolkits/ruby-pango/pkg-comment
new file mode 100644
index 000000000000..85342e39a6db
--- /dev/null
+++ b/x11-toolkits/ruby-pango/pkg-comment
@@ -0,0 +1 @@
+Ruby binding for Pango
diff --git a/x11-toolkits/ruby-pango/pkg-descr b/x11-toolkits/ruby-pango/pkg-descr
new file mode 100644
index 000000000000..9fddb32d0afc
--- /dev/null
+++ b/x11-toolkits/ruby-pango/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/Pango is a Ruby binding for Pango.
+
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/x11-toolkits/ruby-pango/pkg-plist b/x11-toolkits/ruby-pango/pkg-plist
new file mode 100644
index 000000000000..e62a3be36341
--- /dev/null
+++ b/x11-toolkits/ruby-pango/pkg-plist
@@ -0,0 +1,11 @@
+%%RUBY_SITEARCHLIBDIR%%/pango.so
+%%RUBY_SITELIBDIR%%/pango.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/attribute.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gdk_layout.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/label.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.txt
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 8691b5126089..28f897094a2f 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -16,20 +16,22 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	knu@FreeBSD.org
 
 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}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2
 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
+# pango         depends on glib2
+# gdk_pixbuf2   depends on glib2
+# gconf2        depends on glib2
+# gtk2          depends on glib2, gdk_pixbuf2, and pango
 # gnomecanvas2  depends on glib2, gtk2 and libart2
+# gnome2        depends on gtk2, gnomecanvas2
 # libglade2     depends on gtk2 and gnome2 (optional)
-# gconf2        depends on glib2
 
 USE_RUBY=       yes
 
diff --git a/x11/ruby-gnome2-all/pkg-descr b/x11/ruby-gnome2-all/pkg-descr
index a84384c34cfa..4a00a9474165 100644
--- a/x11/ruby-gnome2-all/pkg-descr
+++ b/x11/ruby-gnome2-all/pkg-descr
@@ -1 +1,3 @@
 The "meta-port" for Ruby/GNOME2
+
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 76f7ec1472f8..a0776922e319 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 2d652a2d2f99..87b1fbe7a04d 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.2r1
+RUBY_GNOME_VERSION=		0.3.0
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
@@ -9,7 +9,7 @@ RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
 RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
-RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
+RUBY_GNOME_DISTNAME=		ruby-gnome2-${RUBY_GNOME_VERSION:S/r/rev/}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome2-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 9a35ba8a8beb..ae2066abcb26 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gnome2-all-0.2rev1.tar.gz) = a2a5a5e86a4f7bb32db54cf437c0676b
+MD5 (ruby/ruby-gnome2-0.3.0.tar.gz) = da7dd17fd74e7232cc91a27352bb7c36