diff options
| author | sevan <sevan> | 2015-09-05 21:25:30 +0000 |
|---|---|---|
| committer | sevan <sevan> | 2015-09-05 21:25:30 +0000 |
| commit | daee940730854488ac86e49fbab9c3f129673d80 (patch) | |
| tree | cf31903f0df0d05333e24f32db41a42e9eeb86f8 /mk | |
| parent | 8041009fff3bec326aa4f6b7af0356f3b3f6cd91 (diff) | |
| download | pkgsrc-daee940730854488ac86e49fbab9c3f129673d80.tar.gz | |
Commence deprecation of logic related to detecting the presence of X11 on the
host and whether to use native or pkgsrc components.
With the use of builtin.mk in packages, these tests are superfluous and can
prevent the builtin.mk detection mechanism from working correctly.
Discovered on OpenBSD where X11_TYPE native was being used but the native
MesaLib wasn't because a test to check the presence of xorgversin.def
failed, forcing MesaLib to be added to $PREFER_PKGSRC.
Change leading if statement to default to an empty $PREFER_PKGSRC with OpenBSD &
Bitrig defaulting to this, remaining platforms should also be moved here after
testing, this is in preperation for replacing the block with just the default value for
$PREFER_PKGSRC.
Put together with instruction from jperkin@
Reviewed by jperkin@ wiz@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/mk.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index c2529bbd68e..a8977ae8624 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.259 2015/08/10 21:44:34 khorben Exp $ +# $NetBSD: mk.conf,v 1.260 2015/09/05 21:25:30 sevan Exp $ # # This file provides default values for variables that may be overridden @@ -230,16 +230,17 @@ PKGSRC_USE_SSP?= no # Possible: yes, no # Default: no, except if PKGSRC_USE_FORT is set to "yes". -.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ +# The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below. +# Please add your platform here once you have confirmed it is correct +.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" +PREFER_PKGSRC?= +.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/X11R7/lib/libX11.so)) PREFER_PKGSRC?= .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/lib/libexpat.so)) PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \ freetype2 glu randrproto renderproto xcursor -.elif (!empty(MACHINE_PLATFORM:MOpenBSD-*-*) && \ - exists(/usr/X11R6/lib/X11/config/xorgversion.def)) -PREFER_PKGSRC?= .elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \ (!defined(X11_TYPE) || ${X11_TYPE} == "native") PREFER_PKGSRC?= |