cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update weecaht to 2.5

Browse Source 
Notable Port changes:
 - Spell checking is now default
 - Simplify pre-configure
 - Enable tests
 - s/_CDROM//

OK abieber
This commit is contained in:
rsadowski 2019-07-12 04:42:34 +00:00
parent 79e271ba08
commit cd047b54c2
9 changed files with 73 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
net/weechat/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2019/05/20 22:15:20 naddy Exp $
# $OpenBSD: Makefile,v 1.43 2019/07/12 04:42:34 rsadowski Exp $
COMMENT-main= fast, light and extensible chat client
COMMENT-lua= Lua bindings for weechat
@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weechat
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
V= 2.4
V= 2.5
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@ -15,16 +15,13 @@ PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
REVISION-main= 0
REVISION-ruby= 0
CATEGORIES= net
HOMEPAGE= https://www.weechat.org/
MAINTAINER= Rafael Sadowski <rsadowski@openbsd.org>
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE= Yes
MASTER_SITES= https://www.weechat.org/files/src/
@ -48,7 +45,8 @@ MODLUA_RUNDEP= No
MODPY_RUNDEP= No
MODRUBY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools
BUILD_DEPENDS= devel/gettext,-tools \
devel/cpputest
LIB_DEPENDS= devel/gettext,-runtime \
security/libgcrypt \
@ -68,31 +66,29 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MODRUBY_RUN_DEPENDS}
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \
-DENABLE_GUILE=no \
-DENABLE_RUBY=yes \
-DENABLE_LUA=yes \
-DENABLE_TCL=yes \
-DENABLE_PHP=no \
-DENABLE_PYTHON=yes \
-DENABLE_JAVASCRIPT=no \
-DHAVE_BACKTRACE=no \
TEST_DEPENDS += devel/cpputest
CONFIGURE_ARGS+=-DENABLE_SPELL=ON \
-DENABLE_GUILE=OFF \
-DENABLE_RUBY=ON \
-DENABLE_LUA=ON \
-DENABLE_TCL=ON \
-DENABLE_PHP=OFF \
-DENABLE_PYTHON=ON \
-DENABLE_JAVASCRIPT=OFF \
-DHAVE_BACKTRACE=OFF \
-DENABLE_TESTS=ON \
-DCA_FILE=/etc/ssl/cert.pem \
-DTCL_TCLSH=${MODTCL_BIN} \
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
-DMODTCL_LIB=${MODTCL_LIB}
NO_TEST= Yes
pre-configure:
rm -f ${WRKSRC}/cmake/FindLua.cmake \
${WRKSRC}/cmake/FindRuby.cmake \
${WRKSRC}/cmake/FindTCL.cmake
rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/weechat
${INSTALL_DATA} ${WRKSRC}/doc/en/weechat_*.en.adoc \
${PREFIX}/share/doc/weechat/
.include <bsd.port.mk>

4
net/weechat/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (weechat-2.4.tar.gz) = lj/s3fVcTI1slpONGpB+RIZ5gXcG59ILxq8keXCFp0w=
SIZE (weechat-2.4.tar.gz) = 4130604
SHA256 (weechat-2.5.tar.gz) = PXfrWnz6dfldccDkR6gx0Dm8f/p3lyy2d4Atchi9Vx4=
SIZE (weechat-2.5.tar.gz) = 4185185

14
net/weechat/patches/patch-src_core_hook_wee-hook-timer_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_core_hook_wee-hook-timer_h,v 1.1 2019/07/12 04:42:34 rsadowski Exp $
Index: src/core/hook/wee-hook-timer.h
--- src/core/hook/wee-hook-timer.h.orig
+++ src/core/hook/wee-hook-timer.h
@@ -20,7 +20,7 @@
#ifndef WEECHAT_HOOK_TIMER_H
#define WEECHAT_HOOK_TIMER_H
-#include <time.h>
+#include <sys/time.h>
struct t_weechat_plugin;
struct t_infolist_item;

4
net/weechat/patches/patch-src_plugins_CMakeLists_txt
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_plugins_CMakeLists_txt,v 1.6 2018/04/26 16:06:09 rsadowski Exp $
$OpenBSD: patch-src_plugins_CMakeLists_txt,v 1.7 2019/07/12 04:42:34 rsadowski Exp $
Index: src/plugins/CMakeLists.txt
--- src/plugins/CMakeLists.txt.orig
+++ src/plugins/CMakeLists.txt
@@ -117,8 +117,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
@@ -97,8 +97,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
endif()
if(ENABLE_SCRIPTS AND ENABLE_PYTHON)

