<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149211] trunk/dports/graphics/glfw</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149211">149211</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-06-05 13:32:56 -0700 (Sun, 05 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>glfw: update release to 3.2 and devel to f6ec8355 (20160602).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsglfwPortfile">trunk/dports/graphics/glfw/Portfile</a></li>
<li><a href="#trunkdportsgraphicsglfwfilespatchCMakeListstxtdeveldiff">trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff</a></li>
<li><a href="#trunkdportsgraphicsglfwfilespatchCMakeListstxtreleasediff">trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsglfwPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/glfw/Portfile (149210 => 149211)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -18,12 +18,11 @@
</span><span class="cx">
</span><span class="cx"> # release
</span><span class="cx">
</span><del>- github.setup glfw glfw 3.1.2
- revision 1
</del><ins>+ github.setup glfw glfw 3.2
</ins><span class="cx"> # bump the epoch because I moved the version from 20151012 to 3.1.2
</span><span class="cx"> epoch 1
</span><del>- checksums rmd160 f0a34fda090c5d5e7aef2c916d6160faf777842f \
- sha256 a956537ed306746cf0bfe3e4a71758bff6d2a9e25f51fe718516f5b49ad9bfc5
</del><ins>+ checksums rmd160 0b0e400f47b965af9fe6eb3eb7e373cb6efa105f \
+ sha256 2d98746893b55a332d2861bfc525d91b557894318dc79de015c854a0ee818ed6
</ins><span class="cx">
</span><span class="cx"> # patch to fix install directory for cmake files and docs
</span><span class="cx">
</span><span class="lines">@@ -37,10 +36,10 @@
</span><span class="cx">
</span><span class="cx"> # devel
</span><span class="cx">
</span><del>- github.setup glfw glfw 20ac3d321f820fd99fb1d7fb580c01f7d2d947b6
- version 20160531
- checksums rmd160 15f1c45825e2b26c6be91d39061987fed994a0f3 \
- sha256 116e8eb5e2f557b9c978d605c426cb239a8abb65224c1d8addc8adfbe27236d9
</del><ins>+ github.setup glfw glfw f6ec835599123c3c970d34534ed7ddc69a1fc6af
+ version 20160602
+ checksums rmd160 e88b5e631026118f6def547c62e3a6ce28da8c95 \
+ sha256 601bdf111653940711379e86def931fd5c9d571b08066d72aa25a4d2c572924c
</ins><span class="cx">
</span><span class="cx"> # patch to fix install directory for cmake files and docs
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsglfwfilespatchCMakeListstxtdeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff (149210 => 149211)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -327,7 +327,11 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> #--------------------------------------------------------------------
</span><span class="cx"> include(CMakePackageConfigHelpers)
</span><span class="cx">
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> configure_package_config_file(src/glfw3Config.cmake.in
</span><span class="cx"> src/glfw3Config.cmake
</span><del>-@@ -357,6 +361,9 @@
</del><ins>+@@ -366,6 +370,9 @@
</ins><span class="cx">
</span><span class="cx"> if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
</span><span class="cx"> add_subdirectory(docs)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> #--------------------------------------------------------------------
</span><del>-@@ -377,6 +384,11 @@
</del><ins>+@@ -386,6 +393,11 @@
</ins><span class="cx"> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
</span><span class="cx"> DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsglfwfilespatchCMakeListstxtreleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff (149210 => 149211)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,19 +1,20 @@
</span><del>---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -479,7 +479,10 @@
</del><ins>+--- 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 @@
+ #--------------------------------------------------------------------
</ins><span class="cx"> include(CMakePackageConfigHelpers)
</span><span class="cx">
</span><del>- 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 @@
</del><ins>+-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")
</ins><span class="cx">
</span><ins>+ configure_package_config_file(src/glfw3Config.cmake.in
+ src/glfw3Config.cmake
+@@ -366,6 +370,9 @@
+
</ins><span class="cx"> if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
</span><span class="cx"> add_subdirectory(docs)
</span><span class="cx"> + if (NOT GLFW_DOCS_PATH)
</span><span class="lines">@@ -22,17 +23,9 @@
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> #--------------------------------------------------------------------
</span><del>-@@ -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})
</del><ins>+@@ -386,6 +393,11 @@
</ins><span class="cx"> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
</span><del>- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
</del><ins>+ DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
</ins><span class="cx">
</span><span class="cx"> + if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
</span><span class="cx"> + install(FILES "${GLFW_BINARY_DIR}/docs/html"
</span><span class="lines">@@ -41,4 +34,4 @@
</span><span class="cx"> +
</span><span class="cx"> # Only generate this target if no higher-level project already has
</span><span class="cx"> if (NOT TARGET uninstall)
</span><del>- configure_file("${GLFW_SOURCE_DIR}/cmake_uninstall.cmake.in"
</del><ins>+ configure_file(cmake_uninstall.cmake.in
</ins></span></pre>
</div>
</div>
</body>
</html>