[145575] trunk/dports/graphics/glfw
michaelld at macports.org
michaelld at macports.org
Tue Feb 9 12:54:09 PST 2016
Revision: 145575
https://trac.macports.org/changeset/145575
Author: michaelld at macports.org
Date: 2016-02-09 12:54:09 -0800 (Tue, 09 Feb 2016)
Log Message:
-----------
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).
Modified Paths:
--------------
trunk/dports/graphics/glfw/Portfile
Added Paths:
-----------
trunk/dports/graphics/glfw/files/
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-02-09 20:51:25 UTC (rev 145574)
+++ trunk/dports/graphics/glfw/Portfile 2016-02-09 20:54:09 UTC (rev 145575)
@@ -19,11 +19,16 @@
# release
github.setup glfw glfw 3.1.2
+ revision 1
# bump the epoch because I moved the version from 20151012 to 3.1.2
epoch 1
checksums rmd160 f0a34fda090c5d5e7aef2c916d6160faf777842f \
sha256 a956537ed306746cf0bfe3e4a71758bff6d2a9e25f51fe718516f5b49ad9bfc5
+ # patch to fix install directory for cmake files and docs
+
+ patchfiles-append patch-CMakeLists.txt.release.diff
+
conflicts glfw-devel
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.
@@ -32,11 +37,15 @@
# devel
- github.setup glfw glfw 832c2ffa3b4a34f984de0c4a7bd4d3a84fd172af
- version 20160131
- checksums rmd160 bb2309d291a1b971df389489c29b158b180d162c \
- sha256 b0b8846b16557581cfe863009e76b6563f52749bab3c6ae83af1c175cdef8927
+ github.setup glfw glfw 49d228207f8322ed8aa9f820a1490c852a5cb2d7
+ version 20160208
+ checksums rmd160 39b973e35731e8975246c70538e475adabc1d20e \
+ sha256 ba4119ca5c006293ff75169307b540ffd5b29bbabed136a2a97725d01d4e98b7
+ # patch to fix install directory for cmake files and docs
+
+ patchfiles-append patch-CMakeLists.txt.devel.diff
+
conflicts glfw
long_description ${description}: \
This port follows the GIT master version of GLFW, which is typically updated every few days to weeks.
@@ -55,7 +64,8 @@
configure.args -DBUILD_SHARED_LIBS=on \
-DGLFW_BUILD_EXAMPLES=off \
- -DGLFW_BUILD_TESTS=off
+ -DGLFW_BUILD_TESTS=off \
+ -DGLFW_CMAKE_CONFIG_PATH=share
# remove top-level library path, such that internal libraries are used
# instead of any already-installed ones.
@@ -72,20 +82,3 @@
} else {
configure.args-append -DDOXYGEN_EXECUTABLE=
}
-
-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}
- }
-}
Added: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
===================================================================
--- 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)
@@ -0,0 +1,37 @@
+--- 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
Added: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff
===================================================================
--- 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)
@@ -0,0 +1,44 @@
+--- 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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160209/1eff2bde/attachment.html>
More information about the macports-changes
mailing list