[pkgsrc/trunk]: pkgsrc/mk In man page routines, match the "cat" sub-directories

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1ee0bc57f63
branches:  trunk
changeset: 500232:d1ee0bc57f63
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Oct 04 16:45:25 2005 +0000

description:
In man page routines, match the "cat" sub-directories
for cat pages having "[0-9]" suffixes instead of just "0".
Some systems install cat pages with suffix number same as the cat
section number.

(This has been in my pkgsrc tree for probably a couple years,
but looking today, I do see man/cat1/ftp.1 on one of my systems.)

diffstat:

 mk/bsd.pkg.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 8fe384362d62 -r d1ee0bc57f63 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Oct 04 16:45:03 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Oct 04 16:45:25 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1720 2005/09/28 08:24:52 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1721 2005/10/04 16:45:25 reed Exp $
 #
 # This file is in the public domain.
 #
@@ -2128,7 +2128,7 @@
                #
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PLIST}
        ${_PKG_SILENT}${_PKG_DEBUG}newmanpages=`${EGREP} -h             \
-               '^([^@/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.0)(\.gz)?$$' \
+               '^([^@/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.[0-9])(\.gz)?$$' \
                ${PLIST} 2>/dev/null || ${TRUE}`;                       \
        if [ "${_MANCOMPRESSED}" = "yes" -a "${_MANZ}" != "yes" ]; then \
                ${ECHO_MSG} "${_PKGSRC_IN}> [Automatic manual page handling]";  \
@@ -4507,13 +4507,13 @@
 # plist awk pattern-action statement to strip '.gz' from man
 # entries
 _PLIST_AWK_STRIP_MANZ=                                                 \
-/^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*0)\.gz$$/ { \
+/^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*[0-9])\.gz$$/ { \
        $$0 = substr($$0, 1, length($$0) - 3);                          \
 }
 
 # plist awk pattern-action statement to add '.gz' to man entries
 _PLIST_AWK_ADD_MANZ=                                                   \
-/^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*0)$$/ { \
+/^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*[0-9])$$/ { \
        $$0 = $$0 ".gz";                                                \
 }