39 files changed, 401 insertions, 52 deletions

diff --git a/accessibility/ruby-atk/Makefile b/accessibility/ruby-atk/Makefile
index fd6ebf15917c..af1897afcbc3 100644
--- a/accessibility/ruby-atk/Makefile
+++ b/accessibility/ruby-atk/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDI
 USE_RUBY=	yes
 USE_GNOME=	atk
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 7c9c73aa35da..8302e031847d 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDI
 USE_RUBY=	yes
 USE_GNOME=	gconf2
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -33,7 +34,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index e86622df0d7f..920773c591ed 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS+=	${BUILD_DEPENDS}
 USE_RUBY=	yes
 USE_GNOME=	glib20
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -35,8 +36,6 @@ DOCS=		COPYING.LIB ChangeLog README
 post-patch: general-patch
 	@${RM} ${WRKSRC}/lib/gnome2-win32-binary-downloader.rb
 
-post-configure: general-configure
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile
index b6c77e40ac3b..80fdc2597406 100644
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDI
 USE_RUBY=	yes
 USE_GNOME=	gnomevfs2
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -37,8 +38,6 @@ post-patch: general-patch
 		${WRKSRC}/tests/*.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-configure: general-configure
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 86d085a56846..134a85b876f0 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GNOME=	libglade2
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -35,7 +36,6 @@ RUBY_SHEBANG_FILES=	${WRKSRC}/bin/ruby-glade-create-template
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 45af8dae6799..767598bcec3d 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDI
 USE_RUBY=	yes
 USE_GNOME=	gtk20
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index 77a5789ce0bb..9a14c3f87fba 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -1,4 +1,4 @@
-libdata/pkgconfig/ruby-gdkpixbuf2.pc
+libdata/pkgconfig/ruby-gdk-pixbuf2.pc
 %%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb
 %%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
index 8cd4664cf88f..2b223a660f17 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GNOME=	libgnomecanvas
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index d0b2bedf13bf..8f6d8ab73273 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -26,6 +26,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_RUBY=	yes
 USE_GNOME=	libartlgpl2
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -35,7 +36,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 650f0934df3f..b4dd5e32d79f 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GNOME=	librsvg2
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/print/ruby-gnomeprint/Makefile b/print/ruby-gnomeprint/Makefile
index 55c3ab5325c9..b47fc1ddd50f 100644
--- a/print/ruby-gnomeprint/Makefile
+++ b/print/ruby-gnomeprint/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libart2.so:${PORTS
 USE_RUBY=	yes
 USE_GNOME=	libgnomeprint
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/www/ruby-gtkhtml2/Makefile b/www/ruby-gtkhtml2/Makefile
index 3ce1025f4d6e..27db45947d9c 100644
--- a/www/ruby-gtkhtml2/Makefile
+++ b/www/ruby-gtkhtml2/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GNOME=	libgtkhtml
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -33,7 +34,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index 0407005b0615..051a5e4df4a6 100644
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtkmozembed
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -25,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GECKO=	libxul
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -38,8 +38,6 @@ post-patch: general-patch
 		s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \
 			${WRKSRC}/extconf.rb
 
-post-configure: general-configure
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 351fc735fc39..5dbdee8d212a 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -244,13 +244,17 @@
     SUBDIR += rep-gtk2
     SUBDIR += ruby-fox16
     SUBDIR += ruby-gnomeprintui
+    SUBDIR += ruby-goocanvas
+    SUBDIR += ruby-gstreamer
     SUBDIR += ruby-gtk
     SUBDIR += ruby-gtk2
     SUBDIR += ruby-gtkglext
-    SUBDIR += ruby-gtksourceview
+    SUBDIR += ruby-gtksourceview2
     SUBDIR += ruby-panelapplet
     SUBDIR += ruby-pango
+    SUBDIR += ruby-poppler
     SUBDIR += ruby-tk
+    SUBDIR += ruby-vte
     SUBDIR += ruby-wx
     SUBDIR += sakura
     SUBDIR += scintilla
diff --git a/x11-toolkits/ruby-gnomeprintui/Makefile b/x11-toolkits/ruby-gnomeprintui/Makefile
index 46f6c0572a2b..2bd1a48dc94f 100644
--- a/x11-toolkits/ruby-gnomeprintui/Makefile
+++ b/x11-toolkits/ruby-gnomeprintui/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 USE_RUBY=	yes
 USE_GNOME=	libgnomeprintui
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 # Have to do that to generate ruby-gnomeprint's rblibgnomeprintversion.h or
 # it will not build.
diff --git a/x11-toolkits/ruby-goocanvas/Makefile b/x11-toolkits/ruby-goocanvas/Makefile
new file mode 100644
index 000000000000..25917243f71b
--- /dev/null
+++ b/x11-toolkits/ruby-goocanvas/Makefile
@@ -0,0 +1,51 @@
+# New ports collection makefile for:	ruby-goocanvas
+# Date created:		2010-11-19
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	goocanvas
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+CATEGORIES=	x11-toolkits gnome 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=	ruby@FreeBSD.org
+COMMENT=	Ruby binding for goocanvas
+
+LIB_DEPENDS=	goocanvas.3:${PORTSDIR}/graphics/goocanvas
+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/goocanvas
+INSTALL_TARGET=	site-install
+
+DOCS=		ChangeLog README
+
+post-patch: general-patch
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
+	@${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-goocanvas/pkg-descr b/x11-toolkits/ruby-goocanvas/pkg-descr
new file mode 100644
index 000000000000..b02173ed1134
--- /dev/null
+++ b/x11-toolkits/ruby-goocanvas/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/Goocanvas is a Ruby binding of Goocanvas.
+
+WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11-toolkits/ruby-goocanvas/pkg-plist b/x11-toolkits/ruby-goocanvas/pkg-plist
new file mode 100644
index 000000000000..d61aa09f7330
--- /dev/null
+++ b/x11-toolkits/ruby-goocanvas/pkg-plist
@@ -0,0 +1,24 @@
+libdata/pkgconfig/ruby-goocanvas.pc
+%%RUBY_SITELIBDIR%%/goocanvas.rb
+%%RUBY_SITEARCHLIBDIR%%/goocanvas.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/demo-arrowhead.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/demo-fifteen.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/demo-primitives.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/demo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/flower.png
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/scalability-demo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/simple-demo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/table-demo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/units-demo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/widgets-demo.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11-toolkits/ruby-gstreamer/Makefile b/x11-toolkits/ruby-gstreamer/Makefile
new file mode 100644
index 000000000000..7493625761e5
--- /dev/null
+++ b/x11-toolkits/ruby-gstreamer/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	ruby-gstreamer
+# Date created:		2010-11-19
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gstreamer
+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=	ruby@FreeBSD.org
+COMMENT=	Ruby binding for GStreamer
+
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+
+USE_RUBY=	yes
+USE_GSTREAMER=	yes
+USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+INSTALL_TARGET=	site-install
+
+DOCS=		COPYING.LIB ChangeLog README
+
+post-patch: general-patch
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
+	@${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-gstreamer/pkg-descr b/x11-toolkits/ruby-gstreamer/pkg-descr
new file mode 100644
index 000000000000..eb77be9b97d6
--- /dev/null
+++ b/x11-toolkits/ruby-gstreamer/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/GStreamer is a Ruby binding for GStreamer.
+
+WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11-toolkits/ruby-gstreamer/pkg-plist b/x11-toolkits/ruby-gstreamer/pkg-plist
new file mode 100644
index 000000000000..88e0d190fbc6
--- /dev/null
+++ b/x11-toolkits/ruby-gstreamer/pkg-plist
@@ -0,0 +1,22 @@
+libdata/pkgconfig/ruby-gstreamer.pc
+%%RUBY_SITEARCHLIBDIR%%/gst.so
+%%RUBY_SITELIBDIR%%/gst.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/audio-player.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gst-inspect.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/media-type.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/media-type2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/ogg-audio-player.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/type-find.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/video-player.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/xml-player.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index f019ab40b81c..807a29e17ba4 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -8,7 +8,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}
@@ -28,6 +27,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/atk.so:${PORTSDIR}
 USE_RUBY=	yes
 USE_GNOME=	gtk20
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -45,8 +45,6 @@ post-patch: general-patch
 			${WRKSRC}/sample/testgtk/testgtk*
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-configure: general-configure
-
 # Have to do that to generate ruby-glib's glib-enum-types.h or
 # it will not build.
 pre-configure:
diff --git a/x11-toolkits/ruby-gtk2/files/patch-gtk2-ext-gtk2-rbgtkitemfactory-c b/x11-toolkits/ruby-gtk2/files/patch-gtk2-ext-gtk2-rbgtkitemfactory-c
deleted file mode 100644
index 4377359d6edd..000000000000
--- a/x11-toolkits/ruby-gtk2/files/patch-gtk2-ext-gtk2-rbgtkitemfactory-c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/gtk2/rbgtkitemfactory.c.orig	2010-10-10 15:01:35.146315748 -0400
-+++ ext/gtk2/rbgtkitemfactory.c	2010-10-10 15:01:45.129705841 -0400
-@@ -29,7 +29,7 @@
- {
-     VALUE obj = rb_eval_string("eval('self', binding)");
-     G_RELATIVE(obj, self);
--    RBGTK_INITIALIZE(self, gtk_item_factory_new(FIX2INT(type), RVAL2CSTR(path),
-+    RBGTK_INITIALIZE(self, gtk_item_factory_new(NUM2ULONG(type), RVAL2CSTR(path),
-                                                 RVAL2ACCEL(accel)));
-    
-     return Qnil;
diff --git a/x11-toolkits/ruby-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile
index 09c0e9c65cdc..0afe3b2c903d 100644
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -34,7 +35,6 @@ INSTALL_TARGET=	site-install
 DOCS=		ChangeLog README
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
diff --git a/x11-toolkits/ruby-gtksourceview2/Makefile b/x11-toolkits/ruby-gtksourceview2/Makefile
new file mode 100644
index 000000000000..c9d5c2a03296
--- /dev/null
+++ b/x11-toolkits/ruby-gtksourceview2/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for:	ruby-gtksourceview2
+# Date created:		2010-11-19
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gtksourceview2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+CATEGORIES=	x11-toolkits gnome 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=	ruby@FreeBSD.org
+COMMENT=	Ruby binding for GtkSourceView2
+
+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+
+USE_RUBY=	yes
+USE_GNOME=	gtksourceview2
+USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gtksourceview2
+INSTALL_TARGET=	site-install
+
+DOCS=		COPYING.LIB ChangeLog README
+
+post-patch: general-patch
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
+	@${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-gtksourceview2/pkg-descr b/x11-toolkits/ruby-gtksourceview2/pkg-descr
new file mode 100644
index 000000000000..e1fb59dbe040
--- /dev/null
+++ b/x11-toolkits/ruby-gtksourceview2/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.0.x.
+
+WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11-toolkits/ruby-gtksourceview2/pkg-plist b/x11-toolkits/ruby-gtksourceview2/pkg-plist
new file mode 100644
index 000000000000..95276d9dbb0f
--- /dev/null
+++ b/x11-toolkits/ruby-gtksourceview2/pkg-plist
@@ -0,0 +1,16 @@
+libdata/pkgconfig/ruby-gtksourceview2.pc
+%%RUBY_SITELIBDIR%%/gtksourceview2.rb
+%%RUBY_SITEARCHLIBDIR%%/gtksourceview2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/sourcelanguagemanager.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile
index 3f906d0eb45c..07b9f89a82f7 100644
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@@ -25,6 +25,7 @@ USE_RUBY=	yes
 USE_GNOME=	gnomepanel
 USE_RUBY_EXTCONF=	yes
 MAKE_JOBS_UNSAFE=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -41,8 +42,6 @@ post-patch: general-patch
 		${WRKSRC}/sample/hello-applet.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-configure: general-configure
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index 38cd1917d724..14841d4697ff 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -27,6 +27,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDI
 USE_RUBY=	yes
 USE_GNOME=	pango
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -40,7 +41,6 @@ post-patch: general-patch
 		${WRKSRC}/sample/layout.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-configure: general-configure
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile
new file mode 100644
index 000000000000..3619592bfcac
--- /dev/null
+++ b/x11-toolkits/ruby-poppler/Makefile
@@ -0,0 +1,50 @@
+# New ports collection makefile for:	ruby-poppler
+# Date created:		2010-11-19
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	poppler
+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=	ruby@FreeBSD.org
+COMMENT=	Ruby binding for Poppler
+
+LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+BUILD_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+INSTALL_TARGET=	site-install
+
+DOCS=		COPYING.LIB ChangeLog README
+
+post-patch: general-patch
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
+	@${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-poppler/pkg-descr b/x11-toolkits/ruby-poppler/pkg-descr
new file mode 100644
index 000000000000..1b0ecb3fe3cc
--- /dev/null
+++ b/x11-toolkits/ruby-poppler/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/Poppler is a Ruby binding for Poppler.
+
+WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11-toolkits/ruby-poppler/pkg-plist b/x11-toolkits/ruby-poppler/pkg-plist
new file mode 100644
index 000000000000..8cbaebd56a5a
--- /dev/null
+++ b/x11-toolkits/ruby-poppler/pkg-plist
@@ -0,0 +1,19 @@
+libdata/pkgconfig/ruby-poppler.pc
+%%RUBY_SITEARCHLIBDIR%%/poppler.so
+%%RUBY_SITELIBDIR%%/poppler.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/number-pdf.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2svg.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2text.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdfdiv.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11-toolkits/ruby-vte/Makefile b/x11-toolkits/ruby-vte/Makefile
new file mode 100644
index 000000000000..a261233babe8
--- /dev/null
+++ b/x11-toolkits/ruby-vte/Makefile
@@ -0,0 +1,50 @@
+# New ports collection makefile for:	ruby-vte
+# Date created:		2010-11-19
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	vte
+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=	ruby@FreeBSD.org
+COMMENT=	Ruby binding for VTE
+
+BUILD_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+
+USE_RUBY=	yes
+USE_GNOME=	vte
+USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
+INSTALL_TARGET=	site-install
+
+DOCS=		COPYING.LIB ChangeLog README
+
+post-patch: general-patch
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
+	@${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-vte/pkg-descr b/x11-toolkits/ruby-vte/pkg-descr
new file mode 100644
index 000000000000..ebd5281db757
--- /dev/null
+++ b/x11-toolkits/ruby-vte/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/VTE is a Ruby binding for VTE.
+
+WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11-toolkits/ruby-vte/pkg-plist b/x11-toolkits/ruby-vte/pkg-plist
new file mode 100644
index 000000000000..e57cf08c6366
--- /dev/null
+++ b/x11-toolkits/ruby-vte/pkg-plist
@@ -0,0 +1,16 @@
+libdata/pkgconfig/ruby-vte.pc
+%%RUBY_SITEARCHLIBDIR%%/vte.so
+%%RUBY_SITELIBDIR%%/vte.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/multiterm.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/terminal.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 4ce2a012fc1f..cb8d2acd7579 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -18,15 +18,19 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	The "meta-port" for Ruby/GNOME2
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/goocanvas.so:${PORTSDIR}/x11-toolkits/ruby-goocanvas \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gst.so:${PORTSDIR}/x11-toolkits/ruby-gstreamer \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtksourceview.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/panelapplet2.so:${PORTSDIR}/x11-toolkits/ruby-panelapplet \
-		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/poppler.so:${PORTSDIR}/x11-toolkits/ruby-poppler \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/vte.so:${PORTSDIR}/x11-toolkits/ruby-vte
 
 USE_RUBY=	yes
 
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 324e9d6ba518..6b5e141e999f 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomecanvas2.so:${
 USE_RUBY=	yes
 USE_GNOME=	libgnomeui
 USE_RUBY_EXTCONF=	yes
+CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -33,7 +34,6 @@ INSTALL_TARGET=	site-install
 DOCS_EN=	AUTHORS COPYING.LIB ChangeLog README README.gnome2-all
 
 post-patch: general-patch
-post-configure: general-configure
 
 post-build:
 	@${CP} ${RUBY_GNOME_WRKSRC}/AUTHORS ${WRKSRC}/AUTHORS
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 0cb21ff97e0f..483b1f371507 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.90.2
+RUBY_GNOME_VERSION=		0.90.5
 #RUBY_GNOME_SNAPSHOTDATE=	20061130
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
@@ -28,7 +28,3 @@ DISTINFO_FILE=		${RUBY_GNOME_PORTDIR}/distinfo
 general-patch:
 	@${FIND} ${WRKDIR} -name mkmf-gnome2.rb | ${XARGS} ${REINPLACE_CMD} -e \
 		's|CFLAGS}|CFLAGS} -I${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}|g'
-
-general-configure:
-	@${FIND} ${WRKDIR} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$(libdir)/pkgconfig|$(libdir)data/pkgconfig|g'
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index ac8743ae16d7..4ef12729f22d 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,2 @@
-MD5 (ruby/ruby-gnome2-all-0.90.2.tar.gz) = b25065050aeed8f94c235bee9d4ddf3e
-SHA256 (ruby/ruby-gnome2-all-0.90.2.tar.gz) = 9a30db7802455976f7072fdd57b2e7abdc2a381a8a12e677bc3eabbf8f89e7ea
-SIZE (ruby/ruby-gnome2-all-0.90.2.tar.gz) = 2427946
+SHA256 (ruby/ruby-gnome2-all-0.90.5.tar.gz) = 4017da5fe9dc090c7ca26a0e02901bb66a7579475619f97bc1b7d7774d19945f
+SIZE (ruby/ruby-gnome2-all-0.90.5.tar.gz) = 1754503