- Update to current snapshot (should fix compatiblity problems with the new

  gnome)
- PREFIX-cleaness

Approved by:	mezz (maintainer, implicitly)

25 files changed, 221 insertions, 104 deletions

diff --git a/accessibility/ruby-atk/pkg-plist b/accessibility/ruby-atk/pkg-plist
index d8a1ef1deec3..558c79fa6f9b 100644
--- a/accessibility/ruby-atk/pkg-plist
+++ b/accessibility/ruby-atk/pkg-plist
@@ -1,8 +1,13 @@
+%%RUBY_SITELIBDIR%%/atk.rb
 %%RUBY_SITEARCHLIBDIR%%/atk.so
 %%RUBY_SITEARCHLIBDIR%%/rbatk.h
 %%RUBY_SITEARCHLIBDIR%%/rbatkversion.h
-%%RUBY_SITELIBDIR%%/atk.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%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/databases/ruby-libgda/pkg-plist b/databases/ruby-libgda/pkg-plist
index 284510b09065..cf70646bbff1 100644
--- a/databases/ruby-libgda/pkg-plist
+++ b/databases/ruby-libgda/pkg-plist
@@ -1,12 +1,18 @@
 %%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%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/pkg-plist b/devel/ruby-gconf2/pkg-plist
index 3a6c118b7c55..4fe61e07cd40 100644
--- a/devel/ruby-gconf2/pkg-plist
+++ b/devel/ruby-gconf2/pkg-plist
@@ -1,12 +1,18 @@
-%%RUBY_SITEARCHLIBDIR%%/gconf2.so
 %%RUBY_SITELIBDIR%%/gconf2.rb
+%%RUBY_SITEARCHLIBDIR%%/gconf2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic-gconf-app.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple-controller.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple-view.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/unittest.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index 965d37f9f657..97d2bffab4f3 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -1,10 +1,13 @@
+%%RUBY_SITELIBDIR%%/glib2.rb
 %%RUBY_SITEARCHLIBDIR%%/glib2.so
 %%RUBY_SITEARCHLIBDIR%%/rbglib.h
 %%RUBY_SITEARCHLIBDIR%%/rbgobject.h
 %%RUBY_SITEARCHLIBDIR%%/rbgutil.h
-%%RUBY_SITELIBDIR%%/glib2.rb
 %%RUBY_SITELIBDIR%%/mkmf-gnome2.rb
 %%RUBY_SITELIBDIR%%/pkg-config.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/completion.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/idle.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/iochannel.rb
@@ -22,7 +25,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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-gnomevfs/pkg-plist b/devel/ruby-gnomevfs/pkg-plist
index f54f25ecca47..8219e1efde27 100644
--- a/devel/ruby-gnomevfs/pkg-plist
+++ b/devel/ruby-gnomevfs/pkg-plist
@@ -1,10 +1,16 @@
-%%RUBY_SITEARCHLIBDIR%%/gnomevfs.so
 %%RUBY_SITELIBDIR%%/gnomevfs.rb
+%%RUBY_SITEARCHLIBDIR%%/gnomevfs.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test3.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index faa5a4b76fc6..24598190eb3c 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -1,6 +1,9 @@
 bin/ruby-glade-create-template
 %%RUBY_SITEARCHLIBDIR%%/libglade2.so
 %%RUBY_SITELIBDIR%%/libglade2.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/buffer.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/custom.glade
@@ -9,16 +12,19 @@ bin/ruby-glade-create-template
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/l10n_gui.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/l10n_main.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/makemo.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/l10n.pot
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/l10n.po
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/l10n.pot
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.glade
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/treeview.glade
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/treeview.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja/
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index 4715fc61b1a0..05f047db0ae8 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -1,5 +1,8 @@
-%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
 %%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb
+%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flip.rb
@@ -16,7 +19,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/graphics/ruby-gnomecanvas2/pkg-plist b/graphics/ruby-gnomecanvas2/pkg-plist
index a90ac5b3ea8b..add7ef67ea46 100644
--- a/graphics/ruby-gnomecanvas2/pkg-plist
+++ b/graphics/ruby-gnomecanvas2/pkg-plist
@@ -1,5 +1,8 @@
-%%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
 %%RUBY_SITELIBDIR%%/gnomecanvas2.rb
+%%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-arrowhead.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-curve.rb
@@ -11,7 +14,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flower.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 8c841dbc6da0..2cb05136cddf 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -1,10 +1,16 @@
 %%RUBY_SITEARCHLIBDIR%%/libart2.so
 %%RUBY_SITEARCHLIBDIR%%/rbart.h
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rose.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testlibart2.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/graphics/ruby-rsvg2/pkg-plist b/graphics/ruby-rsvg2/pkg-plist
index 3ae7a1fb6607..fb35b5155f17 100644
--- a/graphics/ruby-rsvg2/pkg-plist
+++ b/graphics/ruby-rsvg2/pkg-plist
@@ -1,8 +1,15 @@
 %%RUBY_SITEARCHLIBDIR%%/rsvg2.so
 %%RUBY_SITELIBDIR%%/rsvg2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/svg2.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/svg-viewer.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/svg2.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/multimedia/ruby-gst/pkg-plist b/multimedia/ruby-gst/pkg-plist
