[pkgsrc/trunk]: pkgsrc/mk Support NetBSD man/html entries. Fixes deforaos-*.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14ced46cb039
branches:  trunk
changeset: 350343:14ced46cb039
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 26 08:41:36 2016 +0000

description:
Support NetBSD man/html entries.  Fixes deforaos-*.

diffstat:

 mk/install/install.mk  |  4 ++--
 mk/plist/plist-man.awk |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 07faa14fe833 -r 14ced46cb039 mk/install/install.mk
--- a/mk/install/install.mk     Tue Jul 26 08:19:45 2016 +0000
+++ b/mk/install/install.mk     Tue Jul 26 08:41:36 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.68 2016/04/10 15:58:02 joerg Exp $
+# $NetBSD: install.mk,v 1.69 2016/07/26 08:41:36 jperkin Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -342,7 +342,7 @@
 _PLIST_REGEXP.info=    \
        ^([^\/]*\/)*${PKGINFODIR}/[^/]*(\.info)?(-[0-9]+)?(\.gz)?$$
 _PLIST_REGEXP.man=     \
-       ^([^/]*/)+(man[1-9ln](am|f)?/[^/]*\.[1-9ln](am|f)?|cat[1-9ln](am|f)?/[^/]*\.[0-9])(\.gz)?$$
+       ^([^/]*/)+((man|html)[1-9ln](am|f)?/[^/]*\.([1-9ln](am|f)?|html)|cat[1-9ln](am|f)?/[^/]*\.[0-9])(\.gz)?$$
 
 _DOC_COMPRESS=                                                         \
        ${PKGSRC_SETENV} PATH=${PATH:Q}                                 \
diff -r 07faa14fe833 -r 14ced46cb039 mk/plist/plist-man.awk
--- a/mk/plist/plist-man.awk    Tue Jul 26 08:19:45 2016 +0000
+++ b/mk/plist/plist-man.awk    Tue Jul 26 08:41:36 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist-man.awk,v 1.11 2016/04/11 12:29:53 jperkin Exp $
+# $NetBSD: plist-man.awk,v 1.12 2016/07/26 08:41:36 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -77,7 +77,7 @@
        PKGMANDIR = getenv("PKGMANDIR", "man")
        CATMAN_SECTION_SUFFIX = getenv("CATMAN_SECTION_SUFFIX", "no")
        CATPAGE_REGEX = "cat[1-9ln](am|f)?/[^/]*\\.[0-9ln](am|f)?"
-       MANPAGE_REGEX = "man[1-9ln](am|f)?/[^/]*\\.[1-9ln](am|f)?"
+       MANPAGE_REGEX = "(man|html)[1-9ln](am|f)?/[^/]*\\.([1-9ln](am|f)?|html)"
        CATORMAN_REGEX = "(" MANPAGE_REGEX "|" CATPAGE_REGEX ")"
 }