11 files changed, 72 insertions, 54 deletions

diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index fa8abb8dcd40..811946a62c1c 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	waffle
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/
 
@@ -11,7 +11,7 @@ COMMENT=	Library that allows to defer selection of an OpenGL API until runtime
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cmake:outsource ninja pkgconfig tar:xz
+USES=		cmake:outsource compiler:c11 ninja pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/waffle1
@@ -21,13 +21,11 @@ OPTIONS_DEFINE=	DOCS
 USE_XORG=	x11 xcb
 USE_GL=		gl egl
 CFLAGS+=	-I${LOCALBASE}/include
-LIBS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
-#CMAKE_ARGS+=	-Dwaffle_has_glx=ON \
-#		-Dwaffle_has_x11_egl=ON
-
-# todo needs libudev
-#		-Dwaffle_has_gbm=ON
+CMAKE_ARGS+=	-Dwaffle_has_glx=ON
+#CMAKE_ARGS+=	-Dwaffle_has_x11_egl=ON
+#CMAKE_ARGS+=	-Dwaffle_has_gbm=ON # FIXME: Required udev
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/graphics/waffle/distinfo b/graphics/waffle/distinfo
index 1503d69a404f..00d4f4ac0ebf 100644
--- a/graphics/waffle/distinfo
+++ b/graphics/waffle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (waffle-1.5.0.tar.xz) = 6344fa2803d76182a08380780605b36c38e795639a3229281c96b75cc30137a8
-SIZE (waffle-1.5.0.tar.xz) = 177164
+SHA256 (waffle-1.5.1.tar.xz) = cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa
+SIZE (waffle-1.5.1.tar.xz) = 178136
diff --git a/graphics/waffle/files/patch-CMakeLists.txt b/graphics/waffle/files/patch-CMakeLists.txt
index 3e04ba50cdda..3f7ae4c311ef 100644
--- a/graphics/waffle/files/patch-CMakeLists.txt
+++ b/graphics/waffle/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-12-09 22:33:50.000000000 +0100
-+++ CMakeLists.txt	2015-01-02 15:27:40.696351276 +0100
-@@ -135,7 +135,7 @@
+--- CMakeLists.txt.orig	2015-01-22 20:00:17 UTC
++++ CMakeLists.txt
+@@ -136,7 +136,7 @@ configure_file(waffle.pc.in ${waffle_lib
  
  install(
      FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc
diff --git a/graphics/waffle/files/patch-Options.cmake b/graphics/waffle/files/patch-Options.cmake
index 35ddd1f9bb81..15c217a8068e 100644
--- a/graphics/waffle/files/patch-Options.cmake
+++ b/graphics/waffle/files/patch-Options.cmake
@@ -1,10 +1,8 @@
-diff --git Options.cmake Options.cmake
-index 7f694e3..8fa62dd 100644
---- Options.cmake
+--- Options.cmake.orig	2015-01-22 20:00:17 UTC
 +++ Options.cmake
 @@ -1,4 +1,4 @@
 -if(waffle_on_linux)
 +if(waffle_on_linux OR waffle_on_freebsd)
-     # On Linux, you must enable at least one of the below options.
-     option(waffle_has_glx "Build support for GLX" OFF)
-     option(waffle_has_wayland "Build support for Wayland" OFF)
+     if(gl_FOUND AND x11-xcb_FOUND)
+         set(glx_default ON)
+     else()
diff --git a/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake b/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake
index b96da2d8d36e..191102f25c17 100644
--- a/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake
+++ b/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake
@@ -1,6 +1,6 @@
---- cmake/Modules/WaffleDefineCompilerFlags.cmake.orig	2014-12-09 22:33:50.000000000 +0100
-+++ cmake/Modules/WaffleDefineCompilerFlags.cmake	2015-01-02 15:29:36.754344546 +0100
-@@ -50,7 +50,7 @@
+--- cmake/Modules/WaffleDefineCompilerFlags.cmake.orig	2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleDefineCompilerFlags.cmake
+@@ -50,7 +50,7 @@ if (NOT MSVC)
      waffle_add_c_flag("-Werror=int-conversion" WERROR_INT_CONVERSION)
      waffle_add_c_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN)
  
@@ -9,7 +9,7 @@
          # On MacOS, the SSE2 headers trigger this error.
          waffle_add_c_flag("-Werror=missing-prototypes" WERROR_MISSING_PROTOTYPES)
      endif()
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ if(waffle_on_mac)
      add_definitions(-DWAFFLE_HAS_CGL)
  endif()
  
diff --git a/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake b/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake
index 13473d20792c..b1c7a86ee81b 100644
--- a/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake
+++ b/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake
@@ -1,6 +1,4 @@
-diff --git cmake/Modules/WaffleDefineOS.cmake cmake/Modules/WaffleDefineOS.cmake
-index e437947..b1a3079 100644
---- cmake/Modules/WaffleDefineOS.cmake
+--- cmake/Modules/WaffleDefineOS.cmake.orig	2015-01-22 20:00:17 UTC
 +++ cmake/Modules/WaffleDefineOS.cmake
 @@ -25,6 +25,8 @@
  
@@ -10,4 +8,4 @@ index e437947..b1a3079 100644
 +    set(waffle_on_freebsd true)
  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
      set(waffle_on_mac true)
- else()
+ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
diff --git a/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake b/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake
new file mode 100644
index 000000000000..9487774523b1
--- /dev/null
+++ b/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake
@@ -0,0 +1,11 @@
+--- cmake/Modules/WaffleFindDependencies.cmake.orig	2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleFindDependencies.cmake
+@@ -62,7 +62,7 @@ if(waffle_on_mac)
+ endif()
+ 
+ 
+-if(waffle_on_linux)
++if(waffle_on_linux OR waffle_on_freebsd)
+     # waffle_has_egl
+     waffle_pkg_config(egl egl)
+ 
diff --git a/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake b/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake
new file mode 100644
index 000000000000..2426ac1d1353
--- /dev/null
+++ b/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake
@@ -0,0 +1,11 @@
+--- cmake/Modules/WaffleValidateOptions.cmake.orig	2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleValidateOptions.cmake
+@@ -44,7 +44,7 @@ if(DEFINED waffle_install_docdir)
+             "details.")
+ endif()
+ 
+-if(waffle_on_linux)
++if(waffle_on_linux OR waffle_on_freebsd)
+     if(NOT waffle_has_glx AND NOT waffle_has_wayland AND
+        NOT waffle_has_x11_egl AND NOT waffle_has_gbm)
+         message(FATAL_ERROR
diff --git a/graphics/waffle/files/patch-examples_CMakeLists.txt b/graphics/waffle/files/patch-examples_CMakeLists.txt
index 232179d6391d..65d7f2d39e6f 100644
--- a/graphics/waffle/files/patch-examples_CMakeLists.txt
+++ b/graphics/waffle/files/patch-examples_CMakeLists.txt
@@ -1,8 +1,6 @@
-diff --git examples/CMakeLists.txt examples/CMakeLists.txt
-index 48147f9..d6d1b5a 100644
---- examples/CMakeLists.txt
+--- examples/CMakeLists.txt.orig	2015-01-22 20:00:17 UTC
 +++ examples/CMakeLists.txt
-@@ -7,7 +7,7 @@ install(FILES Makefile.example
+@@ -11,7 +11,7 @@ install(
  # Target: simple-x11-egl (executable)
  # ----------------------------------------------------------------------------
  
diff --git a/graphics/waffle/files/patch-src_waffle_CMakeLists.txt b/graphics/waffle/files/patch-src_waffle_CMakeLists.txt
index c4c4a011825d..650519376848 100644
--- a/graphics/waffle/files/patch-src_waffle_CMakeLists.txt
+++ b/graphics/waffle/files/patch-src_waffle_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/waffle/CMakeLists.txt.orig	2014-12-09 22:33:50.000000000 +0100
-+++ src/waffle/CMakeLists.txt	2015-01-14 10:00:50.216345455 +0100
-@@ -38,7 +38,7 @@
+--- src/waffle/CMakeLists.txt.orig	2015-01-22 20:00:17 UTC
++++ src/waffle/CMakeLists.txt
+@@ -38,7 +38,7 @@ list(APPEND waffle_libdeps
      ${THREADS_LIBRARIES}
      )
  
@@ -9,7 +9,7 @@
      if(waffle_has_wayland)
          list(APPEND waffle_libdeps
              ${wayland-client_LDFLAGS}
-@@ -114,15 +114,22 @@
+@@ -114,15 +114,22 @@ if(waffle_has_glx)
          )
  endif()
  
diff --git a/graphics/waffle/pkg-plist b/graphics/waffle/pkg-plist
index 058010c2865d..58a7b174a8c7 100644
--- a/graphics/waffle/pkg-plist
+++ b/graphics/waffle/pkg-plist
@@ -5,9 +5,11 @@ include/waffle-1/waffle_glx.h
 include/waffle-1/waffle_version.h
 include/waffle-1/waffle_wayland.h
 include/waffle-1/waffle_x11_egl.h
+lib/cmake/Waffle/WaffleConfig.cmake
+lib/cmake/Waffle/WaffleConfigVersion.cmake
 lib/libwaffle-1.so
 lib/libwaffle-1.so.0
-lib/libwaffle-1.so.0.5.0
+lib/libwaffle-1.so.0.5.1
 libdata/pkgconfig/waffle-1.pc
 share/cmake/Modules/FindWaffle.cmake
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
@@ -17,21 +19,23 @@ share/cmake/Modules/FindWaffle.cmake
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example
 %%PORTDOCS%%%%DOCSDIR%%/examples/gl_basic.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/simple-x11-egl.c
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.3.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.3.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.0.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.0.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.3.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.2.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.3.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.5.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-%%PORTVERSION%%.txt