summaryrefslogtreecommitdiff
path: root/irc/weechat-devel/files
diff options
context:
space:
mode:
authorJase Thew <jase@FreeBSD.org>2012-09-04 16:09:59 +0000
committerJase Thew <jase@FreeBSD.org>2012-09-04 16:09:59 +0000
commit2d5591a59cc3c3121b636ebe1d10ad5689d39643 (patch)
treebb5df3cca3b76732d5f0bd031d8460a7ea33714c /irc/weechat-devel/files
parent- Update to version 24.2 (diff)
- Update to 20120903 (0.3.9-rc1)
Approved by: flo (mentor)
Notes
Notes: svn path=/head/; revision=303661
Diffstat (limited to 'irc/weechat-devel/files')
-rw-r--r--irc/weechat-devel/files/patch-cmake-FindPython_cmake15
1 files changed, 10 insertions, 5 deletions
diff --git a/irc/weechat-devel/files/patch-cmake-FindPython_cmake b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
index 4e5f60e2a6a3..d883e68e4072 100644
--- a/irc/weechat-devel/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
@@ -1,21 +1,26 @@
---- cmake/FindPython.cmake.orig 2012-08-11 14:06:55.086663842 +0100
-+++ cmake/FindPython.cmake 2012-08-11 14:23:55.301504695 +0100
+--- cmake/FindPython.cmake.orig 2012-09-03 15:43:03.205462582 +0100
++++ cmake/FindPython.cmake 2012-09-03 15:46:06.564072755 +0100
@@ -34,8 +34,7 @@
ENDIF(PYTHON_FOUND)
FIND_PROGRAM(PYTHON_EXECUTABLE
-- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
+- NAMES python2.7 python2.6 python2.5 python
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ NAMES ${BSD_PYTHON_CMD}
)
IF(PYTHON_EXECUTABLE)
-@@ -65,7 +64,7 @@
+@@ -60,11 +59,11 @@
)
FIND_LIBRARY(PYTHON_LIBRARY
-- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
+- NAMES python2.7 python2.6 python2.5 python
+ NAMES ${BSD_PYTHON_VER}
PATHS ${PYTHON_POSSIBLE_LIB_PATH}
)
+- IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
++ IF(0)
+ EXECUTE_PROCESS(
+ COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+ OUTPUT_VARIABLE PYTHON_VERSION