diff options
author | agc <agc@pkgsrc.org> | 1998-06-22 09:12:48 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 1998-06-22 09:12:48 +0000 |
commit | dff3f19af74998098430f1fb6d28f8298be5b3d2 (patch) | |
tree | 66eefd91044fa4558db33aa5f41ccc63c77f2ca0 /mk | |
parent | fe5c54148548dd17d3df65f844e2a00936f3169e (diff) | |
download | pkgsrc-dff3f19af74998098430f1fb6d28f8298be5b3d2.tar.gz |
Use one gonzo regular expression to recognise man and catman pages.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f99686f455a..2161c209c5c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.102 1998/06/20 14:01:28 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.103 1998/06/22 09:12:48 agc Exp $ # # This file is in the public domain. # @@ -1077,12 +1077,13 @@ _PORT_USE: .USE .endfor .endif # !MANCOMPRESSED && MANZ .else - @(newmanpages=`/usr/bin/egrep '^man/([^/]*/)?man[1-9ln]/.*\.[1-9ln](\.gz)?' ${PLIST_SRC} || /usr/bin/true`; \ - newcatpages=`/usr/bin/egrep '^man/([^/]*/)?cat[1-9ln]/.*\.0(\.gz)?' ${PLIST_SRC} || /usr/bin/true`; \ + @(newmanpages=`/usr/bin/egrep \ + '^([^/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.0)(\.gz)?$$' \ + ${PLIST_SRC} || /usr/bin/true`; \ if [ X"${MANCOMPRESSED}" != X"" -a X"${MANZ}" = X"" ]; then \ ${ECHO_MSG} "===> [Automatic manual page handling]"; \ ${ECHO_MSG} "===> Decompressing manual pages for ${PKGNAME}"; \ - for manpage in $$newmanpages $$newcatpages; do \ + for manpage in $$newmanpages; do \ manpage=`${ECHO} $$manpage | ${SED} -e 's|\.gz$$||'`; \ ${GUNZIP_CMD} ${PREFIX}/$$manpage.gz; \ if [ X"${PKG_VERBOSE}" != X"" ]; then \ @@ -1093,7 +1094,7 @@ _PORT_USE: .USE if [ X"${MANCOMPRESSED}" = X"" -a X"${MANZ}" != X"" ]; then \ ${ECHO_MSG} "===> [Automatic manual page handling]"; \ ${ECHO_MSG} "===> Compressing manual pages for ${PKGNAME}"; \ - for manpage in $$newmanpages $$newcatpages; do \ + for manpage in $$newmanpages; do \ manpage=`${ECHO} $$manpage | ${SED} -e 's|\.gz$$||'`; \ if [ -L ${PREFIX}/$$manpage ]; then \ set - `${FILE} ${PREFIX}/$$manpage`; \ |