summaryrefslogtreecommitdiff
path: root/mk/buildlink2/pre-cache
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-10-30 00:23:00 +0000
committerjlam <jlam@pkgsrc.org>2002-10-30 00:23:00 +0000
commitf0f05619c5585a095c90e838f7aef476519e675a (patch)
treeb11edc513d781dead0d047a82281d3b4ed07452d /mk/buildlink2/pre-cache
parent30953b8b19c28151e2780753f0f3e821eae11eff (diff)
downloadpkgsrc-f0f05619c5585a095c90e838f7aef476519e675a.tar.gz
Move the sed command in _BLNK_{,UN}TRANSFORM_SED into a sed command files
.transform.sed and .untransform.sed that are generated by a new gen-transform.sh shell script. This avoids all of the silliness with exceeding the length of the value of a make variable that brought about breaking the original _BLNK_TRANSFORM_SED into _BLNK_TRANSFORM_SED.[1-4]. It's also vastly easier to understand the gen-transform.sh script as opposed to the juxtaposition of make and sed regular expressions, a.k.a. massive eyesores, that were in bsd.buildlink.mk. Also fix the directory protection scheme so that it might actually work if the pkgsrc directory is a subdirectory of /usr/pkg (${LOCALBASE}). Lastly, filter out /usr/X11R6 (${X11BASE}) if the package doesn't define USE_X11. This should catch packages that use X11 without announcing it, and avoids one way you can circumvent buildlink2.
Diffstat (limited to 'mk/buildlink2/pre-cache')
-rw-r--r--mk/buildlink2/pre-cache4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildlink2/pre-cache b/mk/buildlink2/pre-cache
index 3c0e0e2d79f..ba6ee6363bb 100644
--- a/mk/buildlink2/pre-cache
+++ b/mk/buildlink2/pre-cache
@@ -1,7 +1,7 @@
-# $NetBSD: pre-cache,v 1.3 2002/08/29 22:29:03 jlam Exp $
+# $NetBSD: pre-cache,v 1.4 2002/10/30 00:23:00 jlam Exp $
case $arg in
--[IL]@WRKDIR@*|-[IL]@BUILDLINK_DIR@*|-[IL]@BUILDLINK_X11_DIR@*|-[IL]@BUILDLINK_X11PKG_DIR@*)
+-[IL]@WRKDIR@*|-[IL]@BUILDLINK_DIR@*|-[IL]@BUILDLINK_X11PKG_DIR@*)
;;
-[IL].|-[IL]./..*|-[IL]..*)
;;