summaryrefslogtreecommitdiff
path: root/devel/cmake/patches
diff options
context:
space:
mode:
Diffstat (limited to 'devel/cmake/patches')
-rw-r--r--devel/cmake/patches/patch-aa8
-rw-r--r--devel/cmake/patches/patch-ab12
-rw-r--r--devel/cmake/patches/patch-ac8
3 files changed, 14 insertions, 14 deletions
diff --git a/devel/cmake/patches/patch-aa b/devel/cmake/patches/patch-aa
index d837a46684e..7ba48fd1d65 100644
--- a/devel/cmake/patches/patch-aa
+++ b/devel/cmake/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $
+$NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $
---- Modules/Platform/UnixPaths.cmake.orig 2009-11-13 19:32:53.000000000 +0100
+--- Modules/Platform/UnixPaths.cmake.orig 2010-11-03 19:58:27.000000000 +0000
+++ Modules/Platform/UnixPaths.cmake
@@ -48,7 +48,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
/usr/include/w32api
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $
+ @X11BASE@/include /usr/X11R6/include /usr/include/X11
# Other
- /opt/local/include /usr/pkg/include
+ /usr/pkg/include
@@ -61,7 +61,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
/usr/lib/w32api
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.6 2009/11/25 19:08:18 adam Exp $
+ @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
# Other
- /opt/local/lib /usr/pkg/lib
+ /usr/pkg/lib
diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab
index cb219c94138..2ac2e4c9a48 100644
--- a/devel/cmake/patches/patch-ab
+++ b/devel/cmake/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.8 2010/02/12 13:45:54 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2010/11/11 08:34:02 adam Exp $
---- Modules/FindPythonInterp.cmake.orig 2009-11-13 18:32:52.000000000 +0000
+--- Modules/FindPythonInterp.cmake.orig 2010-11-10 20:05:11.000000000 +0000
+++ Modules/FindPythonInterp.cmake
@@ -19,8 +19,15 @@
- # (To distributed this file outside of CMake, substitute the full
+ # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+# for pkgsrc: force Python version (set in pyversion.mk)
+IF(DEFINED PYVERSSUFFIX)
+ SET(_VERSIONS python${PYVERSSUFFIX})
+ELSE(DEFINED PYVERSSUFFIX)
-+ SET(_VERSIONS python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python)
++ SET(_VERSIONS python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python)
+ENDIF(DEFINED PYVERSSUFFIX)
+
FIND_PROGRAM(PYTHON_EXECUTABLE
-- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES ${_VERSIONS}
PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index 475663b8476..5fdf72bb6b4 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2010/02/12 13:45:54 drochner Exp $
+$NetBSD: patch-ac,v 1.5 2010/11/11 08:34:02 adam Exp $
---- Modules/FindPythonLibs.cmake.orig 2009-11-13 18:32:52.000000000 +0000
+--- Modules/FindPythonLibs.cmake.orig 2010-11-10 20:06:34.000000000 +0000
+++ Modules/FindPythonLibs.cmake
@@ -27,7 +27,14 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
--FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+-FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+# for pkgsrc: force Python version (set in pyversion.mk)
+IF(DEFINED PYVERSSUFFIX)
+ SET(_VERSIONS ${PYVERSSUFFIX})
+ELSE(DEFINED PYVERSSUFFIX)
-+ SET(_VERSIONS 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++ SET(_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+ENDIF(DEFINED PYVERSSUFFIX)
+
+FOREACH(_CURRENT_VERSION ${_VERSIONS})