diff options
| author | jlam <jlam> | 2004-03-29 16:01:39 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-29 16:01:39 +0000 |
| commit | da49246a34887d2423ec25846aebe97ee9c1c924 (patch) | |
| tree | ee0fba5570cd3fde88322901b7d9bf2aa3b35a55 /mk | |
| parent | fbcef22f1683882cccadb7d3e37c0d85cbddcfd7 (diff) | |
| download | pkgsrc-da49246a34887d2423ec25846aebe97ee9c1c924.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index defc9c5d1d9..369de8397c0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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} is restricted:" \ 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} |