- Update ruby-gnome ports to 0.19.4

Approved by:	wxs (co-mentor)
Reviewed by:	kwm (gnome@)

41 files changed, 64 insertions, 42 deletions

diff --git a/accessibility/ruby-atk/Makefile b/accessibility/ruby-atk/Makefile
index b27dbaa08715..0b97ba16b3d1 100644
--- a/accessibility/ruby-atk/Makefile
+++ b/accessibility/ruby-atk/Makefile
@@ -32,6 +32,7 @@ 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/accessibility/ruby-atk/pkg-plist b/accessibility/ruby-atk/pkg-plist
index 558c79fa6f9b..f641ba0102ee 100644
--- a/accessibility/ruby-atk/pkg-plist
+++ b/accessibility/ruby-atk/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-atk.pc
 %%RUBY_SITELIBDIR%%/atk.rb
 %%RUBY_SITEARCHLIBDIR%%/atk.so
 %%RUBY_SITEARCHLIBDIR%%/rbatk.h
diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 1ab8ccf1b0f2..70a9a0bf3611 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	devel gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,7 @@ 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-gconf2/pkg-plist b/devel/ruby-gconf2/pkg-plist
index 126901004c6c..261ae8a31ef3 100644
--- a/devel/ruby-gconf2/pkg-plist
+++ b/devel/ruby-gconf2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gconf2.pc
 %%RUBY_SITELIBDIR%%/gconf2.rb
 %%RUBY_SITEARCHLIBDIR%%/gconf2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index d68823898295..5a3168da9470 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -34,6 +34,8 @@ post-patch: general-patch
 		${WRKSRC}/sample/utils.rb
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
+post-configure: general-configure
+
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index f52ec06fa3d4..bba9982a035d 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-glib2.pc
 %%RUBY_SITELIBDIR%%/glib-mkenums.rb
 %%RUBY_SITELIBDIR%%/glib2.rb
 %%RUBY_SITEARCHLIBDIR%%/glib2.so
@@ -5,6 +6,7 @@
 %%RUBY_SITEARCHLIBDIR%%/rbglib.h
 %%RUBY_SITEARCHLIBDIR%%/rbgobject.h
 %%RUBY_SITEARCHLIBDIR%%/rbgutil.h
+%%RUBY_SITEARCHLIBDIR%%/glib-enum-types.h
 %%RUBY_SITELIBDIR%%/mkmf-gnome2.rb
 %%RUBY_SITELIBDIR%%/pkg-config.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile
index 97e30ff940c6..c6daa8a87836 100644
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomevfs
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -37,6 +36,8 @@ 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-gnomevfs/pkg-plist b/devel/ruby-gnomevfs/pkg-plist
index 0fd423b7e829..84d217800999 100644
--- a/devel/ruby-gnomevfs/pkg-plist
+++ b/devel/ruby-gnomevfs/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomevfs.pc
 %%RUBY_SITELIBDIR%%/gnomevfs.rb
 %%RUBY_SITEARCHLIBDIR%%/gnomevfs.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 1bd948f00ceb..37df0aa9085e 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -35,6 +34,7 @@ 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/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index 5fa08f41f56b..b27ba8cbae5f 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -1,4 +1,5 @@
 bin/ruby-glade-create-template
+libdata/pkgconfig/ruby-libglade2.pc
 %%RUBY_SITEARCHLIBDIR%%/libglade2.so
 %%RUBY_SITELIBDIR%%/libglade2.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 4a572b81f5b0..63ba3562ac56 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gdk_pixbuf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,7 @@ 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 d0023ca6d0d3..77a5789ce0bb 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gdkpixbuf2.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 d9fa48c98d88..d5e51b978dc4 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomecanvas2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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-gnomecanvas2/pkg-plist b/graphics/ruby-gnomecanvas2/pkg-plist
index 4e7c5e944666..19d64bdd3ee1 100644
--- a/graphics/ruby-gnomecanvas2/pkg-plist
+++ b/graphics/ruby-gnomecanvas2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomecanvas2.pc
 %%RUBY_SITELIBDIR%%/gnomecanvas2.rb
 %%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index 8d37b17f3b73..555d8e0df9a2 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	libart2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 70e32c8e6dc4..cacc29b7ece0 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-libart2.pc
 %%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%RUBY_SITEARCHLIBDIR%%/rbart.h
 %%RUBY_SITELIBDIR%%/libart2.rb
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 267f60b66852..266f80f03364 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	rsvg2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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/pkg-plist b/graphics/ruby-rsvg2/pkg-plist
index e312c19bfdaa..f38bd5cc2041 100644
--- a/graphics/ruby-rsvg2/pkg-plist
+++ b/graphics/ruby-rsvg2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-rsvg2.pc
 %%RUBY_SITEARCHLIBDIR%%/rsvg2.so
 %%RUBY_SITELIBDIR%%/rsvg2.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/print/ruby-gnomeprint/Makefile b/print/ruby-gnomeprint/Makefile
