ports/57861: [PATCH] ports/japanese/*fpw*: `make deinstall' fails if NOPORTDOCS is defined

Hideyuki KURASHINA rushani at FreeBSD.org
Sat Oct 11 05:30:22 UTC 2003


>Number:         57861
>Category:       ports
>Synopsis:       [PATCH] ports/japanese/*fpw*: `make deinstall' fails if NOPORTDOCS is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 10 22:30:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hideyuki KURASHINA
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:

	System: FreeBSD ***.*******.jp FreeBSD 5.1-RELEASE-p10 #0: Sun Oct  5 19:20:19 JST 2003

>Description:

	1.  Due to lack of %%PORTDOCS%% at beginning of their pkg-plist,
	`make deinstall' fails like this;

	  # make -DNOPORTDOCS deinstall
	  ===>  Deinstalling for japanese/ASCIIdates98-fpw
	  ===>   Deinstalling ja-ASCIIdates98-fpw-1.0
	  pkg_delete: file '/usr/local/share/doc/ASCIIdates98-fpw/readme' doesn't really exist
	  pkg_delete: file '/usr/local/share/doc/ASCIIdates98-fpw' doesn't really exist
	  pkg_delete: unable to completely remove directory '/usr/local/share/doc/ASCIIdates98-fpw'
	  pkg_delete: couldn't entirely delete package (perhaps the packing list is
	  incorrectly specified?)

	2. Utilize DOCSDIR.

>How-To-Repeat:

	One of examples;

	  # cd /usr/ports/japanese/ASCIIdates98-fpw
	  # make -DNOPORTDOCS install
	  # make -DNOPORTDOCS deinstall

>Fix:

	Apply following patch;

	P.S.  I could not check install/deinstall is OK for following ports
	because I don't have their licenses:

	  japanese/eijiro-fpw
	  japanese/mypaedia-fpw
	  japanese/otojiro-fpw
	  japanese/srd-fpw
	  japanese/waeijiro-fpw

	However, changes I made should be harmless I think.

Index: ASCIIdates98-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/ASCIIdates98-fpw/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ASCIIdates98-fpw/Makefile	7 Mar 2003 06:04:40 -0000	1.4
+++ ASCIIdates98-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: ASCIIdates98-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/ASCIIdates98-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- ASCIIdates98-fpw/pkg-plist	30 Nov 2000 15:02:59 -0000	1.1
+++ ASCIIdates98-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/ASCIIdates98-fpw/ascdates/data
 @dirrm share/dict/ASCIIdates98-fpw/ascdates
 @dirrm share/dict/ASCIIdates98-fpw
-share/doc/ASCIIdates98-fpw/readme
- at dirrm share/doc/ASCIIdates98-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: CGdic-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/CGdic-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- CGdic-fpw/Makefile	7 Mar 2003 06:04:40 -0000	1.3
+++ CGdic-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: CGdic-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/CGdic-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- CGdic-fpw/pkg-plist	30 Nov 2000 15:05:19 -0000	1.1
+++ CGdic-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/CGdic-fpw/cg/data
 @dirrm share/dict/CGdic-fpw/cg
 @dirrm share/dict/CGdic-fpw
-share/doc/CGdic-fpw/readme
- at dirrm share/doc/CGdic-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: bible_names-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/bible_names-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- bible_names-fpw/Makefile	7 Mar 2003 06:04:42 -0000	1.3
+++ bible_names-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: bible_names-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/bible_names-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- bible_names-fpw/pkg-plist	30 Nov 2000 15:06:17 -0000	1.1
+++ bible_names-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,6 +3,6 @@
 @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
- at dirrm share/doc/bible_names-fpw
+%%PORTDOCS%%%%DOCSDIR%%/biblenam.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: devil-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/devil-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devil-fpw/Makefile	7 Mar 2003 06:04:43 -0000	1.3
+++ devil-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: devil-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/devil-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- devil-fpw/pkg-plist	30 Nov 2000 15:06:54 -0000	1.1
+++ devil-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,6 +3,6 @@
 @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
- at dirrm share/doc/devil-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: ebd-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/ebd-fpw/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ebd-fpw/Makefile	7 Mar 2003 06:04:44 -0000	1.2
+++ ebd-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: ebd-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/ebd-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- ebd-fpw/pkg-plist	23 Aug 2001 05:30:45 -0000	1.1
+++ ebd-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,6 +3,6 @@
 @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
- at dirrm share/doc/ebd-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: edict-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/edict-fpw/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- edict-fpw/Makefile	7 Mar 2003 06:04:45 -0000	1.7
+++ edict-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: edict-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/edict-fpw/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- edict-fpw/pkg-plist	23 Aug 2001 01:57:34 -0000	1.3
+++ edict-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,6 +3,6 @@
 @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
- at dirrm share/doc/edict-fpw
+%%PORTDOCS%%%%DOCSDIR%%/edict.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: eijiro-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/eijiro-fpw/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- eijiro-fpw/Makefile	4 Apr 2003 19:43:31 -0000	1.7
+++ eijiro-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	eijiro-fpw
 PORTVERSION=	1.0b
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
@@ -63,9 +64,9 @@
 	${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
 
Index: eijiro-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/eijiro-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- eijiro-fpw/pkg-plist	21 Dec 2000 06:27:31 -0000	1.1
+++ eijiro-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/eijiro-fpw/eijiro/data
 @dirrm share/dict/eijiro-fpw/eijiro
 @dirrm share/dict/eijiro-fpw
-share/doc/eijiro-fpw/readme.sjis
- at dirrm share/doc/eijiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.sjis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: flower-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/flower-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- flower-fpw/Makefile	7 Mar 2003 06:04:46 -0000	1.3
+++ flower-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: flower-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/flower-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- flower-fpw/pkg-plist	30 Nov 2000 15:07:31 -0000	1.1
+++ flower-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/flower-fpw/flower/data
 @dirrm share/dict/flower-fpw/flower
 @dirrm share/dict/flower-fpw
-share/doc/flower-fpw/readme
- at dirrm share/doc/flower-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: foldoc-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/foldoc-fpw/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- foldoc-fpw/Makefile	7 Mar 2003 06:04:46 -0000	1.2
+++ foldoc-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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>
Index: foldoc-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/foldoc-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- foldoc-fpw/pkg-plist	23 Aug 2001 05:29:54 -0000	1.1
+++ foldoc-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -5,5 +5,5 @@
 @dirrm share/dict/foldoc-fpw/foldoc/gaiji
 @dirrm share/dict/foldoc-fpw/foldoc
 @dirrm share/dict/foldoc-fpw
-share/doc/foldoc-fpw/readme.txt
- at dirrm share/doc/foldoc-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: fumeikai-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/fumeikai-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fumeikai-fpw/Makefile	7 Mar 2003 06:04:46 -0000	1.3
+++ fumeikai-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: fumeikai-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/fumeikai-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- fumeikai-fpw/pkg-plist	30 Nov 2000 15:08:23 -0000	1.1
+++ fumeikai-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/fumeikai-fpw/fumeikai/data
 @dirrm share/dict/fumeikai-fpw/fumeikai
 @dirrm share/dict/fumeikai-fpw
-share/doc/fumeikai-fpw/readme
- at dirrm share/doc/fumeikai-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: jargon-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/jargon-fpw/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- jargon-fpw/Makefile	7 Mar 2003 06:04:47 -0000	1.7
+++ jargon-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: jargon-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/jargon-fpw/pkg-plist,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkg-plist
--- jargon-fpw/pkg-plist	23 Jun 2000 18:31:05 -0000	1.1.1.1
+++ jargon-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -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
- at dirrm share/doc/jargon-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: lsd-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/lsd-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lsd-fpw/Makefile	7 Mar 2003 06:04:50 -0000	1.3
+++ lsd-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: lsd-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/lsd-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- lsd-fpw/pkg-plist	30 Nov 2000 15:09:15 -0000	1.1
+++ lsd-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -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
- at dirrm share/doc/lsd-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: mypaedia-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/mypaedia-fpw/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- mypaedia-fpw/Makefile	7 Mar 2003 06:04:52 -0000	1.8
+++ mypaedia-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	mypaedia-fpw
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 DISTNAME=	mypaedia-fpw${PORTVERSION}-src
@@ -48,9 +49,9 @@
 		${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
 
Index: mypaedia-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/mypaedia-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mypaedia-fpw/pkg-plist	10 Sep 2002 08:37:28 -0000	1.2
+++ mypaedia-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -2,16 +2,16 @@
 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
- at dirrm share/doc/mypaedia-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: mypaedia-fpw-package/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/mypaedia-fpw-package/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- mypaedia-fpw-package/Makefile	4 Apr 2003 05:34:48 -0000	1.10
+++ mypaedia-fpw-package/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 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
 
Index: mypaedia-fpw-package/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/mypaedia-fpw-package/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mypaedia-fpw-package/pkg-plist	24 Aug 2000 15:30:29 -0000	1.2
+++ mypaedia-fpw-package/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -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
- at dirrm share/doc/%%PKGNAME%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: otojiro-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/otojiro-fpw/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- otojiro-fpw/Makefile	4 Apr 2003 19:43:31 -0000	1.4
+++ otojiro-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	otojiro-fpw
 PORTVERSION=	1.0.a
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/ \
 		http://member.nifty.ne.jp/~satomii/freepwing/archive/
@@ -69,9 +70,9 @@
 		${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
 
Index: otojiro-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/otojiro-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- otojiro-fpw/pkg-plist	13 Sep 2002 05:52:57 -0000	1.1
+++ otojiro-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -5,6 +5,6 @@
 @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
- at dirrm share/doc/otojiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: pejv-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/pejv-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- pejv-fpw/Makefile	7 Mar 2003 06:04:54 -0000	1.3
+++ pejv-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: pejv-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/pejv-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pejv-fpw/pkg-plist	30 Nov 2000 15:09:58 -0000	1.1
+++ pejv-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,7 +3,7 @@
 @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
- at dirrm share/doc/pejv-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%%%DOCSDIR%%/legumin.doc
+%%PORTDOCS%%%%DOCSDIR%%/pejvo.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: roget-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/roget-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- roget-fpw/Makefile	7 Mar 2003 06:04:55 -0000	1.3
+++ roget-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: roget-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/roget-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- roget-fpw/pkg-plist	30 Nov 2000 15:10:37 -0000	1.1
+++ roget-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -5,6 +5,6 @@
 @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
- at dirrm share/doc/roget-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: ryaku-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/ryaku-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ryaku-fpw/Makefile	7 Mar 2003 06:04:55 -0000	1.3
+++ ryaku-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: ryaku-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/ryaku-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- ryaku-fpw/pkg-plist	6 Dec 2000 15:20:35 -0000	1.1
+++ ryaku-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/ryaku-fpw/ryaku/data
 @dirrm share/dict/ryaku-fpw/ryaku
 @dirrm share/dict/ryaku-fpw
-share/doc/ryaku-fpw/readme
- at dirrm share/doc/ryaku-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: srd-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/srd-fpw/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- srd-fpw/Makefile	7 Mar 2003 06:04:56 -0000	1.9
+++ srd-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	srd-fpw
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 DISTNAME=	srd-fpw${PORTVERSION}-src
@@ -52,9 +53,9 @@
 	${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
 
Index: srd-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/srd-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- srd-fpw/pkg-plist	25 Aug 2000 00:54:39 -0000	1.2
+++ srd-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,16 +3,16 @@
 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
- at dirrm share/doc/srd-fpw
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: srd-fpw-package/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/srd-fpw-package/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- srd-fpw-package/Makefile	7 Mar 2003 06:04:56 -0000	1.9
+++ srd-fpw-package/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 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
 
Index: srd-fpw-package/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/srd-fpw-package/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- srd-fpw-package/pkg-plist	24 Aug 2000 15:31:31 -0000	1.2
+++ srd-fpw-package/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -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
- at dirrm share/doc/%%PKGNAME%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: vera-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/vera-fpw/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- vera-fpw/Makefile	7 Mar 2003 06:04:57 -0000	1.6
+++ vera-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: vera-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/vera-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- vera-fpw/pkg-plist	23 Aug 2001 00:57:22 -0000	1.2
+++ vera-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -5,6 +5,6 @@
 @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
- at dirrm share/doc/vera-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/vera.tex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: waeijiro-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/waeijiro-fpw/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- waeijiro-fpw/Makefile	9 Sep 2003 04:54:36 -0000	1.6
+++ waeijiro-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	waeijiro-fpw
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 #MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 MASTER_SITES=	http://www.dsl.gr.jp/~tf/pool/
@@ -62,9 +63,9 @@
 	${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
 
Index: waeijiro-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/waeijiro-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- waeijiro-fpw/pkg-plist	13 Sep 2002 05:51:56 -0000	1.1
+++ waeijiro-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/waeijiro-fpw/waeijiro/data
 @dirrm share/dict/waeijiro-fpw/waeijiro
 @dirrm share/dict/waeijiro-fpw
-share/doc/waeijiro-fpw/README
- at dirrm share/doc/waeijiro-fpw
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: wdic-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/wdic-fpw/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- wdic-fpw/Makefile	7 Mar 2003 06:04:58 -0000	1.11
+++ wdic-fpw/Makefile	11 Oct 2003 04:58:37 -0000
@@ -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 @@
 	${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
 
Index: wdic-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/wdic-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- wdic-fpw/pkg-plist	2 Nov 2000 09:21:44 -0000	1.2
+++ wdic-fpw/pkg-plist	11 Oct 2003 04:58:37 -0000
@@ -5,6 +5,6 @@
 @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
- at dirrm share/doc/wdic-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: web1913-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/web1913-fpw/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- web1913-fpw/Makefile	7 Mar 2003 06:04:58 -0000	1.6
+++ web1913-fpw/Makefile	11 Oct 2003 04:58:38 -0000
@@ -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 @@
 	${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>
Index: web1913-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/web1913-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- web1913-fpw/pkg-plist	23 Aug 2001 01:57:34 -0000	1.2
+++ web1913-fpw/pkg-plist	11 Oct 2003 04:58:38 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/web-fpw/web/data
 @dirrm share/dict/web-fpw/web
 @dirrm share/dict/web-fpw
-share/doc/web-fpw/readme
- at dirrm share/doc/web-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: wordnet-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/wordnet-fpw/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- wordnet-fpw/Makefile	7 Mar 2003 06:04:58 -0000	1.7
+++ wordnet-fpw/Makefile	11 Oct 2003 04:58:38 -0000
@@ -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 @@
 	${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>
Index: wordnet-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/wordnet-fpw/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- wordnet-fpw/pkg-plist	23 Aug 2001 01:57:35 -0000	1.2
+++ wordnet-fpw/pkg-plist	11 Oct 2003 04:58:38 -0000
@@ -3,5 +3,5 @@
 @dirrm share/dict/wordnet-fpw/wordnet/data
 @dirrm share/dict/wordnet-fpw/wordnet
 @dirrm share/dict/wordnet-fpw
-share/doc/wordnet-fpw/readme
- at dirrm share/doc/wordnet-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: wwasw-fpw/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/wwasw-fpw/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- wwasw-fpw/Makefile	7 Mar 2003 06:04:59 -0000	1.3
+++ wwasw-fpw/Makefile	11 Oct 2003 04:58:38 -0000
@@ -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 @@
 	${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
 
Index: wwasw-fpw/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/wwasw-fpw/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- wwasw-fpw/pkg-plist	30 Nov 2000 15:11:59 -0000	1.1
+++ wwasw-fpw/pkg-plist	11 Oct 2003 04:58:38 -0000
@@ -3,6 +3,6 @@
 @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
- at dirrm share/doc/wwasw-fpw
+%%PORTDOCS%%%%DOCSDIR%%/readme.pkg
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list