summaryrefslogtreecommitdiff
path: root/mk/buildlink3
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-09-07 00:14:13 +0000
committerjlam <jlam@pkgsrc.org>2004-09-07 00:14:13 +0000
commit0927de52e8e5063b9a80ca0b025f70f3930fa490 (patch)
tree21a5616703e9dbaadd9d608e0fcf31470afd9fef /mk/buildlink3
parentb5a9cefb9ac7e7a568d2c32eb9317aa96c335af0 (diff)
downloadpkgsrc-0927de52e8e5063b9a80ca0b025f70f3930fa490.tar.gz
Use UNWRAP_{PATTERNS,FILES} instead of UNBUILDLINK_{PATTERNS,FILES}. This
will help to minimize diffs for packages between the forthcoming pkgsrc-2004Q3 branch and the HEAD after the integration of the wrapper script framework.
Diffstat (limited to 'mk/buildlink3')
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 1c0f409fe81..8c14edebd07 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.151 2004/08/27 08:38:22 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.152 2004/09/07 00:14:13 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -1008,7 +1008,7 @@ _BLNK_UNTRANSFORM_SED+= -f ${_BLNK_UNTRANSFORM_SEDFILE}
# stripped out of them.
#
UNBUILDLINK_PATTERNS?= # empty
-_UNBUILDLINK_PATTERNS= ${UNBUILDLINK_PATTERNS}
+_UNBUILDLINK_PATTERNS= ${UNWRAP_PATTERNS}
_UNBUILDLINK_PATTERNS+= *-config
_UNBUILDLINK_PATTERNS+= *Conf.sh
_UNBUILDLINK_PATTERNS+= *.pc
@@ -1016,7 +1016,7 @@ _UNBUILDLINK_PATTERNS_FIND= \
\( ${_UNBUILDLINK_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
UNBUILDLINK_FILES?= # empty
_UNBUILDLINK_FILES= \
- ${UNBUILDLINK_FILES} \
+ ${UNWRAP_FILES} \
`${FIND} . ${_UNBUILDLINK_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT} -u`
#
# When "unbuildlinkifying" a file, we must remove references to the