index ba2935130d1c..c1eec66019c0 100644
--- a/print/ruby-gnomeprint/Makefile
+++ b/print/ruby-gnomeprint/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomeprint
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	print ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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/pkg-plist b/print/ruby-gnomeprint/pkg-plist
index bab8fbc7a301..d2f2a81fb669 100644
--- a/print/ruby-gnomeprint/pkg-plist
+++ b/print/ruby-gnomeprint/pkg-plist
@@ -1,5 +1,7 @@
+libdata/pkgconfig/ruby-gnomeprint2.pc
 %%RUBY_SITELIBDIR%%/gnomeprint2.rb
 %%RUBY_SITEARCHLIBDIR%%/gnomeprint2.so
+%%RUBY_SITEARCHLIBDIR%%/rblibgnomeprintversion.h
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/www/ruby-gtkhtml2/Makefile b/www/ruby-gtkhtml2/Makefile
index 0c89d54a7c7f..0fd071a13488 100644
--- a/www/ruby-gtkhtml2/Makefile
+++ b/www/ruby-gtkhtml2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtkhtml2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	www gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,7 @@ 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/pkg-plist b/www/ruby-gtkhtml2/pkg-plist
index ab8c0d429b8f..6f157ca2f9b5 100644
--- a/www/ruby-gtkhtml2/pkg-plist
+++ b/www/ruby-gtkhtml2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkhtml2.pc
 %%RUBY_SITELIBDIR%%/gtkhtml2.rb
 %%RUBY_SITEARCHLIBDIR%%/gtkhtml2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index f5189ec31df4..1733dbfc5894 100644
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtkmozembed
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	4
 CATEGORIES=	www ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -37,6 +36,8 @@ 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/www/ruby-gtkmozembed/files/patch-extconf.rb b/www/ruby-gtkmozembed/files/patch-extconf.rb
index 00a71ed79d86..e69de29bb2d1 100644
--- a/www/ruby-gtkmozembed/files/patch-extconf.rb
+++ b/www/ruby-gtkmozembed/files/patch-extconf.rb
@@ -1,12 +0,0 @@
---- extconf.rb.orig	Fri Dec  1 02:00:22 2006
-+++ extconf.rb	Fri Dec  1 03:37:15 2006
-@@ -40,8 +40,7 @@
- PKGConfig.have_package(package_id)
- setup_win32(PACKAGE_NAME)
- 
--mozpath = PKGConfig.libs_only_L(package_id)
--mozpath.strip!.sub!(/^-L/, "")
-+mozpath = "%%GECKO_PATH%%"
- 
- if mozpath 
-   # please comment the CFLAGS line if you don't want a default comp_path
diff --git a/www/ruby-gtkmozembed/pkg-plist b/www/ruby-gtkmozembed/pkg-plist
index c9465945865b..1fe16f31842e 100644
--- a/www/ruby-gtkmozembed/pkg-plist
+++ b/www/ruby-gtkmozembed/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkmozembed.pc
 %%RUBY_SITELIBDIR%%/gtkmozembed.rb
 %%RUBY_SITEARCHLIBDIR%%/gtkmozembed.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/x11-toolkits/ruby-gnomeprintui/Makefile b/x11-toolkits/ruby-gnomeprintui/Makefile
index 591e24dcb717..2b34b5b033b7 100644
--- a/x11-toolkits/ruby-gnomeprintui/Makefile
+++ b/x11-toolkits/ruby-gnomeprintui/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomeprintui
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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-gnomeprintui/pkg-plist b/x11-toolkits/ruby-gnomeprintui/pkg-plist
index 60494127a60f..086266e5db4c 100644
--- a/x11-toolkits/ruby-gnomeprintui/pkg-plist
+++ b/x11-toolkits/ruby-gnomeprintui/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomeprintui2.pc
 %%RUBY_SITELIBDIR%%/gnomeprintui2.rb
 %%RUBY_SITEARCHLIBDIR%%/gnomeprintui2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index cc65aab2beef..b2f64f6a1cc2 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -44,6 +43,8 @@ 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/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index d13d4700149f..330aeab4b502 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,7 +1,12 @@
+libdata/pkgconfig/ruby-gtk2.pc
 %%RUBY_SITELIBDIR%%/gtk2.rb
 %%RUBY_SITELIBDIR%%/gtk2/base.rb
 %%RUBY_SITEARCHLIBDIR%%/gtk2.so
 %%RUBY_SITEARCHLIBDIR%%/rbgtk.h
