CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jul 26 08:41:36 UTC 2016

Modified Files:
        pkgsrc/mk/install: install.mk
        pkgsrc/mk/plist: plist-man.awk

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


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/mk/install/install.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mk/plist/plist-man.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/install/install.mk
diff -u pkgsrc/mk/install/install.mk:1.68 pkgsrc/mk/install/install.mk:1.69
--- pkgsrc/mk/install/install.mk:1.68   Sun Apr 10 15:58:02 2016
+++ pkgsrc/mk/install/install.mk        Tue Jul 26 08:41:36 2016
@@ -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 @@ install-strip-debug: plist
 _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}                                 \

Index: pkgsrc/mk/plist/plist-man.awk
diff -u pkgsrc/mk/plist/plist-man.awk:1.11 pkgsrc/mk/plist/plist-man.awk:1.12
--- pkgsrc/mk/plist/plist-man.awk:1.11  Mon Apr 11 12:29:53 2016
+++ pkgsrc/mk/plist/plist-man.awk       Tue Jul 26 08:41:36 2016
@@ -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 @@ BEGIN {
        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 ")"
 }