31 files changed, 54 insertions, 182 deletions

diff --git a/accessibility/ruby-atk/Makefile b/accessibility/ruby-atk/Makefile
index 879916589889..7012290673f2 100644
--- a/accessibility/ruby-atk/Makefile
+++ b/accessibility/ruby-atk/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
diff --git a/databases/Makefile b/databases/Makefile
index f0b4c646114a..2b5040724838 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -451,7 +451,6 @@
     SUBDIR += ruby-dbi
     SUBDIR += ruby-gdbm
     SUBDIR += ruby-interbase
-    SUBDIR += ruby-libgda
     SUBDIR += ruby-memcache
     SUBDIR += ruby-msql
     SUBDIR += ruby-mysql
diff --git a/databases/ruby-libgda/Makefile b/databases/ruby-libgda/Makefile
deleted file mode 100644
index a992d54eb118..000000000000
--- a/databases/ruby-libgda/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	Ruby/Libgda
-# Date created:				05 April 2004
-# Whom:					Mezz <mezz7@cox.net>
-#
-# $FreeBSD$
-#   $MCom: ports/databases/ruby-libgda/Makefile,v 1.2 2005/10/17 07:05:39 mezz Exp $
-#
-
-PORTNAME=	libgda
-PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-CATEGORIES=	databases 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=	mezz@FreeBSD.org
-COMMENT=	Ruby binding for libgda (GNOME-DB Project)
-
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
-
-USE_RUBY=	yes
-USE_GNOME=	libgda2
-USE_RUBY_EXTCONF=	yes
-
-.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
-
-WRKSRC=		${RUBY_GNOME_WRKSRC}/libgda
-INSTALL_TARGET=	site-install
-
-DOCS=		COPYING.LIB ChangeLog README
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
-	@${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/databases/ruby-libgda/pkg-descr b/databases/ruby-libgda/pkg-descr
deleted file mode 100644
index 38bc99168edb..000000000000
--- a/databases/ruby-libgda/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Ruby/Libgda is a Ruby binding of libgda (GNOME-DB Project).
-
-WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/databases/ruby-libgda/pkg-plist b/databases/ruby-libgda/pkg-plist
deleted file mode 100644
index cf70646bbff1..000000000000
--- a/databases/ruby-libgda/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/libgda.so
-%%RUBY_SITELIBDIR%%/libgda.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/print_config.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sql_console.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_all.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@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/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 7e0ec0ccd938..80ca82ece884 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index 34e8da595c79..ab08208ff9b5 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -29,7 +29,7 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch:
+post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/sample/utils.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index 97d2bffab4f3..da018cc99eb4 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -1,3 +1,4 @@
+%%RUBY_SITELIBDIR%%/glib-mkenums.rb
 %%RUBY_SITELIBDIR%%/glib2.rb
 %%RUBY_SITEARCHLIBDIR%%/glib2.so
 %%RUBY_SITEARCHLIBDIR%%/rbglib.h
@@ -8,16 +9,17 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bookmarkfile.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/completion.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/idle.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/iochannel.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/keyfile.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/runner.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shell.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-glib2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-iochannel-sjis.txt
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-iochannel.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-iochannel.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_glib2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_iochannel.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_unicode.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timeout.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timeout2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timer.rb
diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile
index 213698651355..38d376550874 100644
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@@ -31,7 +31,7 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch:
+post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|/bin/ruby -w|/bin/env ruby|g' \
 		${WRKSRC}/tests/*.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index d2725249ccee..6acb3beb0b85 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -33,6 +33,8 @@ RUBY_SHEBANG_FILES=	${WRKSRC}/bin/ruby-glade-create-template
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}/po/ja
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 559ff366d4c9..044571a1c893 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
index 8892f01ecabd..55b925a66891 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index 3b1aac10f8b2..a63fc411e0f1 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 807b3ba7af64..3d9bce49acb7 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/multimedia/Makefile b/multimedia/Makefile
index f152e873b9b4..6b622f0ff126 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -198,7 +198,6 @@
     SUBDIR += recmpeg
     SUBDIR += replex
     SUBDIR += rox-videothumbnail
