CVS commit: pkgsrc/graphics/MesaLib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 30 16:30:54 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib: buildlink3.mk

Log Message:
MesaLib: Make feature detection in buildlink3 cleaner.

XXX not sure how to detect the special case of native X but
PREFER_PKGSRC=MesaLib safely


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/MesaLib/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib/buildlink3.mk:1.60 pkgsrc/graphics/MesaLib/buildlink3.mk:1.61
--- pkgsrc/graphics/MesaLib/buildlink3.mk:1.60  Fri Aug 30 16:00:47 2019
+++ pkgsrc/graphics/MesaLib/buildlink3.mk       Fri Aug 30 16:30:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2019/08/30 16:00:47 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2019/08/30 16:30:54 nia Exp $
 
 BUILDLINK_TREE+=       MesaLib
 
@@ -18,18 +18,24 @@ BUILDLINK_LDFLAGS.MesaLib+= -Wl,-dylib_f
 
 pkgbase:= MesaLib
 
-.if    ${X11_TYPE} == "modular" && (${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin") ||   \
-       ${X11_TYPE} == "native"  && exists(${X11BASE}/include/EGL/egl.h)
+.if ${X11_TYPE} == "modular"
+MESALIB_SUPPORTS_OS=   yes
+.  if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin" && ${OPSYS} != "SunOS"
 MESALIB_SUPPORTS_EGL=  yes
+.  else
+MESALIB_SUPPORTS_EGL=  no
+.  endif
 .else
+.  if exists(${X11BASE}/include/EGL/egl.h)
+MESALIB_SUPPORTS_EGL=  yes
+.  else
 MESALIB_SUPPORTS_EGL=  no
-.endif
-
-.if    ${X11_TYPE} == "modular" || \
-       ${X11_TYPE} == "native"  && exists(${X11BASE}/lib/libOSMesa.so)
+.  endif
+.  if exists(${X11BASE}/lib/libOSMesa.so)
 MESALIB_SUPPORTS_OS=   yes
-.else
+.  else
 MESALIB_SUPPORTS_OS=   no
+.  endif
 .endif
 
 .include "../../mk/pkg-build-options.mk"