Fri Mar 7 15:10:33 2014 UTC ()
Avoid the default PREFER_PKGSRC when using native X11_TYPE on Linux.


(jperkin)
diff -r1.235 -r1.236 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.235 -r1.236 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2014/01/30 12:37:56 1.235
+++ pkgsrc/mk/defaults/mk.conf 2014/03/07 15:10:33 1.236
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.235 2014/01/30 12:37:56 obache Exp $ 1# $NetBSD: mk.conf,v 1.236 2014/03/07 15:10:33 jperkin Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -194,26 +194,29 @@ PKGSRC_RUN_TEST?= no @@ -194,26 +194,29 @@ PKGSRC_RUN_TEST?= no
194# Possible: yes, no 194# Possible: yes, no
195# Default: no 195# Default: no
196 196
197.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ 197.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
198 exists(/usr/X11R7/lib/libX11.so)) 198 exists(/usr/X11R7/lib/libX11.so))
199PREFER_PKGSRC?= 199PREFER_PKGSRC?=
200.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ 200.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
201 exists(/usr/lib/libexpat.so)) 201 exists(/usr/lib/libexpat.so))
202PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \ 202PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \
203 freetype2 glu randrproto renderproto xcursor 203 freetype2 glu randrproto renderproto xcursor
204.elif (!empty(MACHINE_PLATFORM:MOpenBSD-*-*) && \ 204.elif (!empty(MACHINE_PLATFORM:MOpenBSD-*-*) && \
205 exists(/usr/X11R6/lib/X11/config/xorgversion.def)) 205 exists(/usr/X11R6/lib/X11/config/xorgversion.def))
206PREFER_PKGSRC?= 206PREFER_PKGSRC?=
 207.elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \
 208 (!defined(X11_TYPE) || ${X11_TYPE} == "native")
 209PREFER_PKGSRC?=
207.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \ 210.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \
208 (!defined(X11_TYPE) || ${X11_TYPE} == "native") 211 (!defined(X11_TYPE) || ${X11_TYPE} == "native")
209PREFER_PKGSRC?= 212PREFER_PKGSRC?=
210.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \ 213.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
211 (!defined(X11_TYPE) || ${X11_TYPE} == "native") 214 (!defined(X11_TYPE) || ${X11_TYPE} == "native")
212PREFER_PKGSRC?= fontconfig pixman Xft2 215PREFER_PKGSRC?= fontconfig pixman Xft2
213.elif !empty(MACHINE_PLATFORM:MCygwin-*-*) && \ 216.elif !empty(MACHINE_PLATFORM:MCygwin-*-*) && \
214 exists(/usr/lib/X11/config/xorgversion.def) 217 exists(/usr/lib/X11/config/xorgversion.def)
215PREFER_PKGSRC?= 218PREFER_PKGSRC?=
216.else 219.else
217PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ 220PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \
218 freetype2 glu randrproto renderproto xcursor 221 freetype2 glu randrproto renderproto xcursor
219.endif 222.endif