Utilize PORTDOCS and DOCSDIR.

PR:		ports/57861
Submitted by:	rushani
Approved by:	taoka (blanket)

52 files changed, 159 insertions, 140 deletions

diff --git a/japanese/ASCIIdates98-fpw/Makefile b/japanese/ASCIIdates98-fpw/Makefile
index c05e8adafd9e..e1e2461b92d2 100644
--- a/japanese/ASCIIdates98-fpw/Makefile
+++ b/japanese/ASCIIdates98-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ASCIIdates98-fpw
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/ASCIIdates98/
 DISTNAME=	${PORTNAME:S/-fpw//}-${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ascdates/data/honmon ${PREFIX}/share/dict/ASCIIdates98-fpw/ascdates/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/ASCIIdates98-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ASCIIdates98-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ASCIIdates98-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/ASCIIdates98-fpw/pkg-plist b/japanese/ASCIIdates98-fpw/pkg-plist
index 93e95830358c..de4b7ec2821b 100644
--- a/japanese/ASCIIdates98-fpw/pkg-plist
+++ b/japanese/ASCIIdates98-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/ASCIIdates98-fpw/catalogs
 @dirrm share/dict/ASCIIdates98-fpw/ascdates/data
 @dirrm share/dict/ASCIIdates98-fpw/ascdates
 @dirrm share/dict/ASCIIdates98-fpw
-share/doc/ASCIIdates98-fpw/readme
-@dirrm share/doc/ASCIIdates98-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/CGdic-fpw/Makefile b/japanese/CGdic-fpw/Makefile
index f42859b7127e..fae0dae52d89 100644
--- a/japanese/CGdic-fpw/Makefile
+++ b/japanese/CGdic-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CGdic-fpw
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/CGdic1.5h/
 DISTNAME=	CGdic1.5h-${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cg/data/honmon ${PREFIX}/share/dict/CGdic-fpw/cg/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/CGdic-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/CGdic-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/CGdic-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/CGdic-fpw/pkg-plist b/japanese/CGdic-fpw/pkg-plist
index 92607c7ab801..802bfd0c2ae3 100644
--- a/japanese/CGdic-fpw/pkg-plist
+++ b/japanese/CGdic-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/CGdic-fpw/catalogs
 @dirrm share/dict/CGdic-fpw/cg/data
 @dirrm share/dict/CGdic-fpw/cg
 @dirrm share/dict/CGdic-fpw
-share/doc/CGdic-fpw/readme
-@dirrm share/doc/CGdic-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/bible_names-fpw/Makefile b/japanese/bible_names-fpw/Makefile
index 75ebbd40cde5..96257d343961 100644
--- a/japanese/bible_names-fpw/Makefile
+++ b/japanese/bible_names-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bible_names-fpw
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/bible_names/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/biblenam/data/honmon ${PREFIX}/share/dict/bible_names-fpw/biblenam/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/bible_names-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/bible_names-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in biblenam.txt readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/bible_names-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/bible_names-fpw/pkg-plist b/japanese/bible_names-fpw/pkg-plist
index 799d9d850d67..fd56a7dea525 100644
--- a/japanese/bible_names-fpw/pkg-plist
+++ b/japanese/bible_names-fpw/pkg-plist
@@ -3,6 +3,6 @@ share/dict/bible_names-fpw/catalogs
 @dirrm share/dict/bible_names-fpw/biblenam/data
 @dirrm share/dict/bible_names-fpw/biblenam
 @dirrm share/dict/bible_names-fpw
-share/doc/bible_names-fpw/biblenam.txt
-share/doc/bible_names-fpw/readme
-@dirrm share/doc/bible_names-fpw
+%%PORTDOCS%%%%DOCSDIR%%/biblenam.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/devil-fpw/Makefile b/japanese/devil-fpw/Makefile
index f10fe07d2db9..e3996e9830c0 100644
--- a/japanese/devil-fpw/Makefile
+++ b/japanese/devil-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	devil-fpw
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/devil/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/devil/data/honmon ${PREFIX}/share/dict/devil-fpw/devil/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/devil-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/devil-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.pkg readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/devil-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/devil-fpw/pkg-plist b/japanese/devil-fpw/pkg-plist
index 8d38d4c0d21f..635b06180717 100644
--- a/japanese/devil-fpw/pkg-plist
+++ b/japanese/devil-fpw/pkg-plist
@@ -3,6 +3,6 @@ share/dict/devil-fpw/catalogs
 @dirrm share/dict/devil-fpw/devil/data
 @dirrm share/dict/devil-fpw/devil
 @dirrm share/dict/devil-fpw
-share/doc/devil-fpw/readme.pkg
-share/doc/devil-fpw/readme.txt
-@dirrm share/doc/devil-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/ebd-fpw/Makefile b/japanese/ebd-fpw/Makefile
index dc138b66919a..2fe674f1ac26 100644
--- a/japanese/ebd-fpw/Makefile
+++ b/japanese/ebd-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ebd-fpw
 PORTVERSION=	1.0
+PORTREVISON=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/ebd/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ebd/data/honmon ${PREFIX}/share/dict/ebd-fpw/ebd/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/ebd-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ebd-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.1st readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ebd-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/ebd-fpw/pkg-plist b/japanese/ebd-fpw/pkg-plist
index 10fb3a35ba08..936fbe1b5c33 100644
--- a/japanese/ebd-fpw/pkg-plist
+++ b/japanese/ebd-fpw/pkg-plist
@@ -3,6 +3,6 @@ share/dict/ebd-fpw/ebd/data/honmon
 @dirrm share/dict/ebd-fpw/ebd/data
 @dirrm share/dict/ebd-fpw/ebd
 @dirrm share/dict/ebd-fpw
-share/doc/ebd-fpw/readme.1st
-share/doc/ebd-fpw/readme.txt
-@dirrm share/doc/ebd-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile
index 7745477dba86..13b3ff58b340 100644
--- a/japanese/edict-fpw/Makefile
+++ b/japanese/edict-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	edict-fpw
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/edict/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/edict/data/honmon ${PREFIX}/share/dict/edict-fpw/edict/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/edict-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/edict-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.pkg edict.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/edict-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/edict-fpw/pkg-plist b/japanese/edict-fpw/pkg-plist
index 517d7bd5f4da..aa9e84dc1d93 100644
--- a/japanese/edict-fpw/pkg-plist
+++ b/japanese/edict-fpw/pkg-plist
@@ -3,6 +3,6 @@ share/dict/edict-fpw/edict/data/honmon
 @dirrm share/dict/edict-fpw/edict/data
 @dirrm share/dict/edict-fpw/edict
 @dirrm share/dict/edict-fpw
-share/doc/edict-fpw/edict.txt
-share/doc/edict-fpw/readme.pkg
-@dirrm share/doc/edict-fpw
+%%PORTDOCS%%%%DOCSDIR%%/edict.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index a2145f47238e..00d4560923a0 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eijiro-fpw
 PORTVERSION=	1.0b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
@@ -64,9 +64,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/eijiro-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/eijiro-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.sjis
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/eijiro-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/eijiro-fpw/pkg-plist b/japanese/eijiro-fpw/pkg-plist
index bdc939216a30..f065e248e62b 100644
--- a/japanese/eijiro-fpw/pkg-plist
+++ b/japanese/eijiro-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/eijiro-fpw/catalogs
 @dirrm share/dict/eijiro-fpw/eijiro/data
 @dirrm share/dict/eijiro-fpw/eijiro
 @dirrm share/dict/eijiro-fpw
-share/doc/eijiro-fpw/readme.sjis
-@dirrm share/doc/eijiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.sjis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/flower-fpw/Makefile b/japanese/flower-fpw/Makefile
index bec1d627ee42..9c708cb027c9 100644
--- a/japanese/flower-fpw/Makefile
+++ b/japanese/flower-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flower-fpw
 PORTVERSION=	1.0
+PORTREVISON=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/Flower/
 DISTNAME=	Flower-${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/flower/data/honmon ${PREFIX}/share/dict/flower-fpw/flower/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/flower-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/flower-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/flower-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/flower-fpw/pkg-plist b/japanese/flower-fpw/pkg-plist
index 2dfbe901cc81..3feb21e26515 100644
--- a/japanese/flower-fpw/pkg-plist
+++ b/japanese/flower-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/flower-fpw/catalogs
 @dirrm share/dict/flower-fpw/flower/data
 @dirrm share/dict/flower-fpw/flower
 @dirrm share/dict/flower-fpw
-share/doc/flower-fpw/readme
-@dirrm share/doc/flower-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/foldoc-fpw/Makefile b/japanese/foldoc-fpw/Makefile
index 70e9be88f911..69931ad69638 100644
--- a/japanese/foldoc-fpw/Makefile
+++ b/japanese/foldoc-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	foldoc-fpw
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/foldoc/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -26,8 +27,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/foldoc/gaiji/gai16h ${PREFIX}/share/dict/foldoc-fpw/foldoc/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/foldoc-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/foldoc-fpw
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/foldoc-fpw
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/foldoc-fpw/pkg-plist b/japanese/foldoc-fpw/pkg-plist
index c1688fa8ac9e..d5d5b0d65d7d 100644
--- a/japanese/foldoc-fpw/pkg-plist
+++ b/japanese/foldoc-fpw/pkg-plist
@@ -5,5 +5,5 @@ share/dict/foldoc-fpw/foldoc/gaiji/gai16h
 @dirrm share/dict/foldoc-fpw/foldoc/gaiji
 @dirrm share/dict/foldoc-fpw/foldoc
 @dirrm share/dict/foldoc-fpw
-share/doc/foldoc-fpw/readme.txt
-@dirrm share/doc/foldoc-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/fumeikai-fpw/Makefile b/japanese/fumeikai-fpw/Makefile
index a65a7c5ecba4..43b1e48d6184 100644
--- a/japanese/fumeikai-fpw/Makefile
+++ b/japanese/fumeikai-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fumeikai-fpw
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/Fumeikai/
 DISTNAME=	Fumeikai-${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/fumeikai/data/honmon ${PREFIX}/share/dict/fumeikai-fpw/fumeikai/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/fumeikai-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/fumeikai-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/fumeikai-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/fumeikai-fpw/pkg-plist b/japanese/fumeikai-fpw/pkg-plist
index 8b004fa294a9..fac56b7c21d6 100644
--- a/japanese/fumeikai-fpw/pkg-plist
+++ b/japanese/fumeikai-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/fumeikai-fpw/catalogs
 @dirrm share/dict/fumeikai-fpw/fumeikai/data
 @dirrm share/dict/fumeikai-fpw/fumeikai
 @dirrm share/dict/fumeikai-fpw
-share/doc/fumeikai-fpw/readme
-@dirrm share/doc/fumeikai-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/jargon-fpw/Makefile b/japanese/jargon-fpw/Makefile
index f7f36aec6da1..5eb17025ac62 100644
--- a/japanese/jargon-fpw/Makefile
+++ b/japanese/jargon-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jargon-fpw
 PORTVERSION=	1.2a
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/jargon/
 DISTNAME=	jarg-fpw${PORTVERSION}
@@ -28,9 +29,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/jargon/gaiji/gai16h ${PREFIX}/share/dict/jargon-fpw/jargon/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/jargon-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/jargon-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.1st readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/jargon-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/jargon-fpw/pkg-plist b/japanese/jargon-fpw/pkg-plist
index 471ba1f76bb3..62310135af97 100644
--- a/japanese/jargon-fpw/pkg-plist
+++ b/japanese/jargon-fpw/pkg-plist
@@ -1,10 +1,10 @@
 share/dict/jargon-fpw/jargon/data/honmon
 share/dict/jargon-fpw/jargon/gaiji/gai16h
 share/dict/jargon-fpw/catalogs
-share/doc/jargon-fpw/readme.1st
-share/doc/jargon-fpw/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
 @dirrm share/dict/jargon-fpw/jargon/data
 @dirrm share/dict/jargon-fpw/jargon/gaiji
 @dirrm share/dict/jargon-fpw/jargon
 @dirrm share/dict/jargon-fpw
-@dirrm share/doc/jargon-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/lsd-fpw/Makefile b/japanese/lsd-fpw/Makefile
index ae55049addd7..f01ff653c02f 100644
--- a/japanese/lsd-fpw/Makefile
+++ b/japanese/lsd-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lsd-fpw
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/lsd/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lsd/data/honmon ${PREFIX}/share/dict/lsd-fpw/lsd/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/lsd-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/lsd-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.pkg readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/lsd-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/lsd-fpw/pkg-plist b/japanese/lsd-fpw/pkg-plist
index 2960b8c97f94..f7347d15ad9d 100644
--- a/japanese/lsd-fpw/pkg-plist
+++ b/japanese/lsd-fpw/pkg-plist
@@ -1,8 +1,8 @@
 share/dict/lsd-fpw/lsd/data/honmon
 share/dict/lsd-fpw/catalogs
-share/doc/lsd-fpw/readme.txt
-share/doc/lsd-fpw/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
 @dirrm share/dict/lsd-fpw/lsd/data
 @dirrm share/dict/lsd-fpw/lsd
 @dirrm share/dict/lsd-fpw
-@dirrm share/doc/lsd-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile
index 60892db7366e..6896d5dfdf79 100644
--- a/japanese/mypaedia-fpw-package/Makefile
+++ b/japanese/mypaedia-fpw-package/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mypaedia-fpw-package
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 
@@ -22,16 +23,15 @@ NO_BUILD=	yes
 PLIST_SUB=	PKGNAME=${PKGNAME}
 
 PKG_DIR=	${PREFIX}/share/dict/lookup-package
-PORT_DOCDIR=	${PREFIX}/share/doc/${PKGNAME}
 
 do-install:
 	${MKDIR} ${PKG_DIR}
 	${INSTALL_DATA} ${WRKSRC}/mypaedia-fpw.el ${PKG_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/extract-mypaedia.pl ${PKG_DIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PORT_DOCDIR}
+	${MKDIR} ${DOCSDIR}
 .for file in ChangeLog README.TXT
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PORT_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/mypaedia-fpw-package/pkg-plist b/japanese/mypaedia-fpw-package/pkg-plist
index 6269b1260886..3960aeb0bf87 100644
--- a/japanese/mypaedia-fpw-package/pkg-plist
+++ b/japanese/mypaedia-fpw-package/pkg-plist
@@ -1,6 +1,6 @@
 share/dict/lookup-package/mypaedia-fpw.el
 share/dict/lookup-package/extract-mypaedia.pl
-share/doc/%%PKGNAME%%/ChangeLog
-share/doc/%%PKGNAME%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
 @dirrm share/dict/lookup-package
-@dirrm share/doc/%%PKGNAME%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index 19bfc88570a1..c46dfdc2b1e5 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mypaedia-fpw
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 DISTNAME=	mypaedia-fpw${PORTVERSION}-src
@@ -49,9 +49,9 @@ do-install:
 		${PREFIX}/share/dict/mypaedia-fpw/mypaedia/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/mypaedia-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/mypaedia-fpw
+	${MKDIR} ${DOCSDIR}
 .for file in AUTHORS COPYING ChangeLog GAIJI.TXT MYPAEDIA-format.txt README.PKG README.TXT TOBEDONE
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mypaedia-fpw
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/mypaedia-fpw/pkg-plist b/japanese/mypaedia-fpw/pkg-plist
index c8a5cf268477..e489dce44e7a 100644
--- a/japanese/mypaedia-fpw/pkg-plist
+++ b/japanese/mypaedia-fpw/pkg-plist
@@ -2,16 +2,16 @@ share/dict/mypaedia-fpw/mypaedia/data/honmon
 share/dict/mypaedia-fpw/mypaedia/gaiji/gai16f
 share/dict/mypaedia-fpw/mypaedia/gaiji/gai16h
 share/dict/mypaedia-fpw/catalogs
-share/doc/mypaedia-fpw/AUTHORS
-share/doc/mypaedia-fpw/COPYING
-share/doc/mypaedia-fpw/ChangeLog
-share/doc/mypaedia-fpw/GAIJI.TXT
-share/doc/mypaedia-fpw/MYPAEDIA-format.txt
-share/doc/mypaedia-fpw/README.PKG
-share/doc/mypaedia-fpw/README.TXT
-share/doc/mypaedia-fpw/TOBEDONE
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GAIJI.TXT
+%%PORTDOCS%%%%DOCSDIR%%/MYPAEDIA-format.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.PKG
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/TOBEDONE
 @dirrm share/dict/mypaedia-fpw/mypaedia/data
 @dirrm share/dict/mypaedia-fpw/mypaedia/gaiji
 @dirrm share/dict/mypaedia-fpw/mypaedia
 @dirrm share/dict/mypaedia-fpw
-@dirrm share/doc/mypaedia-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 21c436e1787d..efc8643a58e7 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	otojiro-fpw
 PORTVERSION=	1.0.a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/ \
 		http://member.nifty.ne.jp/~satomii/freepwing/archive/
@@ -70,9 +70,9 @@ do-install:
 		${PREFIX}/share/dict/otojiro-fpw/otojiro/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/otojiro-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/otojiro-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.txt COPYING
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/otojiro-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/otojiro-fpw/pkg-plist b/japanese/otojiro-fpw/pkg-plist
index 66b9a04eecc9..cfa534a5c559 100644
--- a/japanese/otojiro-fpw/pkg-plist
+++ b/japanese/otojiro-fpw/pkg-plist
@@ -5,6 +5,6 @@ share/dict/otojiro-fpw/catalogs
 @dirrm share/dict/otojiro-fpw/otojiro/gaiji
 @dirrm share/dict/otojiro-fpw/otojiro
 @dirrm share/dict/otojiro-fpw
-share/doc/otojiro-fpw/COPYING
-share/doc/otojiro-fpw/readme.txt
-@dirrm share/doc/otojiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/pejv-fpw/Makefile b/japanese/pejv-fpw/Makefile
index 520218d461bb..12acc2bb1101 100644
--- a/japanese/pejv-fpw/Makefile
+++ b/japanese/pejv-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pejv-fpw
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/pejv/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pejv/data/honmon ${PREFIX}/share/dict/pejv-fpw/pejv/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/pejv-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/pejv-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme legumin.doc pejvo.doc
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/pejv-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/pejv-fpw/pkg-plist b/japanese/pejv-fpw/pkg-plist
index 7103206deffa..d7e602b2b4d6 100644
--- a/japanese/pejv-fpw/pkg-plist
+++ b/japanese/pejv-fpw/pkg-plist
@@ -3,7 +3,7 @@ share/dict/pejv-fpw/catalogs
 @dirrm share/dict/pejv-fpw/pejv/data
 @dirrm share/dict/pejv-fpw/pejv
 @dirrm share/dict/pejv-fpw
-share/doc/pejv-fpw/readme
-share/doc/pejv-fpw/legumin.doc
-share/doc/pejv-fpw/pejvo.doc
-@dirrm share/doc/pejv-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%%%DOCSDIR%%/legumin.doc
+%%PORTDOCS%%%%DOCSDIR%%/pejvo.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/roget-fpw/Makefile b/japanese/roget-fpw/Makefile
index b6f9b1a2769a..f0e22ffec69f 100644
--- a/japanese/roget-fpw/Makefile
+++ b/japanese/roget-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	roget-fpw
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/roget/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -26,9 +27,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/roget/gaiji/gai16h ${PREFIX}/share/dict/roget-fpw/roget/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/roget-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/roget-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.pkg readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/roget-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/roget-fpw/pkg-plist b/japanese/roget-fpw/pkg-plist
index 45a761f37ea8..f5d89f340c32 100644
--- a/japanese/roget-fpw/pkg-plist
+++ b/japanese/roget-fpw/pkg-plist
@@ -5,6 +5,6 @@ share/dict/roget-fpw/catalogs
 @dirrm share/dict/roget-fpw/roget/gaiji
 @dirrm share/dict/roget-fpw/roget
 @dirrm share/dict/roget-fpw
-share/doc/roget-fpw/readme.pkg
-share/doc/roget-fpw/readme.txt
-@dirrm share/doc/roget-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/ryaku-fpw/Makefile b/japanese/ryaku-fpw/Makefile
index 1897877fff9d..d92ea96a2988 100644
--- a/japanese/ryaku-fpw/Makefile
+++ b/japanese/ryaku-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ryaku-fpw
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/Ryaku/
 DISTNAME=	Ryaku-${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ryaku/data/honmon ${PREFIX}/share/dict/ryaku-fpw/ryaku/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/ryaku-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ryaku-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ryaku-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/ryaku-fpw/pkg-plist b/japanese/ryaku-fpw/pkg-plist
index 1afb23834385..a2f2dcc962ce 100644
--- a/japanese/ryaku-fpw/pkg-plist
+++ b/japanese/ryaku-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/ryaku-fpw/catalogs
 @dirrm share/dict/ryaku-fpw/ryaku/data
 @dirrm share/dict/ryaku-fpw/ryaku
 @dirrm share/dict/ryaku-fpw
-share/doc/ryaku-fpw/readme
-@dirrm share/doc/ryaku-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile
index 8df041a2b090..976edfbdedd2 100644
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	srd-fpw-package
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 
@@ -22,16 +23,15 @@ PLIST_SUB=	PKGNAME=${PKGNAME}
 USE_PERL5=	yes
 
 PKG_DIR=	${PREFIX}/share/dict/lookup-package
-PORT_DOCDIR=	${PREFIX}/share/doc/${PKGNAME}
 
 do-install:
 	${MKDIR} ${PKG_DIR}
 	${INSTALL_DATA} ${WRKSRC}/srd-fpw.el ${PKG_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/extract-srd.pl ${PKG_DIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PORT_DOCDIR}
+	${MKDIR} ${DOCSDIR}
 .for file in ChangeLog README.TXT
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PORT_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/srd-fpw-package/pkg-plist b/japanese/srd-fpw-package/pkg-plist
index f4c87a32ec48..1e1057d5f030 100644
--- a/japanese/srd-fpw-package/pkg-plist
+++ b/japanese/srd-fpw-package/pkg-plist
@@ -1,6 +1,6 @@
 share/dict/lookup-package/srd-fpw.el
 share/dict/lookup-package/extract-srd.pl
-share/doc/%%PKGNAME%%/ChangeLog
-share/doc/%%PKGNAME%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
 @dirrm share/dict/lookup-package
-@dirrm share/doc/%%PKGNAME%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 8d662d06009a..84644b448415 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	srd-fpw
 PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 DISTNAME=	srd-fpw${PORTVERSION}-src
@@ -53,9 +53,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/srd-fpw
 	${INSTALL_DATA} ${WRKSRC}/img.dat ${PREFIX}/share/dict/srd-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/srd-fpw
+	${MKDIR} ${DOCSDIR}
 .for file in AUTHORS COPYING ChangeLog GAIJI.TXT NEWS README.PKG README.TXT TOBEDONE
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/srd-fpw
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/srd-fpw/pkg-plist b/japanese/srd-fpw/pkg-plist
index 451cc5be73dc..152b575c1a02 100644
--- a/japanese/srd-fpw/pkg-plist
+++ b/japanese/srd-fpw/pkg-plist
@@ -3,16 +3,16 @@ share/dict/srd-fpw/srd-fpw/gaiji/gai16f
 share/dict/srd-fpw/srd-fpw/gaiji/gai16h
 share/dict/srd-fpw/catalogs
 share/dict/srd-fpw/img.dat
-share/doc/srd-fpw/AUTHORS
-share/doc/srd-fpw/COPYING
-share/doc/srd-fpw/ChangeLog
-share/doc/srd-fpw/GAIJI.TXT
-share/doc/srd-fpw/NEWS
-share/doc/srd-fpw/README.PKG
-share/doc/srd-fpw/README.TXT
-share/doc/srd-fpw/TOBEDONE
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GAIJI.TXT
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.PKG
+%%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/TOBEDONE
 @dirrm share/dict/srd-fpw/srd-fpw/data
 @dirrm share/dict/srd-fpw/srd-fpw/gaiji
 @dirrm share/dict/srd-fpw/srd-fpw
 @dirrm share/dict/srd-fpw
-@dirrm share/doc/srd-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/vera-fpw/Makefile b/japanese/vera-fpw/Makefile
index 3fa29a8d41e5..e6465cd53b34 100644
--- a/japanese/vera-fpw/Makefile
+++ b/japanese/vera-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vera-fpw
 PORTVERSION=	${VERA_VER}.${VERAFPW_VER}
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/vera/
 DISTNAME=	vera-${VERA_VER}-fpw${VERAFPW_VER}
@@ -28,9 +29,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/vera/gaiji/gai16h ${PREFIX}/share/dict/vera-fpw/vera/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/vera-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/vera-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.txt vera.tex
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/vera-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/vera-fpw/pkg-plist b/japanese/vera-fpw/pkg-plist
index c5e39a2e01a2..3ecebe2a78ae 100644
--- a/japanese/vera-fpw/pkg-plist
+++ b/japanese/vera-fpw/pkg-plist
@@ -5,6 +5,6 @@ share/dict/vera-fpw/vera/gaiji/gai16h
 @dirrm share/dict/vera-fpw/vera/gaiji
 @dirrm share/dict/vera-fpw/vera
 @dirrm share/dict/vera-fpw
-share/doc/vera-fpw/readme.txt
-share/doc/vera-fpw/vera.tex
-@dirrm share/doc/vera-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/vera.tex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index 91001a313e09..5a6304b9a2b9 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waeijiro-fpw
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 #MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 MASTER_SITES=	http://www.dsl.gr.jp/~tf/pool/
@@ -63,9 +63,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/waeijiro-fpw/waeijiro/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/waeijiro-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/waeijiro-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in README
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/waeijiro-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/waeijiro-fpw/pkg-plist b/japanese/waeijiro-fpw/pkg-plist
index 483f1d065bdc..5ba48d89aed5 100644
--- a/japanese/waeijiro-fpw/pkg-plist
+++ b/japanese/waeijiro-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/waeijiro-fpw/catalogs
 @dirrm share/dict/waeijiro-fpw/waeijiro/data
 @dirrm share/dict/waeijiro-fpw/waeijiro
 @dirrm share/dict/waeijiro-fpw
-share/doc/waeijiro-fpw/README
-@dirrm share/doc/waeijiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/wdic-fpw/Makefile b/japanese/wdic-fpw/Makefile
index aba82f39d0b9..f2b18be78e91 100644
--- a/japanese/wdic-fpw/Makefile
+++ b/japanese/wdic-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wdic-fpw
 PORTVERSION=	1.3a
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wdic/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -26,9 +27,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/wdic/gaiji/gai16h ${PREFIX}/share/dict/wdic-fpw/wdic/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/wdic-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wdic-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.1st readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/wdic-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/wdic-fpw/pkg-plist b/japanese/wdic-fpw/pkg-plist
index 7ece6e1cb96d..ec74789c1642 100644
--- a/japanese/wdic-fpw/pkg-plist
+++ b/japanese/wdic-fpw/pkg-plist
@@ -5,6 +5,6 @@ share/dict/wdic-fpw/wdic/gaiji/gai16h
 @dirrm share/dict/wdic-fpw/wdic/gaiji
 @dirrm share/dict/wdic-fpw/wdic/
 @dirrm share/dict/wdic-fpw
-share/doc/wdic-fpw/readme.1st
-share/doc/wdic-fpw/readme.txt
-@dirrm share/doc/wdic-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/web1913-fpw/Makefile b/japanese/web1913-fpw/Makefile
index b513868e3933..78ee19d8e3e7 100644
--- a/japanese/web1913-fpw/Makefile
+++ b/japanese/web1913-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	web1913-fpw
 PORTVERSION=	${WEBFPW_VER}
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/web1913/
 DISTNAME=	${PORTNAME}${WEBFPW_VER}
@@ -25,8 +26,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/web/data/honmon ${PREFIX}/share/dict/web-fpw/web/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/web-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/web-fpw
-	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/web-fpw
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/web1913-fpw/pkg-plist b/japanese/web1913-fpw/pkg-plist
index 667beb8bc936..47be5743186f 100644
--- a/japanese/web1913-fpw/pkg-plist
+++ b/japanese/web1913-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/web-fpw/web/data/honmon
 @dirrm share/dict/web-fpw/web/data
 @dirrm share/dict/web-fpw/web
 @dirrm share/dict/web-fpw
-share/doc/web-fpw/readme
-@dirrm share/doc/web-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/wordnet-fpw/Makefile b/japanese/wordnet-fpw/Makefile
index a0cc653cf7fc..1e638da81276 100644
--- a/japanese/wordnet-fpw/Makefile
+++ b/japanese/wordnet-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wordnet-fpw
 PORTVERSION=	${WN_VER}.${WNFPW_VER}
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wordnet/
 DISTNAME=	wordnet-${WN_VER}-fpw${WNFPW_VER}
@@ -27,8 +28,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/wordnet/data/honmon ${PREFIX}/share/dict/wordnet-fpw/wordnet/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/wordnet-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wordnet-fpw
-	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/wordnet-fpw
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/wordnet-fpw/pkg-plist b/japanese/wordnet-fpw/pkg-plist
index 9fc67a3303ee..e9a28b47f21d 100644
--- a/japanese/wordnet-fpw/pkg-plist
+++ b/japanese/wordnet-fpw/pkg-plist
@@ -3,5 +3,5 @@ share/dict/wordnet-fpw/wordnet/data/honmon
 @dirrm share/dict/wordnet-fpw/wordnet/data
 @dirrm share/dict/wordnet-fpw/wordnet
 @dirrm share/dict/wordnet-fpw
-share/doc/wordnet-fpw/readme
-@dirrm share/doc/wordnet-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/wwasw-fpw/Makefile b/japanese/wwasw-fpw/Makefile
index edeeeb119a1d..ec4071c2e197 100644
--- a/japanese/wwasw-fpw/Makefile
+++ b/japanese/wwasw-fpw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wwasw-fpw
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wwasw/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -24,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/wwasw/data/honmon ${PREFIX}/share/dict/wwasw-fpw/wwasw/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/wwasw-fpw
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wwasw-fpw
+	${MKDIR} ${DOCSDIR}
 .for i in readme.pkg readme.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/wwasw-fpw
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/wwasw-fpw/pkg-plist b/japanese/wwasw-fpw/pkg-plist
index b7956863a544..74526f1003f0 100644
--- a/japanese/wwasw-fpw/pkg-plist
+++ b/japanese/wwasw-fpw/pkg-plist
@@ -3,6 +3,6 @@ share/dict/wwasw-fpw/catalogs
 @dirrm share/dict/wwasw-fpw/wwasw/data
 @dirrm share/dict/wwasw-fpw/wwasw
 @dirrm share/dict/wwasw-fpw
-share/doc/wwasw-fpw/readme.pkg
-share/doc/wwasw-fpw/readme.txt
-@dirrm share/doc/wwasw-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%