+%%RUBY_SITEARCHLIBDIR%%/rbgdk.h
+%%RUBY_SITEARCHLIBDIR%%/rbgdkconversions.h
+%%RUBY_SITEARCHLIBDIR%%/rbgtkconversions.h
+%%RUBY_SITEARCHLIBDIR%%/rbgtkmacros.h
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/x11-toolkits/ruby-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile
index 1799fa0db94e..12960e5a76ed 100644
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -34,6 +33,7 @@ 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-gtkglext/pkg-plist b/x11-toolkits/ruby-gtkglext/pkg-plist
index 3881762c5c6a..a4bab08b89f3 100644
--- a/x11-toolkits/ruby-gtkglext/pkg-plist
+++ b/x11-toolkits/ruby-gtkglext/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkglext.pc
 %%RUBY_SITELIBDIR%%/gtkglext.rb
 %%RUBY_SITEARCHLIBDIR%%/gtkglext.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
diff --git a/x11-toolkits/ruby-gtksourceview/Makefile b/x11-toolkits/ruby-gtksourceview/Makefile
index 6faf50ff0ad5..9640c12f3b9b 100644
--- a/x11-toolkits/ruby-gtksourceview/Makefile
+++ b/x11-toolkits/ruby-gtksourceview/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,7 @@ 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/x11-toolkits/ruby-gtksourceview/pkg-plist b/x11-toolkits/ruby-gtksourceview/pkg-plist
index d1aa8b6faf77..238de90234df 100644
--- a/x11-toolkits/ruby-gtksourceview/pkg-plist
+++ b/x11-toolkits/ruby-gtksourceview/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtksourceview.pc
 %%RUBY_SITELIBDIR%%/gtksourceview.rb
 %%RUBY_SITEARCHLIBDIR%%/gtksourceview.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile
index 82ef79bb10bc..682ef2919b3f 100644
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	panelapplet
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -24,10 +23,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnome2.so:${PORTSD
 USE_RUBY=	yes
 USE_GNOME=	gnomepanel
 USE_RUBY_EXTCONF=	yes
-
-BROKEN=		does not build with GNOME 2.26.
-DEPRECATED=	has been broken for 7 months
-EXPIRATION_DATE=2010-01-08
+MAKE_JOBS_UNSAFE=	yes
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
 
@@ -44,6 +40,8 @@ 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-panelapplet/pkg-plist b/x11-toolkits/ruby-panelapplet/pkg-plist
index 3f01e884bd32..943436af001a 100644
--- a/x11-toolkits/ruby-panelapplet/pkg-plist
+++ b/x11-toolkits/ruby-panelapplet/pkg-plist
@@ -1,4 +1,6 @@
+libdata/pkgconfig/ruby-panelapplet2.pc
 %%RUBY_SITEARCHLIBDIR%%/panelapplet2.so
+%%RUBY_SITEARCHLIBDIR%%/panelapplet2_main.so
 %%RUBY_SITELIBDIR%%/panelapplet2.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index eb0256cab10e..94fe142f42b3 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	pango
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -39,6 +38,7 @@ 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-pango/pkg-plist b/x11-toolkits/ruby-pango/pkg-plist
index 5656c6e912f3..3b554c01b9f6 100644
--- a/x11-toolkits/ruby-pango/pkg-plist
+++ b/x11-toolkits/ruby-pango/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-pango.pc
 %%RUBY_SITEARCHLIBDIR%%/pango.so
 %%RUBY_SITEARCHLIBDIR%%/rbpango.h
 %%RUBY_SITEARCHLIBDIR%%/rbpangoversion.h
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index 4f662cc2c17d..24c58d62d4db 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	x11 ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,7 @@ 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 43e14823b1d2..0def593a3f06 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.16.0.20080905 #YYYYMMDD
+RUBY_GNOME_VERSION=		0.19.4
 #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=	${MASTER_SITE_SOURCEFORGE}
-#RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
-RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_LOCAL} \
-				http://people.freebsd.org/~mezz/distfiles/
-RUBY_GNOME_MASTER_SITE_SUBDIR=	mezz
+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/}
 
 CONFIGURE_ARGS+=		--ruby=${RUBY}
@@ -28,3 +28,7 @@ MD5_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 1883b3ff16bf..c2c7c27145f0 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = 8808a5af33811b6188208aefbc1a5b7e
-SHA256 (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = bbddb560744503b7a23d9c92b91b752bf5b12eef60133a1a301e213278b4a013
-SIZE (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = 1494710
+MD5 (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 40451e4173e2c8bcd5046aea7e499ef9
+SHA256 (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf
+SIZE (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 2401534
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index 22e18280246e..3761d1a5b94b 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnome2.pc
 %%RUBY_SITELIBDIR%%/gnome2.rb
 %%RUBY_SITEARCHLIBDIR%%/gnome2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS