pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Abstract out the filter commmand used to...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c34ce51eea5
branches:  trunk
changeset: 467232:9c34ce51eea5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 27 12:19:03 2004 +0000

description:
Abstract out the filter commmand used to list headers and libraries in
the package +CONTENTS file into a variable BUILDLINK_CONTENTS_FILTER.<pkg>.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diffs (56 lines):

diff -r 517a0f29b01b -r 9c34ce51eea5 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Tue Jan 27 12:04:46 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Tue Jan 27 12:19:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.63 2004/01/27 08:42:13 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.64 2004/01/27 12:19:03 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -429,11 +429,17 @@
 # BUILDLINK_FILES_CMD.<pkg>
 #      shell pipeline that outputs to stdout a list of files relative
 #      to ${BUILDLINK_PREFIX.<pkg>}.  The resulting files are to be
-#      symlinked into ${BUILDLINK_DIR}.  By default for overwrite
-#      packages, BUILDLINK_FILES_CMD.<pkg> outputs the contents of the
-#      include and lib directories in the package +CONTENTS, and for
-#      pkgviews packages, it outputs any libtool archives in lib
-#      directories.
+#      symlinked into ${BUILDLINK_DIR}.  By default, this takes the
+#      +CONTENTS of a <pkg> and filters it through
+#      ${BUILDLINK_CONTENTS_FILTER.<pkg>}.
+#
+# BUILDLINK_CONTENTS_FILTER.<pkg>
+#      filter command that filters +CONTENTS input into a list of files
+#      relative to ${BUILDLINK_PREFIX.<pkg>} on stdout.  By default for
+#      overwrite packages, BUILDLINK_CONTENTS_FILTER.<pkg> outputs the
+#      contents of the include and lib directories in the package
+#      +CONTENTS, and for pkgviews packages, it outputs any libtool
+#      archives in lib directories.
 #
 # BUILDLINK_TRANSFORM.<pkg>
 #      sed arguments used to transform the name of the source filename
@@ -464,16 +470,16 @@
 
 .  if (${PKG_INSTALLATION_TYPE} == "pkgviews") &&                      \
       !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[yY][eE][sS])
+BUILDLINK_CONTENTS_FILTER.${_pkg_}?=                                   \
+       ${GREP} 'lib.*/lib[^/]*\.la$$'
+.  else
+BUILDLINK_CONTENTS_FILTER.${_pkg_}?=                                   \
+       ${EGREP} '(include.*/|lib.*/lib[^/]*$$)'
+.  endif
 BUILDLINK_FILES_CMD.${_pkg_}?=                                         \
        ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |   \
        ${SED} -n '/File:/s/^[  ]*File:[        ]*//p' |                \
-       ${GREP} 'lib.*/lib[^/]*\.la$$'
-.  else
-BUILDLINK_FILES_CMD.${_pkg_}?=                                         \
-       ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |   \
-       ${SED} -n '/File:/s/^[  ]*File:[        ]*//p' |                \
-       ${EGREP} '(include.*/|lib.*/lib[^/]*$$)'
-.  endif
+       ${BUILDLINK_CONTENTS_FILTER.${_pkg_}}
 
 # _BLNK_FILES_CMD.<pkg> combines BUILDLINK_FILES_CMD.<pkg> and
 # BUILDLINK_FILES.<pkg> into one command that outputs all of the files



Home | Main Index | Thread Index | Old Index