[pkgsrc/trunk]: pkgsrc/mk Use X11_TYPE check instead of USE_PKGSRC_XFREE86. ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1a250491dde
branches:  trunk
changeset: 471614:e1a250491dde
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 29 16:01:39 2004 +0000

description:
Use X11_TYPE check instead of USE_PKGSRC_XFREE86.  It's safe to use the
value of X11_TYPE here since it's defined in bsd.buildlink3.mk which is
included before this check.  This fixes breakage for packages that set
USE_X11 due to USE_PKGSRC_XFREE86 not being defined before it's used.

diffstat:

 mk/bsd.pkg.mk |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r 1c5a6ab3b5f8 -r e1a250491dde mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Mar 29 15:46:49 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Mar 29 16:01:39 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1429 2004/03/29 06:52:23 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1430 2004/03/29 16:01:39 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1439,14 +1439,14 @@
 PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography"
 .    endif
 .  endif
-.  if defined(USE_X11) && !exists(${X11BASE}) && \
-       !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss])
-       @${MKDIR} ${X11BASE}
-       @${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${X11BASE}
-       @${CHMOD} ${PKGDIRMODE} ${X11BASE}
-.  elif defined(USE_X11) && !exists(${X11BASE}) && \
-       !empty(USE_PKGSRC_XFREE86:M[Nn][Oo])
+.  if defined(USE_X11) && !exists(${X11BASE})
+.    if ${X11_TYPE} == "native"
 PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
+.    else
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${X11BASE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${X11BASE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} ${PKGDIRMODE} ${X11BASE}
+.    endif
 .  endif
 .  if defined(BROKEN)
 PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" ${BROKEN:Q}