diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-05 17:11:37 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-05 17:11:37 +0000 |
| commit | ed8841d0fdf382d6b115bce9d7ccb632e0ac0d12 (patch) | |
| tree | 979d5f148a85761e6609f6b9a591767f2c6d3288 | |
| parent | 6f75213cec21819be6af4cfcc075f62aee5131e2 (diff) | |
| download | pkgsrc-ed8841d0fdf382d6b115bce9d7ccb632e0ac0d12.tar.gz | |
Move the default value of X11_TYPE from x11.version.mk into
bsd.prefs.mk. Add a coment to defaults/mk.conf, why the entry should
be left commented out there.
| -rw-r--r-- | mk/bsd.prefs.mk | 3 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 3 | ||||
| -rw-r--r-- | mk/x11.version.mk | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 112c663759e..e8de8101463 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.221 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.222 2006/06/05 17:11:37 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -388,6 +388,7 @@ USE_INET6= NO .endif LOCALBASE?= ${DESTDIR}/usr/pkg +X11_TYPE?= native .if !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative) . if ${OPSYS} == "SunOS" # On Solaris, we default to using OpenWindows for X11. diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index d659744b993..eab6e06c10e 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.120 2006/06/04 14:56:37 joerg Exp $ +# $NetBSD: mk.conf,v 1.121 2006/06/05 17:11:37 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -193,6 +193,7 @@ VARBASE?= /var # 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 +# The default is defined in bsd.prefs.mk to allow platform specific overrides. #X11BASE?= /usr/X11R6 # Where X11 is installed on the system. diff --git a/mk/x11.version.mk b/mk/x11.version.mk index 848163bfb76..0f55ca61740 100644 --- a/mk/x11.version.mk +++ b/mk/x11.version.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.version.mk,v 1.3 2005/11/09 01:07:37 reed Exp $ +# $NetBSD: x11.version.mk,v 1.4 2006/06/05 17:11:37 joerg Exp $ # # The following variables may be set in /etc/mk.conf: # @@ -24,7 +24,6 @@ # X11 distribution detected on the system. # -X11_TYPE?= native X11_PKGSRCDIR.native= ../../pkgtools/x11-links X11_PKGSRCDIR.XFree86= ../../x11/XFree86-libs X11_PKGSRCDIR.xorg= ../../x11/xorg-libs |