4 files changed, 24 insertions, 25 deletions

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