use DOCSDIR + some cleaning.

PR:		ports/65412
Submitted by:	maintainer
Approved by:	pav (mentor)

3 files changed, 28 insertions, 51 deletions

diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 1346d332b093..12b0f49f36d1 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -23,31 +23,35 @@ GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 MAN1=		wgoto.1 win.1 wreplace.1 Tag.1 mktags.1 Man.1
 
-# Run the configure script in the tools directory.
-post-configure:
-	${RM} ${WRKSRC}/tools/win/config.cache
-	cd ${WRKSRC}/tools/win; ./configure
-
-WILYDOCDIR=	${PREFIX}/share/doc/wily
-WILYTUTEDIR=	${WILYDOCDIR}/tute
-WILYDOCFILES=	index.html intro.html download.html credits.html FAQ.html \
+PORTDOCS=	index.html intro.html download.html credits.html FAQ.html \
 		onepage.html user.html idioms.html C.html python.html \
 		hack.html AcmeVsWily.html Tcl.html \
 		pythonpaper.html winmanager.html auug.html one.html \
 		example.gif thumb.gif cartoon.gif \
 		FAQ.txt Tcl.txt changes.txt perl.txt \
-		Credits fonts mouse\
-		tute/findword tute/script tute/start tute/hello.c \
-		tute/send_to_gary
+		Credits fonts mouse
+TUTEDOCS=	hello.c start typescript
+TUTESHS=	findword script send_to_gary
+
+# Run the configure script in the tools directory.
+post-configure:
+	@${RM} ${WRKSRC}/tools/win/config.cache
+	cd ${WRKSRC}/tools/win; ./configure
 
 # The default Wily makefile does not install any documentation.  Rectify.
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/wily
+	@${STRIP_CMD} ${PREFIX}/bin/wily
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${WILYDOCDIR} ${WILYTUTEDIR}
-	set -e; for f in ${WILYDOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/Doc/$${f} ${WILYDOCDIR}/$${f}; \
-	done
+	@${MKDIR} ${DOCSDIR}/tute
+. for doc in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/Doc/${doc} ${DOCSDIR}
+. endfor
+. for doc in ${TUTEDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/Doc/tute/${doc} ${DOCSDIR}/tute
+. endfor
+. for doc in ${TUTESHS}
+	@${INSTALL_SCRIPT} ${WRKSRC}/Doc/tute/${doc} ${DOCSDIR}/tute
+. endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/editors/wily/pkg-message b/editors/wily/pkg-message
index ef4430b6ba0a..9b9f460f7181 100644
--- a/editors/wily/pkg-message
+++ b/editors/wily/pkg-message
@@ -6,4 +6,4 @@ Please refer to their manual pages for information on their use.
 
 The wily(1) manual page has not been installed because it's out-of-date.
 
-Please refer to "${PREFIX}/share/doc/wily/documentation".
+Please refer to "${PREFIX}/share/doc/wily/" documentation.
diff --git a/editors/wily/pkg-plist b/editors/wily/pkg-plist
index 976934985599..6bd7df58074d 100644
--- a/editors/wily/pkg-plist
+++ b/editors/wily/pkg-plist
@@ -5,37 +5,10 @@ bin/wgoto
 bin/wily
 bin/win
 bin/wreplace
-share/doc/wily/index.html
-share/doc/wily/intro.html
-share/doc/wily/download.html
-share/doc/wily/credits.html
-share/doc/wily/FAQ.html
-share/doc/wily/onepage.html
-share/doc/wily/user.html
-share/doc/wily/idioms.html
-share/doc/wily/C.html
-share/doc/wily/python.html
-share/doc/wily/hack.html
-share/doc/wily/AcmeVsWily.html
-share/doc/wily/Tcl.html
-share/doc/wily/pythonpaper.html
-share/doc/wily/winmanager.html
-share/doc/wily/auug.html
-share/doc/wily/one.html
-share/doc/wily/example.gif
-share/doc/wily/thumb.gif
-share/doc/wily/cartoon.gif
-share/doc/wily/FAQ.txt
-share/doc/wily/Tcl.txt
-share/doc/wily/changes.txt
-share/doc/wily/perl.txt
-share/doc/wily/Credits
-share/doc/wily/fonts
-share/doc/wily/mouse
-share/doc/wily/tute/findword
-share/doc/wily/tute/script
-share/doc/wily/tute/start
-share/doc/wily/tute/hello.c
-share/doc/wily/tute/send_to_gary
-@dirrm share/doc/wily/tute
-@dirrm share/doc/wily
+%%PORTDOCS%%%%DOCSDIR%%/tute/findword
+%%PORTDOCS%%%%DOCSDIR%%/tute/hello.c
+%%PORTDOCS%%%%DOCSDIR%%/tute/script
+%%PORTDOCS%%%%DOCSDIR%%/tute/send_to_gary
+%%PORTDOCS%%%%DOCSDIR%%/tute/start
+%%PORTDOCS%%%%DOCSDIR%%/tute/typescript
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tute