[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Make sure requires and libs (PROVIDES) a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61688693eb29
branches:  trunk
changeset: 517104:61688693eb29
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Aug 04 14:11:29 2006 +0000

description:
Make sure requires and libs (PROVIDES) are set for
packages that use a sub-directory for prefix, like
/usr/pkg/qt3/.

(I have been using this for a couple years but recently
merged my patch over to new flavor mk file.)

Okayed by jlam on tech-pkg.

diffstat:

 mk/flavor/pkg/metadata.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 94b2091563d3 -r 61688693eb29 mk/flavor/pkg/metadata.mk
--- a/mk/flavor/pkg/metadata.mk Fri Aug 04 13:22:11 2006 +0000
+++ b/mk/flavor/pkg/metadata.mk Fri Aug 04 14:11:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.9 2006/07/27 22:16:06 jlam Exp $
+# $NetBSD: metadata.mk,v 1.10 2006/08/04 14:11:29 reed Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -61,14 +61,14 @@
        "")     ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
        *)      ldd=${LDD:Q} ;;                                         \
        esac;                                                           \
-       bins=`${AWK} '/^(bin|sbin|libexec)\// { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
+       bins=`${AWK} '/(^|\/)(bin|sbin|libexec)\// { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
        case ${OBJECT_FMT:Q}"" in                                       \
        ELF)                                                            \
-               libs=`${AWK} '/^lib\/lib.*\.so\.[0-9]+$$/ { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
+               libs=`${AWK} '/(^|\/)lib\/lib.*\.so\.[0-9]+$$/ { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
                if ${TEST} -n "$$bins" -o -n "$$libs"; then             \
                        requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
                fi;                                                     \
-               linklibs=`${AWK} '/^[^@].*\.so\.[0-9\.]+$$/ { print "${PREFIX}/" $$0 }' ${PLIST}`; \
+               linklibs=`${AWK} '/[^@].*\.so\.[0-9\.]+$$/ { print "${PREFIX}/" $$0 }' ${PLIST}`; \
                for i in $$linklibs; do                                 \
                        if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then \
                                ${TEST} ${PKG_DEVELOPER:Uno:Q} = "no" || \
@@ -78,7 +78,7 @@
                done;                                                   \
                ;;                                                      \
        Mach-O)                                                         \
-               libs=`${AWK} '/^lib\/lib.*\.dylib/ { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
+               libs=`${AWK} '/(^|\/)lib\/lib.*\.dylib/ { print "${PREFIX}/" $$0 } END { exit 0 }' ${PLIST}`; \
                if ${TEST} "$$bins" != "" -o "$$libs" != ""; then       \
                        requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '/compatibility version/ { print $$1 }' | ${SORT} -u`; \
                fi;                                                     \