glfw: update release to 3.3 and devel to 20190415-b0796109

graphics/glfw/Portfile

@@ -43,15 +43,34 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
 
     # Mac OS X 10.7 and newer: release and devel
 
+    # requires c11 support as of 82ca58da (20190305) for
+    # <stdatomic.h>; 3.3 was released shortly after this change, so
+    # this requirement is now for all modern GLFW. hopefully the
+    # following force a C11 compliant compiler to be used! require GCC
+    # >= 4.6 (4.9 for full C11) or MacPorts' Clang >= 3.1 or
+    # AppleClang >= 700. MacPorts' Clang starts at 3.3, so nothing to
+    # block there!
+
+    PortGroup compiler_blacklist_versions 1.0
+
+    compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 \
+        macports-gcc macports-gcc-4.6 macports-gcc-4.7 macports-gcc-4.8 \
+        macports-llvm-gcc-4.2 macports-dragonegg-3.3 macports-dragonegg-3.4 \
+        apple-gcc-4.0 apple-gcc-4.2 gcc-3.3 gcc-4.0 llvm-gcc-4.2 gcc cc \
+        {clang < 700}
+
+    configure.args-append -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=OFF
+
     subport glfw-devel {}
 
     if {${subport} eq ${name}} {
 
         # release
 
-        github.setup    glfw glfw 3.2.1
-        checksums       rmd160 5fb5988736a0a2812426907ab8d64b94eeacc010 \
-                        sha256 34bc25f8111501eec35a52fd39fa50336a0c2e812d4a14454c7c946458ab015c
+        github.setup    glfw glfw 3.3
+        checksums       rmd160 c119dfda395c2250042b1463eaf00b068422e9b2 \
+                        sha256 7f788385e1bce1151f80101a14310bd8add536fbe940fbce02aef1d28417009b \
+                        size   758548
         revision        0
 
         # bump the epoch because I moved the version from 20151012 to 3.1.2
@@ -74,11 +93,11 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
 
         # devel
 
-        github.setup glfw glfw 0267cebe00d72b56d7a57262e39e5b39eb221e85
-        version      20190405
-        checksums    rmd160 88620c01dd19dda7ece8b2fdc9a328e2c654a324 \
-                     sha256 26bd6aa642733dd68797c32a4c127648e2a4c0c6499c2c4ace12711513a3f551 \
-                     size   774144
+        github.setup glfw glfw b0796109629931b6fa6e449c15a177845256a407
+        version      20190415-[string range ${github.version} 0 7]
+        checksums    rmd160 51c3a8e82276a3f48bc44deaf5345a98d40b523d \
+                     sha256 e8a261a448a5659e9bb86433fdb0b36592f61b9df545d4ce0dbcf9e5f54a6fa0 \
+                     size   758563
         revision     0
 
         conflicts       glfw
@@ -93,22 +112,6 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
 
         patchfiles-append patch-src_CMakeLists.txt.devel.diff
 
-        # requires c11 support as of 82ca58da (20190305) for
-        # <stdatomic.h>.  hopefully the following force a C11
-        # compliant compiler to be used!  require GCC >= 4.6 (4.9 for
-        # full C11) or MacPorts' Clang >= 3.1 or AppleClang >= 700.
-        # MacPorts' Clang starts at 3.3, so nothing to block there!
-
-        PortGroup compiler_blacklist_versions 1.0
-
-        compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 \
-            macports-gcc macports-gcc-4.6 macports-gcc-4.7 macports-gcc-4.8 \
-            macports-llvm-gcc-4.2 macports-dragonegg-3.3 macports-dragonegg-3.4 \
-            apple-gcc-4.0 apple-gcc-4.2 gcc-3.3 gcc-4.0 llvm-gcc-4.2 gcc cc \
-            {clang < 700}
-
-        configure.args-append -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=OFF
-
     }
 }
 

graphics/glfw/files/patch-CMakeLists.txt.devel.diff

@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -321,7 +321,11 @@
+@@ -314,7 +314,11 @@
  #--------------------------------------------------------------------
  include(CMakePackageConfigHelpers)
 
@@ -13,7 +13,7 @@
 
  configure_package_config_file(src/glfw3Config.cmake.in
                                src/glfw3Config.cmake
-@@ -351,6 +355,9 @@
+@@ -344,6 +348,9 @@
 
  if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
      add_subdirectory(docs)
@@ -23,7 +23,7 @@
  endif()
 
  #--------------------------------------------------------------------
-@@ -371,6 +378,11 @@
+@@ -364,6 +371,11 @@
      install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
              DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 

graphics/glfw/files/patch-CMakeLists.txt.release.diff

@@ -1,10 +1,10 @@
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -356,7 +356,11 @@
+@@ -314,7 +314,11 @@
  #--------------------------------------------------------------------
  include(CMakePackageConfigHelpers)
 
--set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
+-set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
 +if (NOT GLFW_CMAKE_CONFIG_PATH)
 +  set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
 +endif()
@@ -13,7 +13,7 @@
 
  configure_package_config_file(src/glfw3Config.cmake.in
                                src/glfw3Config.cmake
-@@ -386,6 +390,9 @@
+@@ -344,6 +348,9 @@
 
  if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
      add_subdirectory(docs)
@@ -23,9 +23,9 @@
  endif()
 
  #--------------------------------------------------------------------
-@@ -406,6 +413,11 @@
+@@ -364,6 +371,11 @@
      install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
-             DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
+             DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 
 +    if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
 +        install(FILES "${GLFW_BINARY_DIR}/docs/html"

graphics/glfw/files/patch-src_CMakeLists.txt.release.diff

@@ -1,14 +1,13 @@
 --- src/CMakeLists.txt.orig
 +++ src/CMakeLists.txt
-@@ -96,9 +96,10 @@
-     elseif (APPLE)
+@@ -138,8 +138,10 @@
          # Add -fno-common to work around a bug in Apple's GCC
          target_compile_options(glfw PRIVATE "-fno-common")
--
+ 
 -        set_target_properties(glfw PROPERTIES
 +	if (NOT CMAKE_INSTALL_NAME_DIR)
 +            set_target_properties(glfw PROPERTIES
-                               INSTALL_NAME_DIR "lib${LIB_SUFFIX}")
+                               INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")
 +	endif()
      elseif (UNIX)
          # Hide symbols not explicitly tagged for export from the shared library