diff options
Diffstat (limited to 'irc/weechat-devel/files')
-rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindIconv.cmake | 14 | ||||
-rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindLua_cmake | 61 | ||||
-rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindPython_cmake | 61 | ||||
-rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindRuby_cmake | 56 | ||||
-rw-r--r-- | irc/weechat-devel/files/patch-cmake-FindTCL_cmake | 106 |
5 files changed, 0 insertions, 298 deletions
diff --git a/irc/weechat-devel/files/patch-cmake-FindIconv.cmake b/irc/weechat-devel/files/patch-cmake-FindIconv.cmake deleted file mode 100644 index eef7422b85cc..000000000000 --- a/irc/weechat-devel/files/patch-cmake-FindIconv.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/FindIconv.cmake -+++ cmake/FindIconv.cmake -@@ -48,9 +48,8 @@ find_library(ICONV_LIBRARY - - IF(ICONV_INCLUDE_PATH) - IF(ICONV_LIBRARY) -- STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}") -- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND) -- CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND) -+ CHECK_LIBRARY_EXISTS("${ICONV_LIBRARY}" libiconv_open "" LIBICONV_OPEN_FOUND) -+ CHECK_LIBRARY_EXISTS("${ICONV_LIBRARY}" iconv_open "" ICONV_OPEN_FOUND) - IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND) - SET(ICONV_FOUND TRUE) - ENDIF() diff --git a/irc/weechat-devel/files/patch-cmake-FindLua_cmake b/irc/weechat-devel/files/patch-cmake-FindLua_cmake deleted file mode 100644 index 221f0568985d..000000000000 --- a/irc/weechat-devel/files/patch-cmake-FindLua_cmake +++ /dev/null @@ -1,61 +0,0 @@ ---- cmake/FindLua.cmake.orig 2012-07-07 11:41:16.000000000 +0000 -+++ cmake/FindLua.cmake 2012-07-08 09:00:30.126123501 +0000 -@@ -33,51 +33,18 @@ - SET(LUA_FIND_QUIETLY TRUE) - ENDIF(LUA_FOUND) - --FIND_PATH( -- LUA51_INCLUDE_PATH lua.h -- PATHS /usr/include /usr/local/include /usr/pkg/include -- PATH_SUFFIXES lua51 lua5.1 lua-5.1 -+FIND_PATH(LUA_INCLUDE_PATH lua.h -+ PATHS ${BSD_LUA_INCDIR} - ) - --FIND_LIBRARY( -- LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua -- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib -- PATH_SUFFIXES lua51 lua5.1 lua-5.1 -+FIND_LIBRARY(LUA_LIBRARY -+ NAMES lua lua-5.1 -+ PATHS ${BSD_LUA_LIBDIR} - ) - --IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}") -- SET(LUA_LIBRARY "${LUA51_LIBRARY}") -- SET(LUA_VERSION "5.1") -+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) - SET(LUA_FOUND TRUE) --ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- FIND_PATH( -- LUA50_INCLUDE_PATH lua.h -- PATHS /usr/include /usr/local/include /usr/pkg/include -- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua -- ) -- -- FIND_LIBRARY( -- LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua -- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib -- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua -- ) -- -- FIND_LIBRARY( -- LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib -- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib -- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua -- ) -- -- IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) -- SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}") -- SET(LUA_LIBRARY "${LUA50_LIBRARY}") -- SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}") -- SET(LUA_VERSION "5.0") -- SET(LUA_FOUND TRUE) -- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) --ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) -- -+ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY) - - MARK_AS_ADVANCED( - LUA_INCLUDE_PATH diff --git a/irc/weechat-devel/files/patch-cmake-FindPython_cmake b/irc/weechat-devel/files/patch-cmake-FindPython_cmake deleted file mode 100644 index af4844d5c914..000000000000 --- a/irc/weechat-devel/files/patch-cmake-FindPython_cmake +++ /dev/null @@ -1,61 +0,0 @@ ---- cmake/FindPython.cmake.orig 2013-01-11 00:10:37.730703018 +0000 -+++ cmake/FindPython.cmake 2013-01-11 00:21:33.725664455 +0000 -@@ -33,17 +33,9 @@ - SET(PYTHON_FIND_QUIETLY TRUE) - ENDIF(PYTHON_FOUND) - --IF(ENABLE_PYTHON3) -- FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -- PATHS /usr/bin /usr/local/bin /usr/pkg/bin -- ) --ELSE(ENABLE_PYTHON3) -- FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.7 python2.6 python2.5 python -- PATHS /usr/bin /usr/local/bin /usr/pkg/bin -- ) --ENDIF(ENABLE_PYTHON3) -+FIND_PROGRAM(PYTHON_EXECUTABLE -+ NAMES ${BSD_PYTHON_CMD} -+ ) - - IF(PYTHON_EXECUTABLE) - EXECUTE_PROCESS( -@@ -65,32 +57,13 @@ - NAMES Python.h - PATHS ${PYTHON_INC_DIR} - ) -- IF(ENABLE_PYTHON3) -- FIND_LIBRARY(PYTHON_LIBRARY -- NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -- PATHS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- ELSE(ENABLE_PYTHON3) -- FIND_LIBRARY(PYTHON_LIBRARY -- NAMES python2.7 python2.6 python2.5 python -- PATHS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- ENDIF(ENABLE_PYTHON3) -+ -+ FIND_LIBRARY(PYTHON_LIBRARY -+ NAMES ${BSD_PYTHON_VER} -+ ) - - IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) -- EXECUTE_PROCESS( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" -- OUTPUT_VARIABLE PYTHON_VERSION -- ) -- EXECUTE_PROCESS( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))" -- OUTPUT_VARIABLE PYTHON_OLD_VERSION -- ) -- IF(${PYTHON_OLD_VERSION} STREQUAL "True") -- MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}") -- ELSE() -- SET(PYTHON_FOUND TRUE) -- ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True") -+ SET(PYTHON_FOUND TRUE) - ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) - - MARK_AS_ADVANCED( diff --git a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake deleted file mode 100644 index e9e916459f8e..000000000000 --- a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake +++ /dev/null @@ -1,56 +0,0 @@ ---- cmake/FindRuby.cmake.orig 2014-02-09 18:24:48.291574320 +0000 -+++ cmake/FindRuby.cmake 2014-02-09 18:27:20.902318912 +0000 -@@ -31,11 +31,6 @@ - SET(RUBY_FIND_QUIETLY TRUE) - ENDIF(RUBY_FOUND) - --FIND_PACKAGE(PkgConfig) --IF(PKG_CONFIG_FOUND) -- pkg_search_module(RUBY ruby-2.0 ruby-1.9 ruby-1.8) --ENDIF(PKG_CONFIG_FOUND) -- - IF(RUBY_FOUND) - - SET(RUBY_LIB "") -@@ -44,14 +39,13 @@ - ELSE(RUBY_FOUND) - - FIND_PROGRAM(RUBY_EXECUTABLE -- NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby -- PATHS /usr/bin /usr/local/bin /usr/pkg/bin -+ NAMES ${BSD_RUBY_CMD} - ) - - IF(RUBY_EXECUTABLE) - - EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']" - OUTPUT_VARIABLE RUBY_ARCH_DIR - ) - -@@ -61,12 +55,12 @@ - ) - - EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'" - OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH - ) - - EXECUTE_PROCESS( -- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" -+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']" - OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH - ) - -@@ -78,8 +72,7 @@ - SET(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") - - FIND_LIBRARY(RUBY_LIB -- NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby -- PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} -+ NAMES ${BSD_RUBY_VER} - ) - - IF(RUBY_LIB AND RUBY_INCLUDE_DIRS) diff --git a/irc/weechat-devel/files/patch-cmake-FindTCL_cmake b/irc/weechat-devel/files/patch-cmake-FindTCL_cmake deleted file mode 100644 index a2346696322e..000000000000 --- a/irc/weechat-devel/files/patch-cmake-FindTCL_cmake +++ /dev/null @@ -1,106 +0,0 @@ ---- cmake/FindTCL.cmake.orig 2011-04-02 18:26:10.225070885 +0100 -+++ cmake/FindTCL.cmake 2011-04-02 18:29:21.009167958 +0100 -@@ -55,98 +55,18 @@ - SET(TCL_FIND_QUIETLY TRUE) - ENDIF(TCL_FOUND) - --INCLUDE(CMakeFindFrameworks) --INCLUDE(FindTclsh) -- --GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) --GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) --STRING(REGEX REPLACE -- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") -- --GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) -- --GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) --GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) --STRING(REGEX REPLACE -- "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}") -- --SET(TCL_POSSIBLE_LIB_PATHS -- "${TCL_INCLUDE_PATH_PARENT}/lib" -- "${TCL_INCLUDE_PATH_PARENT}/lib64" -- "${TCL_LIBRARY_PATH}" -- "${TCL_TCLSH_PATH_PARENT}/lib" -- "${TCL_TCLSH_PATH_PARENT}/lib64" -- /usr/lib -- /usr/lib64 -- /usr/local/lib -- /usr/local/lib64 -- ) -- --IF(WIN32) -- GET_FILENAME_COMPONENT( -- ActiveTcl_CurrentVersion -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" -- NAME) -- SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS} -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib" -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib" -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib" -- "$ENV{ProgramFiles}/Tcl/Lib" -- "C:/Program Files/Tcl/lib" -- "C:/Tcl/lib" -- ) --ENDIF(WIN32) -+SET(TCL_VERSION ${BSD_TCL_VER}) -+STRING(REPLACE "." "" TCL_INT_VERSION ${TCL_VERSION}) - - FIND_LIBRARY(TCL_LIBRARY - NAMES -- tcl86 tcl8.6 -- tcl85 tcl8.5 -- tcl -- tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION} -- PATHS ${TCL_POSSIBLE_LIB_PATHS} -+ tcl${TCL_INT_VERSION} -+ PATHS ${BSD_TCL_LIBDIR} - ) - --CMAKE_FIND_FRAMEWORKS(Tcl) -- --SET(TCL_FRAMEWORK_INCLUDES) --IF(Tcl_FRAMEWORKS) -- IF(NOT TCL_INCLUDE_PATH) -- FOREACH(dir ${Tcl_FRAMEWORKS}) -- SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers) -- ENDFOREACH(dir) -- ENDIF(NOT TCL_INCLUDE_PATH) --ENDIF(Tcl_FRAMEWORKS) -- --SET(TCL_POSSIBLE_INCLUDE_PATHS -- "${TCL_LIBRARY_PATH_PARENT}/include" -- "${TCL_INCLUDE_PATH}" -- ${TCL_FRAMEWORK_INCLUDES} -- "${TCL_TCLSH_PATH_PARENT}/include" -- /usr/include/tcl8.6 -- /usr/include/tcl8.5 -- /usr/include -- /usr/local/include -- /usr/include/tcl${TCL_VERSION} -- /usr/local/include/tcl${TCL_VERSION} -- /usr/local/include/tcl8.6 -- /usr/local/include/tcl8.5 -- ) -- -- --IF(WIN32) -- SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS} -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include" -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include" -- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include" -- "$ENV{ProgramFiles}/Tcl/include" -- "C:/Program Files/Tcl/include" -- "C:/Tcl/include" -- ) --ENDIF(WIN32) -- - FIND_PATH(TCL_INCLUDE_PATH - NAMES tcl.h -- PATHS ${TCL_POSSIBLE_INCLUDE_PATHS} -+ PATHS ${BSD_TCL_INCDIR} - ) - - IF(TCL_LIBRARY AND TCL_INCLUDE_PATH) |