summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2004-03-11 05:15:23 +0000
committerjlam <jlam>2004-03-11 05:15:23 +0000
commitf934cfa36b93b20d60af62b62bf629689323706f (patch)
tree16f89190c2710ef4f6bf9bfb6067f429adfe55f2
parentfd317159a59d8f1696cd82976d3bc46ee4329ecc (diff)
downloadpkgsrc-f934cfa36b93b20d60af62b62bf629689323706f.tar.gz
We can garbage collect USE_X11_LINKS which was used solely to avoid
build loops, which are now handled in a more general way using IGNORE_PKG.<pkg>.
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 08f10581db6..f57e7434b4b 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.109 2004/03/11 05:13:31 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.110 2004/03/11 05:15:23 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -65,10 +65,7 @@ PREPEND_PATH+= ${BUILDLINK_DIR}/bin
BUILDLINK_DEPENDS?= # empty
.if defined(USE_X11)
-USE_X11_LINKS?= YES
-. if !empty(USE_X11_LINKS:M[yY][eE][sS])
-. include "../../pkgtools/x11-links/buildlink3.mk"
-. endif
+. include "../../pkgtools/x11-links/buildlink3.mk"
.endif
# For each package we use, check whether we are using the built-in