pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink2 Enable X11_TYPE=XFree86, ok'ed by jlam@.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/00383d2ba143
branches:  trunk
changeset: 471760:00383d2ba143
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Mar 30 20:57:19 2004 +0000

description:
Enable X11_TYPE=XFree86, ok'ed by jlam@.

diffstat:

 mk/buildlink2/bsd.buildlink2.mk |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r fb005a886650 -r 00383d2ba143 mk/buildlink2/bsd.buildlink2.mk
--- a/mk/buildlink2/bsd.buildlink2.mk   Tue Mar 30 20:29:54 2004 +0000
+++ b/mk/buildlink2/bsd.buildlink2.mk   Tue Mar 30 20:57:19 2004 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index