[pkgsrc/trunk]: pkgsrc/mk Put back LIBTOOLIZE_PLIST, which I meant to do but ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8615262c2bf4
branches:  trunk
changeset: 482189:8615262c2bf4
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Oct 21 17:00:10 2004 +0000

description:
Put back LIBTOOLIZE_PLIST, which I meant to do but didn't commit.  This is
needed by some packages currently which install broken .la files or
otherwise don't work with the transform logic yet.

diffstat:

 mk/bsd.pkg.mk       |  8 +++++++-
 mk/defaults/mk.conf |  8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diffs (62 lines):

diff -r 43cff804f17d -r 8615262c2bf4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Oct 21 16:36:28 2004 +0000
+++ b/mk/bsd.pkg.mk     Thu Oct 21 17:00:10 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1520 2004/10/16 22:37:29 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1521 2004/10/21 17:00:10 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -4488,6 +4488,7 @@
 _PRINT_LA_LIBNAMES=    ${SETENV} ECHO=${ECHO:Q} GREP=${GREP:Q} SORT=${SORT:Q} \
                        ${SH} ${.CURDIR}/../../mk/scripts/print-la-libnames
 
+.if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
 _PRINT_PLIST_LIBTOOLIZE_FILTER?=                                       \
        (                                                               \
          if ${TEST} -d ${WRKDIR}; then                                 \
@@ -4512,6 +4513,9 @@
          fi;                                                           \
          ${RM} -f "$$fileslist" "$$libslist";                          \
        )
+.else
+_PRINT_PLIST_LIBTOOLIZE_FILTER?=       ${CAT}
+.endif
 
 .PHONY: print-PLIST
 .if !target(print-PLIST)
@@ -4959,10 +4963,12 @@
 .if ${PLIST_TYPE} == "dynamic"
 _PLIST_AWK_LIBTOOL?=   # empty
 .else
+.  if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
 _PLIST_AWK_LIBTOOL?=                                                   \
 /^[^@].*\.la$$/ {                                                      \
        system("cd ${PREFIX} && ${_PRINT_LA_LIBNAMES} " $$0)            \
 }
+.  endif
 .endif
 
 # _PLIST_AWK_SCRIPT hold the complete awk script for plist target.
diff -r 43cff804f17d -r 8615262c2bf4 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Oct 21 16:36:28 2004 +0000
+++ b/mk/defaults/mk.conf       Thu Oct 21 17:00:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.8 2004/10/12 13:58:22 tv Exp $
+# $NetBSD: mk.conf,v 1.9 2004/10/21 17:00:10 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -257,6 +257,12 @@
 # Default: -R
 # Possible: depends on your FETCH_CMD value.
 
+LIBTOOLIZE_PLIST?=     yes
+# This determines whether to expand libtool archives in PLISTs into the
+# represented library names.
+# Possible: yes, no
+# Default: no
+
 PKG_INSTALLATION_PREFS?= overwrite pkgviews
 # This is a whitespace-separated list of installation types to try when
 # building a package, in order of preference.