index da08f351d298..3b74e51425e7 100644
--- a/multimedia/ruby-gst/pkg-plist
+++ b/multimedia/ruby-gst/pkg-plist
@@ -1,5 +1,8 @@
-%%RUBY_SITEARCHLIBDIR%%/gst.so
 %%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
@@ -20,7 +23,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/video-player.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xml-ogg-player.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/pkg-plist b/print/ruby-gnomeprint/pkg-plist
index ab55c4f8b625..32c2ae2fa46d 100644
--- a/print/ruby-gnomeprint/pkg-plist
+++ b/print/ruby-gnomeprint/pkg-plist
@@ -1,5 +1,8 @@
-%%RUBY_SITEARCHLIBDIR%%/gnomeprint2.so
 %%RUBY_SITELIBDIR%%/gnomeprint2.rb
+%%RUBY_SITEARCHLIBDIR%%/gnomeprint2.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gp-pac.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ruby-gnome2-logo.png
@@ -8,7 +11,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_return_code.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/to_file.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/www/ruby-gtkhtml2/pkg-plist b/www/ruby-gtkhtml2/pkg-plist
index c3158ccac479..8c6837bfed24 100644
--- a/www/ruby-gtkhtml2/pkg-plist
+++ b/www/ruby-gtkhtml2/pkg-plist
@@ -1,8 +1,14 @@
-%%RUBY_SITEARCHLIBDIR%%/gtkhtml2.so
 %%RUBY_SITELIBDIR%%/gtkhtml2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gtkhtml.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%RUBY_SITEARCHLIBDIR%%/gtkhtml2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gtkhtml.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/www/ruby-gtkmozembed/files/patch-.._glib_src_lib_mkmf-gnome2.rb b/www/ruby-gtkmozembed/files/patch-.._glib_src_lib_mkmf-gnome2.rb
deleted file mode 100644
index 7bc6ab9e3026..000000000000
--- a/www/ruby-gtkmozembed/files/patch-.._glib_src_lib_mkmf-gnome2.rb
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../glib/src/lib/mkmf-gnome2.rb.orig	Fri Nov  3 18:58:17 2006
-+++ ../glib/src/lib/mkmf-gnome2.rb	Fri Nov  3 18:58:45 2006
-@@ -184,6 +184,10 @@
- def make_version_header(app_name, pkgname, dir = "src")
-   version = PKGConfig.modversion(pkgname).split(/\./)
- 
-+  (0..2).each do |v|
-+    version[v] = "0" unless version[v]
-+  end
-+
-   filename = "rb#{app_name.downcase}version.h"
- 
-   puts "creating #{filename}"
diff --git a/www/ruby-gtkmozembed/files/patch-extconf.rb b/www/ruby-gtkmozembed/files/patch-extconf.rb
index c08018c84c24..00a71ed79d86 100644
--- a/www/ruby-gtkmozembed/files/patch-extconf.rb
+++ b/www/ruby-gtkmozembed/files/patch-extconf.rb
@@ -1,10 +1,10 @@
---- extconf.rb.orig	Sun Jul  2 19:15:05 2006
-+++ extconf.rb	Sun Jul  2 19:19:25 2006
-@@ -23,8 +23,7 @@
- PKGConfig.have_package(PACKAGE_ID)
+--- 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 = PKGConfig.libs_only_L(package_id)
 -mozpath.strip!.sub!(/^-L/, "")
 +mozpath = "%%GECKO_PATH%%"
  
diff --git a/www/ruby-gtkmozembed/pkg-plist b/www/ruby-gtkmozembed/pkg-plist
index b7c06062b465..4e6350143d57 100644
--- a/www/ruby-gtkmozembed/pkg-plist
+++ b/www/ruby-gtkmozembed/pkg-plist
@@ -1,10 +1,16 @@
-%%RUBY_SITEARCHLIBDIR%%/gtkmozembed.so
 %%RUBY_SITELIBDIR%%/gtkmozembed.rb
+%%RUBY_SITEARCHLIBDIR%%/gtkmozembed.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ruby-gecko.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/x11-toolkits/ruby-gnomeprintui/pkg-plist b/x11-toolkits/ruby-gnomeprintui/pkg-plist
index d356ec7d5b2e..bcc5b03cd169 100644
--- a/x11-toolkits/ruby-gnomeprintui/pkg-plist
+++ b/x11-toolkits/ruby-gnomeprintui/pkg-plist
@@ -1,9 +1,15 @@
-%%RUBY_SITEARCHLIBDIR%%/gnomeprintui2.so
 %%RUBY_SITELIBDIR%%/gnomeprintui2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dialog.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ruby-gnome2-logo.png
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%RUBY_SITEARCHLIBDIR%%/gnomeprintui2.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dialog.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ruby-gnome2-logo.png
+%%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/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 0b3a4e06d289..041a6e30fa9f 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,9 +1,10 @@
-%%RUBY_SITEARCHLIBDIR%%/gtk2.so
-%%RUBY_SITEARCHLIBDIR%%/gtk20.so
-%%RUBY_SITEARCHLIBDIR%%/gtk22.so
-%%RUBY_SITEARCHLIBDIR%%/rbgtk.h
 %%RUBY_SITELIBDIR%%/gtk2.rb
 %%RUBY_SITELIBDIR%%/gtk2/base.rb
