21 files changed, 59 insertions, 116 deletions

diff --git a/UPDATING b/UPDATING
index 776a24876841..a44b8e5a6649 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20111205:
+  AFFECTS: users of ruby-gnome ports
+  AUTHOR: swills@FreeBSD.org
+
+  ruby-gnome has been updated to 1.0.3. Some of the have been removed
+  since they are no longer included upstream. The meta port is
+  now x11/ruby-gnome2. To update run the following command:
+
+  # portmaster -o x11/ruby-gnome2 x11/ruby-gnome2-all
+
+  You may also wish to remove the old ports using:
+
+  # portmaster -s
+
 20111130:
   AFFECTS: users of dns/nsd
   AUTHOR: zi@FreeBSD.org
diff --git a/accessibility/ruby-atk/Makefile b/accessibility/ruby-atk/Makefile
index b38d1a3754e9..b546295e6aee 100644
--- a/accessibility/ruby-atk/Makefile
+++ b/accessibility/ruby-atk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for ATK
@@ -34,8 +34,6 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index ceaed1246a86..e4654c8454f6 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GLib2
@@ -33,7 +33,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${RM} ${WRKSRC}/lib/gnome2-win32-binary-downloader.rb
 
 post-install:
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index ecdc0a25634f..ad6e9f16b7e4 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -1,6 +1,7 @@
 libdata/pkgconfig/ruby-glib2.pc
 %%RUBY_SITELIBDIR%%/glib-mkenums.rb
 %%RUBY_SITELIBDIR%%/glib2.rb
+%%RUBY_SITELIBDIR%%/gnome2-raketask.rb
 %%RUBY_SITEARCHLIBDIR%%/glib2.so
 %%RUBY_SITEARCHLIBDIR%%/rbgcompat.h
 %%RUBY_SITEARCHLIBDIR%%/rbglib.h
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index be5316080f9b..fc48cc97c941 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GdkPixbuf2
@@ -34,8 +34,6 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 87166580b180..a62c053ee3b9 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for librsvg2
@@ -34,8 +34,6 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-goocanvas/Makefile b/x11-toolkits/ruby-goocanvas/Makefile
index d2f3f5b32880..40cb1baf135a 100644
--- a/x11-toolkits/ruby-goocanvas/Makefile
+++ b/x11-toolkits/ruby-goocanvas/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for goocanvas
@@ -34,8 +34,6 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		ChangeLog README
 
