- s/DOCDIR/DOCSDIR/ and use DATADIR both in Makefile and pkg-plist

- pet portlint
- fix plist with -DNOPORTDOCS
- bump PORTREVISION

Prompted by:	QA Tindy run

2 files changed, 80 insertions, 80 deletions

diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 61d50585b5e3..2dde0049dbca 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edict
 PORTVERSION=	19990714
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	\
 		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
@@ -47,13 +47,13 @@ DOCFILES=	edict_doc.html edicth.doc \
 #
 # These change too often and are not made into executables.
 #
-IGNOREFILES=	$(DICTFILES) $(DOCFILES)
+IGNOREFILES=	${DICTFILES} ${DOCFILES}
 
 BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen
 
 # Where to install the data files
 DATADIR=	${PREFIX}/share/dict/edict
-DOCDIR=		${PREFIX}/share/doc/xjdic
+DOCSDIR=	${PREFIX}/share/doc/xjdic
 MAN1=		xjdic.1
 
 NO_WRKSUBDIR=	yes
@@ -63,16 +63,16 @@ NO_WRKSUBDIR=	yes
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@for file in ${SRCFILES}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+	@for _file in ${SRCFILES}; do \
+		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$${_file} ${EXTRACT_AFTER_ARGS});\
 		then \
 			exit 1; \
 		fi \
 	done
 
 do-install:
-	@for file in ${BINFILES}; do \
-		if ! ${INSTALL_PROGRAM} ${WRKDIR}/$$file ${PREFIX}/bin ;\
+	@for _file in ${BINFILES}; do \
+		if ! ${INSTALL_PROGRAM} ${WRKDIR}/$${_file} ${PREFIX}/bin ;\
 		then \
 			exit 1; \
 		fi \
@@ -81,11 +81,11 @@ do-install:
 	then \
 		${MKDIR} ${DATADIR} ; \
 	fi
-	@for file in ${DICTFILES}; do \
-		case $$file in \
+	@for _file in ${DICTFILES}; do \
+		case $${_file} in \
 		*.gz) \
-			instfile=`${BASENAME} $$file .gz` ; \
-			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
+			instfile=`${BASENAME} $${_file} .gz` ; \
+			if ${GZIP_CMD} -cd ${_DISTDIR}/$${_file} > ${DATADIR}/$$instfile ; \
 			then \
 				${TRUE} ; \
 			else \
@@ -94,7 +94,7 @@ do-install:
 			;; \
 		*.Z) \
 			instfile=`${BASENAME} $$file .Z` ; \
-			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
+			if ${GZIP_CMD} -cd ${_DISTDIR}/$${_file} > ${DATADIR}/$$instfile ; \
 			then \
 				${TRUE} ; \
 			else \
@@ -102,12 +102,12 @@ do-install:
 			fi \
 			;; \
 		*.zip) \
-			instfile=`${BASENAME} $$file .zip` ; \
+			instfile=`${BASENAME} $${_file} .zip` ; \
 			if [ $$instfile = 4jword3_edict ] ; \
 			then \
 				instfile=4jword3_edict.euc ; \
 			fi; \
-			if unzip -o ${_DISTDIR}/$$file $$instfile -d ${DATADIR} ; \
+			if ${UNZIP_CMD} -o ${_DISTDIR}/$${_file} $$instfile -d ${DATADIR} ; \
 			then \
 				${TRUE} ; \
 			else \
@@ -115,8 +115,8 @@ do-install:
 			fi \
 			;; \
 		*) \