+%%RUBY_SITEARCHLIBDIR%%/gtk2.so
+%%RUBY_SITEARCHLIBDIR%%/rbgtk.h
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/alphatest.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/apple-red.png
@@ -70,6 +71,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/tree_store.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/assistant.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/bindings.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button2.rb
@@ -103,6 +105,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/itemfactory2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/keyboard_grab.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/label.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/linkbutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/listview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/menu.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/misc_button.rb
@@ -111,14 +114,17 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/properties.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/recentchooserdialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/rgtk+cairo.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/settings.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/statusicon.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/stock.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/style_property.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/style_property.rc
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtkplug.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/t-gtksocket.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/test.xpm
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/textbuffer_serialize.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/threads.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
@@ -177,8 +183,11 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/misc
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/gtk-demo
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-@dirrm %%RUBY_SITELIBDIR%%/gtk2
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%/gtk2
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
diff --git a/x11-toolkits/ruby-gtkglext/pkg-plist b/x11-toolkits/ruby-gtkglext/pkg-plist
index 46d546daf56e..3f374291bbbe 100644
--- a/x11-toolkits/ruby-gtkglext/pkg-plist
+++ b/x11-toolkits/ruby-gtkglext/pkg-plist
@@ -1,11 +1,17 @@
-%%RUBY_SITEARCHLIBDIR%%/gtkglext.so
 %%RUBY_SITELIBDIR%%/gtkglext.rb
+%%RUBY_SITEARCHLIBDIR%%/gtkglext.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/font.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtkglut.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/share-lists.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple-mixed.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/x11-toolkits/ruby-gtksourceview/pkg-plist b/x11-toolkits/ruby-gtksourceview/pkg-plist
index 70121ba3c784..23b7ccaf699a 100644
--- a/x11-toolkits/ruby-gtksourceview/pkg-plist
+++ b/x11-toolkits/ruby-gtksourceview/pkg-plist
@@ -1,9 +1,15 @@
-%%RUBY_SITEARCHLIBDIR%%/gtksourceview.so
 %%RUBY_SITELIBDIR%%/gtksourceview.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sourcelanguagesmanager.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%RUBY_SITEARCHLIBDIR%%/gtksourceview.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sourcelanguagesmanager.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.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/x11-toolkits/ruby-panelapplet/pkg-plist b/x11-toolkits/ruby-panelapplet/pkg-plist
index c9f92926b101..1bc77645f850 100644
--- a/x11-toolkits/ruby-panelapplet/pkg-plist
+++ b/x11-toolkits/ruby-panelapplet/pkg-plist
@@ -1,12 +1,18 @@
 %%RUBY_SITEARCHLIBDIR%%/panelapplet2.so
 %%RUBY_SITELIBDIR%%/panelapplet2.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/clock-applet.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/clock-applet.server
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello-applet.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello-applet.server
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/x11-toolkits/ruby-pango/pkg-plist b/x11-toolkits/ruby-pango/pkg-plist
index 93b9bfa08301..c70da7a73d2c 100644
--- a/x11-toolkits/ruby-pango/pkg-plist
+++ b/x11-toolkits/ruby-pango/pkg-plist
@@ -2,6 +2,9 @@
 %%RUBY_SITEARCHLIBDIR%%/rbpango.h
 %%RUBY_SITEARCHLIBDIR%%/rbpangoversion.h
 %%RUBY_SITELIBDIR%%/pango.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/attribute.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/break.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gdk_layout.rb
@@ -14,7 +17,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.txt
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/script.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 0b4c55f16b69..51201901cbea 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,15 +1,16 @@
 # $FreeBSD$
 
 RUBY_GNOME_VERSION=		0.15.0
-#RUBY_GNOME_SNAPSHOTDATE=	20010224
+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_SITES=	http://mbsd.msk.ru/dist/
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
 RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
+CONFIGURE_ARGS+=		--ruby=${RUBY}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome2-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index c9de1629bd23..bcc38530ac07 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) = 3e5b89b674a2b60ff9d3a2eeac0468e9
-SHA256 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 313e6f9c7b328fd3c28c54be9dca7eec13eb70daaf717590988e4d22ace951b3
-SIZE (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 1273856
+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
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index 9f6d6d22b88c..7212878e5b30 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -1,5 +1,10 @@
-%%RUBY_SITEARCHLIBDIR%%/gnome2.so
 %%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
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-app-helper.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-config.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-druid.rb
@@ -23,9 +28,10 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test-gnome
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.gnome2-all
+%%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