? libepoxy.diff
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	14 Jun 2015 21:50:07 -0000	1.5
+++ Makefile	13 Aug 2015 09:40:09 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.5 2015/06/14 21:50:07 prlw1 Exp $
 
-DISTNAME=	libepoxy-1.2
-PKGREVISION=	2
+DISTNAME=	libepoxy-1.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -25,9 +24,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=		egl
+PLIST_VARS+=		egl glx
 .if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+.if ${OPSYS} != "Darwin"
 PLIST.egl=		yes
+PLIST.glx=		yes
+.endif
 CONFIGURE_ENV+=		PKGSRC_BUILD_EGL=yes
 .else
 CONFIGURE_ENV+=		PKGSRC_BUILD_EGL=no
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	13 Jun 2015 19:13:10 -0000	1.2
+++ PLIST	13 Aug 2015 09:40:09 -0000
@@ -3,7 +3,7 @@
 ${PLIST.egl}include/epoxy/egl_generated.h
 include/epoxy/gl.h
 include/epoxy/gl_generated.h
-include/epoxy/glx.h
-include/epoxy/glx_generated.h
+${PLIST.glx}include/epoxy/glx.h
+${PLIST.glx}include/epoxy/glx_generated.h
 lib/libepoxy.la
 lib/pkgconfig/epoxy.pc
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	14 Jun 2015 21:50:07 -0000	1.3
+++ distinfo	13 Aug 2015 09:40:09 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.3 2015/06/14 21:50:07 prlw1 Exp $
 
-SHA1 (libepoxy-1.2.tar.gz) = e700520711b9e4fa07c286aa36e431d8ad4133f5
-RMD160 (libepoxy-1.2.tar.gz) = fc5c11eacb437b437c4d6b185a79dc1d6a4467df
-Size (libepoxy-1.2.tar.gz) = 267110 bytes
-SHA1 (patch-configure.ac) = 6651693923d0384806a400e54c9dcec8553f06c4
-SHA1 (patch-src_dispatch__common.c) = 09132e4da31ff799563e2f7aae0b1af42a87701f
-SHA1 (patch-src_dispatch__common.h) = a95512892d4f0172366b19246602f00db6c03dc6
+SHA1 (libepoxy-1.3.1.tar.gz) = 94d98d83a50d2f607ee9986b622a48df00d5926c
+RMD160 (libepoxy-1.3.1.tar.gz) = 1fbdcd713b3b95d7b5fc5dd80b81c4ffcf27214f
+Size (libepoxy-1.3.1.tar.gz) = 284227 bytes
+SHA1 (patch-configure.ac) = 0c46e40cffe7ab1ffa9fa7f026410407765ed3b3
+SHA1 (patch-src_dispatch__common.c) = e69b5e5b6f68a95f10ecbbdb8b1c9ab6695fe24c
+SHA1 (patch-src_dispatch__common.h) = e593bdd5570ea4bd0e777e79f32cd87c93dd171d
Index: patches/patch-configure.ac
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/patches/patch-configure.ac,v
retrieving revision 1.1
diff -u -r1.1 patch-configure.ac
--- patches/patch-configure.ac	13 Jun 2015 19:13:10 -0000	1.1
+++ patches/patch-configure.ac	13 Aug 2015 09:40:09 -0000
@@ -2,7 +2,7 @@
 
 Override EGL detection.
 
---- configure.ac.orig	2014-05-14 00:22:08.000000000 +0000
+--- configure.ac.orig	2015-07-15 23:46:36.000000000 +0000
 +++ configure.ac
 @@ -62,7 +62,7 @@ has_znow=yes
  
@@ -13,15 +13,6 @@
          build_glx=no
          build_wgl=yes
          # On windows, the DLL has to have all of its functions
-@@ -77,7 +77,7 @@ case $host_os in
-         AC_SUBST([LOG_COMPILER], [wine])
-         ;;
-     darwin*)
--        build_egl=no
-+        build_egl=${PKGSRC_BUILD_EGL}
-         build_glx=yes
-         build_wgl=no
-         build_apple=yes
 @@ -85,7 +85,7 @@ case $host_os in
          EPOXY_LINK_LIBS=""
          ;;
Index: patches/patch-src_dispatch__common.c
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_dispatch__common.c
--- patches/patch-src_dispatch__common.c	14 Jun 2015 21:50:07 -0000	1.1
+++ patches/patch-src_dispatch__common.c	13 Aug 2015 09:40:09 -0000
@@ -2,14 +2,14 @@
 
 Native X has /usr/X11R7/lib/libGL.so.2.
 
---- src/dispatch_common.c.orig	2014-05-14 00:22:08.000000000 +0000
+--- src/dispatch_common.c.orig	2015-07-15 23:46:36.000000000 +0000
 +++ src/dispatch_common.c
-@@ -105,7 +105,7 @@
- #ifdef __APPLE__
- #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
+@@ -107,7 +107,7 @@
+ #elif defined(ANDROID)
+ #define GLX_LIB "libGLESv2.so"
  #else
 -#define GLX_LIB "libGL.so.1"
 +#define GLX_LIB "libGL.so"
  #endif
  
- struct api {
+ #ifdef ANDROID
Index: patches/patch-src_dispatch__common.h
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h,v
retrieving revision 1.1
diff -u -r1.1 patch-src_dispatch__common.h
--- patches/patch-src_dispatch__common.h	13 Jun 2015 19:13:10 -0000	1.1
+++ patches/patch-src_dispatch__common.h	13 Aug 2015 09:40:09 -0000
@@ -2,9 +2,9 @@
 
 Override EGL detection.
 
---- src/dispatch_common.h.orig	2014-05-14 00:22:08.000000000 +0000
+--- src/dispatch_common.h.orig	2015-07-15 23:46:36.000000000 +0000
 +++ src/dispatch_common.h
-@@ -34,7 +34,12 @@
+@@ -39,7 +39,12 @@
  #define PLATFORM_HAS_WGL 0
  #define EPOXY_IMPORTEXPORT
  #else