diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-02 20:04:04 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-02 20:04:04 +0000 |
commit | cd3cb530e48f3a7d699dc205d81a8db2732f0f24 (patch) | |
tree | 2642b9bcf8d4d3a7cda09b8ca779e260d521cbc3 /devel/cmake | |
parent | 1215d5acbfdfd89ae90f7fa143e3f15f2fdcf284 (diff) | |
download | pkgsrc-cd3cb530e48f3a7d699dc205d81a8db2732f0f24.tar.gz |
Adjust Cygwin to the normal pkgsrc installation layout. Add one file
that doesn't seem to get installed otherwise.
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/PLIST.Cygwin | 2 | ||||
-rw-r--r-- | devel/cmake/distinfo | 3 | ||||
-rw-r--r-- | devel/cmake/patches/patch-CMakeLists.txt | 24 |
3 files changed, 28 insertions, 1 deletions
diff --git a/devel/cmake/PLIST.Cygwin b/devel/cmake/PLIST.Cygwin new file mode 100644 index 00000000000..ca81c3a0149 --- /dev/null +++ b/devel/cmake/PLIST.Cygwin @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.Cygwin,v 1.1 2013/10/02 20:04:04 joerg Exp $ +share/doc/Cygwin/cmake-2.8.11.2-1.README diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 64435462151..b6757531690 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.48 2013/07/20 12:49:26 ryoon Exp $ +$NetBSD: distinfo,v 1.49 2013/10/02 20:04:04 joerg Exp $ SHA1 (cmake-2.8.11.2.tar.gz) = 31f217c9305add433e77eff49a6eac0047b9e929 RMD160 (cmake-2.8.11.2.tar.gz) = 4fe1fe6306cae0d11da53b30266203c846e484d8 Size (cmake-2.8.11.2.tar.gz) = 5887016 bytes +SHA1 (patch-CMakeLists.txt) = 9f1def44b74b9161face2da351331c3201b7944d SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564 SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 diff --git a/devel/cmake/patches/patch-CMakeLists.txt b/devel/cmake/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..7be8c1bb33f --- /dev/null +++ b/devel/cmake/patches/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2013/10/02 20:04:04 joerg Exp $ + +Provide consistent installation according to the pkgsrc layout for Cygwin. + +--- CMakeLists.txt.orig 2013-10-01 23:01:08.455787200 +0000 ++++ CMakeLists.txt +@@ -467,17 +467,6 @@ set(CMAKE_DOC_DIR "/doc/cmake-${CMake_VE + set(CMAKE_MAN_DIR "/man" CACHE STRING + "Install location for man pages (relative to prefix).") + mark_as_advanced(CMAKE_DATA_DIR CMAKE_DOC_DIR CMAKE_MAN_DIR) +-if(CYGWIN AND EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") +- # Force doc, data and man dirs to conform to cygwin layout. +- set(CMAKE_DOC_DIR "/share/doc/cmake-${CMake_VERSION}") +- set(CMAKE_DATA_DIR "/share/cmake-${CMake_VERSION}") +- set(CMAKE_MAN_DIR "/share/man") +- # let the user know we just forced these values +- message(STATUS "Setup for Cygwin packaging") +- message(STATUS "Override cache CMAKE_DOC_DIR = ${CMAKE_DOC_DIR}") +- message(STATUS "Override cache CMAKE_DATA_DIR = ${CMAKE_DATA_DIR}") +- message(STATUS "Override cache CMAKE_MAN_DIR = ${CMAKE_MAN_DIR}") +-endif() + string(REGEX REPLACE "^/" "" CMake_DATA_DEST "${CMAKE_DATA_DIR}") + string(REGEX REPLACE "^/" "" CMake_DOC_DEST "${CMAKE_DOC_DIR}") + |