1 files changed, 45 insertions, 64 deletions
diff --git a/mail/ruby-rmail/pkg-plist b/mail/ruby-rmail/pkg-plist
index 5134ac606a79..74143a6b5c82 100644
--- a/mail/ruby-rmail/pkg-plist
+++ b/mail/ruby-rmail/pkg-plist
@@ -1,3 +1,4 @@
+%%RUBY_SITELIBDIR%%/rmail.rb
 %%RUBY_SITELIBDIR%%/rmail/address.rb
 %%RUBY_SITELIBDIR%%/rmail/header.rb
 %%RUBY_SITELIBDIR%%/rmail/mailbox.rb
@@ -18,52 +19,67 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000109.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000094.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000095.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000096.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000097.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000098.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000099.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000100.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000101.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000102.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000103.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000104.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000105.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000106.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000107.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000108.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000110.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000111.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000112.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000113.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000114.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000115.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000116.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000117.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000118.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000119.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000120.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000121.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000122.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000123.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000125.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000128.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000129.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000130.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000131.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000132.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000133.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000113.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000114.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000115.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000116.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000117.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src/M000118.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000126.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000127.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000111.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000112.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000030.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000031.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000032.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000033.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000034.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000035.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000036.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000038.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000039.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000040.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000045.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000046.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000047.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000048.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000049.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000050.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000051.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000052.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000053.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000054.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000055.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000057.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000059.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000060.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000061.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000062.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000063.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000064.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000065.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000066.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000067.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000068.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000069.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000070.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000071.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000072.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000073.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000074.html
@@ -86,21 +102,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000091.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000092.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000093.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000094.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000095.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000096.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000097.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000098.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000099.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000100.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000101.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000102.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000103.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000104.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000105.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000106.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000107.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000108.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox.src/M000001.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox/MBoxReader.html
@@ -129,28 +130,10 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src/M000025.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src/M000026.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/Error.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000035.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000036.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000037.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000038.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000039.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000040.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src/M000041.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000027.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000028.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000029.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000030.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000031.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000032.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000033.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src/M000034.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000042.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000043.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000044.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize/Error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000028.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000029.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src/M000007.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src/M000008.html
@@ -174,6 +157,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/lib/rmail/parser_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/lib/rmail/serialize_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/lib/rmail/utils_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/lib/rmail_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
@@ -187,9 +171,6 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/PushbackReader.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser/MultipartReader.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src