summaryrefslogtreecommitdiff
path: root/mk/plist
diff options
context:
space:
mode:
authorjoerg <joerg>2009-06-14 22:57:58 +0000
committerjoerg <joerg>2009-06-14 22:57:58 +0000
commit9e5abac2231c8933a844b631489453a9b2ee32c7 (patch)
tree63741286465d08baa5292031d5f6b9ffd847c5b9 /mk/plist
parentff7d16fdff9f2bce4cdae576fad91cda40b48b97 (diff)
downloadpkgsrc-9e5abac2231c8933a844b631489453a9b2ee32c7.tar.gz
Remove @dirrm related logic.
Diffstat (limited to 'mk/plist')
-rw-r--r--mk/plist/plist-info.awk5
-rw-r--r--mk/plist/plist-man.awk5
2 files changed, 2 insertions, 8 deletions
diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk
index 1f4d943af47..237f194f32a 100644
--- a/mk/plist/plist-info.awk
+++ b/mk/plist/plist-info.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-info.awk,v 1.15 2006/06/01 07:11:09 rillig Exp $
+# $NetBSD: plist-info.awk,v 1.16 2009/06/14 22:58:05 joerg Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -78,9 +78,6 @@ BEGIN {
sub("^" PKGINFODIR "/", "info/")
}
($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \
-($0 ~ "^@dirrm " PKGINFODIR "$") {
- sub(PKGINFODIR "$", "info")
-}
###
### Canonicalize info page entries by stripping any ".gz" suffixes.
diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk
index f3caba80947..a9ef60bd190 100644
--- a/mk/plist/plist-man.awk
+++ b/mk/plist/plist-man.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-man.awk,v 1.5 2006/02/07 18:43:02 jlam Exp $
+# $NetBSD: plist-man.awk,v 1.6 2009/06/14 22:58:05 joerg Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -142,6 +142,3 @@ BEGIN {
/^man\/([^\/]*\/)?(man[1-9ln]\/[^\/]*\.[1-9ln]|cat[1-9ln]\/[^\/]*\.[0-9])/ {
sub("^man/", PKGMANDIR "/")
}
-/^@dirrm man\/([^\/]*\/)?(man[1-9ln]|cat[1-9ln])/ {
- sub("^@dirrm man/", "@dirrm " PKGMANDIR "/")
-}