CVS commit: pkgsrc/graphics/libepoxy

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jun  3 07:54:07 UTC 2017

Modified Files:
        pkgsrc/graphics/libepoxy: Makefile

Log Message:
libepoxy: set PLIST.egl=yes in the Darwin case in case it's supported.
simplify logic. only functional change should be fixing Darwin builds.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/libepoxy/Makefile

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

Modified files:

Index: pkgsrc/graphics/libepoxy/Makefile
diff -u pkgsrc/graphics/libepoxy/Makefile:1.21 pkgsrc/graphics/libepoxy/Makefile:1.22
--- pkgsrc/graphics/libepoxy/Makefile:1.21      Fri May 26 17:40:44 2017
+++ pkgsrc/graphics/libepoxy/Makefile   Sat Jun  3 07:54:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/05/26 17:40:44 adam Exp $
+# $NetBSD: Makefile,v 1.22 2017/06/03 07:54:07 maya Exp $
 
 DISTNAME=      libepoxy-1.4.2
 CATEGORIES=    graphics
@@ -33,16 +33,13 @@ CONFIGURE_ARGS+=    --enable-glx=yes
 PLIST.glx=     yes
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.  if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=       --enable-egl=${MESALIB_SUPPORTS_EGL}
-.    if ${X11_TYPE} == "modular"
-CPPFLAGS+=     -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\"
-.    endif
-.  else # ! Darwin
+
 CONFIGURE_ARGS+=       --enable-egl=${MESALIB_SUPPORTS_EGL}
-.    if !empty(MESALIB_SUPPORTS_EGL:Myes)
+.  if !empty(MESALIB_SUPPORTS_EGL:Myes)
 PLIST.egl=     yes
-.    endif
+.  endif
+.  if ${OPSYS} == "Darwin" && ${X11_TYPE} == "modular"
+CPPFLAGS+=     -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\"
 .  endif
 .else # ! x11
 CONFIGURE_ARGS+=       --enable-glx=no