Wed Oct 2 20:04:04 2013 UTC ()
Adjust Cygwin to the normal pkgsrc installation layout. Add one file
that doesn't seem to get installed otherwise.


(joerg)
diff -r0 -r1.1 pkgsrc/devel/cmake/PLIST.Cygwin
diff -r1.48 -r1.49 pkgsrc/devel/cmake/distinfo
diff -r0 -r1.1 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt

File Added: pkgsrc/devel/cmake/Attic/PLIST.Cygwin
@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

cvs diff -r1.48 -r1.49 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2013/07/20 12:49:26 1.48
+++ pkgsrc/devel/cmake/distinfo 2013/10/02 20:04:04 1.49
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.48 2013/07/20 12:49:26 ryoon Exp $ 1$NetBSD: distinfo,v 1.49 2013/10/02 20:04:04 joerg Exp $
2 2
3SHA1 (cmake-2.8.11.2.tar.gz) = 31f217c9305add433e77eff49a6eac0047b9e929 3SHA1 (cmake-2.8.11.2.tar.gz) = 31f217c9305add433e77eff49a6eac0047b9e929
4RMD160 (cmake-2.8.11.2.tar.gz) = 4fe1fe6306cae0d11da53b30266203c846e484d8 4RMD160 (cmake-2.8.11.2.tar.gz) = 4fe1fe6306cae0d11da53b30266203c846e484d8
5Size (cmake-2.8.11.2.tar.gz) = 5887016 bytes 5Size (cmake-2.8.11.2.tar.gz) = 5887016 bytes
 6SHA1 (patch-CMakeLists.txt) = 9f1def44b74b9161face2da351331c3201b7944d
6SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564 7SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564
7SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a 8SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
8SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 9SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
9SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 8ed0972c27e23937e01333c3cd997562dbcb4ced 10SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 8ed0972c27e23937e01333c3cd997562dbcb4ced
10SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c 11SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
11SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b 12SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
12SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502 13SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
13SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508 14SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508

File Added: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
$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}")