<!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>[145575] 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/145575">145575</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-02-09 12:54:09 -0800 (Tue, 09 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>glfw:
+ add patches for release and devel to fix install directory for cmake files and docs, instead of doing them in post-destroot;
+ rev-bump release for changes;
+ update devel to 49d22820 (20160208).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsglfwPortfile">trunk/dports/graphics/glfw/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/glfw/files/</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 (145574 => 145575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/glfw/Portfile 2016-02-09 20:51:25 UTC (rev 145574)
+++ trunk/dports/graphics/glfw/Portfile 2016-02-09 20:54:09 UTC (rev 145575)
</span><span class="lines">@@ -19,11 +19,16 @@
</span><span class="cx"> # release
</span><span class="cx">
</span><span class="cx"> github.setup glfw glfw 3.1.2
</span><ins>+ revision 1
</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><span class="cx"> checksums rmd160 f0a34fda090c5d5e7aef2c916d6160faf777842f \
</span><span class="cx"> sha256 a956537ed306746cf0bfe3e4a71758bff6d2a9e25f51fe718516f5b49ad9bfc5
</span><span class="cx">
</span><ins>+ # patch to fix install directory for cmake files and docs
+
+ patchfiles-append patch-CMakeLists.txt.release.diff
+
</ins><span class="cx"> conflicts glfw-devel
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port follows the release version of GLFW, which is typically updated every 6 months. If for some reason this port does not build or function as desired, try the ${name}-devel port.
</span><span class="lines">@@ -32,11 +37,15 @@
</span><span class="cx">
</span><span class="cx"> # devel
</span><span class="cx">
</span><del>- github.setup glfw glfw 832c2ffa3b4a34f984de0c4a7bd4d3a84fd172af
- version 20160131
- checksums rmd160 bb2309d291a1b971df389489c29b158b180d162c \
- sha256 b0b8846b16557581cfe863009e76b6563f52749bab3c6ae83af1c175cdef8927
</del><ins>+ github.setup glfw glfw 49d228207f8322ed8aa9f820a1490c852a5cb2d7
+ version 20160208
+ checksums rmd160 39b973e35731e8975246c70538e475adabc1d20e \
+ sha256 ba4119ca5c006293ff75169307b540ffd5b29bbabed136a2a97725d01d4e98b7
</ins><span class="cx">
</span><ins>+ # patch to fix install directory for cmake files and docs
+
+ patchfiles-append patch-CMakeLists.txt.devel.diff
+
</ins><span class="cx"> conflicts glfw
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port follows the GIT master version of GLFW, which is typically updated every few days to weeks.
</span><span class="lines">@@ -55,7 +64,8 @@
</span><span class="cx">
</span><span class="cx"> configure.args -DBUILD_SHARED_LIBS=on \
</span><span class="cx"> -DGLFW_BUILD_EXAMPLES=off \
</span><del>- -DGLFW_BUILD_TESTS=off
</del><ins>+ -DGLFW_BUILD_TESTS=off \
+ -DGLFW_CMAKE_CONFIG_PATH=share
</ins><span class="cx">
</span><span class="cx"> # remove top-level library path, such that internal libraries are used
</span><span class="cx"> # instead of any already-installed ones.
</span><span class="lines">@@ -72,20 +82,3 @@
</span><span class="cx"> } else {
</span><span class="cx"> configure.args-append -DDOXYGEN_EXECUTABLE=
</span><span class="cx"> }
</span><del>-
-post-destroot {
-
- # move cmake Modules to an appropriate location
-
- xinstall -m 755 -d ${destroot}${prefix}/share/cmake
- move ${destroot}${prefix}/lib/cmake/glfw \
- ${destroot}${prefix}/share/cmake
-
- # copy html docs if requested
-
- if {[variant_isset docs]} {
- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
- copy ${cmake.build_dir}/docs/html \
- ${destroot}${prefix}/share/doc/${name}
- }
-}
</del></span></pre></div>
<a id="trunkdportsgraphicsglfwfilespatchCMakeListstxtdeveldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff (0 => 145575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff (rev 0)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff 2016-02-09 20:54:09 UTC (rev 145575)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -366,7 +366,11 @@ endforeach()
+ #--------------------------------------------------------------------
+ include(CMakePackageConfigHelpers)
+
+-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
+@@ -400,6 +404,9 @@ endif()
+
+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
+ add_subdirectory(docs)
++ if (NOT GLFW_DOCS_PATH)
++ set(GLFW_DOCS_PATH "share/doc/glfw3/")
++ endif()
+ endif()
+
+ #--------------------------------------------------------------------
+@@ -420,6 +427,11 @@ if (GLFW_INSTALL)
+ install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
+ DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
+
++ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
++ install(FILES "${GLFW_BINARY_DIR}/docs/html"
++ DESTINATION "${GLFW_DOCS_PATH}")
++ endif()
++
+ # Only generate this target if no higher-level project already has
+ if (NOT TARGET uninstall)
+ configure_file(cmake_uninstall.cmake.in
</ins></span></pre></div>
<a id="trunkdportsgraphicsglfwfilespatchCMakeListstxtreleasediff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff (0 => 145575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff (rev 0)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff 2016-02-09 20:54:09 UTC (rev 145575)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+--- CMakeLists.txt.orig 2016-02-09 15:37:20.000000000 -0500
++++ CMakeLists.txt 2016-02-09 15:41:47.000000000 -0500
+@@ -479,7 +479,10 @@
+ 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 @@
+
+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
+ add_subdirectory(docs)
++ if (NOT GLFW_DOCS_PATH)
++ set(GLFW_DOCS_PATH "share/doc/glfw3/")
++ endif()
+ 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})
+ install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
+ DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+
++ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
++ install(FILES "${GLFW_BINARY_DIR}/docs/html"
++ DESTINATION "${GLFW_DOCS_PATH}")
++ endif()
++
+ # Only generate this target if no higher-level project already has
+ if (NOT TARGET uninstall)
+ configure_file("${GLFW_SOURCE_DIR}/cmake_uninstall.cmake.in"
</ins></span></pre>
</div>
</div>
</body>
</html>