summaryrefslogtreecommitdiff
path: root/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
diff options
context:
space:
mode:
authorJase Thew <jase@FreeBSD.org>2014-02-13 18:38:20 +0000
committerJase Thew <jase@FreeBSD.org>2014-02-13 18:38:20 +0000
commit23cef1d92259227f0f7760942cc06f8c677acb12 (patch)
tree89a4514eead9d72b2a7a35ff999ba51061a41671 /irc/weechat-devel/files/patch-cmake-FindRuby_cmake
parentUpdate to flex 2.5.38 (diff)
- Update to 20140213 (0.4.4-dev)
- Add secondary MASTER_SITES entry - Rename DOCUMENTATION option to DOCS and add a pre-built docs distfile - Utilise DOCSDIR macro in pkg-plist - Change defaults to enable all OPTIONS [1] - Remove COLOR256 option as devel/ncurses no longer supports building with extended colour support - Rework MAINTAINER_MODE to cater for building both manpages and docs PR: ports/185908 [1] Requested by: dumbbell [1]
Notes
Notes: svn path=/head/; revision=344137
Diffstat (limited to 'irc/weechat-devel/files/patch-cmake-FindRuby_cmake')
-rw-r--r--irc/weechat-devel/files/patch-cmake-FindRuby_cmake81
1 files changed, 47 insertions, 34 deletions
diff --git a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
index 8488e3070cda..e9e916459f8e 100644
--- a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
@@ -1,43 +1,56 @@
---- cmake/FindRuby.cmake.orig 2012-07-06 10:35:11.000000000 +0000
-+++ cmake/FindRuby.cmake 2012-07-07 04:50:51.807510722 +0000
-@@ -32,13 +32,12 @@
+--- 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_PROGRAM(RUBY_EXECUTABLE
-- NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 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
+-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}
)
-@@ -48,12 +47,12 @@
- )
+ IF(RUBY_EXECUTABLE)
- 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['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
+ OUTPUT_VARIABLE RUBY_ARCH_DIR
+ )
- EXECUTE_PROCESS(
-- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
-+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
- OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
- )
+@@ -61,12 +55,12 @@
+ )
-@@ -71,8 +70,7 @@
- "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
+ 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
+ )
- FIND_LIBRARY(RUBY_LIBRARY
-- 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 ruby1.6 ruby16 ruby
-- PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-+ NAMES ${BSD_RUBY_VER}
- )
+ 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_LIBRARY AND RUBY_INCLUDE_PATH)
+ IF(RUBY_LIB AND RUBY_INCLUDE_DIRS)