[pkgsrc/trunk]: pkgsrc/mk/plist Kill more @dirrm logic.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec384430fc1d
branches:  trunk
changeset: 394756:ec384430fc1d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 14 23:10:39 2009 +0000

description:
Kill more @dirrm logic.

diffstat:

 mk/plist/plist-info.awk   |   7 +------
 mk/plist/plist-locale.awk |   6 +-----
 mk/plist/plist-man.awk    |  10 +---------
 3 files changed, 3 insertions(+), 20 deletions(-)

diffs (73 lines):

diff -r 173e538368b7 -r ec384430fc1d mk/plist/plist-info.awk
--- a/mk/plist/plist-info.awk   Sun Jun 14 23:03:21 2009 +0000
+++ b/mk/plist/plist-info.awk   Sun Jun 14 23:10:39 2009 +0000
@@ -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 @@
 ($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 @@
        }
        next
 }
-($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \
-($0 ~ "^@dirrm info$") {
-       sub("info$", PKGINFODIR)
-}
diff -r 173e538368b7 -r ec384430fc1d mk/plist/plist-locale.awk
--- a/mk/plist/plist-locale.awk Sun Jun 14 23:03:21 2009 +0000
+++ b/mk/plist/plist-locale.awk Sun Jun 14 23:10:39 2009 +0000
@@ -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 @@
 /^share\/locale\// {
        sub("^share", PKGLOCALEDIR)
 }
-(USE_PKGLOCALEDIR ~ /[yY][eE][sS]/) && \
-/^@dirrm share\/locale\// {
-       sub("^@dirrm share", "@dirrm " PKGLOCALEDIR)
-}
diff -r 173e538368b7 -r ec384430fc1d mk/plist/plist-man.awk
--- a/mk/plist/plist-man.awk    Sun Jun 14 23:03:21 2009 +0000
+++ b/mk/plist/plist-man.awk    Sun Jun 14 23:10:39 2009 +0000
@@ -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 @@
        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 @@
        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