-    SUBDIR += ruby-gst
     SUBDIR += sabbu
     SUBDIR += shell-fm
     SUBDIR += smpeg
diff --git a/multimedia/ruby-gst/Makefile b/multimedia/ruby-gst/Makefile
deleted file mode 100644
index 842a791217a3..000000000000
--- a/multimedia/ruby-gst/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	ruby-gst
-# Date created:		26 June 2003
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#   $MCom: ports/multimedia/ruby-gst/Makefile,v 1.5 2006/01/31 20:36:52 marcus Exp $
-#
-
-PORTNAME=	gst
-PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-CATEGORIES=	multimedia devel 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=	mezz@FreeBSD.org
-COMMENT=	Ruby bindings for the GStreamer framework
-
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
-
-USE_RUBY=	yes
-USE_GSTREAMER80=	core
-USE_RUBY_EXTCONF=	yes
-
-.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
-
-WRKSRC=		${RUBY_GNOME_WRKSRC}/gstreamer
-INSTALL_TARGET=	site-install
-
-DOCS=		COPYING.LIB ChangeLog README
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|tests/||g' \
-		${WRKSRC}/tests/tc_*.rb
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
-	@${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/multimedia/ruby-gst/pkg-descr b/multimedia/ruby-gst/pkg-descr
deleted file mode 100644
index b6073cbbc83b..000000000000
--- a/multimedia/ruby-gst/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a set of Ruby bindings for the GStreamer multimedia framework.
-
-WWW: http://ruby-gnome2.sourceforge.jp/
diff --git a/multimedia/ruby-gst/pkg-plist b/multimedia/ruby-gst/pkg-plist
deleted file mode 100644
index 3b74e51425e7..000000000000
--- a/multimedia/ruby-gst/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-%%RUBY_SITELIBDIR%%/gst.rb
-%%RUBY_SITEARCHLIBDIR%%/gst.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/audio-player.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gst-inspect.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media-type.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media-type2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mp3-player.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_all.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_clock.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_cpu.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_element.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_modfunc.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_pad.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_parse.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_plugin.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_registry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_type.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_xml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/video-player.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xml-ogg-player.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@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/print/ruby-gnomeprint/Makefile b/print/ruby-gnomeprint/Makefile
index 909c853fe067..588a460e2cc1 100644
--- a/print/ruby-gnomeprint/Makefile
+++ b/print/ruby-gnomeprint/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/www/ruby-gtkhtml2/Makefile b/www/ruby-gtkhtml2/Makefile
index 294ad7ff28f4..68d9d2a10da2 100644
--- a/www/ruby-gtkhtml2/Makefile
+++ b/www/ruby-gtkhtml2/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index 7c977946347e..69d2569ba2dd 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}
@@ -23,7 +22,6 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 
 USE_RUBY=	yes
 USE_GECKO=	firefox mozilla xulrunner firefox15
-USE_DOS2UNIX=	../glib/src/lib/mkmf-gnome2.rb
 USE_RUBY_EXTCONF=	yes
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
@@ -36,7 +34,7 @@ DOCS=		COPYING.LIB ChangeLog README
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
-post-patch:
+post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|xulrunner-|${GECKO}-|g ; \
 		s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \
 			${WRKSRC}/extconf.rb
