Don't use share/doc/html. Clean up a lot of additional pkglint.

PKGREVISION -> 2.

2 files changed, 161 insertions, 163 deletions

diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile
index 84c9e1f93e1..e181f013c0c 100644
--- a/devel/gentle/Makefile
+++ b/devel/gentle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/12/21 01:16:50 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2012/12/21 01:26:34 dholland Exp $
 #
 
 DISTNAME=		gentle-97
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://gentle.compilertools.net/
 
@@ -13,12 +13,12 @@ COMMENT=		Gentle Compiler Construction System
 NOT_FOR_PLATFORM=	${LP64PLATFORMS}
 
 USE_LIBTOOL=		yes
-INSTALLATION_DIRS=	bin lib
+INSTALLATION_DIRS=	bin lib share/doc/gentle/html share/examples/gentle
 
 do-build:
-	(cd ${WRKSRC}/gentle ; LIBTOOL=${LIBTOOL} CC=${CC} ./build)
-	(cd ${WRKSRC}/lib ; LIBTOOL=${LIBTOOL} CC=${CC} ./build)
-	(cd ${WRKSRC}/reflex ; LIBTOOL=${LIBTOOL} CC=${CC} ./build)
+	(cd ${WRKSRC}/gentle && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build)
+	(cd ${WRKSRC}/lib && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build)
+	(cd ${WRKSRC}/reflex && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gentle/gentle ${DESTDIR}${PREFIX}/bin
@@ -27,22 +27,20 @@ do-install:
 		${DESTDIR}${PREFIX}/lib
 	${LIBTOOL} --mode=finish ${DESTDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/reflex/reflex ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/gentle/html
-	(for i in ${WRKSRC}/html/* ; do \
-		${INSTALL_DATA} $$i \
-			${DESTDIR}${PREFIX}/share/doc/html/gentle/html ; \
-	done)
+	set -e; for i in ${WRKSRC}/html/* ; do \
+		${INSTALL_DATA} "$$i" \
+			${DESTDIR}${PREFIX}/share/doc/gentle/html ; \
+	done
 	${INSTALL_DATA} ${WRKSRC}/BOOK.html \
-		${DESTDIR}${PREFIX}/share/doc/html/gentle
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gentle
+		${DESTDIR}${PREFIX}/share/doc/gentle
 	${INSTALL_DATA} ${WRKSRC}/BOOK.ps ${DESTDIR}${PREFIX}/share/doc/gentle
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gentle
-	(for i in calc flat micro nested polish virtual ; do \
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gentle/$$i ; \
-	for j in ${WRKSRC}/examples/$$i/* ; do \
-	${INSTALL_DATA} $$j ${DESTDIR}${PREFIX}/share/examples/gentle/$$i ; \
-	done ; \
-	done)
+.for i in calc flat micro nested polish virtual
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gentle/${i}
+	set -e; for j in ${WRKSRC}/examples/${i}/* ; do \
+		${INSTALL_DATA} "$$j" \
+			${DESTDIR}${PREFIX}/share/examples/gentle/${i} ; \
+	done
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/examples/README \
 		${DESTDIR}${PREFIX}/share/examples/gentle
 
diff --git a/devel/gentle/PLIST b/devel/gentle/PLIST
index edceb417d80..5f20ac19da5 100644
--- a/devel/gentle/PLIST
+++ b/devel/gentle/PLIST
@@ -1,151 +1,151 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/12/21 01:26:34 dholland Exp $
 bin/gentle
 bin/reflex
 lib/grts.o
 lib/libgentle.la
+share/doc/gentle/BOOK.html
 share/doc/gentle/BOOK.ps
-share/doc/html/gentle/BOOK.html
-share/doc/html/gentle/html/abstract.html
-share/doc/html/gentle/html/abstrsyn.html
-share/doc/html/gentle/html/accu.html
-share/doc/html/gentle/html/actgram.html
-share/doc/html/gentle/html/alternative.html
-share/doc/html/gentle/html/at.html
-share/doc/html/gentle/html/attr.html
-share/doc/html/gentle/html/aux.html
-share/doc/html/gentle/html/basictp.html
-share/doc/html/gentle/html/bodies.html
-share/doc/html/gentle/html/braodcast.html
-share/doc/html/gentle/html/cabstrsyn.html
-share/doc/html/gentle/html/calculator.html
-share/doc/html/gentle/html/casestudy.html
-share/doc/html/gentle/html/codegen.html
-share/doc/html/gentle/html/codegenexpr.html
-share/doc/html/gentle/html/codegenspec.html
-share/doc/html/gentle/html/combined.html
-share/doc/html/gentle/html/compiler.html
-share/doc/html/gentle/html/compuations.html
-share/doc/html/gentle/html/concrsyn.html
-share/doc/html/gentle/html/conditional.html
-share/doc/html/gentle/html/conditions.html
-share/doc/html/gentle/html/control.html
-share/doc/html/gentle/html/coord.html
-share/doc/html/gentle/html/costdriven.html
-share/doc/html/gentle/html/cs2as.html
-share/doc/html/gentle/html/data.html
-share/doc/html/gentle/html/dataflow.html
-share/doc/html/gentle/html/defaultrule.html
-share/doc/html/gentle/html/descrtok.html
-share/doc/html/gentle/html/descrwhite.html
-share/doc/html/gentle/html/disjunct.html
-share/doc/html/gentle/html/elements.html
-share/doc/html/gentle/html/errmsg.html
-share/doc/html/gentle/html/export.html
-share/doc/html/gentle/html/external.html
-share/doc/html/gentle/html/extpred.html
-share/doc/html/gentle/html/exttypes.html
-share/doc/html/gentle/html/failure.html
-share/doc/html/gentle/html/firstex.html
-share/doc/html/gentle/html/generating.html
-share/doc/html/gentle/html/glance.html
-share/doc/html/gentle/html/global.html
-share/doc/html/gentle/html/idents.html
-share/doc/html/gentle/html/implc.html
-share/doc/html/gentle/html/index.html
-share/doc/html/gentle/html/installation.html
-share/doc/html/gentle/html/instr.html
-share/doc/html/gentle/html/joker.html
-share/doc/html/gentle/html/libintro.html
-share/doc/html/gentle/html/library.html
-share/doc/html/gentle/html/lrm.html
-share/doc/html/gentle/html/lrmcateg.html
-share/doc/html/gentle/html/lrmexpr.html
-share/doc/html/gentle/html/lrmintro.html
-share/doc/html/gentle/html/lrmmemebers.html
-share/doc/html/gentle/html/lrmmodules.html
-share/doc/html/gentle/html/lrmpatterns.html
-share/doc/html/gentle/html/lrmpredef.html
-share/doc/html/gentle/html/lrmpredicates.html
-share/doc/html/gentle/html/lrmroot.html
-share/doc/html/gentle/html/lrmspec.html
-share/doc/html/gentle/html/lrmsyntax.html
-share/doc/html/gentle/html/lrmtables.html
-share/doc/html/gentle/html/lrmtypes.html
-share/doc/html/gentle/html/lrmvars.html
-share/doc/html/gentle/html/lrmvoc.html
-share/doc/html/gentle/html/machine.html
-share/doc/html/gentle/html/macine.html
-share/doc/html/gentle/html/main.html
-share/doc/html/gentle/html/mlexpr.html
-share/doc/html/gentle/html/mlio.html
-share/doc/html/gentle/html/mlprogs.html
-share/doc/html/gentle/html/mlstmts.html
-share/doc/html/gentle/html/mlsummary.html
-share/doc/html/gentle/html/mltypes.html
-share/doc/html/gentle/html/mlvars.html
-share/doc/html/gentle/html/mlvoc.html
-share/doc/html/gentle/html/modulename.html
-share/doc/html/gentle/html/mutable.html
-share/doc/html/gentle/html/named.html
-share/doc/html/gentle/html/next.gif
-share/doc/html/gentle/html/nondeterministic.html
-share/doc/html/gentle/html/nonterms.html
-share/doc/html/gentle/html/optimal.html
-share/doc/html/gentle/html/output.html
-share/doc/html/gentle/html/overall.html
-share/doc/html/gentle/html/parser.html
-share/doc/html/gentle/html/patterns.html
-share/doc/html/gentle/html/preddcl.html
-share/doc/html/gentle/html/predefined.html
-share/doc/html/gentle/html/prediwhere.html
-share/doc/html/gentle/html/preface.html
-share/doc/html/gentle/html/prefix.html
-share/doc/html/gentle/html/previous.gif
-share/doc/html/gentle/html/primer.html
-share/doc/html/gentle/html/print.html
-share/doc/html/gentle/html/projects.html
-share/doc/html/gentle/html/references.html
-share/doc/html/gentle/html/reflex.html
-share/doc/html/gentle/html/reflexintro.html
-share/doc/html/gentle/html/reflexout.html
-share/doc/html/gentle/html/reflexuse.html
-share/doc/html/gentle/html/relations.html
-share/doc/html/gentle/html/rootmod.html
-share/doc/html/gentle/html/rules.html
-share/doc/html/gentle/html/rulesel.html
-share/doc/html/gentle/html/scopes.html
-share/doc/html/gentle/html/shallow.html
-share/doc/html/gentle/html/smart.html
-share/doc/html/gentle/html/sourcelang.html
-share/doc/html/gentle/html/special.html
-share/doc/html/gentle/html/srategy.html
-share/doc/html/gentle/html/stackcomp.html
-share/doc/html/gentle/html/start.html
-share/doc/html/gentle/html/strings.html
-share/doc/html/gentle/html/syndef.html
-share/doc/html/gentle/html/syntaxdescr.html
-share/doc/html/gentle/html/target.html
-share/doc/html/gentle/html/targetif.html
-share/doc/html/gentle/html/terms.html
-share/doc/html/gentle/html/thread.html
-share/doc/html/gentle/html/tokens.html
-share/doc/html/gentle/html/tools.gif
-share/doc/html/gentle/html/transf.html
-share/doc/html/gentle/html/traversal.html
-share/doc/html/gentle/html/trdesig.html
-share/doc/html/gentle/html/trexpr.html
-share/doc/html/gentle/html/trprocs.html
-share/doc/html/gentle/html/trstats.html
-share/doc/html/gentle/html/twophases.html
-share/doc/html/gentle/html/typedefs.html
-share/doc/html/gentle/html/unparsing.html
-share/doc/html/gentle/html/useclause.html
-share/doc/html/gentle/html/usingalt.html
-share/doc/html/gentle/html/usingoutput.html
-share/doc/html/gentle/html/usingterms.html
-share/doc/html/gentle/html/vars.html
-share/doc/html/gentle/html/wellformed.html
-share/doc/html/gentle/html/where.html
+share/doc/gentle/html/abstract.html
+share/doc/gentle/html/abstrsyn.html
+share/doc/gentle/html/accu.html
+share/doc/gentle/html/actgram.html
+share/doc/gentle/html/alternative.html
+share/doc/gentle/html/at.html
+share/doc/gentle/html/attr.html
+share/doc/gentle/html/aux.html
+share/doc/gentle/html/basictp.html
+share/doc/gentle/html/bodies.html
+share/doc/gentle/html/braodcast.html
+share/doc/gentle/html/cabstrsyn.html
+share/doc/gentle/html/calculator.html
+share/doc/gentle/html/casestudy.html
+share/doc/gentle/html/codegen.html
+share/doc/gentle/html/codegenexpr.html
+share/doc/gentle/html/codegenspec.html
+share/doc/gentle/html/combined.html
+share/doc/gentle/html/compiler.html
+share/doc/gentle/html/compuations.html
+share/doc/gentle/html/concrsyn.html
+share/doc/gentle/html/conditional.html
+share/doc/gentle/html/conditions.html
+share/doc/gentle/html/control.html
+share/doc/gentle/html/coord.html
+share/doc/gentle/html/costdriven.html
+share/doc/gentle/html/cs2as.html
+share/doc/gentle/html/data.html
+share/doc/gentle/html/dataflow.html
+share/doc/gentle/html/defaultrule.html
+share/doc/gentle/html/descrtok.html
+share/doc/gentle/html/descrwhite.html
+share/doc/gentle/html/disjunct.html
+share/doc/gentle/html/elements.html
+share/doc/gentle/html/errmsg.html
+share/doc/gentle/html/export.html
+share/doc/gentle/html/external.html
+share/doc/gentle/html/extpred.html
+share/doc/gentle/html/exttypes.html
+share/doc/gentle/html/failure.html
+share/doc/gentle/html/firstex.html
+share/doc/gentle/html/generating.html
+share/doc/gentle/html/glance.html
+share/doc/gentle/html/global.html
+share/doc/gentle/html/idents.html
+share/doc/gentle/html/implc.html
+share/doc/gentle/html/index.html
+share/doc/gentle/html/installation.html
+share/doc/gentle/html/instr.html
+share/doc/gentle/html/joker.html
+share/doc/gentle/html/libintro.html
+share/doc/gentle/html/library.html
+share/doc/gentle/html/lrm.html
+share/doc/gentle/html/lrmcateg.html
+share/doc/gentle/html/lrmexpr.html
+share/doc/gentle/html/lrmintro.html
+share/doc/gentle/html/lrmmemebers.html
+share/doc/gentle/html/lrmmodules.html
+share/doc/gentle/html/lrmpatterns.html
+share/doc/gentle/html/lrmpredef.html
+share/doc/gentle/html/lrmpredicates.html
+share/doc/gentle/html/lrmroot.html
+share/doc/gentle/html/lrmspec.html
+share/doc/gentle/html/lrmsyntax.html
+share/doc/gentle/html/lrmtables.html
+share/doc/gentle/html/lrmtypes.html
+share/doc/gentle/html/lrmvars.html
+share/doc/gentle/html/lrmvoc.html
+share/doc/gentle/html/machine.html
+share/doc/gentle/html/macine.html
+share/doc/gentle/html/main.html
+share/doc/gentle/html/mlexpr.html
+share/doc/gentle/html/mlio.html
+share/doc/gentle/html/mlprogs.html
+share/doc/gentle/html/mlstmts.html
+share/doc/gentle/html/mlsummary.html
+share/doc/gentle/html/mltypes.html
+share/doc/gentle/html/mlvars.html
+share/doc/gentle/html/mlvoc.html
+share/doc/gentle/html/modulename.html
+share/doc/gentle/html/mutable.html
+share/doc/gentle/html/named.html
+share/doc/gentle/html/next.gif
+share/doc/gentle/html/nondeterministic.html
+share/doc/gentle/html/nonterms.html
+share/doc/gentle/html/optimal.html
+share/doc/gentle/html/output.html
+share/doc/gentle/html/overall.html
+share/doc/gentle/html/parser.html
+share/doc/gentle/html/patterns.html
+share/doc/gentle/html/preddcl.html
+share/doc/gentle/html/predefined.html
+share/doc/gentle/html/prediwhere.html
+share/doc/gentle/html/preface.html
+share/doc/gentle/html/prefix.html
+share/doc/gentle/html/previous.gif
+share/doc/gentle/html/primer.html
+share/doc/gentle/html/print.html
+share/doc/gentle/html/projects.html
+share/doc/gentle/html/references.html
+share/doc/gentle/html/reflex.html
+share/doc/gentle/html/reflexintro.html
+share/doc/gentle/html/reflexout.html
+share/doc/gentle/html/reflexuse.html
+share/doc/gentle/html/relations.html
+share/doc/gentle/html/rootmod.html
+share/doc/gentle/html/rules.html
+share/doc/gentle/html/rulesel.html
+share/doc/gentle/html/scopes.html
+share/doc/gentle/html/shallow.html
+share/doc/gentle/html/smart.html
+share/doc/gentle/html/sourcelang.html
+share/doc/gentle/html/special.html
+share/doc/gentle/html/srategy.html
+share/doc/gentle/html/stackcomp.html
+share/doc/gentle/html/start.html
+share/doc/gentle/html/strings.html
+share/doc/gentle/html/syndef.html
+share/doc/gentle/html/syntaxdescr.html
+share/doc/gentle/html/target.html
+share/doc/gentle/html/targetif.html
+share/doc/gentle/html/terms.html
+share/doc/gentle/html/thread.html
+share/doc/gentle/html/tokens.html
+share/doc/gentle/html/tools.gif
+share/doc/gentle/html/transf.html
+share/doc/gentle/html/traversal.html
+share/doc/gentle/html/trdesig.html
+share/doc/gentle/html/trexpr.html
+share/doc/gentle/html/trprocs.html
+share/doc/gentle/html/trstats.html
+share/doc/gentle/html/twophases.html
+share/doc/gentle/html/typedefs.html
+share/doc/gentle/html/unparsing.html
+share/doc/gentle/html/useclause.html
+share/doc/gentle/html/usingalt.html
+share/doc/gentle/html/usingoutput.html
+share/doc/gentle/html/usingterms.html
+share/doc/gentle/html/vars.html
+share/doc/gentle/html/wellformed.html
+share/doc/gentle/html/where.html
 share/examples/gentle/README
 share/examples/gentle/calc/Number.t
 share/examples/gentle/calc/build