From 825c5574f1fd21279089999c3e69ce6f77436c1e Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 31 Aug 2003 06:59:39 +0000
Subject: Make USE_X11_LINKS=NO mean "don't add a dependency on x11-links".

---
 mk/buildlink3/bsd.buildlink3.mk | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index ae42448245a..f59ca79306b 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.1.2.33 2003/08/30 14:23:27 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.1.2.34 2003/08/31 06:59:39 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -53,12 +53,17 @@ PATH:=		${BUILDLINK_DIR}/bin:${PATH}
 BUILDLINK_DEPENDS?=	${BUILDLINK_PACKAGES}
 
 X11_LINKS_SUBDIR=		share/x11-links
-.if defined(USE_X11) && empty(PKGPATH:Mpkgtools/x11-links)
+.if defined(USE_X11)
+USE_X11_LINKS?=			YES
+.  if empty(USE_X11_LINKS:M[nN][oO])
 BUILDLINK_DEPENDS+=		x11-links
-BUILDLINK_DEPENDS.x11-links=	x11-links>=0.13
+_BLNK_X11_LINKS_PACKAGE=	x11-links
+.  else
+_BLNK_X11_LINKS_PACKAGE=	# empty
+.  endif
+BUILDLINK_DEPENDS.x11-links=	x11-links>=0.12
 BUILDLINK_DEPMETHOD.x11-links=	build
 BUILDLINK_PKGSRCDIR.x11-links=	../../pkgtools/x11-links
-_BLNK_X11_LINKS_PACKAGE=	x11-links
 _BLNK_X11_LINKS_DIR=	${BUILDLINK_PREFIX.x11-links}/${X11_LINKS_SUBDIR}
 .else
 _BLNK_X11_LINKS_PACKAGE=	# empty
@@ -241,14 +246,16 @@ LDFLAGS+=	${_flag_}
 do-buildlink: buildlink-directories
 buildlink-directories:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}
-.if defined(USE_X11) && empty(PKGPATH:Mpkgtools/x11-links)
+.if defined(USE_X11)
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR}
 	${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
-.  if exists(${_BLNK_X11_LINKS_DIR})
+.  if empty(USE_X11_LINKS:M[nN][oO])
+.    if exists(${_BLNK_X11_LINKS_DIR})
 	${_PKG_SILENT}${_PKG_DEBUG}${CP} -R ${_BLNK_X11_LINKS_DIR}/* ${BUILDLINK_X11_DIR}
-.  else
+.    else
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO_MSG} "x11-links doesn't seem to be installed."
 	${_PKG_SILENT}${_PKG_DEBUG}${FALSE}
+.    endif
 .  endif
 .endif
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
-- 
cgit v1.2.3