[pkgsrc/trunk]: pkgsrc/mk Added a new variable for XFree86 packages:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4330607f6738
branches:  trunk
changeset: 466905:4330607f6738
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jan 24 09:23:22 2004 +0000

description:
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.

diffstat:

 mk/bsd.pkg.defaults.mk |   7 ++++++-
 mk/bsd.pkg.mk          |  12 ++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 3fb5cdc67cc9 -r 4330607f6738 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Sat Jan 24 09:20:12 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Sat Jan 24 09:23:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.208 2004/01/22 10:19:58 xtraeme Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.209 2004/01/24 09:23:22 xtraeme Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -2010,6 +2010,11 @@
 # Possible: not defined, YES
 # Default: not defined
 
+USE_PKGSRC_XFREE86?=   NO
+# Used in the XFree86 packages to install them automatically.
+# Possible: YES, or NO.
+# Default: NO.
+
 USERPPP_GROUP?=        network
 # Used in the userppp package to specify the default group.
 # Possible: any group name
diff -r 3fb5cdc67cc9 -r 4330607f6738 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Jan 24 09:20:12 2004 +0000
+++ b/mk/bsd.pkg.mk     Sat Jan 24 09:23:22 2004 +0000
@@ -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} 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)