diff options
author | joerg <joerg@pkgsrc.org> | 2009-06-14 22:57:58 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2009-06-14 22:57:58 +0000 |
commit | 9bb0d96ea93fe7d169bb22cd824d463449d51611 (patch) | |
tree | 63741286465d08baa5292031d5f6b9ffd847c5b9 /mk | |
parent | dc3a8c2312879451e787a3a002089e0123c0d646 (diff) | |
download | pkgsrc-9bb0d96ea93fe7d169bb22cd824d463449d51611.tar.gz |
Remove @dirrm related logic.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/alternatives.mk | 3 | ||||
-rw-r--r-- | mk/java-env.mk | 3 | ||||
-rw-r--r-- | mk/omf-scrollkeeper.mk | 6 | ||||
-rw-r--r-- | mk/plist/plist-info.awk | 5 | ||||
-rw-r--r-- | mk/plist/plist-man.awk | 5 |
5 files changed, 5 insertions, 17 deletions
diff --git a/mk/alternatives.mk b/mk/alternatives.mk index 0f8213c4adb..47c1b05a258 100644 --- a/mk/alternatives.mk +++ b/mk/alternatives.mk @@ -1,4 +1,4 @@ -# $NetBSD: alternatives.mk,v 1.10 2007/09/29 15:56:04 rillig Exp $ +# $NetBSD: alternatives.mk,v 1.11 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment handles the alternatives system, registering a # package in the database. @@ -61,7 +61,6 @@ ${WRKDIR}/.altdeinstall: ${ALTERNATIVES_SRC} } >${WRKDIR}/.altdeinstall PRINT_PLIST_AWK+= /^libdata\/alternatives\// { next; } -PRINT_PLIST_AWK+= /^@dirrm libdata\/alternatives/ { next; } EVAL_PREFIX+= PREFIX.pkg_alternatives=pkg_alternatives PREFIX.alternatives_DEFAULT= ${LOCALBASE} diff --git a/mk/java-env.mk b/mk/java-env.mk index b752d81e180..b23fa9ff129 100644 --- a/mk/java-env.mk +++ b/mk/java-env.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-env.mk,v 1.11 2007/11/09 00:49:54 joerg Exp $ +# $NetBSD: java-env.mk,v 1.12 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment handles Java wrappers and is meant to be included # by packages that provide a Java build-time and/or run-time environment. @@ -92,7 +92,6 @@ install-java-wrapper-${w}: # Handle the ${PREFIX}/java shared directory automatically. REQD_DIRS+= ${PREFIX}/java -PRINT_PLIST_AWK+= /^@dirrm java$$/ { next; } PLIST_SUBST+= JAVA_HOME=${JAVA_HOME:Q} FILES_SUBST+= JAVA_HOME=${JAVA_HOME:Q} diff --git a/mk/omf-scrollkeeper.mk b/mk/omf-scrollkeeper.mk index e1d7c9a19ae..2248c2eb681 100644 --- a/mk/omf-scrollkeeper.mk +++ b/mk/omf-scrollkeeper.mk @@ -1,4 +1,4 @@ -# $NetBSD: omf-scrollkeeper.mk,v 1.1 2007/11/12 20:45:52 drochner Exp $ +# $NetBSD: omf-scrollkeeper.mk,v 1.2 2009/06/14 22:58:05 joerg Exp $ # # This Makefile fragment is intended to be included by packages that install # OMF files. It redirects callers to compatibility scripts provided @@ -31,10 +31,6 @@ FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q} FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q} FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q} -PRINT_PLIST_AWK+= /^@dirrm share\/omf$$/ \ - { print "@comment in rarian: " $$0; \ - next; } - .include "../../textproc/rarian/buildlink3.mk" .endif # SCROLLKEEPER_OMF_MK 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 "/") -} |