diff options
| author | tv <tv@pkgsrc.org> | 2005-03-06 02:47:42 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-06 02:47:42 +0000 |
| commit | e63b00d2dc87ddd16089f1ee651cbe25f4b68646 (patch) | |
| tree | 2dd887f53e93362b69cf3d9700d7518117c7c905 | |
| parent | cfe26b0593df8c0f623b442b020aeb081a94c359 (diff) | |
| download | pkgsrc-e63b00d2dc87ddd16089f1ee651cbe25f4b68646.tar.gz | |
sync with HEAD
| -rw-r--r-- | mk/defaults/mk.conf | 8 | ||||
| -rw-r--r-- | mk/defaults/obsolete.mk | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 2eb10f754a2..f91e85376f0 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -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 @@ VARBASE?= /var # 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 --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk index d5705114cf1..89287e68140 100644 --- a/mk/defaults/obsolete.mk +++ b/mk/defaults/obsolete.mk @@ -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+= rsaref 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 |