6 files changed, 200 insertions, 200 deletions

diff --git a/mail/ruby-rmail/Makefile b/mail/ruby-rmail/Makefile
index b3acaff4fdf6..933b7cc791e2 100644
--- a/mail/ruby-rmail/Makefile
+++ b/mail/ruby-rmail/Makefile
@@ -25,9 +25,9 @@ do-install:
 	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/${PORTNAME}/* ${RUBY_SITELIBDIR}/${PORTNAME}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/mail/ruby-rmail/pkg-plist b/mail/ruby-rmail/pkg-plist
index 9ab0ff287479..a33781ec3d52 100644
--- a/mail/ruby-rmail/pkg-plist
+++ b/mail/ruby-rmail/pkg-plist
@@ -7,111 +7,111 @@
 %%RUBY_SITELIBDIR%%/rmail/parser/multipart.rb
 @dirrm %%RUBY_SITELIBDIR%%/rmail/parser
 @dirrm %%RUBY_SITELIBDIR%%/rmail
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/NEWS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/THANKS
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000055.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000056.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000057.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000058.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000059.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000060.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000061.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000062.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000063.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000064.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000065.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000066.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src/M000067.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address/Parser.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address/Parser.src/M000068.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address/Parser.src/M000069.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000020.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000021.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000022.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000023.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000024.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000025.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000026.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000027.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000028.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000029.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000030.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000031.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000032.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000033.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000034.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000035.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000036.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000037.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000038.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000039.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000040.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000041.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000042.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000043.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000044.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000045.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000046.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000047.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000048.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000049.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000050.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000051.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000052.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000053.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src/M000054.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000008.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000009.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000010.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000011.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000012.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000013.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000014.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000015.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000016.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000017.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000018.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src/M000019.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Parser.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Parser.src/M000006.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Parser.src/M000007.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize.src/M000004.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize.src/M000005.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize/Error.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Utils.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Utils.src/M000001.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Utils.src/M000002.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Utils.src/M000003.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/created.rid
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/address_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/header_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/message_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/parser_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/serialize_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/files/rmail/utils_rb.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rmail/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/files/rmail
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Utils.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Serialize
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Parser.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Message.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Header.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address/Parser.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address.src
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail/Address
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes/RMail
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail/doc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rmail
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/THANKS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000055.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000056.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000057.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000059.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000060.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000061.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000062.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000063.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000064.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000065.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000066.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src/M000067.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000068.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src/M000069.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000022.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000023.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000024.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000025.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000026.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000028.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000029.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/M000037.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/M000041.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000042.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000043.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src/M000044.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/Message.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000008.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000009.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000010.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000017.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src/M000006.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src/M000007.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000004.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src/M000005.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize/Error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src/M000001.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src/M000002.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src/M000003.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/address_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/header_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/message_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/parser_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/serialize_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/rmail/utils_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
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/rmail
+%%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.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index 6ba2c842c720..7c0ac7545df6 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -27,11 +27,11 @@ WRKDIR_TMAIL=	${WRKSRC}/packages/tmail
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_MODDOCDIR}/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/ruby-tmail/pkg-plist b/mail/ruby-tmail/pkg-plist
index ec3d00342ebe..da1dd82034c3 100644
--- a/mail/ruby-tmail/pkg-plist
+++ b/mail/ruby-tmail/pkg-plist
@@ -23,43 +23,43 @@
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
 %%RUBY_SITELIBDIR%%/tmail/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/tmail
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/multipart
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/normal
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/sendtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/simple
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/data
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/Incompatibilities
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/address.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/config.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/details.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mbox.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/port.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/tmail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/usage.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/Incompatibilities.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/address.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/config.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/details.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mbox.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/port.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/tmail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mbox.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mbox.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index 6ba2c842c720..7c0ac7545df6 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -27,11 +27,11 @@ WRKDIR_TMAIL=	${WRKSRC}/packages/tmail
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}/ja
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_MODDOCDIR}/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
index ec3d00342ebe..da1dd82034c3 100644
--- a/mail/rubygem-tmail/pkg-plist
+++ b/mail/rubygem-tmail/pkg-plist
@@ -23,43 +23,43 @@
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
 %%RUBY_SITELIBDIR%%/tmail/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/tmail
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/multipart
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/normal
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/sendtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/simple
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/data
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/Incompatibilities
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/README.en
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/address.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/config.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/details.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mbox.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/port.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/tmail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/usage.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/Incompatibilities.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/address.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/config.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/details.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mbox.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/notes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/port.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/tmail.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mbox.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mbox.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%