diff options
| author | jperkin <jperkin> | 2016-04-14 10:42:31 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-04-14 10:42:31 +0000 |
| commit | 482981df05167d7288c42d5b4e4c565b52d19071 (patch) | |
| tree | 09c4c4bf8955e21e3228d61cd2600736cfce3fc3 /chat | |
| parent | f2d30813fa8d9b0b86597fc791c56085f42c2fa9 (diff) | |
| download | pkgsrc-482981df05167d7288c42d5b4e4c565b52d19071.tar.gz | |
Fix option build with ruby22 and ruby21.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/weechat/distinfo | 4 | ||||
| -rw-r--r-- | chat/weechat/patches/patch-cmake_FindRuby_cmake.patch | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index e18995e6249..097e2dae19c 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.36 2016/02/14 12:52:13 ryoon Exp $ +$NetBSD: distinfo,v 1.37 2016/04/14 10:42:31 jperkin Exp $ SHA1 (weechat-1.4.tar.bz2) = 1245d1bf1cbcb37bfa586299850e37f1a23aee98 RMD160 (weechat-1.4.tar.bz2) = e473abd155e79842a734e0c2deb0bc4a7bc9f47f SHA512 (weechat-1.4.tar.bz2) = 4c4bf25da513c25a16b24d94c1a6971db12d5cf168c83aa97570ffff53c634f7b25e92f1dbe54fefd09eeb69ece9ddc4be115bb6f6fc078ef7682dcb1df21f04 Size (weechat-1.4.tar.bz2) = 2464362 bytes SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207 -SHA1 (patch-cmake_FindRuby_cmake.patch) = dbd214aa35eeedc4ea304a9e51cecd1761c05eab +SHA1 (patch-cmake_FindRuby_cmake.patch) = 6b7a8957d2ef3fccf21b7f39ef34e69444875544 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b SHA1 (patch-src_gui_curses_gui-curses-term_c) = 900af9a94e74f229b32031bfeced1b85ea3a0ccf diff --git a/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch b/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch index ce615fc64f7..44c9d39aa0d 100644 --- a/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch +++ b/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch @@ -1,8 +1,8 @@ -$NetBSD: patch-cmake_FindRuby_cmake.patch,v 1.1 2015/12/06 22:36:46 tonio Exp $ +$NetBSD: patch-cmake_FindRuby_cmake.patch,v 1.2 2016/04/14 10:42:31 jperkin Exp $ -Support ruby 200 from pkgsrc +Support pkgsrc ruby layout and additional versions. ---- cmake/FindRuby.cmake.orig 2015-08-16 06:27:07.000000000 +0000 +--- cmake/FindRuby.cmake.orig 2016-01-10 08:17:50.000000000 +0000 +++ cmake/FindRuby.cmake @@ -33,7 +33,7 @@ endif() @@ -13,3 +13,12 @@ Support ruby 200 from pkgsrc endif() if(RUBY_FOUND) +@@ -67,7 +67,7 @@ else() + ) + 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 ++ NAMES ruby22 ruby21 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} + ) + if(RUBY_LIB AND RUBY_INCLUDE_DIRS) |