summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-03-30 20:57:19 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-03-30 20:57:19 +0000
commit5c1491f6c75d0d0dc6638b5bb8fbf8f6ceeefa0c (patch)
tree3354c548753534c6e295842b384dbe57d5d54085
parenta87ac65a407add13a08549f34226402fa7e8a97b (diff)
downloadpkgsrc-5c1491f6c75d0d0dc6638b5bb8fbf8f6ceeefa0c.tar.gz
Enable X11_TYPE=XFree86, ok'ed by jlam@.
-rw-r--r--mk/buildlink2/bsd.buildlink2.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 25ac6665346..ac624e0d780 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.121 2004/03/29 05:42:58 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.122 2004/03/30 20:57:19 xtraeme Exp $
#
# An example package buildlink2.mk file:
#
@@ -89,10 +89,16 @@ MAKE_ENV+= BUILDLINK_CACHE_ALL=yes
.if defined(USE_X11)
USE_X11_LINKS?= YES
-. if empty(USE_X11_LINKS:M[nN][oO])
+X11_TYPE?= native
+. if empty(USE_X11_LINKS:M[nN][oO]) && \
+ empty(X11_TYPE:MXFree86)
BUILD_DEPENDS+= x11-links>=0.23:../../pkgtools/x11-links
_BLNK_X11_DIR= ${LOCALBASE}/share/x11-links
-. endif
+. elif empty(USE_X11_LINKS:M[nN][oO]) && \
+ !empty(X11_TYPE:MXFree86)
+DEPENDS+= XFree86-libs>=4.4.0:../../x11/XFree86-libs
+_BLNK_X11_DIR= ${LOCALBASE}/X11R6
+. endif # X11_TYPE=XFree86
_BLNK_CPPFLAGS+= -I${X11BASE}/include
_BLNK_LDFLAGS+= -L${X11BASE}/lib
.if ${_USE_RPATH} == "yes"