-			instfile=`${BASENAME} $$file` ; \
-			${CP} ${_DISTDIR}/$$file ${DATADIR} ; \
+			instfile=`${BASENAME} $${_file}` ; \
+			${CP} ${_DISTDIR}/$${_file} ${DATADIR} ; \
 			;; \
 		esac ; \
 		( \
@@ -157,14 +157,14 @@ do-install:
 	@${CHMOD} ${SHAREMODE} ${DATADIR}/.xjdicrc
 	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@if [ ! -d ${DOCDIR} ] ; \
+	@if [ ! -d ${DOCSDIR} ] ; \
 	then \
-		${MKDIR} ${DOCDIR} ; \
+		${MKDIR} ${DOCSDIR} ; \
 	fi
-	${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCSDIR}
 	@for docfile in ${DOCFILES} ; do \
-		${ECHO_CMD} Installing  ${DOCDIR}/$$docfile ; \
-		${INSTALL_MAN}  ${_DISTDIR}/$$docfile ${DOCDIR} ; \
+		${ECHO_CMD} Installing  ${DOCSDIR}/$${docfile} ; \
+		${INSTALL_MAN}  ${_DISTDIR}/$${docfile} ${DOCSDIR} ; \
 	done
 .endif
 
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index de398ff3a23a..5d0f72a35f99 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -4,62 +4,62 @@ bin/xjdic_sa
 bin/xjdic_cl
 bin/xjdserver
 bin/xjdxgen
-share/dict/edict/4jword3_edict.euc
-share/dict/edict/4jword3_edict.euc.xjdx
-share/dict/edict/aviation
-share/dict/edict/aviation.xjdx
-share/dict/edict/compdic
-share/dict/edict/compdic.xjdx
-share/dict/edict/concrete
-share/dict/edict/concrete.xjdx
-share/dict/edict/ediclsd3
-share/dict/edict/ediclsd3.xjdx
-share/dict/edict/edict
-share/dict/edict/edict.xjdx
-share/dict/edict/edicth
-share/dict/edict/edicth.xjdx
-share/dict/edict/enamdict
-share/dict/edict/enamdict.xjdx
-share/dict/edict/findic
-share/dict/edict/findic.xjdx
-share/dict/edict/geodic
-share/dict/edict/geodic.xjdx
-share/dict/edict/j_places
-share/dict/edict/j_places.xjdx
-share/dict/edict/kanjd212
-share/dict/edict/kanjd212.xjdx
-share/dict/edict/kanjidic
-share/dict/edict/kanjidic.xjdx
-share/dict/edict/kanjstroke
-share/dict/edict/lawgledt
-share/dict/edict/lawgledt.xjdx
-share/dict/edict/lingdic
-share/dict/edict/lingdic.xjdx
-share/dict/edict/mktdic
-share/dict/edict/mktdic.xjdx
-share/dict/edict/pandpdic
-share/dict/edict/pandpdic.xjdx
-share/dict/edict/radicals.tm
-share/dict/edict/radkfile
-share/dict/edict/romkana.cnv
-share/dict/edict/vconj
-share/dict/edict/.xjdicrc
-@dirrm share/dict/edict
-share/doc/xjdic/4jword3_inf.txt
-share/doc/xjdic/aviation.txt
-share/doc/xjdic/concrete.doc
-share/doc/xjdic/ediclsd3.rme
-share/doc/xjdic/edict_doc.html
-share/doc/xjdic/edicth.doc
-share/doc/xjdic/enamdict_doc.html
-share/doc/xjdic/enamdict_doc.txt
-share/doc/xjdic/findic.doc
-share/doc/xjdic/geodic.doc
-share/doc/xjdic/j_places.inf
-share/doc/xjdic/kanjd212.doc
-share/doc/xjdic/kanjidic.doc
-share/doc/xjdic/lawgldoc.new
-share/doc/xjdic/lingdic.txt
-share/doc/xjdic/mktdic.doc
-share/doc/xjdic/xjdic23.inf
-@dirrm share/doc/xjdic
+%%DATADIR%%/4jword3_edict.euc
+%%DATADIR%%/4jword3_edict.euc.xjdx
+%%DATADIR%%/aviation
+%%DATADIR%%/aviation.xjdx
+%%DATADIR%%/compdic
+%%DATADIR%%/compdic.xjdx
+%%DATADIR%%/concrete
+%%DATADIR%%/concrete.xjdx
+%%DATADIR%%/ediclsd3
+%%DATADIR%%/ediclsd3.xjdx
+%%DATADIR%%/edict
+%%DATADIR%%/edict.xjdx
+%%DATADIR%%/edicth
+%%DATADIR%%/edicth.xjdx
+%%DATADIR%%/enamdict
+%%DATADIR%%/enamdict.xjdx
+%%DATADIR%%/findic
+%%DATADIR%%/findic.xjdx
+%%DATADIR%%/geodic
+%%DATADIR%%/geodic.xjdx
+%%DATADIR%%/j_places
+%%DATADIR%%/j_places.xjdx
+%%DATADIR%%/kanjd212
+%%DATADIR%%/kanjd212.xjdx
+%%DATADIR%%/kanjidic
+%%DATADIR%%/kanjidic.xjdx
+%%DATADIR%%/kanjstroke
+%%DATADIR%%/lawgledt
+%%DATADIR%%/lawgledt.xjdx
+%%DATADIR%%/lingdic
+%%DATADIR%%/lingdic.xjdx
+%%DATADIR%%/mktdic
+%%DATADIR%%/mktdic.xjdx
+%%DATADIR%%/pandpdic
+%%DATADIR%%/pandpdic.xjdx
+%%DATADIR%%/radicals.tm
+%%DATADIR%%/radkfile
+%%DATADIR%%/romkana.cnv
+%%DATADIR%%/vconj
+%%DATADIR%%/.xjdicrc
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/4jword3_inf.txt
+%%PORTDOCS%%%%DOCSDIR%%/aviation.txt
+%%PORTDOCS%%%%DOCSDIR%%/concrete.doc
+%%PORTDOCS%%%%DOCSDIR%%/ediclsd3.rme
+%%PORTDOCS%%%%DOCSDIR%%/edict_doc.html
+%%PORTDOCS%%%%DOCSDIR%%/edicth.doc
+%%PORTDOCS%%%%DOCSDIR%%/enamdict_doc.html
+%%PORTDOCS%%%%DOCSDIR%%/enamdict_doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/findic.doc
+%%PORTDOCS%%%%DOCSDIR%%/geodic.doc
+%%PORTDOCS%%%%DOCSDIR%%/j_places.inf
+%%PORTDOCS%%%%DOCSDIR%%/kanjd212.doc
+%%PORTDOCS%%%%DOCSDIR%%/kanjidic.doc
+%%PORTDOCS%%%%DOCSDIR%%/lawgldoc.new
+%%PORTDOCS%%%%DOCSDIR%%/lingdic.txt
+%%PORTDOCS%%%%DOCSDIR%%/mktdic.doc
+%%PORTDOCS%%%%DOCSDIR%%/xjdic23.inf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%