13 files changed, 99 insertions, 30 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 2407295617b8..57fcdccc05af 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -338,11 +338,14 @@
     SUBDIR += ruby-gdchart
     SUBDIR += ruby-gdk_imlib
     SUBDIR += ruby-gdk_pixbuf
+    SUBDIR += ruby-gdk_pixbuf2
     SUBDIR += ruby-gimp
+    SUBDIR += ruby-gnomecanvas2
     SUBDIR += ruby-graph
     SUBDIR += ruby-image_size
     SUBDIR += ruby-imlib2
     SUBDIR += ruby-libart
+    SUBDIR += ruby-libart2
     SUBDIR += ruby-libexif
     SUBDIR += ruby-libpng
     SUBDIR += ruby-ming
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 148db9c69250..bc8e6a521a87 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-gdk_pixbuf
+# New ports collection makefile for:	Ruby/GdkPixbuf2
 # Date created:		28 February 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gdk_pixbuf
+PORTNAME=	gdk_pixbuf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,24 +16,20 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
+LIB_DEPENDS=    gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	glib12 libcapplet gdkpixbuf
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
-CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gdkpixbuf
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README
-
-post-extract:
-	${MV} ${WRKSRC:S/gdk_pixbuf$/gdkpixbuf/} ${WRKSRC}
+DOCS_EN=	ChangeLog \
+		README
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-comment b/graphics/ruby-gdk_pixbuf2/pkg-comment
index 8e0acee39b67..8dd85e332627 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-comment
+++ b/graphics/ruby-gdk_pixbuf2/pkg-comment
@@ -1 +1 @@
-Ruby binding for Gdkpixbuf
+Ruby binding for GdkPixbuf2
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-descr b/graphics/ruby-gdk_pixbuf2/pkg-descr
index def5bdee0bac..9067e7aa3f1d 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-descr
+++ b/graphics/ruby-gdk_pixbuf2/pkg-descr
@@ -1,3 +1,3 @@
-Ruby/Gdkpixbuf is a Ruby binding for Gdkpixbuf.
+Ruby/GdkPixbuf2 is a Ruby binding for GdkPixbuf2.
 
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index ee96f305cb44..7611a8ef10db 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -1,8 +1,13 @@
-%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf.so
-%%RUBY_SITELIBDIR%%/gdk_pixbuf.rb
+%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
+%%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/save.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/to_drawable.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
new file mode 100644
index 000000000000..2043241a7b8d
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	Ruby/GnomeCanvas2
+# Date created:		24 November 2002
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnomecanvas2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+CATEGORIES=	graphics ruby gnome
+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=    gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
+		${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+USE_XLIB=	yes
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gnomecanvas
+INSTALL_TARGET=	site-install
+
+DOCS_EN=	ChangeLog \
+		README
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/ruby-gnomecanvas2/pkg-comment b/graphics/ruby-gnomecanvas2/pkg-comment
new file mode 100644
index 000000000000..098b14564226
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-comment
@@ -0,0 +1 @@
+Ruby binding for GnomeCanvas2
diff --git a/graphics/ruby-gnomecanvas2/pkg-descr b/graphics/ruby-gnomecanvas2/pkg-descr
new file mode 100644
index 000000000000..fe4ce07931f4
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/GnomeCanvas2 is a Ruby binding for GnomeCanvas2.
+
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-gnomecanvas2/pkg-plist b/graphics/ruby-gnomecanvas2/pkg-plist
new file mode 100644
index 000000000000..2a304534b551
--- /dev/null
+++ b/graphics/ruby-gnomecanvas2/pkg-plist
@@ -0,0 +1,15 @@
+%%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
+%%RUBY_SITELIBDIR%%/gnomecanvas2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-arrowhead.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-curve.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-features.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-fifteen.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-primitives.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-rich-text.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flower.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index 819c73fe4962..9519b23a2d49 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	ruby-libart
+# New ports collection makefile for:	Ruby/libart2
 # Date created:		1 September 2002
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libart
+PORTNAME=	libart2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
@@ -16,24 +16,25 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	art_lgpl.5:${PORTSDIR}/graphics/libart
+LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+WRKSRC=		${RUBY_GNOME_WRKSRC}/libart
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	ChangeLog	README
+DOCS=		ChangeLog \
+		README
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
+.for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
diff --git a/graphics/ruby-libart2/pkg-comment b/graphics/ruby-libart2/pkg-comment
index 3274af612f95..a44c970744d3 100644
--- a/graphics/ruby-libart2/pkg-comment
+++ b/graphics/ruby-libart2/pkg-comment
@@ -1 +1 @@
-Ruby binding for libart
+Ruby binding for Libart2
diff --git a/graphics/ruby-libart2/pkg-descr b/graphics/ruby-libart2/pkg-descr
index 620974f6e7b4..a1b7bc6b448a 100644
--- a/graphics/ruby-libart2/pkg-descr
+++ b/graphics/ruby-libart2/pkg-descr
@@ -1,4 +1,3 @@
-Ruby/libart is a Ruby binding for libart.
+Ruby/Libart2 is a Ruby binding for Libart2.
 
-Author:	KUBO Takehiro <kubo@jiubao.org>, Ruby-GNOME Project Team
-WWW:	http://ruby-gnome.sourceforge.net/
+WWW:	http://ruby-gnome2.sourceforge.net/
diff --git a/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 66c25d5499fb..559c2b207a67 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,4 +1,4 @@
-%%RUBY_SITEARCHLIBDIR%%/libart.so
+%%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog