pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/plist Don't generate @dirrm lines in print-PLIST, s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/607d8421c840
branches:  trunk
changeset: 394642:607d8421c840
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 14 17:12:03 2009 +0000

description:
Don't generate @dirrm lines in print-PLIST, switch @exec mkdir lines to
@pkgdir.

diffstat:

 mk/plist/print-plist.mk |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r c30e822e5bd9 -r 607d8421c840 mk/plist/print-plist.mk
--- a/mk/plist/print-plist.mk   Sun Jun 14 15:17:10 2009 +0000
+++ b/mk/plist/print-plist.mk   Sun Jun 14 17:12:03 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: print-plist.mk,v 1.17 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: print-plist.mk,v 1.18 2009/06/14 17:12:03 joerg Exp $
 
 ###
 ### Automatic PLIST generation
 ###  - files & symlinks first
-###  - @dirrm statements last
 ###  - empty directories are handled properly
 ###  - dirs from mtree files are excluded
 ###  - substitute for platform or package specifics substrings
@@ -33,7 +32,6 @@
        gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}");                        \
        gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\
        gsub(/^${PKGLOCALEDIR}\/locale/, "share/locale");               \
-       gsub(/^@dirrm ${PKGLOCALEDIR}\/locale/, "@dirrm share/locale"); \
        gsub("^${PKGINFODIR}/", "info/");                               \
        gsub("^${PKGMANDIR}/", "man/");
 _PRINT_PLIST_AWK_SUBST+=}
@@ -189,13 +187,10 @@
                                ${_PRINT_PLIST_COMMON_DIRS}'` ;         \
        do                                                              \
                if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \
-                       ${ECHO} @exec \$${MKDIR} %D/$$i | ${AWK} '      \
+                       ${ECHO} @pkgdir $$i | ${AWK} '                  \
                        ${PRINT_PLIST_AWK}                              \
                        { print $$0; }' ;                               \
                fi ;                                                    \
-               ${ECHO} @dirrm $$i | ${AWK} '                           \
-                       ${PRINT_PLIST_AWK}                              \
-                       { print $$0; }' ;                               \
        done                                                            \
        | ${AWK} '${_PRINT_PLIST_AWK_SUBST} { print $$0; }'
 .endif # target(print-PLIST)



Home | Main Index | Thread Index | Old Index