[pkgsrc/trunk]: pkgsrc/shells/bash2-doc shells/bash2-doc: fix location of HTM...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/350fa4465fb7
branches:  trunk
changeset: 415728:350fa4465fb7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 12 20:51:48 2019 +0000

description:
shells/bash2-doc: fix location of HTML documentation

diffstat:

 shells/bash2-doc/Makefile |  17 +++++------------
 shells/bash2-doc/PLIST    |   6 +++---
 2 files changed, 8 insertions(+), 15 deletions(-)

diffs (50 lines):

diff -r 2aecae0feefb -r 350fa4465fb7 shells/bash2-doc/Makefile
--- a/shells/bash2-doc/Makefile Sat Oct 12 20:47:00 2019 +0000
+++ b/shells/bash2-doc/Makefile Sat Oct 12 20:51:48 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:25 agc Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/12 20:51:48 rillig Exp $
 
 DISTNAME=      bash-doc-2.05b
 PKGNAME=       bash-doc-2.05.2
+PKGREVISION=   1
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GNU:=bash/}
 MASTER_SITES+= ftp://ftp.cwru.edu/pub/bash/
@@ -19,20 +20,12 @@
 USE_TOOLS+=    gzip
 
 DOCDIR=                ${PREFIX}/share/doc/bash
-HTMLDIR=       ${PREFIX}/share/doc/html/bash
+DOCDIR_FILES=  article.ps bashref.ps article.txt bash.html bashref.html
 
-INSTALLATION_DIRS=     ${DOCDIR} ${HTMLDIR}
+INSTALLATION_DIRS=     ${DOCDIR}
 
 do-install:
-       ${INSTALL_MAN}                                                  \
-               ${WRKSRC}/article.ps                                    \
-               ${WRKSRC}/bashref.ps                                    \
-               ${WRKSRC}/article.txt                                   \
-               ${DESTDIR}${PREFIX}/share/doc/bash
-       ${INSTALL_MAN}                                                  \
-               ${WRKSRC}/bash.html                                     \
-               ${WRKSRC}/bashref.html                                  \
-               ${DESTDIR}${HTMLDIR}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${DOCDIR_FILES} ${DESTDIR}${DOCDIR}
        ${GZIP_CMD} ${DESTDIR}${DOCDIR}/*.ps
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2aecae0feefb -r 350fa4465fb7 shells/bash2-doc/PLIST
--- a/shells/bash2-doc/PLIST    Sat Oct 12 20:47:00 2019 +0000
+++ b/shells/bash2-doc/PLIST    Sat Oct 12 20:51:48 2019 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:14:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/12 20:51:48 rillig Exp $
 share/doc/bash/article.ps.gz
 share/doc/bash/article.txt
+share/doc/bash/bash.html
+share/doc/bash/bashref.html
 share/doc/bash/bashref.ps.gz
-share/doc/html/bash/bash.html
-share/doc/html/bash/bashref.html