diff options
| author | joerg <joerg@pkgsrc.org> | 2009-06-14 23:10:39 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-06-14 23:10:39 +0000 |
| commit | b41847e7bfd0315b11d5241f72a24e2ef5133534 (patch) | |
| tree | eb7bc70619f13a561f010bb6ae0ffd385701b9da /mk | |
| parent | 4ba971d1772d7f711cf51eda35ba5974ec87c3bd (diff) | |
| download | pkgsrc-b41847e7bfd0315b11d5241f72a24e2ef5133534.tar.gz | |
Kill more @dirrm logic.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/plist/plist-info.awk | 7 | ||||
| -rw-r--r-- | mk/plist/plist-locale.awk | 6 | ||||
| -rw-r--r-- | mk/plist/plist-man.awk | 10 |
3 files changed, 3 insertions, 20 deletions
diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk index 237f194f32a..559bdbd4a39 100644 --- a/mk/plist/plist-info.awk +++ b/mk/plist/plist-info.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-info.awk,v 1.16 2009/06/14 22:58:05 joerg Exp $ +# $NetBSD: plist-info.awk,v 1.17 2009/06/14 23:10:39 joerg Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -77,7 +77,6 @@ BEGIN { ($0 ~ "^" PKGINFODIR "/[^/]+(\\.info)?(-[0-9]+)?(\\.gz)?$") { sub("^" PKGINFODIR "/", "info/") } -($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \ ### ### Canonicalize info page entries by stripping any ".gz" suffixes. @@ -130,7 +129,3 @@ BEGIN { } next } -($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \ -($0 ~ "^@dirrm info$") { - sub("info$", PKGINFODIR) -} diff --git a/mk/plist/plist-locale.awk b/mk/plist/plist-locale.awk index ec914ecb718..81375431310 100644 --- a/mk/plist/plist-locale.awk +++ b/mk/plist/plist-locale.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-locale.awk,v 1.2 2006/04/17 06:30:48 jlam Exp $ +# $NetBSD: plist-locale.awk,v 1.3 2009/06/14 23:10:39 joerg Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -56,7 +56,3 @@ BEGIN { /^share\/locale\// { sub("^share", PKGLOCALEDIR) } -(USE_PKGLOCALEDIR ~ /[yY][eE][sS]/) && \ -/^@dirrm share\/locale\// { - sub("^@dirrm share", "@dirrm " PKGLOCALEDIR) -} diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk index a9ef60bd190..486b40d0c14 100644 --- a/mk/plist/plist-man.awk +++ b/mk/plist/plist-man.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-man.awk,v 1.6 2009/06/14 22:58:05 joerg Exp $ +# $NetBSD: plist-man.awk,v 1.7 2009/06/14 23:10:39 joerg Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -90,10 +90,6 @@ BEGIN { sub("[0-9ln]$", section, components[n]) $0 = join(components, 1, n, "/") } -(IMAKE_MANINSTALL == "maninstall") && \ -/^@dirrm ([^\/]*\/)+cat[1-9ln]/ { - next -} ### ### Rewrite "imake-installed" man pages as catman pages if imake only @@ -107,10 +103,6 @@ BEGIN { sub("[0-9ln]$", section, components[n]) $0 = join(components, 1, n, "/") } -(IMAKE_MANINSTALL == "catinstall") && \ -/^@dirrm ([^\/]*\/)+man[1-9ln]/ { - next -} ### ### If MANINSTALL doesn't contain "maninstall", then strip out man page |