-post-patch: general-patch
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-gstreamer/Makefile b/x11-toolkits/ruby-gstreamer/Makefile
index cc463bb5e279..d47855e0c09c 100644
--- a/x11-toolkits/ruby-gstreamer/Makefile
+++ b/x11-toolkits/ruby-gstreamer/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GStreamer
@@ -34,7 +34,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
diff --git a/x11-toolkits/ruby-gstreamer/pkg-plist b/x11-toolkits/ruby-gstreamer/pkg-plist
index 2e519116b0fc..493516aa5f67 100644
--- a/x11-toolkits/ruby-gstreamer/pkg-plist
+++ b/x11-toolkits/ruby-gstreamer/pkg-plist
@@ -6,6 +6,7 @@ libdata/pkgconfig/ruby-gstreamer.pc
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/audio-player.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gst-inspect.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/install-plugins.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/media-type.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/media-type2.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/ogg-audio-player.rb
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 2626c25781ec..6c47e8007ce1 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GTK+2
@@ -36,7 +36,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/sample/gtk-demo/common.rb
 	@${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \
diff --git a/x11-toolkits/ruby-gtksourceview2/Makefile b/x11-toolkits/ruby-gtksourceview2/Makefile
index 3af5a620d6be..26f06b983607 100644
--- a/x11-toolkits/ruby-gtksourceview2/Makefile
+++ b/x11-toolkits/ruby-gtksourceview2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GtkSourceView2
@@ -32,8 +32,6 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index 39c0144804e1..d81a18146b12 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Pango
@@ -36,7 +36,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${REINPLACE_CMD} -e 's|local/bin/|bin/env |g' \
 		${WRKSRC}/sample/layout.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile
index 83fa392ca9ba..d41a248c778d 100644
--- a/x11-toolkits/ruby-poppler/Makefile
+++ b/x11-toolkits/ruby-poppler/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	poppler
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	2
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,7 +32,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
diff --git a/x11-toolkits/ruby-poppler/pkg-plist b/x11-toolkits/ruby-poppler/pkg-plist
index 5c85a2570129..509c11d090b1 100644
--- a/x11-toolkits/ruby-poppler/pkg-plist
+++ b/x11-toolkits/ruby-poppler/pkg-plist
@@ -8,6 +8,7 @@ libdata/pkgconfig/ruby-poppler.pc
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2svg.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdf2text.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdfcrop.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pdfdiv.rb
 %%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
diff --git a/x11-toolkits/ruby-vte/Makefile b/x11-toolkits/ruby-vte/Makefile
index 89268511722c..7bcae870b6aa 100644
--- a/x11-toolkits/ruby-vte/Makefile
+++ b/x11-toolkits/ruby-vte/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DIST_SUBDIR=	${RUBY_GNOME_DIST_SUBDIR}
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for VTE
@@ -32,7 +32,7 @@ INSTALL_TARGET=	site-install install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch: general-patch
+post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
diff --git a/x11-toolkits/ruby-vte/pkg-plist b/x11-toolkits/ruby-vte/pkg-plist
index 579e0c2833e6..03ffa148c5d6 100644
--- a/x11-toolkits/ruby-vte/pkg-plist
+++ b/x11-toolkits/ruby-vte/pkg-plist
@@ -1,6 +1,7 @@
 libdata/pkgconfig/ruby-vte.pc
 %%RUBY_SITEARCHLIBDIR%%/vte.so
 %%RUBY_SITELIBDIR%%/vte.rb
+%%RUBY_SITELIBDIR%%/vte/deprecated.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
@@ -9,4 +10,5 @@ libdata/pkgconfig/ruby-vte.pc
 %%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrm %%RUBY_SITELIBDIR%%/vte
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 9ce0cf5dede9..c537a8aef960 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -9,47 +9,29 @@
 PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 CATEGORIES=	x11 ruby gnome
-MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
+MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${RUBY_GNOME_DISTNAME}
-DIST_SUBDIR=	ruby
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	A set of Ruby bindings for GNOME2
+COMMENT=	The "meta-port" for Ruby/GNOME2
 
-BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gio2.so:${PORTSDIR}/devel/ruby-gio2 \
+		${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}/}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview2 \
+		${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
-USE_GNOME=	libgnomeui
-USE_RUBY_EXTCONF=	yes
-CONFIGURE_ARGS=	--with-pkg-config-dir=${LOCALBASE}/libdata/pkgconfig
 
 .include "${.CURDIR}/Makefile.common"
 
-WRKSRC=		${RUBY_GNOME_WRKSRC}/gnome
-INSTALL_TARGET=	site-install install
-
-DOCS_EN=	AUTHORS COPYING.LIB ChangeLog README README.gnome2-all
-
-post-patch: general-patch
-
-post-build:
-	@${CP} ${RUBY_GNOME_WRKSRC}/AUTHORS ${WRKSRC}/AUTHORS
-	@${CP} ${RUBY_GNOME_WRKSRC}/README ${WRKSRC}/README.gnome2-all
-
-post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${RUBY_MODEXAMPLESDIR}/test-gnome
-	@${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/sample/test-gnome/* ${RUBY_MODEXAMPLESDIR}/test-gnome/
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.endif
+NO_BUILD=	yes
+
+do-install:
+	@${DO_NADA}
 
 .include <bsd.port.mk>
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 483b1f371507..6faa8ae9453f 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,30 +1,15 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.90.5
-#RUBY_GNOME_SNAPSHOTDATE=	20061130
-.if defined(RUBY_GNOME_SNAPSHOTDATE)
-RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
-.else
+RUBY_GNOME_VERSION=		1.0.3
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
-.endif
 RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2/ruby-gnome2/ruby-gnome2-${RUBY_GNOME_VERSION:S/r/rev/}
-#RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_LOCAL} \
-#				http://people.freebsd.org/~mezz/distfiles/
-#RUBY_GNOME_MASTER_SITE_SUBDIR=	mezz
 RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
+RUBY_GNOME_DIST_SUBDIR=		${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
 
 CONFIGURE_ARGS+=		--ruby=${RUBY}
 
-.if defined(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-gnome2
 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'
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 4ef12729f22d..6947fd95f27b 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-gnome2-all-0.90.5.tar.gz) = 4017da5fe9dc090c7ca26a0e02901bb66a7579475619f97bc1b7d7774d19945f
-SIZE (ruby/ruby-gnome2-all-0.90.5.tar.gz) = 1754503
+SHA256 (ruby/ruby-gnome2-all-1.0.3.tar.gz) = 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
+SIZE (ruby/ruby-gnome2-all-1.0.3.tar.gz) = 1141565
diff --git a/x11/ruby-gnome2/pkg-descr b/x11/ruby-gnome2/pkg-descr
index 8e08a534738a..f7eddfcfcdf4 100644
--- a/x11/ruby-gnome2/pkg-descr
+++ b/x11/ruby-gnome2/pkg-descr
@@ -1,5 +1,7 @@
-Ruby/GNOME2 is a set of Ruby bindings for GNOME2 which consists of
-glib2, gtk2, gdk_pixbuf2, gnome2, gnomecanvas2, libglade2, libart2 and
-gconf2 modules.
+The "meta-port" for Ruby/GNOME2
+
+Ruby/GNOME2 is a set of Ruby bindings for GNOME2 which consists of atk, glib2,
+gio2, gdk_pixbuf2, rsvg2, goocanvas, gstreamer, gtk2, gtksourceview2, pango,
+poppler and vte modules.
 
 WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index 7e43b5bbeb9d..e69de29bb2d1 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -1,34 +0,0 @@
-libdata/pkgconfig/ruby-gnome2.pc
-%%RUBY_SITELIBDIR%%/gnome2.rb
-%%RUBY_SITEARCHLIBDIR%%/gnome2.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.gnome2-all
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-app-helper.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-config.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-druid.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-program.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-sound.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-trigger.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/README
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/about.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/app-helper.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/bomb.xpm
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/color-picker.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/dateedit.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/entry.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/file-entry.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/font-picker.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/href.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-entry.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-list.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/pixmap-entry.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome-app.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome.rb
-%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test-gnome
-%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%