[pkgsrc/tv-derecurse]: pkgsrc/mk/defaults sync with HEAD

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c05b1a932e1d
branches:  tv-derecurse
changeset: 483999:c05b1a932e1d
user:      tv <tv%pkgsrc.org@localhost>
date:      Sun Mar 06 02:47:42 2005 +0000

description:
sync with HEAD

diffstat:

 mk/defaults/mk.conf     |  8 +++++++-
 mk/defaults/obsolete.mk |  4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 26c564019a60 -r c05b1a932e1d mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Wed Mar 02 19:38:26 2005 +0000
+++ b/mk/defaults/mk.conf       Sun Mar 06 02:47:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.7 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.8 2005/03/06 02:47:42 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -178,6 +178,12 @@
 # Possible: any path
 # Default: /var
 
+#X11_TYPE?=    native
+# Used to set the X11 implementation used to build X11 packages.
+# Possible: xorg (uses x11/xorg-libs), XFree86 (uses x11/XFree86-libs), or
+# native (uses pkgtools/x11-links to use the native, non-pkgsrc-managed X11).
+# Default: native
+
 # Default installation prefix for meta-pkgs/XFree86 and
 # meta-pkgs/xorg.
 .if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
diff -r 26c564019a60 -r c05b1a932e1d mk/defaults/obsolete.mk
--- a/mk/defaults/obsolete.mk   Wed Mar 02 19:38:26 2005 +0000
+++ b/mk/defaults/obsolete.mk   Sun Mar 06 02:47:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.2.2.1 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: obsolete.mk,v 1.2.2.2 2005/03/06 02:47:42 tv Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -61,7 +61,7 @@
 PKG_DEFAULT_OPTIONS+=  sasl
 .endif
 .if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  sasl
+PKG_DEFAULT_OPTIONS+=  sasl2
 .endif
 .if defined(USE_SJ3) && !empty(USE_SJ3:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=  sj3