5 files changed, 24 insertions, 89 deletions

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%%