<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4e712363a6f3221a42c907a65d95a5b9026dd939">https://github.com/macports/macports-ports/commit/4e712363a6f3221a42c907a65d95a5b9026dd939</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4e71236 glfw-devel: update to a90ee65f (20161108); split CMakeLists.txt patch into release and devel versions.
</span>4e71236 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e712363a6f3221a42c907a65d95a5b9026dd939
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Nov 8 11:23:43 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> glfw-devel: update to a90ee65f (20161108); split CMakeLists.txt patch into release and devel versions.
</span>---
graphics/glfw/Portfile | 20 ++++++++++++--------
...ists.txt.diff => patch-CMakeLists.txt.devel.diff} | 6 +++---
...ts.txt.diff => patch-CMakeLists.txt.release.diff} | 0
3 files changed, 15 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/Portfile b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5cf3c9d..0ff5a51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,28 +53,32 @@ platform darwin {
</span> long_description ${description}: \
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 style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix install directory for cmake files and docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup glfw glfw 8d6f265441959d0eff2d3fd97edfb99b98ce2777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20161019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 43b59ba3be7d03b23536db3628021f4dda8d3147 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a9cc3d0f8effac9978613523fd5c5f1b81c8577ed13f206fa177678619cb445
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup glfw glfw a90ee65f7b0264a672634fc4f5891a2ab57a47ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20161108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 927f518ffbd6ae9a35d7c51c3b44e1905325605d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 95abb482bd698c92bc747c4e397b1c64b880d521d0a9664bd78d81a8f68f089e
</span>
conflicts glfw
long_description ${description}: \
This port follows the GIT master version of GLFW, which is typically updated every few days to weeks.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix install directory for cmake files and docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.devel.diff
</span> }
# patch to fix install name of library
patchfiles-append patch-src_CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix install directory for cmake files and docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-CMakeLists.txt.diff b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span>similarity index 94%
copy from graphics/glfw/files/patch-CMakeLists.txt.diff
copy to graphics/glfw/files/patch-CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 78afc7c..87383ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,7 +356,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,7 +360,11 @@
</span> #--------------------------------------------------------------------
include(CMakePackageConfigHelpers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span>
configure_package_config_file(src/glfw3Config.cmake.in
src/glfw3Config.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,6 +390,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,6 +394,9 @@
</span>
if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
add_subdirectory(docs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> endif()
#--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,6 +413,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,6 +417,11 @@
</span> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-CMakeLists.txt.diff b/graphics/glfw/files/patch-CMakeLists.txt.release.diff
</span>similarity index 100%
rename from graphics/glfw/files/patch-CMakeLists.txt.diff
rename to graphics/glfw/files/patch-CMakeLists.txt.release.diff
</pre><pre style='margin:0'>
</pre>