From c0f8903bb6c660b2bdd6b42dd9ecb3114c1a5e19 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sat, 24 Jan 2004 09:23:22 +0000 Subject: Added a new variable for XFree86 packages: USE_PKGSRC_XFREE86 By default it is disabled, if you want to use XFree86 packages from pkgsrc, please add "USE_PKGSRC_XFREE86=YES" in /etc/mk.conf. --- mk/bsd.pkg.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'mk/bsd.pkg.mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8c69c7706d4..d462a47d3ef 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1354 2004/01/23 17:55:17 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1355 2004/01/24 09:23:23 xtraeme Exp $ # # This file is in the public domain. # @@ -1383,7 +1383,15 @@ 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}) +. if defined(USE_X11) && !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss]) +DEPENDS+= XFree86-libs>=4.3.0:../../x11/XFree86-libs +. 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} +DEPENDS+= XFree86-libs>=4.3.0:../../x11/XFree86-libs +. elif defined(USE_X11) && !exists(${X11BASE}) PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" . endif . if defined(BROKEN) -- cgit v1.2.3