diff options
| author | reed <reed@pkgsrc.org> | 2005-10-04 16:45:25 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2005-10-04 16:45:25 +0000 |
| commit | 8f1da2c3e0093b90510581a0a6375bb94b4314da (patch) | |
| tree | 6f2b25307adcc3cc2ad223348f74d86abc979c8e /mk | |
| parent | 4549bf8eb0cb248a2a635a6c3dd4d505da7ab050 (diff) | |
| download | pkgsrc-8f1da2c3e0093b90510581a0a6375bb94b4314da.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 38111db029d..1c8cc533210 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ real-su-install: ${MESSAGE} # ${_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_MANINSTALL= \ # 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"; \ } |