[149211] trunk/dports/graphics/glfw

[michaelld at macports.org]

Revision: 149211
          https://trac.macports.org/changeset/149211
Author:   michaelld at macports.org
Date:     2016-06-05 13:32:56 -0700 (Sun, 05 Jun 2016)
Log Message:
-----------
glfw: update release to 3.2 and devel to f6ec8355 (20160602).

Modified Paths:
--------------
    trunk/dports/graphics/glfw/Portfile
    trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
    trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff

Modified: trunk/dports/graphics/glfw/Portfile
===================================================================
--- trunk/dports/graphics/glfw/Portfile	2016-06-05 18:36:14 UTC (rev 149210)
+++ trunk/dports/graphics/glfw/Portfile	2016-06-05 20:32:56 UTC (rev 149211)
@@ -18,12 +18,11 @@
 
     # release
 
-    github.setup    glfw glfw 3.1.2
-    revision        1
+    github.setup    glfw glfw 3.2
     # bump the epoch because I moved the version from 20151012 to 3.1.2
     epoch           1
-    checksums       rmd160 f0a34fda090c5d5e7aef2c916d6160faf777842f \
-                    sha256 a956537ed306746cf0bfe3e4a71758bff6d2a9e25f51fe718516f5b49ad9bfc5
+    checksums       rmd160 0b0e400f47b965af9fe6eb3eb7e373cb6efa105f \
+                    sha256 2d98746893b55a332d2861bfc525d91b557894318dc79de015c854a0ee818ed6
 
     # patch to fix install directory for cmake files and docs
 
@@ -37,10 +36,10 @@
 
     # devel
 
-    github.setup    glfw glfw 20ac3d321f820fd99fb1d7fb580c01f7d2d947b6
-    version         20160531
-    checksums       rmd160 15f1c45825e2b26c6be91d39061987fed994a0f3 \
-                    sha256 116e8eb5e2f557b9c978d605c426cb239a8abb65224c1d8addc8adfbe27236d9
+    github.setup    glfw glfw f6ec835599123c3c970d34534ed7ddc69a1fc6af
+    version         20160602
+    checksums       rmd160 e88b5e631026118f6def547c62e3a6ce28da8c95 \
+                    sha256 601bdf111653940711379e86def931fd5c9d571b08066d72aa25a4d2c572924c
 
     # patch to fix install directory for cmake files and docs
 

Modified: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
===================================================================
--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff	2016-06-05 18:36:14 UTC (rev 149210)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff	2016-06-05 20:32:56 UTC (rev 149211)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -327,7 +327,11 @@
+--- CMakeLists.txt.orig	2016-06-02 10:13:47.000000000 -0400
++++ CMakeLists.txt	2016-06-02 15:10:42.000000000 -0400
+@@ -336,7 +336,11 @@
  #--------------------------------------------------------------------
  include(CMakePackageConfigHelpers)
  
@@ -13,7 +13,7 @@
  
  configure_package_config_file(src/glfw3Config.cmake.in
                                src/glfw3Config.cmake
-@@ -357,6 +361,9 @@
+@@ -366,6 +370,9 @@
  
  if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
      add_subdirectory(docs)
@@ -23,7 +23,7 @@
  endif()
  
  #--------------------------------------------------------------------
-@@ -377,6 +384,11 @@
+@@ -386,6 +393,11 @@
      install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
              DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
  

Modified: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff
===================================================================
--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff	2016-06-05 18:36:14 UTC (rev 149210)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff	2016-06-05 20:32:56 UTC (rev 149211)
@@ -1,19 +1,20 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -479,7 +479,10 @@
+--- CMakeLists.txt.orig	2016-06-02 10:13:47.000000000 -0400
++++ CMakeLists.txt	2016-06-02 15:10:42.000000000 -0400
+@@ -336,7 +336,11 @@
+ #--------------------------------------------------------------------
  include(CMakePackageConfigHelpers)
  
- if (UNIX)
--    set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake/glfw3/")
-+    if (NOT GLFW_CMAKE_CONFIG_PATH)
-+        set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
-+    endif()
-+    set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GLFW_CMAKE_CONFIG_PATH}/cmake/glfw3/")
- else()
-     set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/")
- endif()
-@@ -520,6 +523,9 @@
+-set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
++if (NOT GLFW_CMAKE_CONFIG_PATH)
++  set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
++endif()
++
++set(GLFW_CONFIG_PATH "${GLFW_CMAKE_CONFIG_PATH}/cmake/glfw3")
  
+ configure_package_config_file(src/glfw3Config.cmake.in
+                               src/glfw3Config.cmake
+@@ -366,6 +370,9 @@
+ 
  if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
      add_subdirectory(docs)
 +    if (NOT GLFW_DOCS_PATH)
@@ -22,17 +23,9 @@
  endif()
  
  #--------------------------------------------------------------------
-@@ -532,12 +538,17 @@
- 
-     install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
-                   "${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake"
--            DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
-+            DESTINATION ${GLFW_CONFIG_PATH})
- 
--    install(EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
-+    install(EXPORT glfwTargets DESTINATION ${GLFW_CONFIG_PATH})
+@@ -386,6 +393,11 @@
      install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
-             DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+             DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
  
 +    if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
 +        install(FILES "${GLFW_BINARY_DIR}/docs/html"
@@ -41,4 +34,4 @@
 +
      # Only generate this target if no higher-level project already has
      if (NOT TARGET uninstall)
-         configure_file("${GLFW_SOURCE_DIR}/cmake_uninstall.cmake.in"
+         configure_file(cmake_uninstall.cmake.in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160605/9d28eac7/attachment.html>