diff options
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/weechat/Makefile | 5 | ||||
| -rw-r--r-- | chat/weechat/distinfo | 11 | ||||
| -rw-r--r-- | chat/weechat/options.mk | 6 | ||||
| -rw-r--r-- | chat/weechat/patches/patch-cmake_FindRuby_cmake.patch | 15 |
4 files changed, 26 insertions, 11 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile index 1bcb41069a5..28e7ae809e4 100644 --- a/chat/weechat/Makefile +++ b/chat/weechat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2015/11/07 23:03:31 dholland Exp $ +# $NetBSD: Makefile,v 1.59 2015/12/06 22:36:46 tonio Exp $ -DISTNAME= weechat-1.2 -PKGREVISION= 3 +DISTNAME= weechat-1.3 CATEGORIES= chat MASTER_SITES= http://www.weechat.org/files/src/ diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index 1a56b9ffa20..0475d951bb1 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.34 2015/11/03 01:20:25 agc Exp $ +$NetBSD: distinfo,v 1.35 2015/12/06 22:36:46 tonio Exp $ -SHA1 (weechat-1.2.tar.bz2) = 494c14ee078f9670a9434b842bd8d61107168021 -RMD160 (weechat-1.2.tar.bz2) = 9db8427595ceec939d0c0195cef4dfa67d8c4cdd -SHA512 (weechat-1.2.tar.bz2) = dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9 -Size (weechat-1.2.tar.bz2) = 2367277 bytes +SHA1 (weechat-1.3.tar.bz2) = 3d6cac3a92b194819197ee7ed435a0c2e62a7c66 +RMD160 (weechat-1.3.tar.bz2) = 2484204e67eea53328a37c7d588cb76f76dfd0ec +SHA512 (weechat-1.3.tar.bz2) = 82159f1c630bf389e7a3b8baf29b67c50711e1a767040440c71bfd7d3cd0c3005b7423e6dd53c2437512cc68953f540039971a4e6f6d7a4cdb4a4e74e4c3985b +Size (weechat-1.3.tar.bz2) = 2402422 bytes SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207 +SHA1 (patch-cmake_FindRuby_cmake.patch) = dbd214aa35eeedc4ea304a9e51cecd1761c05eab 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/options.mk b/chat/weechat/options.mk index ca1cee6b937..f3f34b9b12c 100644 --- a/chat/weechat/options.mk +++ b/chat/weechat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2015/08/01 19:10:15 tonio Exp $ +# $NetBSD: options.mk,v 1.13 2015/12/06 22:36:46 tonio Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.weechat PKG_SUPPORTED_OPTIONS= gnutls python lua wide-curses perl ruby @@ -48,8 +48,8 @@ CMAKE_ARGS+= -DENABLE_PERL:BOOL=OFF .include "../../lang/ruby/buildlink3.mk" CMAKE_ARGS+= -DENABLE_RUBY:BOOL=ON PLIST.ruby= yes -BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_INC} -BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_ARCHINC} +#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_INC} +#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_ARCHINC} .else CMAKE_ARGS+= -DENABLE_RUBY:BOOL=OFF .endif diff --git a/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch b/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch new file mode 100644 index 00000000000..ce615fc64f7 --- /dev/null +++ b/chat/weechat/patches/patch-cmake_FindRuby_cmake.patch @@ -0,0 +1,15 @@ +$NetBSD: patch-cmake_FindRuby_cmake.patch,v 1.1 2015/12/06 22:36:46 tonio Exp $ + +Support ruby 200 from pkgsrc + +--- cmake/FindRuby.cmake.orig 2015-08-16 06:27:07.000000000 +0000 ++++ cmake/FindRuby.cmake +@@ -33,7 +33,7 @@ endif() + + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) +- pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) ++ pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0.0 ruby-2.0 ruby-1.9 ruby-1.8) + endif() + + if(RUBY_FOUND) |