13
net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt
View File

@ -1,14 +1,15 @@
$OpenBSD: patch-src_plugins_lua_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $
--- src/plugins/lua/CMakeLists.txt.orig Mon Jan 19 03:45:59 2015
+++ src/plugins/lua/CMakeLists.txt Mon Jan 19 03:46:40 2015
$OpenBSD: patch-src_plugins_lua_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 rsadowski Exp $
Index: src/plugins/lua/CMakeLists.txt
--- src/plugins/lua/CMakeLists.txt.orig
+++ src/plugins/lua/CMakeLists.txt
@@ -24,8 +24,8 @@ weechat-lua-api.h)
set_target_properties(lua PROPERTIES PREFIX "")
if(LUA_FOUND)
- include_directories(${LUA_INCLUDE_DIRS})
- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts)
- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
+ include_directories(${LUA_INCLUDE_DIR})
+ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts)
+ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config)
endif()
install(TARGETS lua LIBRARY DESTINATION ${LIBDIR}/plugins)
install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)

13
net/weechat/patches/patch-src_plugins_python_CMakeLists_txt
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-src_plugins_python_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $
--- src/plugins/python/CMakeLists.txt.orig Mon Jan 19 04:44:30 2015
+++ src/plugins/python/CMakeLists.txt Mon Jan 19 04:45:43 2015
$OpenBSD: patch-src_plugins_python_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 rsadowski Exp $
Index: src/plugins/python/CMakeLists.txt
--- src/plugins/python/CMakeLists.txt.orig
+++ src/plugins/python/CMakeLists.txt
@@ -22,10 +22,9 @@ weechat-python-api.c weechat-python-api.h)
set_target_properties(python PROPERTIES PREFIX "")
@ -8,10 +9,10 @@ $OpenBSD: patch-src_plugins_python_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcop
-if(PYTHON_FOUND)
- include_directories(${PYTHON_INCLUDE_PATH})
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}")
- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts)
- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts coverage_config)
+if(PYTHONLIBS_FOUND)
+ include_directories(${PYTHON_INCLUDE_DIRS})
+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts)
+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config)
endif()
install(TARGETS python LIBRARY DESTINATION ${LIBDIR}/plugins)
install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)

13
net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
View File

@ -1,14 +1,15 @@
$OpenBSD: patch-src_plugins_ruby_CMakeLists_txt,v 1.1 2015/01/19 12:28:46 dcoppa Exp $
--- src/plugins/ruby/CMakeLists.txt.orig Mon Jan 19 03:50:14 2015
+++ src/plugins/ruby/CMakeLists.txt Mon Jan 19 03:51:43 2015
$OpenBSD: patch-src_plugins_ruby_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 rsadowski Exp $
Index: src/plugins/ruby/CMakeLists.txt
--- src/plugins/ruby/CMakeLists.txt.orig
+++ src/plugins/ruby/CMakeLists.txt
@@ -24,9 +24,7 @@ set_target_properties(ruby PROPERTIES PREFIX "")
if(RUBY_FOUND)
include_directories(${RUBY_INCLUDE_DIRS})
- set(LINK_LIBS)
- list(APPEND LINK_LIBS ${RUBY_LDFLAGS})
- target_link_libraries(ruby ${LINK_LIBS} ${RUBY_LIB} weechat_plugins_scripts)
+ target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts)
- target_link_libraries(ruby ${LINK_LIBS} ${RUBY_LIB} weechat_plugins_scripts coverage_config)
+ target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts coverage_config)
endif(RUBY_FOUND)
install(TARGETS ruby LIBRARY DESTINATION ${LIBDIR}/plugins)
install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)

14
net/weechat/patches/patch-tests_CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_CMakeLists_txt,v 1.1 2019/07/12 04:42:34 rsadowski Exp $
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
@@ -55,7 +55,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
list(APPEND EXTRA_LIBS "intl")
if(HAVE_BACKTRACE)
list(APPEND EXTRA_LIBS "execinfo")

4
net/weechat/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2018/07/28 08:08:11 rsadowski Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2019/07/12 04:42:35 rsadowski Exp $
@bin bin/weechat
bin/weechat-curses
@bin bin/weechat-headless
@ -8,7 +8,6 @@ lib/pkgconfig/weechat.pc
lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/aspell.so
lib/weechat/plugins/buflist.so
lib/weechat/plugins/charset.so
lib/weechat/plugins/exec.so
@ -19,6 +18,7 @@ lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/script.so
lib/weechat/plugins/spell.so
lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
share/doc/weechat/