diff --git a/x11-toolkits/ruby-gnomeprintui/Makefile b/x11-toolkits/ruby-gnomeprintui/Makefile
index 4a4bec3f62e4..b8dda18c98ab 100644
--- a/x11-toolkits/ruby-gnomeprintui/Makefile
+++ b/x11-toolkits/ruby-gnomeprintui/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 # Have to do that to generate ruby-gnomeprint's rblibgnomeprintversion.h or
 # it will not build.
 pre-configure:
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 94f220fc2834..7f0900605f35 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -34,7 +34,7 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch:
+post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/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-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile
index d2c7c37ab950..1fc3956d17ce 100644
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@@ -32,6 +32,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-gtksourceview/Makefile b/x11-toolkits/ruby-gtksourceview/Makefile
index 979a106fa8f8..88ea0b39862e 100644
--- a/x11-toolkits/ruby-gtksourceview/Makefile
+++ b/x11-toolkits/ruby-gtksourceview/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
+post-patch: general-patch
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile
index eb0f3826678d..7d7b9a8c8877 100644
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@@ -31,9 +31,9 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/lib/|${X11BASE}/libdata/|g ; \
-		s|/usr/libexec/|${X11BASE}/libexec/|g' \
+post-patch: general-patch
+	@${REINPLACE_CMD} -e 's|/usr/lib/|${LOCALBASE}/libdata/|g ; \
+		s|/usr/libexec/|${LOCALBASE}/libexec/|g' \
 			${WRKSRC}/sample/README ${WRKSRC}/sample/*.server
 	@${REINPLACE_CMD} -e 's|bin/ruby|bin/env ruby|g' \
 		${WRKSRC}/sample/hello-applet.rb
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index cf4836b24141..23ef63c69455 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -33,7 +33,7 @@ INSTALL_TARGET=	site-install
 
 DOCS=		COPYING.LIB ChangeLog README
 
-post-patch:
+post-patch: general-patch
 	@${REINPLACE_CMD} -e 's|local/bin/|bin/env |g' \
 		${WRKSRC}/sample/layout.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 6db0245c7ae8..61ff5c02acb1 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -21,14 +21,12 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
 		${RUBY_SITEARCHLIBDIR}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
 		${RUBY_SITEARCHLIBDIR}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
 		${RUBY_SITEARCHLIBDIR}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \
-		${RUBY_SITEARCHLIBDIR}/gst.so:${PORTSDIR}/multimedia/ruby-gst \
 		${RUBY_SITEARCHLIBDIR}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \
 		${RUBY_SITEARCHLIBDIR}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext \
 		${RUBY_SITEARCHLIBDIR}/gtksourceview.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview \
 		${RUBY_SITEARCHLIBDIR}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
 		${RUBY_SITEARCHLIBDIR}/panelapplet2.so:${PORTSDIR}/x11-toolkits/ruby-panelapplet \
-		${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \
-		${RUBY_SITEARCHLIBDIR}/libgda.so:${PORTSDIR}/databases/ruby-libgda
+		${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
 
 USE_RUBY=	yes
 
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index c74c3f05476b..e1076d63308c 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-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
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 51201901cbea..001163900579 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,16 +1,19 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.15.0
-RUBY_GNOME_SNAPSHOTDATE=	20061130
+RUBY_GNOME_VERSION=		0.16.0
+#RUBY_GNOME_SNAPSHOTDATE=	20061130
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
-RUBY_GNOME_MASTER_SITES=	http://mbsd.msk.ru/dist/
+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/}
+
 CONFIGURE_ARGS+=		--ruby=${RUBY}
+RUBY_DOCDIR=			${PREFIX}/share/doc/${RUBY_NAME}
+RUBY_EXAMPLESDIR=		${PREFIX}/share/examples/${RUBY_NAME}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome2-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
@@ -19,10 +22,8 @@ RUBY_GNOME_WRKSRC=	${WRKDIR}/${RUBY_GNOME_DISTNAME}
 .endif
 
 RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome2
+MD5_FILE=		${RUBY_GNOME_PORTDIR}/distinfo
 
-MD5_FILE=	${RUBY_GNOME_PORTDIR}/distinfo
-
-#post-extract:	pre-post-extract
-
-pre-post-extract:
-	${FIND} ${WRKSRC} -name CVS -type d -print0 | ${XARGS} -0 ${RM} -rf
+general-patch:
+	@${FIND} ${WRKDIR} -name mkmf-gnome2.rb | ${XARGS} ${REINPLACE_CMD} -e \
+		's|CFLAGS}|CFLAGS} -I${RUBY_SITEARCHLIBDIR}|g'
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index bcc38530ac07..b1981b93f7dc 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 324c2c19cd704353dad835d89e777be7
-SHA256 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 12735ce24e416819f55284c82c648810fd6e0aca7a2743d783d3a16b145b2515
-SIZE (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 1317766
+MD5 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = b3b4f81ef0fe2ce6b3f965bb7c6d3686
+SHA256 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
+SIZE (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 1208856