UPDATE: net/weechat
Simple update weechat from 4.0.x to 4.1.x.
I noticed the following message, so I switch tcl to 8.6 as default.
weechat-tcl-4.1.2(net/weechat,-tcl):
Missing lib: tcl86.1 (/usr/local/lib/weechat/plugins/tcl.so) (NOT REACHABLE)
Extra: tcl85.1
Everything else looks unexciting. OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
diff -u -p -u -p -r1.78 Makefile
--- Makefile15 Oct 2023 12:47:37 - 1.78
+++ Makefile30 Dec 2023 07:43:55 -
@@ -4,7 +4,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 4.0.5
+V= 4.1.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -40,6 +40,8 @@ MODULES= devel/cmake \
lang/ruby \
lang/tcl
+MODTCL_VERSION = 8.6
+
MODLUA_RUNDEP= No
MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
@@ -79,8 +81,6 @@ CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
CONFIGURE_ARGS+= -DTCL_TCLSH=${MODTCL_BIN} \
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
-DMODTCL_LIB=${MODTCL_LIB}
-
-MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
.include
.if ${PROPERTIES:Mclang}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
diff -u -p -u -p -r1.43 distinfo
--- distinfo15 Oct 2023 12:47:37 - 1.43
+++ distinfo30 Dec 2023 07:43:55 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-4.0.5.tar.gz) = RWTK92fMrGye1RrBK63oO9BA9Ckx3XaoH4Kp47oO5Xw=
-SIZE (weechat-4.0.5.tar.gz) = 4946817
+SHA256 (weechat-4.1.2.tar.gz) = XMocRdOLMTBU0Cn23Pxhc4h6wHj5fDWYrXk9nzkITOA=
+SIZE (weechat-4.1.2.tar.gz) = 5081223
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-CMakeLists_txt,v
diff -u -p -u -p -r1.11 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt27 Jul 2023 12:37:01 - 1.11
+++ patches/patch-CMakeLists_txt30 Dec 2023 07:43:55 -
@@ -13,14 +13,14 @@ Index: CMakeLists.txt
set(CMAKE_SKIP_RPATH ON)
# compiler options
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra -Werror-implicit-function-declaration")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra -Werror-implicit-function-declaration -Wformat -Werror=format-security")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -Wall -Wextra
-Werror-implicit-function-declaration")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra")
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
# extra options specific to gcc/g++
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2
-Wformat-truncation=2")
-@@ -255,7 +255,7 @@ if(DL_LIBRARY)
+@@ -245,7 +245,7 @@ if(DL_LIBRARY)
list(APPEND EXTRA_LIBS dl)
endif()
@@ -28,4 +28,4 @@ Index: CMakeLists.txt
+#add_subdirectory(icons)
if(ENABLE_NLS)
- add_subdirectory(po)
+ find_package(Gettext REQUIRED)
Index: patches/patch-src_core_hook_wee-hook-url_h
===
RCS file: patches/patch-src_core_hook_wee-hook-url_h
diff -N patches/patch-src_core_hook_wee-hook-url_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_core_hook_wee-hook-url_h 30 Dec 2023 07:43:55 -
@@ -0,0 +1,12 @@
+Index: src/core/hook/wee-hook-url.h
+--- src/core/hook/wee-hook-url.h.orig
src/core/hook/wee-hook-url.h
+@@ -20,6 +20,8 @@
+ #ifndef WEECHAT_HOOK_URL_H
+ #define WEECHAT_HOOK_URL_H
+
++#include
++
+ struct t_weechat_plugin;
+ struct t_infolist_item;
+ struct t_hashtable;
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
diff -u -p -u -p -r1.14 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 23 Jul 2023 20:08:13 - 1.14
+++ patches/patch-tests_CMakeLists_txt 30 Dec 2023 07:43:55 -
@@ -1,7 +1,7 @@
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -129,7 +129,7 @@ if(ICONV_LIBRARY)
+@@ -132,7 +132,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
UPDATE: net/weechat
Simple update weechat to 4.0.2. Tested on amd64. OK?
Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile31 May 2023 15:21:52 - 1.72
+++ Makefile19 Jul 2023 15:21:33 -
@@ -4,7 +4,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 3.8
+V= 4.0.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -12,8 +12,6 @@ PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
-
-REVISION-ruby= 0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 distinfo
--- distinfo8 Jan 2023 21:26:16 - 1.39
+++ distinfo19 Jul 2023 15:21:33 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-3.8.tar.gz) = 2dJ/rBJ8ckVkzyjGF5+m7MeaYfna0Jo7JRUA8rB1VAk=
-SIZE (weechat-3.8.tar.gz) = 5461256
+SHA256 (weechat-4.0.2.tar.gz) = 6zv2X5wkEdhdSEEYcYLX6jeP9kuCwurwzviF+Bjsh1M=
+SIZE (weechat-4.0.2.tar.gz) = 4938413
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt8 Jan 2023 21:26:16 - 1.9
+++ patches/patch-CMakeLists_txt19 Jul 2023 15:21:33 -
@@ -9,16 +9,7 @@ typedef int __wchar_
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -27,8 +27,6 @@ project(weechat C)
- set(CMAKE_VERBOSE_MAKEFILE OFF)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
- set(CMAKE_SKIP_RPATH ON)
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra -Werror-implicit-function-declaration")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra")
-
- # version
- execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major
OUTPUT_VARIABLE VERSION_MAJOR)
-@@ -224,7 +222,7 @@ if(DL_LIBRARY)
+@@ -255,7 +255,7 @@ if(DL_LIBRARY)
list(APPEND EXTRA_LIBS dl)
endif()
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt28 Mar 2022 05:10:14 - 1.12
+++ patches/patch-doc_CMakeLists_txt19 Jul 2023 15:21:33 -
@@ -1,30 +1,12 @@
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
-@@ -73,16 +73,16 @@ if(ENABLE_MAN OR ENABLE_DOC)
- add_custom_target(rn DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html)
+@@ -22,7 +22,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
- # man/doc in all languages
--add_subdirectory(cs)
--add_subdirectory(de)
--add_subdirectory(en)
--add_subdirectory(es)
--add_subdirectory(fr)
--add_subdirectory(it)
--add_subdirectory(ja)
--add_subdirectory(pl)
--add_subdirectory(ru)
--add_subdirectory(sr)
-+#add_subdirectory(cs)
-+#add_subdirectory(de)
-+#add_subdirectory(en)
-+#add_subdirectory(es)
-+#add_subdirectory(fr)
-+#add_subdirectory(it)
-+#add_subdirectory(ja)
-+#add_subdirectory(pl)
-+#add_subdirectory(ru)
-+#add_subdirectory(sr)
- else()
- message(SEND_ERROR "Asciidoctor not found")
- endif()
+ # docs languages
+ set(AUTOGEN_LANG de en fr it ja pl sr)
+- set(MAN_LANG cs de en fr it ja pl ru sr)
++ set(MAN_LANG en)
+ set(USER_LANG de en fr it ja pl sr)
+ set(PLUGIN_API_LANG en fr it ja sr)
+ set(SCRIPTING_LANG de en fr it ja pl sr)
Index: patches/patch-src_plugins_lua_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_plugins_lua_CMakeLists_txt
--- patches/patch-src_plugins_lua_CMakeLists_txt11 Mar 2022 19:48:10
- 1.4
+++ patches/patch-src_plugins_lua_CMakeLists_txt19 Jul 2023 15:21:33
-
@@ -11,4 +11,4 @@ Index: src/plugins/lua/CMakeLists.txt
+ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts
coverage_config)
endif()
- install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
+ install(TARGETS lua LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.13
diff
UPDATE: net/weechat (needs tests)
Update weechat to the latest stable version. I would be happy about
testers as I would like to see this in 7.1.
- FYI: CA_FILE build option was removed.
- I drop the c/cpp flags, see the patch below for details.
Tested with:
*.freenode.net: *** You are connected to chat.freenode.net using TLS
(SSL) cipher 'TLSv1.3-TLS_AES_256_GCM_SHA384'
Rafael
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 200149a2062..8e49a4afd2e 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -4,8 +4,7 @@ COMMENT-python= Python bindings for weechat
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 3.3
-REVISION-python= 0
+V= 3.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -75,8 +74,7 @@ CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
-DENABLE_TESTS=ON \
-DHAVE_BACKTRACE=OFF
-CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
- -DTCL_TCLSH=${MODTCL_BIN} \
+CONFIGURE_ARGS+= -DTCL_TCLSH=${MODTCL_BIN} \
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
-DMODTCL_LIB=${MODTCL_LIB}
diff --git a/net/weechat/distinfo b/net/weechat/distinfo
index 124a8bfd000..fbc4cc88ea7 100644
--- a/net/weechat/distinfo
+++ b/net/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-3.3.tar.gz) = qYNPhNi2s3vOoQf+Wig2mfExLabfndcNZ15w32XO58k=
-SIZE (weechat-3.3.tar.gz) = 5129511
+SHA256 (weechat-3.4.1.tar.gz) = +jYfmZ6ZgoF7Ea0SSh984HIEOfKc4l+Svh2j2LV6R7U=
+SIZE (weechat-3.4.1.tar.gz) = 5177946
diff --git a/net/weechat/patches/patch-CMakeLists_txt
b/net/weechat/patches/patch-CMakeLists_txt
index 923e0f2fb35..b845541ab15 100644
--- a/net/weechat/patches/patch-CMakeLists_txt
+++ b/net/weechat/patches/patch-CMakeLists_txt
@@ -1,9 +1,24 @@
Disable icons and weechat.desktop to avoid GUI dependencies
+Remove flags:
+In file included from
/usr/ports/pobj/weechat-3.4.1/weechat-3.4.1/src/plugins/plugin.c:27:
+In file included from /usr/include/stdlib.h:40:
+/usr/include/machine/_types.h:133:15: error: cannot combine with previous
'int' declaration specifier
+typedef int __wchar_t;
+
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -221,7 +221,7 @@ if(DL_LIBRARY)
+@@ -27,8 +27,6 @@ project(weechat C)
+ set(CMAKE_VERBOSE_MAKEFILE OFF)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ set(CMAKE_SKIP_RPATH ON)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra -Werror-implicit-function-declaration")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra")
+
+ # version
+ execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major
OUTPUT_VARIABLE VERSION_MAJOR)
+@@ -221,7 +219,7 @@ if(DL_LIBRARY)
list(APPEND EXTRA_LIBS dl)
endif()
diff --git a/net/weechat/patches/patch-doc_CMakeLists_txt
b/net/weechat/patches/patch-doc_CMakeLists_txt
index 0766b7563ce..c638536dc7c 100644
--- a/net/weechat/patches/patch-doc_CMakeLists_txt
+++ b/net/weechat/patches/patch-doc_CMakeLists_txt
@@ -1,10 +1,10 @@
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
-@@ -22,16 +22,16 @@ if(ENABLE_MAN OR ENABLE_DOC)
- find_package(Asciidoctor)
- if(ASCIIDOCTOR_FOUND)
- set(ASCIIDOCTOR_ARGS -a experimental -a "prewrap!" -a icons=font -a
revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
+@@ -73,16 +73,16 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ add_custom_target(rn DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html)
+
+ # man/doc in all languages
-add_subdirectory(cs)
-add_subdirectory(de)
-add_subdirectory(en)
@@ -15,16 +15,16 @@ Index: doc/CMakeLists.txt
-add_subdirectory(pl)
-add_subdirectory(ru)
-add_subdirectory(sr)
-+#add_subdirectory(cs)
-+#add_subdirectory(de)
-+#add_subdirectory(en)
-+#add_subdirectory(es)
-+#add_subdirectory(fr)
-+#add_subdirectory(it)
-+#add_subdirectory(ja)
-+#add_subdirectory(pl)
-+#add_subdirectory(ru)
-+#add_subdirectory(sr)
++#add_subdirectory(cs)
++#add_subdirectory(de)
++#add_subdirectory(en)
++#add_subdirectory(es)
++#add_subdirectory(fr)
++#add_subdirectory(it)
++#add_subdirectory(ja)
++#add_subdirectory(pl)
++#add_subdirectory(ru)
++#add_subdirectory(sr)
else()
message(SEND_ERROR "Asciidoctor not found")
endif()
diff --git a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
b/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
deleted file mode 100644
index e917ae60ffd..000
--- a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/plugins/ruby/CMakeLists.txt
src/plugins/ruby/CMakeLists.txt.orig
-+++ src/plugins/ruby/CMakeLists.txt
-@@ -25,9 +25,7 @@ set_target_properties(ruby PROPERTIES PREFIX "")
-
- if(RUBY_FOUND)
-
UPDATE: net/weechat
Update weechat to 3.1. Changelog:
https://weechat.org/news/112/20210307-Version-3.1/
Feedback, OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- Makefile23 Feb 2021 19:39:35 - 1.53
+++ Makefile9 Mar 2021 05:30:18 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 3.0.1
+V= 3.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo31 Jan 2021 16:52:40 - 1.29
+++ distinfo9 Mar 2021 05:30:18 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-3.0.1.tar.gz) = ULJ89muksfd6bZq3/jdCsKt5+QCI2b/mRTpLzuX7Ldw=
-SIZE (weechat-3.0.1.tar.gz) = 4446454
+SHA256 (weechat-3.1.tar.gz) = ibxLQ+8hNzMpPtJvcytEeC9macgj+ftud6O4F2lgqe8=
+SIZE (weechat-3.1.tar.gz) = 4475210
Index: patches/patch-src_gui_gui-hotlist_h
===
RCS file: patches/patch-src_gui_gui-hotlist_h
diff -N patches/patch-src_gui_gui-hotlist_h
--- patches/patch-src_gui_gui-hotlist_h 12 Nov 2020 05:26:17 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gui_gui-hotlist_h,v 1.1 2020/11/12 05:26:17 rsadowski Exp $
-
-Index: src/gui/gui-hotlist.h
src/gui/gui-hotlist.h.orig
-+++ src/gui/gui-hotlist.h
-@@ -20,6 +20,8 @@
- #ifndef WEECHAT_GUI_HOTLIST_H
- #define WEECHAT_GUI_HOTLIST_H
-
-+#include
-+
- enum t_gui_hotlist_priority
- {
- GUI_HOTLIST_LOW = 0,
UPDATE: net/weechat
Update weechat to 3.0.
- Changelog: https://weechat.org/news/111/2020-Version-3.0/
- Add simple patch to unbreak the build
- Remove WANTLIB-ruby, hint by make port-lib-depends-check:
weechat-ruby-3.0(net/weechat,-ruby):
Extra: c.96 gmp.11 m.10 pthread.26 ruby26.
- ctest: 100% tests passed, 0 tests failed out of 1
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- Makefile23 Jul 2020 04:38:21 - 1.49
+++ Makefile11 Nov 2020 20:46:46 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.9
+V= 3.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -32,7 +32,6 @@ WANTLIB-main= aspell c curl iconv intl m
WANTLIB-lua= ${MODLUA_WANTLIB} m
WANTLIB-python=${MODPY_WANTLIB}
-WANTLIB-ruby= ${MODRUBY_WANTLIB}
WANTLIB-tcl= ${MODTCL_WANTLIB}
MODULES= devel/cmake \
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 distinfo
--- distinfo23 Jul 2020 04:38:21 - 1.27
+++ distinfo11 Nov 2020 20:46:46 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.9.tar.gz) = OngGO3bEK6MG6s+PdMuMmiYPimHRkV0LXXbxHSvmmlM=
-SIZE (weechat-2.9.tar.gz) = 4419872
+SHA256 (weechat-3.0.tar.gz) = vSP+THdf6l4UCtau1pbaoi3ul6KYo3IR0NorRZNb8HY=
+SIZE (weechat-3.0.tar.gz) = 4446169
Index: patches/patch-src_gui_gui-hotlist_h
===
RCS file: patches/patch-src_gui_gui-hotlist_h
diff -N patches/patch-src_gui_gui-hotlist_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_gui_gui-hotlist_h 11 Nov 2020 20:46:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/gui/gui-hotlist.h
+--- src/gui/gui-hotlist.h.orig
src/gui/gui-hotlist.h
+@@ -20,6 +20,8 @@
+ #ifndef WEECHAT_GUI_HOTLIST_H
+ #define WEECHAT_GUI_HOTLIST_H
+
++#include
++
+ enum t_gui_hotlist_priority
+ {
+ GUI_HOTLIST_LOW = 0,
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 23 Jul 2020 04:38:21 - 1.5
+++ patches/patch-tests_CMakeLists_txt 11 Nov 2020 20:46:46 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -73,7 +73,7 @@ if(ICONV_LIBRARY)
+@@ -74,7 +74,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST-main
--- pkg/PLIST-main 23 Jul 2020 04:38:21 - 1.14
+++ pkg/PLIST-main 11 Nov 2020 20:46:46 -
@@ -21,7 +21,6 @@ lib/weechat/plugins/
@so lib/weechat/plugins/spell.so
@so lib/weechat/plugins/trigger.so
@so lib/weechat/plugins/xfer.so
-share/applications/
share/applications/weechat.desktop
share/doc/weechat/
share/doc/weechat/weechat_dev.en.adoc
UPDATE: net/weechat
Simple update weechat to 2.9. Tests welcome.
https://weechat.org/news/110/20200718-Version-2.9/
Rafael Sadowski
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 Makefile
--- Makefile3 Jul 2020 21:13:03 - 1.48
+++ Makefile21 Jul 2020 20:00:07 -
@@ -6,11 +6,9 @@ COMMENT-python=Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.8
+V= 2.9
DISTNAME= weechat-${V}
-REVISION-python= 0
-
PKGNAME-main= weechat-${V}
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
@@ -51,7 +49,8 @@ BUILD_DEPENDS=devel/gettext,-tools \
devel/cpputest \
sysutils/flock
-RUN_DEPENDS= sysutils/flock
+RUN_DEPENDS= sysutils/flock \
+ devel/desktop-file-utils
LIB_DEPENDS= devel/gettext,-runtime \
net/curl \
@@ -75,16 +74,10 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
-CONFIGURE_ARGS=-DENABLE_SPELL=ON \
- -DENABLE_RUBY=ON \
- -DENABLE_LUA=ON \
- -DENABLE_TCL=ON \
- -DENABLE_PYTHON=ON \
- -DENABLE_TESTS=ON
CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
-DENABLE_PHP=OFF \
- -DENABLE_JAVASCRIPT=OFF \
+ -DENABLE_TESTS=ON \
-DHAVE_BACKTRACE=OFF
CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo1 Apr 2020 05:11:43 - 1.26
+++ distinfo21 Jul 2020 20:00:07 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.8.tar.gz) = adpodOLVg7SkZmsWb1IO5FtqyEVEpKlDQDD4KYmJPIg=
-SIZE (weechat-2.8.tar.gz) = 4442035
+SHA256 (weechat-2.9.tar.gz) = OngGO3bEK6MG6s+PdMuMmiYPimHRkV0LXXbxHSvmmlM=
+SIZE (weechat-2.9.tar.gz) = 4419872
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Jan 2020 07:26:00 - 1.1
+++ patches/patch-CMakeLists_txt21 Jul 2020 20:00:07 -
@@ -5,7 +5,7 @@ Disable icons and weechat.desktop to avo
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -235,7 +235,7 @@ if(DL_LIBRARY)
+@@ -231,7 +231,7 @@ if(DL_LIBRARY)
list(APPEND EXTRA_LIBS dl)
endif()
@@ -14,12 +14,3 @@ Index: CMakeLists.txt
if(ENABLE_NLS)
add_subdirectory(po)
-@@ -302,7 +302,7 @@ if(CYGWIN)
- endif()
-
- # desktop file
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION
${SHAREDIR}/applications)
-+#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION
${SHAREDIR}/applications)
-
- # packages
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat
client")
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt11 Jan 2020 07:26:00 - 1.8
+++ patches/patch-doc_CMakeLists_txt21 Jul 2020 20:00:07 -
@@ -5,7 +5,7 @@ Index: doc/CMakeLists.txt
@@ -22,15 +22,15 @@ if(ENABLE_MAN OR ENABLE_DOC)
find_package(Asciidoctor)
if(ASCIIDOCTOR_FOUND)
- set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a
revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
+ set(ASCIIDOCTOR_ARGS -a experimental -a "prewrap!" -a icons=font -a
revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
-add_subdirectory(cs)
-add_subdirectory(de)
-add_subdirectory(en)
@@ -15,15 +15,15 @@ Index: doc/CMakeLists.txt
-add_subdirectory(ja)
-add_subdirectory(pl)
-add_subdirectory(ru)
-+#add_subdirectory(cs)
-+#add_subdirectory(de)
-+#add_subdirectory(en)
-+#add_subdirectory(es)
-+#add_subdirectory(fr)
-+#add_subdirectory(it)
-+#add_subdirectory(ja)
-+#add_subdirectory(pl)
-+#add_subdirectory(ru)
++#add_subdirectory(cs)
++#add_subdirectory(de)
++#add_subdirectory(en)
++#add_subdirectory(es)
++#add_subdirectory(fr)
++#add_subdirectory(it)
++#add_subdirectory(ja)
++#add_subdirectory(pl)
++#add_subdirectory(ru)
else()
message(SEND_ERROR "Asciidoctor not found")
endif()
Index:
Re: UPDATE: net/weechat
On Tue Mar 31, 2020 at 09:10:40PM -0300, Elias M. Mariani wrote:
> Tested on amd64.
>
> make port-lib-depends-check
> weechat-ruby-2.8(net/weechat,-ruby):
> Extra: c.96 gmp.11 m.10 pthread.26 ruby26.0
Yeah the normal noise here. It comes from the modules
>
> Is this right? If It is:
> OK mariani@
Thanks for testing, committed.
>
> Cheers.
> Elias.
>
> On Mon, Mar 30, 2020 at 1:27 AM Rafael Sadowski wrote:
> >
> > Simple update to the latest stable version. Changelog:
> > https://weechat.org/news/109/20200329-Version-2.8/
> >
> > OK?
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/weechat/Makefile,v
> > retrieving revision 1.46
> > diff -u -p -u -p -r1.46 Makefile
> > --- Makefile21 Feb 2020 15:29:13 - 1.46
> > +++ Makefile30 Mar 2020 04:24:53 -
> > @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
> > COMMENT-ruby= Ruby bindings for weechat
> > COMMENT-tcl= Tcl bindings for weechat
> >
> > -V= 2.7.1
> > +V= 2.8
> > DISTNAME= weechat-${V}
> >
> > PKGNAME-main= weechat-${V}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/net/weechat/distinfo,v
> > retrieving revision 1.25
> > diff -u -p -u -p -r1.25 distinfo
> > --- distinfo21 Feb 2020 15:29:13 - 1.25
> > +++ distinfo30 Mar 2020 04:24:53 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (weechat-2.7.1.tar.gz) =
> > xBDqe4/ellP4yd+IZ9Pua0zI+4diYLZYhCJ6S/YTlaU=
> > -SIZE (weechat-2.7.1.tar.gz) = 4394236
> > +SHA256 (weechat-2.8.tar.gz) = adpodOLVg7SkZmsWb1IO5FtqyEVEpKlDQDD4KYmJPIg=
> > +SIZE (weechat-2.8.tar.gz) = 4442035
> > Index: patches/patch-tests_CMakeLists_txt
> > ===
> > RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 patch-tests_CMakeLists_txt
> > --- patches/patch-tests_CMakeLists_txt 11 Jan 2020 07:26:00 - 1.3
> > +++ patches/patch-tests_CMakeLists_txt 30 Mar 2020 04:24:53 -
> > @@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
> > Index: tests/CMakeLists.txt
> > --- tests/CMakeLists.txt.orig
> > +++ tests/CMakeLists.txt
> > -@@ -61,7 +61,7 @@ if(ICONV_LIBRARY)
> > +@@ -63,7 +63,7 @@ if(ICONV_LIBRARY)
> > list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
> > endif()
> >
> >
>
Re: UPDATE: net/weechat
Tested on amd64.
make port-lib-depends-check
weechat-ruby-2.8(net/weechat,-ruby):
Extra: c.96 gmp.11 m.10 pthread.26 ruby26.0
Is this right? If It is:
OK mariani@
Cheers.
Elias.
On Mon, Mar 30, 2020 at 1:27 AM Rafael Sadowski wrote:
>
> Simple update to the latest stable version. Changelog:
> https://weechat.org/news/109/20200329-Version-2.8/
>
> OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/weechat/Makefile,v
> retrieving revision 1.46
> diff -u -p -u -p -r1.46 Makefile
> --- Makefile21 Feb 2020 15:29:13 - 1.46
> +++ Makefile30 Mar 2020 04:24:53 -
> @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
> COMMENT-ruby= Ruby bindings for weechat
> COMMENT-tcl= Tcl bindings for weechat
>
> -V= 2.7.1
> +V= 2.8
> DISTNAME= weechat-${V}
>
> PKGNAME-main= weechat-${V}
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/weechat/distinfo,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 distinfo
> --- distinfo21 Feb 2020 15:29:13 - 1.25
> +++ distinfo30 Mar 2020 04:24:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (weechat-2.7.1.tar.gz) = xBDqe4/ellP4yd+IZ9Pua0zI+4diYLZYhCJ6S/YTlaU=
> -SIZE (weechat-2.7.1.tar.gz) = 4394236
> +SHA256 (weechat-2.8.tar.gz) = adpodOLVg7SkZmsWb1IO5FtqyEVEpKlDQDD4KYmJPIg=
> +SIZE (weechat-2.8.tar.gz) = 4442035
> Index: patches/patch-tests_CMakeLists_txt
> ===
> RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-tests_CMakeLists_txt
> --- patches/patch-tests_CMakeLists_txt 11 Jan 2020 07:26:00 - 1.3
> +++ patches/patch-tests_CMakeLists_txt 30 Mar 2020 04:24:53 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
> Index: tests/CMakeLists.txt
> --- tests/CMakeLists.txt.orig
> +++ tests/CMakeLists.txt
> -@@ -61,7 +61,7 @@ if(ICONV_LIBRARY)
> +@@ -63,7 +63,7 @@ if(ICONV_LIBRARY)
> list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
> endif()
>
>
UPDATE: net/weechat
Simple update to the latest stable version. Changelog:
https://weechat.org/news/109/20200329-Version-2.8/
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 Makefile
--- Makefile21 Feb 2020 15:29:13 - 1.46
+++ Makefile30 Mar 2020 04:24:53 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.7.1
+V= 2.8
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo21 Feb 2020 15:29:13 - 1.25
+++ distinfo30 Mar 2020 04:24:53 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.7.1.tar.gz) = xBDqe4/ellP4yd+IZ9Pua0zI+4diYLZYhCJ6S/YTlaU=
-SIZE (weechat-2.7.1.tar.gz) = 4394236
+SHA256 (weechat-2.8.tar.gz) = adpodOLVg7SkZmsWb1IO5FtqyEVEpKlDQDD4KYmJPIg=
+SIZE (weechat-2.8.tar.gz) = 4442035
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 11 Jan 2020 07:26:00 - 1.3
+++ patches/patch-tests_CMakeLists_txt 30 Mar 2020 04:24:53 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -61,7 +61,7 @@ if(ICONV_LIBRARY)
+@@ -63,7 +63,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
Re: UPDATE: net/weechat
Hi Rafael, On 21.02.2020 06:23, Rafael Sadowski wrote: Update weechat to 2.7.1 (security release) This update fix three security problems. - CVE-2020-8955 Buffer overflow when receiving a malformed IRC message 324 (channel mode). - Buffer overflow when a new IRC message 005 is received with longer nick prefixes. - Crash when receiving a malformed IRC message 352 (WHO). OK? and also OK for -stable? Still plans to update weechat in -stable? Cheers and thanks Matthias
Re: UPDATE: net/weechat
On Fri, 21 Feb 2020 06:23:02 +0100, Rafael Sadowski wrote: > Update weechat to 2.7.1 (security release) > > This update fix three security problems. > > - CVE-2020-8955 > Buffer overflow when receiving a malformed IRC message 324 (channel > mode). > - Buffer overflow when a new IRC message 005 is received with longer > nick prefixes. > - Crash when receiving a malformed IRC message 352 (WHO). > > OK? Thanks for the quick update! ok dan@ for -current Cheers, Daniel
UPDATE: net/weechat
Update weechat to 2.7.1 (security release)
This update fix three security problems.
- CVE-2020-8955
Buffer overflow when receiving a malformed IRC message 324 (channel
mode).
- Buffer overflow when a new IRC message 005 is received with longer
nick prefixes.
- Crash when receiving a malformed IRC message 352 (WHO).
OK? and also OK for -stable?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- Makefile11 Jan 2020 07:26:00 - 1.45
+++ Makefile21 Feb 2020 05:20:15 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.7
+V= 2.7.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo11 Jan 2020 07:26:00 - 1.24
+++ distinfo21 Feb 2020 05:20:15 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
-SIZE (weechat-2.7.tar.gz) = 4393859
+SHA256 (weechat-2.7.1.tar.gz) = xBDqe4/ellP4yd+IZ9Pua0zI+4diYLZYhCJ6S/YTlaU=
+SIZE (weechat-2.7.1.tar.gz) = 4394236
Re: UPDATE: net/weechat
builds and installs fine here on amd64, okay on my side
пт, 10 янв. 2020 г. в 10:18, Rafael Sadowski :
>
> On Fri Jan 10, 2020 at 09:12:02AM +0300, Vadim Zhukov wrote:
> > 9 января 2020 г. 18:20:59 GMT+03:00, Rafael Sadowski
> > пишет:
> > >Update weechat to 2.7 with some Makefile tweaks.
> > >
> > >Changelog: https://weechat.org/news/108/20191208-Version-2.7/
> > >
> >
> > Hm, why does this port disables its icon packaging? And it's probably
> > better to remove files in post-install than to register in resulting plist
> > as @comment...
>
> Simply to avoid the GUI dependencies for a CLI tool.
> New diff with a patch (which i prefer here)
>
> Cheers, Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/weechat/Makefile,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 Makefile
> --- Makefile22 Sep 2019 19:34:56 - 1.44
> +++ Makefile10 Jan 2020 07:16:02 -
> @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
> COMMENT-ruby= Ruby bindings for weechat
> COMMENT-tcl= Tcl bindings for weechat
>
> -V= 2.6
> +V= 2.7
> DISTNAME= weechat-${V}
>
> PKGNAME-main= weechat-${V}
> @@ -46,15 +46,20 @@ MODPY_RUNDEP= No
> MODRUBY_RUNDEP=No
>
> BUILD_DEPENDS= devel/gettext,-tools \
> - devel/cpputest
> + devel/cpputest \
> + sysutils/flock
> +
> +RUN_DEPENDS= sysutils/flock
>
> LIB_DEPENDS= devel/gettext,-runtime \
> - security/libgcrypt \
> - security/gnutls \
> net/curl \
> + security/gnutls \
> + security/libgcrypt \
> textproc/aspell/core
>
> -MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
> +TEST_DEPENDS= devel/cpputest
> +
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
> @@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
> LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
> RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
>
> -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}
> +CONFIGURE_ARGS=-DENABLE_SPELL=ON \
> + -DENABLE_RUBY=ON \
> + -DENABLE_LUA=ON \
> + -DENABLE_TCL=ON \
> + -DENABLE_PYTHON=ON \
> + -DENABLE_TESTS=ON
> +
> +CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
> + -DENABLE_PHP=OFF \
> + -DENABLE_JAVASCRIPT=OFF \
> + -DHAVE_BACKTRACE=OFF
> +
> +CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
> + -DTCL_TCLSH=${MODTCL_BIN} \
> + -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
> + -DMODTCL_LIB=${MODTCL_LIB}
>
> pre-configure:
> rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/weechat/distinfo,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 distinfo
> --- distinfo22 Sep 2019 19:34:56 - 1.23
> +++ distinfo10 Jan 2020 07:16:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
> -SIZE (weechat-2.6.tar.gz) = 4212612
> +SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
> +SIZE (weechat-2.7.tar.gz) = 4393859
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt10 Jan 2020 07:16:02 -
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +Disable icons and weechat.desktop to avoid GUI dependencies
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -235,7 +235,7 @@ if(DL_LIBRARY)
> + list(APPEND EXTRA_LIBS dl)
> + endif()
> +
> +-add_subdirectory(icons)
> ++#add_subdirectory(icons)
> +
> + if(ENABLE_NLS)
> + add_subdirectory(po)
> +@@ -302,7 +302,7 @@ if(CYGWIN)
> + endif()
> +
> + # desktop file
> +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION
>
Re: UPDATE: net/weechat
On 2020/01/10 08:18, Rafael Sadowski wrote: > On Fri Jan 10, 2020 at 09:12:02AM +0300, Vadim Zhukov wrote: > > 9 января 2020 г. 18:20:59 GMT+03:00, Rafael Sadowski > > пишет: > > >Update weechat to 2.7 with some Makefile tweaks. > > > > > >Changelog: https://weechat.org/news/108/20191208-Version-2.7/ > > > > > > > Hm, why does this port disables its icon packaging? And it's probably > > better to remove files in post-install than to register in resulting plist > > as @comment... > > Simply to avoid the GUI dependencies for a CLI tool. For these cases, it would be nice if tags could be optional... "run update-desktop-database if it exists, otherwise ignore".
Re: UPDATE: net/weechat
On Fri Jan 10, 2020 at 09:12:02AM +0300, Vadim Zhukov wrote:
> 9 января 2020 г. 18:20:59 GMT+03:00, Rafael Sadowski
> пишет:
> >Update weechat to 2.7 with some Makefile tweaks.
> >
> >Changelog: https://weechat.org/news/108/20191208-Version-2.7/
> >
>
> Hm, why does this port disables its icon packaging? And it's probably better
> to remove files in post-install than to register in resulting plist as
> @comment...
Simply to avoid the GUI dependencies for a CLI tool.
New diff with a patch (which i prefer here)
Cheers, Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile22 Sep 2019 19:34:56 - 1.44
+++ Makefile10 Jan 2020 07:16:02 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.6
+V= 2.7
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -46,15 +46,20 @@ MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
BUILD_DEPENDS= devel/gettext,-tools \
- devel/cpputest
+ devel/cpputest \
+ sysutils/flock
+
+RUN_DEPENDS= sysutils/flock
LIB_DEPENDS= devel/gettext,-runtime \
- security/libgcrypt \
- security/gnutls \
net/curl \
+ security/gnutls \
+ security/libgcrypt \
textproc/aspell/core
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+TEST_DEPENDS= devel/cpputest
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
@@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
-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}
+CONFIGURE_ARGS=-DENABLE_SPELL=ON \
+ -DENABLE_RUBY=ON \
+ -DENABLE_LUA=ON \
+ -DENABLE_TCL=ON \
+ -DENABLE_PYTHON=ON \
+ -DENABLE_TESTS=ON
+
+CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
+ -DENABLE_PHP=OFF \
+ -DENABLE_JAVASCRIPT=OFF \
+ -DHAVE_BACKTRACE=OFF
+
+CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
+ -DTCL_TCLSH=${MODTCL_BIN} \
+ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
+ -DMODTCL_LIB=${MODTCL_LIB}
pre-configure:
rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo22 Sep 2019 19:34:56 - 1.23
+++ distinfo10 Jan 2020 07:16:02 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
-SIZE (weechat-2.6.tar.gz) = 4212612
+SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
+SIZE (weechat-2.7.tar.gz) = 4393859
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt10 Jan 2020 07:16:02 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Disable icons and weechat.desktop to avoid GUI dependencies
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -235,7 +235,7 @@ if(DL_LIBRARY)
+ list(APPEND EXTRA_LIBS dl)
+ endif()
+
+-add_subdirectory(icons)
++#add_subdirectory(icons)
+
+ if(ENABLE_NLS)
+ add_subdirectory(po)
+@@ -302,7 +302,7 @@ if(CYGWIN)
+ endif()
+
+ # desktop file
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION
${SHAREDIR}/applications)
++#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION
${SHAREDIR}/applications)
+
+ # packages
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat
client")
Index: patches/patch-doc_CMakeLists_txt
===
RCS file:
Re: UPDATE: net/weechat
9 января 2020 г. 18:20:59 GMT+03:00, Rafael Sadowski
пишет:
>Update weechat to 2.7 with some Makefile tweaks.
>
>Changelog: https://weechat.org/news/108/20191208-Version-2.7/
>
>OK?
>
>Rafael
>
>Index: Makefile
>===
>RCS file: /cvs/ports/net/weechat/Makefile,v
>retrieving revision 1.44
>diff -u -p -u -p -r1.44 Makefile
>--- Makefile 22 Sep 2019 19:34:56 - 1.44
>+++ Makefile 9 Jan 2020 05:45:29 -
>@@ -6,7 +6,7 @@ COMMENT-python=Python bindings for weec
> COMMENT-ruby= Ruby bindings for weechat
> COMMENT-tcl= Tcl bindings for weechat
>
>-V=2.6
>+V=2.7
> DISTNAME= weechat-${V}
>
> PKGNAME-main= weechat-${V}
>@@ -46,15 +46,20 @@ MODPY_RUNDEP= No
> MODRUBY_RUNDEP= No
>
> BUILD_DEPENDS=devel/gettext,-tools \
>- devel/cpputest
>+ devel/cpputest \
>+ sysutils/flock
>+
>+RUN_DEPENDS= sysutils/flock
>
> LIB_DEPENDS= devel/gettext,-runtime \
>- security/libgcrypt \
>- security/gnutls \
> net/curl \
>+ security/gnutls \
>+ security/libgcrypt \
> textproc/aspell/core
>
>-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>+TEST_DEPENDS= devel/cpputest
>+
>+MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
>
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
>@@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
> LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
> RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
>
>-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}
>+CONFIGURE_ARGS= -DENABLE_SPELL=ON \
>+ -DENABLE_RUBY=ON \
>+ -DENABLE_LUA=ON \
>+ -DENABLE_TCL=ON \
>+ -DENABLE_PYTHON=ON \
>+ -DENABLE_TESTS=ON
>+
>+CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
>+ -DENABLE_PHP=OFF \
>+ -DENABLE_JAVASCRIPT=OFF \
>+ -DHAVE_BACKTRACE=OFF
>+
>+CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
>+ -DTCL_TCLSH=${MODTCL_BIN} \
>+ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
>+ -DMODTCL_LIB=${MODTCL_LIB}
>
> pre-configure:
> rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
>Index: distinfo
>===
>RCS file: /cvs/ports/net/weechat/distinfo,v
>retrieving revision 1.23
>diff -u -p -u -p -r1.23 distinfo
>--- distinfo 22 Sep 2019 19:34:56 - 1.23
>+++ distinfo 9 Jan 2020 05:45:29 -
>@@ -1,2 +1,2 @@
>-SHA256 (weechat-2.6.tar.gz) =
>76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
>-SIZE (weechat-2.6.tar.gz) = 4212612
>+SHA256 (weechat-2.7.tar.gz) =
>UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
>+SIZE (weechat-2.7.tar.gz) = 4393859
>Index: patches/patch-doc_CMakeLists_txt
>===
>RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
>retrieving revision 1.7
>diff -u -p -u -p -r1.7 patch-doc_CMakeLists_txt
>--- patches/patch-doc_CMakeLists_txt 23 Mar 2017 01:46:23 - 1.7
>+++ patches/patch-doc_CMakeLists_txt 9 Jan 2020 05:45:29 -
>@@ -1,10 +1,11 @@
>$OpenBSD: patch-doc_CMakeLists_txt,v 1.7 2017/03/23 01:46:23 danj Exp $
> doc/CMakeLists.txt.orig Sun Jan 15 01:41:25 2017
>-+++ doc/CMakeLists.txtSun Mar 12 20:36:40 2017
>-@@ -26,15 +26,15 @@ if(ENABLE_MAN OR ENABLE_DOC)
>-
>+Index: doc/CMakeLists.txt
>+--- doc/CMakeLists.txt.orig
> doc/CMakeLists.txt
>+@@ -22,15 +22,15 @@ if(ENABLE_MAN OR ENABLE_DOC)
>+ find_package(Asciidoctor)
>+ if(ASCIIDOCTOR_FOUND)
>set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a
>revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
>-
> -add_subdirectory(cs)
> -add_subdirectory(de)
> -add_subdirectory(en)
>@@ -22,7 +23,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.7
> +#add_subdirectory(it)
> +#add_subdirectory(ja)
> +#add_subdirectory(pl)
>-+##add_subdirectory(ru)
>-
>++#add_subdirectory(ru)
>+ else()
>+ message(SEND_ERROR "Asciidoctor not found")
>endif()
>-
>Index: patches/patch-src_plugins_lua_CMakeLists_txt
UPDATE: net/weechat
Update weechat to 2.7 with some Makefile tweaks.
Changelog: https://weechat.org/news/108/20191208-Version-2.7/
OK?
Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile22 Sep 2019 19:34:56 - 1.44
+++ Makefile9 Jan 2020 05:45:29 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.6
+V= 2.7
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -46,15 +46,20 @@ MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
BUILD_DEPENDS= devel/gettext,-tools \
- devel/cpputest
+ devel/cpputest \
+ sysutils/flock
+
+RUN_DEPENDS= sysutils/flock
LIB_DEPENDS= devel/gettext,-runtime \
- security/libgcrypt \
- security/gnutls \
net/curl \
+ security/gnutls \
+ security/libgcrypt \
textproc/aspell/core
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+TEST_DEPENDS= devel/cpputest
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
@@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
-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}
+CONFIGURE_ARGS=-DENABLE_SPELL=ON \
+ -DENABLE_RUBY=ON \
+ -DENABLE_LUA=ON \
+ -DENABLE_TCL=ON \
+ -DENABLE_PYTHON=ON \
+ -DENABLE_TESTS=ON
+
+CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
+ -DENABLE_PHP=OFF \
+ -DENABLE_JAVASCRIPT=OFF \
+ -DHAVE_BACKTRACE=OFF
+
+CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
+ -DTCL_TCLSH=${MODTCL_BIN} \
+ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
+ -DMODTCL_LIB=${MODTCL_LIB}
pre-configure:
rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo22 Sep 2019 19:34:56 - 1.23
+++ distinfo9 Jan 2020 05:45:29 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
-SIZE (weechat-2.6.tar.gz) = 4212612
+SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
+SIZE (weechat-2.7.tar.gz) = 4393859
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt23 Mar 2017 01:46:23 - 1.7
+++ patches/patch-doc_CMakeLists_txt9 Jan 2020 05:45:29 -
@@ -1,10 +1,11 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.7 2017/03/23 01:46:23 danj Exp $
doc/CMakeLists.txt.origSun Jan 15 01:41:25 2017
-+++ doc/CMakeLists.txt Sun Mar 12 20:36:40 2017
-@@ -26,15 +26,15 @@ if(ENABLE_MAN OR ENABLE_DOC)
-
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -22,15 +22,15 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ find_package(Asciidoctor)
+ if(ASCIIDOCTOR_FOUND)
set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a
revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
-
-add_subdirectory(cs)
-add_subdirectory(de)
-add_subdirectory(en)
@@ -22,7 +23,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.7
+#add_subdirectory(it)
+#add_subdirectory(ja)
+#add_subdirectory(pl)
-+##add_subdirectory(ru)
-
++#add_subdirectory(ru)
+ else()
+ message(SEND_ERROR "Asciidoctor not found")
endif()
-
Index: patches/patch-src_plugins_lua_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u
Re: UPDATE: net/weechat
On Sat Sep 14, 2019 at 09:52:33AM +0200, Rafael Sadowski wrote:
> Update weechat to the latest stable version. Upstream switched to python
> 3 as default python version. Changlog here:
>
> https://weechat.org/news/
>
> OK?
Nobody?
>
> RS
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/weechat/Makefile,v
> retrieving revision 1.43
> diff -u -p -u -p -r1.43 Makefile
> --- Makefile 12 Jul 2019 04:42:34 - 1.43
> +++ Makefile 14 Sep 2019 07:48:41 -
> @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
> COMMENT-ruby=Ruby bindings for weechat
> COMMENT-tcl= Tcl bindings for weechat
>
> -V= 2.5
> +V= 2.6
> DISTNAME=weechat-${V}
>
> PKGNAME-main=weechat-${V}
> @@ -53,6 +53,8 @@ LIB_DEPENDS=devel/gettext,-runtime \
> security/gnutls \
> net/curl \
> textproc/aspell/core
> +
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/weechat/distinfo,v
> retrieving revision 1.22
> diff -u -p -u -p -r1.22 distinfo
> --- distinfo 12 Jul 2019 04:42:34 - 1.22
> +++ distinfo 14 Sep 2019 07:48:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (weechat-2.5.tar.gz) = PXfrWnz6dfldccDkR6gx0Dm8f/p3lyy2d4Atchi9Vx4=
> -SIZE (weechat-2.5.tar.gz) = 4185185
> +SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
> +SIZE (weechat-2.6.tar.gz) = 4212612
> Index: patches/patch-src_core_hook_wee-hook-timer_h
> ===
> RCS file: patches/patch-src_core_hook_wee-hook-timer_h
> diff -N patches/patch-src_core_hook_wee-hook-timer_h
> --- patches/patch-src_core_hook_wee-hook-timer_h 12 Jul 2019 04:42:34
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$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
> -+#include
> -
> - struct t_weechat_plugin;
> - struct t_infolist_item;
> Index: patches/patch-src_plugins_CMakeLists_txt
> ===
> RCS file: patches/patch-src_plugins_CMakeLists_txt
> diff -N patches/patch-src_plugins_CMakeLists_txt
> --- patches/patch-src_plugins_CMakeLists_txt 12 Jul 2019 04:42:34 -
> 1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$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
> -@@ -97,8 +97,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
> - endif()
> -
> - if(ENABLE_SCRIPTS AND ENABLE_PYTHON)
> -- find_package(Python)
> -- if(PYTHON_FOUND)
> -+ find_package(PythonLibs)
> -+ if(PYTHONLIBS_FOUND)
> - add_subdirectory(python)
> - endif()
> - endif()
> Index: patches/patch-src_plugins_python_CMakeLists_txt
> ===
> RCS file: patches/patch-src_plugins_python_CMakeLists_txt
> diff -N patches/patch-src_plugins_python_CMakeLists_txt
> --- patches/patch-src_plugins_python_CMakeLists_txt 12 Jul 2019 04:42:34
> - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,18 +0,0 @@
> -$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 "")
> -
> --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
> coverage_config)
> -+if(PYTHONLIBS_FOUND)
> -+ include_directories(${PYTHON_INCLUDE_DIRS})
> -+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts
> coverage_config)
> - endif()
> -
> - install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
> Index: patches/patch-tests_CMakeLists_txt
> ===
> RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-tests_CMakeLists_txt
> --- patches/patch-tests_CMakeLists_txt12 Jul 2019 04:42:34 -
> 1.1
> +++
UPDATE: net/weechat
Update weechat to the latest stable version. Upstream switched to python
3 as default python version. Changlog here:
https://weechat.org/news/
OK?
RS
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 Makefile
--- Makefile12 Jul 2019 04:42:34 - 1.43
+++ Makefile14 Sep 2019 07:48:41 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.5
+V= 2.6
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -53,6 +53,8 @@ LIB_DEPENDS= devel/gettext,-runtime \
security/gnutls \
net/curl \
textproc/aspell/core
+
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 distinfo
--- distinfo12 Jul 2019 04:42:34 - 1.22
+++ distinfo14 Sep 2019 07:48:41 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.5.tar.gz) = PXfrWnz6dfldccDkR6gx0Dm8f/p3lyy2d4Atchi9Vx4=
-SIZE (weechat-2.5.tar.gz) = 4185185
+SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I=
+SIZE (weechat-2.6.tar.gz) = 4212612
Index: patches/patch-src_core_hook_wee-hook-timer_h
===
RCS file: patches/patch-src_core_hook_wee-hook-timer_h
diff -N patches/patch-src_core_hook_wee-hook-timer_h
--- patches/patch-src_core_hook_wee-hook-timer_h12 Jul 2019 04:42:34
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$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
-+#include
-
- struct t_weechat_plugin;
- struct t_infolist_item;
Index: patches/patch-src_plugins_CMakeLists_txt
===
RCS file: patches/patch-src_plugins_CMakeLists_txt
diff -N patches/patch-src_plugins_CMakeLists_txt
--- patches/patch-src_plugins_CMakeLists_txt12 Jul 2019 04:42:34 -
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$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
-@@ -97,8 +97,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
- endif()
-
- if(ENABLE_SCRIPTS AND ENABLE_PYTHON)
-- find_package(Python)
-- if(PYTHON_FOUND)
-+ find_package(PythonLibs)
-+ if(PYTHONLIBS_FOUND)
- add_subdirectory(python)
- endif()
- endif()
Index: patches/patch-src_plugins_python_CMakeLists_txt
===
RCS file: patches/patch-src_plugins_python_CMakeLists_txt
diff -N patches/patch-src_plugins_python_CMakeLists_txt
--- patches/patch-src_plugins_python_CMakeLists_txt 12 Jul 2019 04:42:34
- 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$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 "")
-
--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
coverage_config)
-+if(PYTHONLIBS_FOUND)
-+ include_directories(${PYTHON_INCLUDE_DIRS})
-+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts
coverage_config)
- endif()
-
- install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 12 Jul 2019 04:42:34 - 1.1
+++ patches/patch-tests_CMakeLists_txt 14 Sep 2019 07:48:41 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -55,7 +55,7 @@ if(ICONV_LIBRARY)
+@@ -59,7 +59,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
UPDATE: net/weechat
Update weechat to 2.5.
Release notes:
https://weechat.org/news/103/20190606-Version-2.5/
Notable Port changes:
- Spell checking is now default
- Simplify pre-configure
- Enable tests:
When I run "make test" from the ports folder I see the following results:
"0% tests passed, 1 tests failed out of 1"
A deep look into the test shows just one real tests fails (The guile test also
fails but we are not supporting guile):
$ cd `make show=WRKBUILD` && ctest -VV
1: TEST(Scripts, API)__weechat_plugin__: [BUG] Bus Error at 0x0168c73cccd0
1: ruby 2.6.3p62 (2019-04-16 revision 67580) [x86_64-openbsd]
1:
1: -- Control frame information ---
1: c:0001 p: s:0003 E:000ed0 (none) [FINISH]
1:
1:
1: -- Other runtime information ---
1:
1: * Loaded script: __weechat_plugin__
1:
1: * Loaded features:
1:
1: 0 enumerator.so
1: 1 thread.rb
1: 2 rational.so
1: 3 complex.so
1:
1: [NOTE]
1: You may have encountered a bug in the Ruby interpreter or extension
libraries.
1: Bug reports are welcome.
1: For details: https://www.ruby-lang.org/bugreport.html
I have no clue. The ruby weechat backend is not broken for me. I ran a simple
example script in weechat 2.4 and 2.5:
def weechat_init
Weechat.register("test_ruby", "FlashCode", "1.0", "GPL3", "Test Skript", "",
"")
Weechat.print("", "Hallo, weechat+ruby+openbsd!")
return Weechat::WEECHAT_RC_OK
end
So I don't think there's a big issue or showstopper, is there?
It's going to be exciting! When I run the following command from hand `make
show=MODCMAKE_TEST_TARGET` in an xterm it going to crash my whole xterm. Has
ever seen anything like it before?
However weechat itself works fine form me on amd64.
Happy to see feedback.
RS
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile20 May 2019 22:15:20 - 1.42
+++ Makefile21 Jun 2019 21:39:45 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
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,9 +15,6 @@ 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/
@@ -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,7 +66,9 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
-CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \
+TEST_DEPENDS +=devel/cpputest
+
+CONFIGURE_ARGS+=-DENABLE_SPELL=yes \
-DENABLE_GUILE=no \
-DENABLE_RUBY=yes \
-DENABLE_LUA=yes \
@@ -77,22 +77,18 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \
-DENABLE_PYTHON=yes \
-DENABLE_JAVASCRIPT=no \
-DHAVE_BACKTRACE=no \
+ -DENABLE_TESTS=yes \
-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
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 distinfo
--- distinfo28 Mar 2019 20:39:15 - 1.21
+++ distinfo21 Jun 2019 21:39:45 -
@@ -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
Index: patches/patch-src_core_hook_wee-hook-timer_h
===
RCS file: patches/patch-src_core_hook_wee-hook-timer_h
diff -N patches/patch-src_core_hook_wee-hook-timer_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_core_hook_wee-hook-timer_h21 Jun 2019 21:39:45
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index:
UPDATE: net/weechat
Simple update to the latest stable version. Changelog:
https://weechat.org/files/changelog/ChangeLog-devel.html
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- Makefile6 Nov 2018 19:34:04 - 1.39
+++ Makefile1 Mar 2019 05:43:00 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.3
+V= 2.4
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- distinfo6 Nov 2018 19:34:04 - 1.20
+++ distinfo1 Mar 2019 05:43:00 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.3.tar.gz) = 9GszsI8qko3ROgWZ370h60t0TEGnP6GOREaPrx18W0c=
-SIZE (weechat-2.3.tar.gz) = 4089562
+SHA256 (weechat-2.4.tar.gz) = lj/s3fVcTI1slpONGpB+RIZ5gXcG59ILxq8keXCFp0w=
+SIZE (weechat-2.4.tar.gz) = 4130604
Index: patches/patch-src_plugins_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_plugins_CMakeLists_txt
--- patches/patch-src_plugins_CMakeLists_txt26 Apr 2018 16:06:09 -
1.6
+++ patches/patch-src_plugins_CMakeLists_txt1 Mar 2019 05:43:00 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_plugins_CMakeLists_t
Index: src/plugins/CMakeLists.txt
--- src/plugins/CMakeLists.txt.orig
+++ src/plugins/CMakeLists.txt
-@@ -117,8 +117,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
+@@ -118,8 +118,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
endif()
if(ENABLE_SCRIPTS AND ENABLE_PYTHON)
UPDATE: net/weechat
Hi All.
Please fine below a simple and straightforward update to the latest
stable version. Works on amd64 as usual.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile26 Oct 2018 16:16:24 - 1.38
+++ Makefile5 Nov 2018 06:02:42 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.2
+V= 2.3
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -14,8 +14,6 @@ PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
-
-REVISION-ruby= 0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo28 Jul 2018 08:08:11 - 1.19
+++ distinfo5 Nov 2018 06:02:42 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.2.tar.gz) = ZysgQxzRIS1NaX5ti981AUB6rcPLegtlRPPWbKQRiaA=
-SIZE (weechat-2.2.tar.gz) = 4058098
+SHA256 (weechat-2.3.tar.gz) = 9GszsI8qko3ROgWZ370h60t0TEGnP6GOREaPrx18W0c=
+SIZE (weechat-2.3.tar.gz) = 4089562
UPDATE: net/weechat
Hi All!
please find below a simple update diff to the latest stable version 2.2.
Notable changes:
- enable aspell:
-- /plugin load aspell
-- /aspell enable
-- /aspell setdict en
- remove unnecessary patch
Tests welcome. ok?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile26 Apr 2018 16:06:09 - 1.36
+++ Makefile16 Jul 2018 04:24:39 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.1
+V= 2.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -27,7 +27,7 @@ MASTER_SITES= https://www.weechat.org/fi
MULTI_PACKAGES=-main -lua -python -ruby -tcl
-WANTLIB-main= c curl iconv intl m curses perl pthread \
+WANTLIB-main= aspell c curl iconv intl m curses perl pthread \
gcrypt gnutls gpg-error z
WANTLIB-lua= ${MODLUA_WANTLIB} m
@@ -50,7 +50,8 @@ BUILD_DEPENDS=devel/gettext-tools
LIB_DEPENDS= devel/gettext \
security/libgcrypt \
security/gnutls \
- net/curl
+ net/curl \
+ textproc/aspell/core
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
@@ -64,7 +65,7 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MO
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
-CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
+CONFIGURE_ARGS+=-DENABLE_ASPELL=yes \
-DENABLE_GUILE=no \
-DENABLE_RUBY=yes \
-DENABLE_LUA=yes \
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo26 Apr 2018 16:06:09 - 1.18
+++ distinfo16 Jul 2018 04:24:39 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.1.tar.gz) = LCf6aHg71P2nrQDW8+oP77bHkvS9qCYcpxBupLRZWQY=
-SIZE (weechat-2.1.tar.gz) = 4017348
+SHA256 (weechat-2.2.tar.gz) = ZysgQxzRIS1NaX5ti981AUB6rcPLegtlRPPWbKQRiaA=
+SIZE (weechat-2.2.tar.gz) = 4058098
Index: patches/patch-src_gui_curses_normal_CMakeLists_txt
===
RCS file: patches/patch-src_gui_curses_normal_CMakeLists_txt
diff -N patches/patch-src_gui_curses_normal_CMakeLists_txt
--- patches/patch-src_gui_curses_normal_CMakeLists_txt 26 Apr 2018 16:17:18
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_gui_curses_normal_CMakeLists_txt,v 1.1 2018/04/26 16:17:18
rsadowski Exp $
-
-Fix cyclical dependency error
-
-Index: src/gui/curses/normal/CMakeLists.txt
src/gui/curses/normal/CMakeLists.txt.orig
-+++ src/gui/curses/normal/CMakeLists.txt
-@@ -70,10 +70,10 @@ add_custom_command(
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Creating symbolic link
${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
- )
--add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
-+add_custom_target(create_weechat-curses_symlink ALL
- DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
- )
--add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
-+add_dependencies(create_weechat-curses_symlink ${EXECUTABLE})
- list(APPEND CMAKE_INSTALL_MANIFEST_FILES
"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
-
- # Install executable and symbolic link
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 26 Apr 2018 16:06:09 - 1.10
+++ pkg/PLIST-main 16 Jul 2018 04:24:39 -
@@ -8,6 +8,7 @@ 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
Re: UPDATE: net/weechat
On Thu, Apr 26, 2018 at 07:41:46AM +0200, Rafael Sadowski wrote:
> Update weechat to the latest stable version. I take maintainer,
> requested by danj@. Little tested with ICB and freenode so far.
>
> https://weechat.org/files/changelog/ChangeLog-2.1.html
>
> Please test it and give me feedback.
>
> Ok? Comments?
MASTER_SITES should not use HOMEPAGE anymore.
Can you do $(WRKSRC) -> ${WRKSRC} in post-install and also move NO_TEST
above the targets?
Both CC and CFLAGS are ignored as `make CC=foo CFLAGS=bar clean build'
runs fine.
UPDATE: net/weechat
Update weechat to the latest stable version. I take maintainer,
requested by danj@. Little tested with ICB and freenode so far.
https://weechat.org/files/changelog/ChangeLog-2.1.html
Please test it and give me feedback.
Ok? Comments?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile18 Jan 2018 03:49:58 - 1.35
+++ Makefile26 Apr 2018 05:34:30 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.0.1
+V= 2.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -18,7 +18,7 @@ PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES=net
HOMEPAGE= https://www.weechat.org/
-MAINTAINER=Daniel Jakots
+MAINTAINER=Rafael Sadowski
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo18 Jan 2018 03:49:58 - 1.17
+++ distinfo26 Apr 2018 05:34:30 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.0.1.tar.gz) = k40jLnMb7gbRlh5lL7LEvt3Vr83rbTpAqMRomDR4xbo=
-SIZE (weechat-2.0.1.tar.gz) = 3954182
+SHA256 (weechat-2.1.tar.gz) = LCf6aHg71P2nrQDW8+oP77bHkvS9qCYcpxBupLRZWQY=
+SIZE (weechat-2.1.tar.gz) = 4017348
Index: patches/patch-src_gui_curses_CMakeLists_txt
===
RCS file: patches/patch-src_gui_curses_CMakeLists_txt
diff -N patches/patch-src_gui_curses_CMakeLists_txt
--- patches/patch-src_gui_curses_CMakeLists_txt 23 Mar 2017 01:46:23 -
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_gui_curses_CMakeLists_txt,v 1.6 2017/03/23 01:46:23 danj
Exp $
-
-Fix cyclical dependency error
-
src/gui/curses/CMakeLists.txt.orig Sun Jan 15 01:41:25 2017
-+++ src/gui/curses/CMakeLists.txt Sun Mar 12 19:58:13 2017
-@@ -100,10 +100,10 @@ add_custom_command(
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Creating symbolic link
${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
- )
--add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
-+add_custom_target(create_weechat-curses_symlink ALL
- DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
- )
--add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
-+add_dependencies(create_weechat-curses_symlink ${EXECUTABLE})
- list(APPEND CMAKE_INSTALL_MANIFEST_FILES
"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
-
- # Install executable and symbolic link
Index: patches/patch-src_gui_curses_normal_CMakeLists_txt
===
RCS file: patches/patch-src_gui_curses_normal_CMakeLists_txt
diff -N patches/patch-src_gui_curses_normal_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_gui_curses_normal_CMakeLists_txt 26 Apr 2018 05:34:30
-
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Fix cyclical dependency error
+
+Index: src/gui/curses/normal/CMakeLists.txt
+--- src/gui/curses/normal/CMakeLists.txt.orig
src/gui/curses/normal/CMakeLists.txt
+@@ -70,10 +70,10 @@ add_custom_command(
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Creating symbolic link
${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
+ )
+-add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
++add_custom_target(create_weechat-curses_symlink ALL
+ DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
+ )
+-add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
++add_dependencies(create_weechat-curses_symlink ${EXECUTABLE})
+ list(APPEND CMAKE_INSTALL_MANIFEST_FILES
"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
+
+ # Install executable and symbolic link
Index: patches/patch-src_plugins_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_plugins_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_CMakeLists_txt
--- patches/patch-src_plugins_CMakeLists_txt17 Dec 2017 02:21:23 -
1.5
+++ patches/patch-src_plugins_CMakeLists_txt26 Apr 2018 05:34:30 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_plugins_CMakeLists_t
Index: src/plugins/CMakeLists.txt
--- src/plugins/CMakeLists.txt.orig
+++ src/plugins/CMakeLists.txt
-@@ -114,8 +114,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
+@@ -117,8 +117,8 @@ if(ENABLE_SCRIPTS AND ENABLE_PERL)
endif()
if(ENABLE_SCRIPTS AND ENABLE_PYTHON)
Index: pkg/PLIST-main
===
RCS file:
Re: [UPDATE] net/weechat to 1.5.0
On Wed, May 04, 2016 at 04:37:41PM -0600, Aaron Bieber wrote: > > > On Sun, May 1, 2016, at 12:28 PM, Eric Lalonde wrote: > > Hello ports, > > > > net/weechat has been updated to 1.5.0. Changes include Portuguese > > support, detection of ruby 2.3, and 16 bugfixes. Full changelog is > > available at: https://weechat.org/files/changelog/ChangeLog-1.5.html > > > > Tested with recent snapshots on i386 and amd64 arches. > > Working well here! OK abieber@. Can we get another OK? :D Works fine here too. ok lteo@
Re: [UPDATE] net/weechat to 1.5.0
On 5/1/16 11:28 AM, Eric Lalonde wrote: Hello ports, net/weechat has been updated to 1.5.0. Changes include Portuguese support, detection of ruby 2.3, and 16 bugfixes. Full changelog is available at: https://weechat.org/files/changelog/ChangeLog-1.5.html Tested with recent snapshots on i386 and amd64 arches. Ping.
Re: [UPDATE] net/weechat to 1.5.0
On Sun, May 1, 2016, at 12:28 PM, Eric Lalonde wrote: > Hello ports, > > net/weechat has been updated to 1.5.0. Changes include Portuguese > support, detection of ruby 2.3, and 16 bugfixes. Full changelog is > available at: https://weechat.org/files/changelog/ChangeLog-1.5.html > > Tested with recent snapshots on i386 and amd64 arches. Working well here! OK abieber@. Can we get another OK? :D > > Cheers, > > - Eric > > Email had 1 attachment: > + weechat-1.5.diff > 1k (text/plain)
[UPDATE] net/weechat to 1.5.0
Hello ports,
net/weechat has been updated to 1.5.0. Changes include Portuguese
support, detection of ruby 2.3, and 16 bugfixes. Full changelog is
available at: https://weechat.org/files/changelog/ChangeLog-1.5.html
Tested with recent snapshots on i386 and amd64 arches.
Cheers,
- Eric
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile20 Mar 2016 16:12:25 - 1.24
+++ Makefile1 May 2016 18:22:26 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 1.4
+V= 1.5
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo11 Jan 2016 15:11:31 - 1.10
+++ distinfo1 May 2016 18:22:26 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.4.tar.gz) = UYWb87Jv/u2VwKM5kWfmZw6CQFQsUnckOfucreBoV6U=
-SIZE (weechat-1.4.tar.gz) = 3443798
+SHA256 (weechat-1.5.tar.gz) = MXRVhVaiCuj57jq79mt9QrZX0zcDIlVVAacH4znhB3E=
+SIZE (weechat-1.5.tar.gz) = 3582515
[UPDATE] net/weechat 1.3 => 1.4
Hello ports@,
Attached is a diff to bring weechat to its recently released version
1.4. Changes include fixes for memleaks, better tmux support, character
set decoding, improved UTF-8 support.
Additionally, new features are listed at
https://weechat.org/files/changelog/ChangeLog-1.4.html
I've left javascript disabled in the CONFIGURE_ARGS definition to avoid
intermittent failures on bulk builds. Not sure if the v8 build issues
were resolved or not.
I am currently running this on amd64, seems to work well.
- Eric
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile5 Oct 2015 08:46:21 - 1.22
+++ Makefile10 Jan 2016 21:34:25 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 1.3
+V= 1.4
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo3 Sep 2015 17:44:13 - 1.9
+++ distinfo10 Jan 2016 21:34:25 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.3.tar.gz) = XGyPIfSDUDTHjJ+G9wyN92r6c4l0gehCYeFYPbRrZ40=
-SIZE (weechat-1.3.tar.gz) = 3402449
+SHA256 (weechat-1.4.tar.gz) = UYWb87Jv/u2VwKM5kWfmZw6CQFQsUnckOfucreBoV6U=
+SIZE (weechat-1.4.tar.gz) = 3443798
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt18 Jul 2015 23:10:37 - 1.5
+++ patches/patch-doc_CMakeLists_txt10 Jan 2016 21:34:25 -
@@ -1,7 +1,6 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.5 2015/07/18 23:10:37 ajacoutot Exp $
doc/CMakeLists.txt.origSun May 10 09:24:50 2015
-+++ doc/CMakeLists.txt Sun Jul 19 01:03:00 2015
-@@ -45,13 +45,13 @@ if(ENABLE_MAN OR ENABLE_DOC)
+--- doc/CMakeLists.txt.origSun Jan 10 00:17:50 2016
doc/CMakeLists.txt Sun Jan 10 06:09:03 2016
+@@ -45,14 +45,14 @@ if(ENABLE_MAN OR ENABLE_DOC)
set(ASCIIDOC_ARGS_DEV${ASCIIDOC_ARGS} ${CSS_TOC2} )
add_subdirectory(en)
@@ -12,6 +11,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.5
-add_subdirectory(es)
-add_subdirectory(ru)
-add_subdirectory(ja)
+-add_subdirectory(cs)
+#add_subdirectory(fr)
+#add_subdirectory(it)
+#add_subdirectory(de)
@@ -19,6 +19,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.5
+#add_subdirectory(es)
+#add_subdirectory(ru)
+#add_subdirectory(ja)
++#add_subdirectory(cs)
endif()
Re: [UPDATE] net/weechat 1.3 => 1.4
Eric Lalonde writes: > Hello ports@, > > Attached is a diff to bring weechat to its recently released version > 1.4. Changes include fixes for memleaks, better tmux support, character > set decoding, improved UTF-8 support. > > Additionally, new features are listed at > https://weechat.org/files/changelog/ChangeLog-1.4.html > > I've left javascript disabled in the CONFIGURE_ARGS definition to avoid > intermittent failures on bulk builds. Not sure if the v8 build issues > were resolved or not. > > I am currently running this on amd64, seems to work well. > > - Eric Working fine here as well. OK abieber@ if anyone wants to commit!
Re: UPDATE: net/weechat to 1.1.1
Ping?
UPDATE: net/weechat to 1.1.1
1.1.1 is a maintenance/bugfix release.
It seems that the symlink-fix is not required anymore, which is why I
removed the corresponding patch.
Related commit:
https://github.com/weechat/weechat/commit/a6327bc6f20252481366406580bab9d60e6b5725#diff-27f5c7a9707c7201d66952cbfde37f05
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile19 Jan 2015 12:28:46 - 1.17
+++ Makefile15 Mar 2015 15:43:42 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 1.1
+V= 1.1.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo19 Jan 2015 12:28:46 - 1.7
+++ distinfo15 Mar 2015 15:43:42 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.1.tar.gz) = g/N4sHA3wUfFvajVO/pYFJ0h7ENuNNpaunXa5xS2+cM=
-SIZE (weechat-1.1.tar.gz) = 3293228
+SHA256 (weechat-1.1.1.tar.gz) = oy9+V9XoNBlbrK/6h0QZtKnRfNQog8gNfsufrb9gE0k=
+SIZE (weechat-1.1.1.tar.gz) = 3294132
Index: patches/patch-src_gui_curses_CMakeLists_txt
===
RCS file: patches/patch-src_gui_curses_CMakeLists_txt
diff -N patches/patch-src_gui_curses_CMakeLists_txt
--- patches/patch-src_gui_curses_CMakeLists_txt 19 Jan 2015 12:28:46 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_gui_curses_CMakeLists_txt,v 1.2 2015/01/19 12:28:46 dcoppa
Exp $
src/gui/curses/CMakeLists.txt.orig Sun Jan 11 02:39:40 2015
-+++ src/gui/curses/CMakeLists.txt Mon Jan 19 03:17:43 2015
-@@ -84,15 +84,12 @@ add_dependencies(${EXECUTABLE} weechat_gui_curses)
- # Due to circular references, we must link two times with libweechat_core.a
- target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses
${EXTRA_LIBS} ${STATIC_LIBS})
-
--install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
--
- # Create a symbolic link weechat-curses - weechat
- # This link is created for compatibility with old versions on /upgrade.
- # It may be removed in future.
--install(CODE
-- EXECUTE_PROCESS(
--COMMAND ${CMAKE_COMMAND} -E remove -f
\\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\
--COMMAND ${CMAKE_COMMAND} -E create_symlink
weechat${CMAKE_EXECUTABLE_SUFFIX}
\\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\
-- )
-- LIST(APPEND CMAKE_INSTALL_MANIFEST_FILES
\${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\)
--)
-+add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-+COMMAND ${CMAKE_COMMAND} -E create_symlink
$TARGET_FILE_NAME:${EXECUTABLE}
${CMAKE_CURRENT_BINARY_DIR}/$TARGET_FILE_NAME:${EXECUTABLE}-curses
-+)
-+
-+install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
-+install(FILES
${CMAKE_CURRENT_BINARY_DIR}/$TARGET_FILE_NAME:${EXECUTABLE}-curses
DESTINATION bin)
Re: UPDATE: net/weechat to 1.1
Ping?
UPDATE: net/weechat to 1.1
Diff updates the port to 1.1. OK?
Re: UPDATE: net/weechat to 1.1
On Mon, Jan 12, 2015 at 04:15:56PM +0100, Henrik Friedrichsen wrote:
Diff updates the port to 1.1.
Ugh.. Forgot the diff.
Index: net/weechat/Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- net/weechat/Makefile8 Oct 2014 13:46:16 - 1.16
+++ net/weechat/Makefile12 Jan 2015 15:14:32 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 1.0.1
+V= 1.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -31,7 +31,7 @@ MULTI_PACKAGES= -main -lua -python -ruby
WANTLIB-main= c curl m ncursesw perl pthread util \
gcrypt gnutls gpg-error z ${MODGETTEXT_WANTLIB}
-WANTLIB-lua= ${MODLUA_WANTLIB}
+WANTLIB-lua= ${MODLUA_WANTLIB} m
WANTLIB-python=${MODPY_WANTLIB}
WANTLIB-ruby= ${MODRUBY_WANTLIB} gmp m pthread
WANTLIB-tcl= ${MODTCL_WANTLIB}
Index: net/weechat/distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- net/weechat/distinfo8 Oct 2014 13:46:16 - 1.6
+++ net/weechat/distinfo12 Jan 2015 15:14:32 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
-SIZE (weechat-1.0.1.tar.gz) = 3237820
+SHA256 (weechat-1.1.tar.gz) = g/N4sHA3wUfFvajVO/pYFJ0h7ENuNNpaunXa5xS2+cM=
+SIZE (weechat-1.1.tar.gz) = 3293228
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
On 10/04/14 12:04, Henrik Friedrichsen wrote:
On Sat, Oct 04, 2014 at 11:21:18AM +0100, Stuart Henderson wrote:
This doesn't apply to -current, please update your tree first.
Pardon me. Looks like I missed out on a commit from a few days ago.
Here goes another try.
weechat 0.4.2 ruby plunin is broken by the ruby update, only
built/working if by a fuke the correct multiple ruby versions have been
installed, during the build and at runtime. A weechat update is required.
weechat 1.0.1 supports Ruby 2.1, weechat 0.4.2 only supports Ruby 1.8,
1.9, weechat 0.4.3 supports up to Ruby 2.0. As ruby 2.1 is default,
weechat 1.0.1 is needed.
weechat 0.4.2 to 1.0.1 - tcl plugin can be built incorrectly against the
wrong versions of tcl, this is corrected by changing the version
detection, and forcing use of the correct version using the configure
args passed to cmake.
$ make show=CONFIGURE_ARGS
-DENABLE_ASPELL=no -DENABLE_GUILE=no -DENABLE_RUBY=yes
-DENABLE_LUA=yes -DENABLE_TCL=yes -DENABLE_PYTHON=yes
-DHAVE_BACKTRACE=no -DMANDIR=/usr/local/man -DENABLE_MAN=on
-DCA_FILE=/etc/ssl/cert.pem -DTCL_TCLSH=/usr/local/bin/tclsh8.5
-DTCL_INCLUDE_PATH=/usr/local/include/tcl8.5 -DMODTCL_LIB=tcl85
To ensure the correct generation of the PLIST's, the plugins should
depends on weechat,-main. RUN_DEPENDS-{lua,ruby,python,tcl} updated. The
plugins are of little use without weechat installed.
All ports should pass
make port-lib-depends-check or make lib-depends-check or
$ check-lib-depends -d . weechat-*-1*.tgz
Scanning: ok
once built, LIB_DEPENDS / WANTLIB's have been updated to pass this.
Not only does the port have to build, it has to build even if other
versions of lua/Python/Ruby/Tcl are installed, and build without relying
on other ports being built also. Tried the different combinations
building on amd64.
No runtime testing has been carried out.
Index: Makefile
===
RCS file: /home/cvs/ports/net/weechat/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 27 Sep 2014 17:07:20 - 1.15
+++ Makefile 7 Oct 2014 09:31:22 -
@@ -6,15 +6,13 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 0
PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES= net
@@ -35,7 +33,7 @@ WANTLIB-main= c curl m ncursesw perl pth
WANTLIB-lua= ${MODLUA_WANTLIB}
WANTLIB-python= ${MODPY_WANTLIB}
-WANTLIB-ruby= ${MODRUBY_WANTLIB}
+WANTLIB-ruby= ${MODRUBY_WANTLIB} gmp m pthread
WANTLIB-tcl= ${MODTCL_WANTLIB}
MODULES= devel/cmake \
@@ -55,16 +53,17 @@ LIB_DEPENDS= security/libgcrypt \
net/curl
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
-RUN_DEPENDS-lua= ${MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS}
-RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
+RUN_DEPENDS-python= net/weechat,-main ${MODPY_RUN_DEPENDS}
-LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS}
-RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
+LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS} \
+ devel/gmp
+RUN_DEPENDS-ruby= net/weechat,-main ${MODRUBY_RUN_DEPENDS}
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
-RUN_DEPENDS-tcl= ${MODTCL_RUN_DEPENDS}
+RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DENABLE_GUILE=no \
@@ -75,11 +74,14 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DHAVE_BACKTRACE=no \
-DMANDIR=${PREFIX}/man \
-DENABLE_MAN=on \
- -DCA_FILE=/etc/ssl/cert.pem
+ -DCA_FILE=/etc/ssl/cert.pem \
+ -DTCL_TCLSH=${MODTCL_BIN} \
+ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
+ -DMODTCL_LIB=${MODTCL_LIB}
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /home/cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 14 Nov 2013 22:30:29 - 1.5
+++ distinfo 6 Oct 2014 18:07:40 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
+SIZE (weechat-1.0.1.tar.gz) = 3237820
Index: patches/patch-cmake_FindTCL_cmake
===
RCS file: patches/patch-cmake_FindTCL_cmake
diff -N patches/patch-cmake_FindTCL_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_FindTCL_cmake 6 Oct 2014 18:21:39 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- cmake/FindTCL.cmake.orig Sun Sep 28
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
This is better, nice. Works fine on amd64.
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
On Sat, Oct 04, 2014 at 12:31:26AM -0400, Brian Callahan wrote:
Could you please regenerate this using cvs diff -uNp
Done.
Why MODRUBY_REV=1.9?
No particular reason. Just a leftover from previous versions
where Ruby1.9 wasn't supported, I suppose.
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile19 Nov 2013 13:11:03 - 1.14
+++ Makefile4 Oct 2014 09:08:06 -
@@ -6,11 +6,10 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
@@ -47,7 +46,6 @@ MODULES= devel/cmake \
MODLUA_RUNDEP= No
MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
-MODRUBY_REV= 1.9
BUILD_DEPENDS =textproc/asciidoc
LIB_DEPENDS= security/libgcrypt \
@@ -79,7 +77,7 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo4 Oct 2014 09:08:06 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
+SIZE (weechat-1.0.1.tar.gz) = 3237820
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt14 Nov 2013 22:30:29 - 1.3
+++ patches/patch-doc_CMakeLists_txt4 Oct 2014 09:08:06 -
@@ -1,24 +1,25 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
+--- doc/CMakeLists.txt.origSat Oct 4 06:04:43 2014
doc/CMakeLists.txt Sat Oct 4 06:05:04 2014
+@@ -22,13 +22,13 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ find_package(Sourcehighlight)
+ find_package(Asciidoc)
+ if(ASCIIDOC_FOUND)
+-add_subdirectory(en)
+-add_subdirectory(fr)
+-add_subdirectory(it)
+-add_subdirectory(de)
+-add_subdirectory(pl)
+-add_subdirectory(es)
+-add_subdirectory(ru)
+-add_subdirectory(ja)
++ #add_subdirectory(en)
++ #add_subdirectory(fr)
++ #add_subdirectory(it)
++ #add_subdirectory(de)
++ #add_subdirectory(pl)
++ #add_subdirectory(es)
++ #add_subdirectory(ru)
++ #add_subdirectory(ja)
+ endif()
+ endif()
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 17 Nov 2013 00:05:51 - 1.5
+++ pkg/PLIST-main 4 Oct 2014 09:08:06 -
@@ -7,24 +7,24 @@ lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
-@man man/man1/weechat.1
share/doc/weechat/
-share/doc/weechat/weechat_dev.en.txt
-share/doc/weechat/weechat_faq.en.txt
-share/doc/weechat/weechat_plugin_api.en.txt
-share/doc/weechat/weechat_quickstart.en.txt
-share/doc/weechat/weechat_relay_protocol.en.txt
-share/doc/weechat/weechat_scripting.en.txt
-share/doc/weechat/weechat_tester.en.txt
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
On 2014/10/04 11:09, Henrik Friedrichsen wrote: On Sat, Oct 04, 2014 at 12:31:26AM -0400, Brian Callahan wrote: Could you please regenerate this using cvs diff -uNp Done. This doesn't apply to -current, please update your tree first. I suggest: cd /usr/ports/net/weechat rsync -avC ./ /tmp/weechat/ cvs up -PdA rsync -avC --delete /tmp/weechat/ ./ cvs diff -u
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
On Sat, Oct 04, 2014 at 11:21:18AM +0100, Stuart Henderson wrote:
This doesn't apply to -current, please update your tree first.
Pardon me. Looks like I missed out on a commit from a few days ago.
Here goes another try.
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- Makefile27 Sep 2014 17:07:20 - 1.15
+++ Makefile4 Oct 2014 10:59:32 -
@@ -6,15 +6,13 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 0
PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES=net
@@ -79,7 +77,7 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo4 Oct 2014 10:59:32 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
+SIZE (weechat-1.0.1.tar.gz) = 3237820
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt14 Nov 2013 22:30:29 - 1.3
+++ patches/patch-doc_CMakeLists_txt4 Oct 2014 10:59:32 -
@@ -1,24 +1,23 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
+--- doc/CMakeLists.txt.origSun Sep 28 08:59:19 2014
doc/CMakeLists.txt Sat Oct 4 12:45:13 2014
+@@ -23,12 +23,12 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ find_package(Asciidoc)
+ if(ASCIIDOC_FOUND)
+ add_subdirectory(en)
+-add_subdirectory(fr)
+-add_subdirectory(it)
+-add_subdirectory(de)
+-add_subdirectory(pl)
+-add_subdirectory(es)
+-add_subdirectory(ru)
+-add_subdirectory(ja)
++ #add_subdirectory(fr)
++ #add_subdirectory(it)
++ #add_subdirectory(de)
++ #add_subdirectory(pl)
++ #add_subdirectory(es)
++ #add_subdirectory(ru)
++ #add_subdirectory(ja)
+ endif()
+ endif()
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-main
--- pkg/PLIST-main 17 Nov 2013 00:05:51 - 1.5
+++ pkg/PLIST-main 4 Oct 2014 10:59:32 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.5 2013/11/17 00:05:51 fgsch Exp $
@bin bin/weechat
+bin/weechat-curses
include/weechat/
include/weechat/weechat-plugin.h
lib/pkgconfig/weechat.pc
@@ -7,24 +8,25 @@ lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat.1
share/doc/weechat/
-share/doc/weechat/weechat_dev.en.txt
-share/doc/weechat/weechat_faq.en.txt
-share/doc/weechat/weechat_plugin_api.en.txt
-share/doc/weechat/weechat_quickstart.en.txt
-share/doc/weechat/weechat_relay_protocol.en.txt
-share/doc/weechat/weechat_scripting.en.txt
-share/doc/weechat/weechat_tester.en.txt
-share/doc/weechat/weechat_user.en.txt
UPDATE: net/weechat 0.4.2 - 1.0.1
Hey,
Giving this another try after the update to 1.0 got buried.
Same routine. Tested on amd64, rather minor update.
OK?
diff -Naur ../_weechat/CVS/Entries ./CVS/Entries
--- ../_weechat/CVS/Entries Sat Oct 4 06:12:18 2014
+++ ./CVS/Entries Wed Mar 5 17:03:03 2014
@@ -1,4 +1,4 @@
-/Makefile/1.15/Sat Sep 27 17:07:20 2014//
+/Makefile/1.14/Tue Nov 19 13:11:03 2013//
/distinfo/1.5/Thu Nov 14 22:30:29 2013//
D/patches
D/pkg
diff -Naur ../_weechat/CVS/Root ./CVS/Root
--- ../_weechat/CVS/RootSat Oct 4 06:12:18 2014
+++ ./CVS/Root Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-anon...@ftp.hostserver.de:/cvs
diff -Naur ../_weechat/Makefile ./Makefile
--- ../_weechat/MakefileSat Sep 27 19:07:20 2014
+++ ./Makefile Sat Oct 4 06:11:11 2014
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2014/09/27 17:07:20 jeremy Exp $
+# $OpenBSD: Makefile,v 1.14 2013/11/19 13:11:03 sthen Exp $
COMMENT-main= fast, light and extensible chat client
COMMENT-lua= Lua bindings for weechat
@@ -6,15 +6,13 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 0
PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES=net
@@ -48,6 +46,7 @@
MODLUA_RUNDEP= No
MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
+MODRUBY_REV= 1.9
BUILD_DEPENDS =textproc/asciidoc
LIB_DEPENDS= security/libgcrypt \
@@ -79,7 +78,7 @@
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
diff -Naur ../_weechat/distinfo ./distinfo
--- ../_weechat/distinfoThu Nov 14 23:30:29 2013
+++ ./distinfo Sat Oct 4 05:57:34 2014
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
+SIZE (weechat-1.0.1.tar.gz) = 3237820
diff -Naur ../_weechat/patches/CVS/Root ./patches/CVS/Root
--- ../_weechat/patches/CVS/RootSat Oct 4 06:12:18 2014
+++ ./patches/CVS/Root Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-anon...@ftp.hostserver.de:/cvs
diff -Naur ../_weechat/patches/patch-doc_CMakeLists_txt
./patches/patch-doc_CMakeLists_txt
--- ../_weechat/patches/patch-doc_CMakeLists_txtThu Nov 14 23:30:29 2013
+++ ./patches/patch-doc_CMakeLists_txt Sat Oct 4 06:05:10 2014
@@ -1,24 +1,25 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
+--- doc/CMakeLists.txt.origSat Oct 4 06:04:43 2014
doc/CMakeLists.txt Sat Oct 4 06:05:04 2014
+@@ -22,13 +22,13 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ find_package(Sourcehighlight)
+ find_package(Asciidoc)
+ if(ASCIIDOC_FOUND)
+-add_subdirectory(en)
+-add_subdirectory(fr)
+-add_subdirectory(it)
+-add_subdirectory(de)
+-add_subdirectory(pl)
+-add_subdirectory(es)
+-add_subdirectory(ru)
+-add_subdirectory(ja)
++ #add_subdirectory(en)
++ #add_subdirectory(fr)
++ #add_subdirectory(it)
++ #add_subdirectory(de)
++ #add_subdirectory(pl)
++ #add_subdirectory(es)
++ #add_subdirectory(ru)
++ #add_subdirectory(ja)
+ endif()
+ endif()
diff -Naur ../_weechat/pkg/CVS/Root ./pkg/CVS/Root
--- ../_weechat/pkg/CVS/RootSat Oct 4 06:12:18 2014
+++ ./pkg/CVS/Root Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-anon...@ftp.hostserver.de:/cvs
diff -Naur ../_weechat/pkg/PLIST-main ./pkg/PLIST-main
--- ../_weechat/pkg/PLIST-main Sun Nov 17 01:05:51 2013
+++ ./pkg/PLIST-mainSat Oct 4 06:09:27 2014
@@ -7,24 +7,24 @@
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
Re: UPDATE: net/weechat 0.4.2 - 1.0.1
On 10/04/14 00:18, Henrik Friedrichsen wrote: Hey, Giving this another try after the update to 1.0 got buried. Same routine. Tested on amd64, rather minor update. OK? Could you please regenerate this using cvs diff -uNp Why MODRUBY_REV=1.9?
Re: UPDATE: net/weechat 1.0
On Fri, 5 Sep 2014 04:49:24 +0200
Henrik Friedrichsen hen...@diff.cc wrote:
Hey
On Thu, Sep 04, 2014 at 07:22:31AM +0200, Remi Pointel wrote:
I have a similar diff in my ports tree.
I removed the post-installation and added -DENABLE_DOC=yes instead.
Seems reasonable, although those PLIST entries for the locales that
are only in the -lua package look a bit out of place, no?
Uh, you're allright.
this is the correct diff.
OK?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Nov 2013 13:11:03 - 1.14
+++ Makefile5 Sep 2014 06:18:37 -
@@ -6,11 +6,10 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
@@ -75,12 +74,8 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DHAVE_BACKTRACE=no \
-DMANDIR=${PREFIX}/man \
-DENABLE_MAN=on \
- -DCA_FILE=/etc/ssl/cert.pem
-
-post-install:
- $(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
- ${PREFIX}/share/doc/weechat/
+ -DCA_FILE=/etc/ssl/cert.pem \
+ -DENABLE_DOC=yes
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo5 Sep 2014 06:18:37 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.tar.gz) = fcj2lzbq1eVcniCHCos7g6czf71ZE3LxSea6QrPnJ/w=
+SIZE (weechat-1.0.tar.gz) = 3234864
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt14 Nov 2013 22:30:29 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 17 Nov 2013 00:05:51 - 1.5
+++ pkg/PLIST-main 5 Sep 2014 06:18:37 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.5 2013/11/17 00:05:51 fgsch Exp $
@bin bin/weechat
+bin/weechat-curses
include/weechat/
include/weechat/weechat-plugin.h
lib/pkgconfig/weechat.pc
@@ -7,24 +8,31 @@ lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
+man/de/
+man/de/man1/
+@man man/de/man1/weechat.1
+man/fr/
+man/fr/man1/
+@man man/fr/man1/weechat.1
+man/it/
+man/it/man1/
+@man man/it/man1/weechat.1
+man/ja/
+man/ja/man1/
+@man man/ja/man1/weechat.1
@man man/man1/weechat.1
-share/doc/weechat/
-share/doc/weechat/weechat_dev.en.txt
-share/doc/weechat/weechat_faq.en.txt
-share/doc/weechat/weechat_plugin_api.en.txt
-share/doc/weechat/weechat_quickstart.en.txt
-share/doc/weechat/weechat_relay_protocol.en.txt
-share/doc/weechat/weechat_scripting.en.txt
-share/doc/weechat/weechat_tester.en.txt
-share/doc/weechat/weechat_user.en.txt
+man/pl/
+man/pl/man1/
+@man man/pl/man1/weechat.1
@comment share/icons/
@comment share/icons/hicolor/
@comment share/icons/hicolor/32x32/
Re: UPDATE: net/weechat 1.0
On 09/05/2014 08:19 AM, Remi Pointel wrote: OK? Cheers, Remi. Looks better. I was unsure about the localized manpages myself which is why I removed them. I was looking at /usr/local/man and haven't found any..
Re: UPDATE: net/weechat 1.0
Hey On Thu, Sep 04, 2014 at 07:22:31AM +0200, Remi Pointel wrote: I have a similar diff in my ports tree. I removed the post-installation and added -DENABLE_DOC=yes instead. Seems reasonable, although those PLIST entries for the locales that are only in the -lua package look a bit out of place, no?
UPDATE: net/weechat 1.0
Update weechat to 1.0
Requires only small changes
OK?
diff -Naur ../_weechat/Makefile ./Makefile
--- ../_weechat/MakefileThu Sep 4 00:45:49 2014
+++ ./Makefile Thu Sep 4 01:03:21 2014
@@ -6,11 +6,10 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
@@ -79,7 +78,7 @@
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
diff -Naur ../_weechat/distinfo ./distinfo
--- ../_weechat/distinfoThu Sep 4 00:45:49 2014
+++ ./distinfo Thu Sep 4 00:46:22 2014
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.tar.gz) = fcj2lzbq1eVcniCHCos7g6czf71ZE3LxSea6QrPnJ/w=
+SIZE (weechat-1.0.tar.gz) = 3234864
diff -Naur ../_weechat/patches/patch-doc_CMakeLists_txt
./patches/patch-doc_CMakeLists_txt
--- ../_weechat/patches/patch-doc_CMakeLists_txtThu Sep 4 00:45:49 2014
+++ ./patches/patch-doc_CMakeLists_txt Thu Sep 4 00:56:39 2014
@@ -1,24 +1,23 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
+--- doc/CMakeLists.txt.origThu Sep 4 00:55:54 2014
doc/CMakeLists.txt Thu Sep 4 00:56:14 2014
+@@ -23,12 +23,12 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ find_package(Asciidoc)
+ if(ASCIIDOC_FOUND)
+ add_subdirectory(en)
+-add_subdirectory(fr)
+-add_subdirectory(it)
+-add_subdirectory(de)
+-add_subdirectory(pl)
+-add_subdirectory(es)
+-add_subdirectory(ru)
+-add_subdirectory(ja)
++#add_subdirectory(fr)
++#add_subdirectory(it)
++#add_subdirectory(de)
++#add_subdirectory(pl)
++#add_subdirectory(es)
++#add_subdirectory(ru)
++#add_subdirectory(ja)
+ endif()
+ endif()
diff -Naur ../_weechat/patches/patch-doc_CMakeLists_txt.orig
./patches/patch-doc_CMakeLists_txt.orig
--- ../_weechat/patches/patch-doc_CMakeLists_txt.orig Thu Jan 1 01:00:00 1970
+++ ./patches/patch-doc_CMakeLists_txt.orig Thu Sep 4 00:54:41 2014
@@ -0,0 +1,24 @@
+$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
+--- doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
+@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
+ FIND_PACKAGE(Asciidoc)
+ IF(ASCIIDOC_FOUND)
+ ADD_SUBDIRECTORY( en )
+-ADD_SUBDIRECTORY( fr )
+-ADD_SUBDIRECTORY( it )
+-ADD_SUBDIRECTORY( de )
+-ADD_SUBDIRECTORY( pl )
+-ADD_SUBDIRECTORY( es )
+-ADD_SUBDIRECTORY( ru )
+-ADD_SUBDIRECTORY( ja )
++ # ADD_SUBDIRECTORY( fr )
++ # ADD_SUBDIRECTORY( it )
++ # ADD_SUBDIRECTORY( de )
++ # ADD_SUBDIRECTORY( pl )
++ # ADD_SUBDIRECTORY( es )
++ # ADD_SUBDIRECTORY( ru )
++ # ADD_SUBDIRECTORY( ja )
+ ENDIF(ASCIIDOC_FOUND)
+
+ ENDIF(ENABLE_MAN OR ENABLE_DOC)
diff -Naur ../_weechat/pkg/PLIST-main ./pkg/PLIST-main
--- ../_weechat/pkg/PLIST-main Thu Sep 4 00:45:49 2014
+++ ./pkg/PLIST-mainThu Sep 4 01:00:21 2014
@@ -7,24 +7,25 @@
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat.1
share/doc/weechat/
-share/doc/weechat/weechat_dev.en.txt
-share/doc/weechat/weechat_faq.en.txt
-share/doc/weechat/weechat_plugin_api.en.txt
-share/doc/weechat/weechat_quickstart.en.txt
-share/doc/weechat/weechat_relay_protocol.en.txt
-share/doc/weechat/weechat_scripting.en.txt
-share/doc/weechat/weechat_tester.en.txt
-share/doc/weechat/weechat_user.en.txt
+share/doc/weechat/weechat_dev.en.asciidoc
+share/doc/weechat/weechat_faq.en.asciidoc
Re: UPDATE: net/weechat 1.0
On Thu, 4 Sep 2014 01:05:21 +0200
Henrik Friedrichsen hen...@diff.cc wrote:
Update weechat to 1.0
Requires only small changes
OK?
I have a similar diff in my ports tree.
I removed the post-installation and added -DENABLE_DOC=yes instead.
Attached is the diff.
ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Nov 2013 13:11:03 - 1.14
+++ Makefile4 Sep 2014 04:55:23 -
@@ -6,11 +6,10 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
@@ -75,12 +74,8 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DHAVE_BACKTRACE=no \
-DMANDIR=${PREFIX}/man \
-DENABLE_MAN=on \
- -DCA_FILE=/etc/ssl/cert.pem
-
-post-install:
- $(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
- ${PREFIX}/share/doc/weechat/
+ -DCA_FILE=/etc/ssl/cert.pem \
+ -DENABLE_DOC=yes
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo4 Sep 2014 04:55:23 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.tar.gz) = fcj2lzbq1eVcniCHCos7g6czf71ZE3LxSea6QrPnJ/w=
+SIZE (weechat-1.0.tar.gz) = 3234864
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt14 Nov 2013 22:30:29 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
doc/CMakeLists.txt.origThu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 2013
-@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
- FIND_PACKAGE(Asciidoc)
- IF(ASCIIDOC_FOUND)
- ADD_SUBDIRECTORY( en )
--ADD_SUBDIRECTORY( fr )
--ADD_SUBDIRECTORY( it )
--ADD_SUBDIRECTORY( de )
--ADD_SUBDIRECTORY( pl )
--ADD_SUBDIRECTORY( es )
--ADD_SUBDIRECTORY( ru )
--ADD_SUBDIRECTORY( ja )
-+ # ADD_SUBDIRECTORY( fr )
-+ # ADD_SUBDIRECTORY( it )
-+ # ADD_SUBDIRECTORY( de )
-+ # ADD_SUBDIRECTORY( pl )
-+ # ADD_SUBDIRECTORY( es )
-+ # ADD_SUBDIRECTORY( ru )
-+ # ADD_SUBDIRECTORY( ja )
- ENDIF(ASCIIDOC_FOUND)
-
- ENDIF(ENABLE_MAN OR ENABLE_DOC)
Index: pkg/PLIST-lua
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-lua
--- pkg/PLIST-lua 26 Jun 2012 15:06:42 - 1.1.1.1
+++ pkg/PLIST-lua 4 Sep 2014 04:55:23 -
@@ -1,2 +1,25 @@
@comment $OpenBSD: PLIST-lua,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $
lib/weechat/plugins/lua.so
+share/locale/
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 17 Nov 2013 00:05:51 - 1.5
+++ pkg/PLIST-main 4 Sep 2014 04:55:23 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.5 2013/11/17 00:05:51 fgsch Exp $
@bin bin/weechat
+bin/weechat-curses
include/weechat/
include/weechat/weechat-plugin.h
lib/pkgconfig/weechat.pc
@@ -7,24 +8,31 @@ lib/weechat/
lib/weechat/plugins/
lib/weechat/plugins/alias.so
lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
lib/weechat/plugins/fifo.so
lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
+man/de/
+man/de/man1/
+@man
Update: net/weechat 0.4.3
Hi,
the attached patch updates net/weechat to the latest version 0.4.3.
Announcement: http://dev.weechat.org/post/2014/02/09/Version-0.4.3
Changelog: http://weechat.org/files/changelog/ChangeLog-0.4.3.html
It builds and install fine on sparc64,
at least it did before the ports lock.
Please test and comment.
Regards,
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile19 Nov 2013 13:11:03 - 1.14
+++ Makefile13 Mar 2014 14:59:34 -
@@ -6,11 +6,10 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 0.4.3
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo14 Nov 2013 22:30:29 - 1.5
+++ distinfo13 Mar 2014 14:59:34 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-0.4.3.tar.gz) = v7WjT3jqrQ4i4aoHg/8zCQfyU/zVCh0/0KoZ35EU3ek=
+SIZE (weechat-0.4.3.tar.gz) = 2985048
Re: UPDATE: net/weechat 0.4.2
Simon Kuhnle si...@blarzwurst.de writes: attached is a diff that updates net/weechat to 0.4.2: http://dev.weechat.org/post/2013/10/06/Version-0.4.2 works for me on 32bit x86... Thanks, Christian
UPDATE: net/weechat 0.4.2
Hi,
attached is a diff that updates net/weechat to 0.4.2:
http://dev.weechat.org/post/2013/10/06/Version-0.4.2
As stated in the release notes[1], the binary got renamed from
weechat-curses to just plain weechat.
The missing include is fixed upstream and the CA file can now be set
via a configure flag. The post-install target got a slight adjustment,
as cmdline_options.en.txt is not really interesting when you have
a manpage IMHO.
Building of the manpage has to be specifically enabled and requires
asciidoc. I needed to comment out all language dirs, except English,
otherwise every translated manpage gets built and installed.
Please tell me, if you'd prefer to handle this some other way.
Tested on sparc64, though I had to comment out everything Ruby
related, as Ruby is marked broken on sparc64 ATM. It'd be nice if
somebody could do a full build. Everything else works fine.
Regards
Simon
P.S.: No, I still won't take maintainership for it ;-)
[1] http://www.weechat.org/files/releasenotes/ReleaseNotes-0.4.2.html
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile3 Jun 2013 20:35:23 - 1.12
+++ Makefile10 Oct 2013 09:17:37 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.1
+V= 0.4.2
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -48,6 +48,8 @@
MODRUBY_RUNDEP=No
MODRUBY_REV= 1.9
+BUILD_DEPENDS= textproc/asciidoc
+
LIB_DEPENDS= security/libgcrypt \
security/gnutls \
net/curl
@@ -71,11 +73,13 @@
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
-DHAVE_BACKTRACE=no \
- -DMANDIR=${PREFIX}/man
+ -DMANDIR=${PREFIX}/man \
+ -DENABLE_MAN=on \
+ -DCA_FILE=/etc/ssl/cert.pem
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/*.en.txt ${PREFIX}/share/doc/weechat/
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo3 Jun 2013 20:35:23 - 1.4
+++ distinfo10 Oct 2013 09:17:37 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
-SIZE (weechat-0.4.1.tar.gz) = 2567828
+SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
+SIZE (weechat-0.4.2.tar.gz) = 2729241
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt10 Oct 2013 09:17:37 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- doc/CMakeLists.txt.origWed Oct 9 13:46:15 2013
doc/CMakeLists.txt Wed Oct 9 13:47:13 2013
+@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
+ FIND_PACKAGE(Asciidoc)
+ IF(ASCIIDOC_FOUND)
+ ADD_SUBDIRECTORY( en )
+-ADD_SUBDIRECTORY( fr )
+-ADD_SUBDIRECTORY( it )
+-ADD_SUBDIRECTORY( de )
+-ADD_SUBDIRECTORY( pl )
+-ADD_SUBDIRECTORY( es )
+-ADD_SUBDIRECTORY( ru )
+-ADD_SUBDIRECTORY( ja )
++#ADD_SUBDIRECTORY( fr )
++#ADD_SUBDIRECTORY( it )
++#ADD_SUBDIRECTORY( de )
++#ADD_SUBDIRECTORY( pl )
++#ADD_SUBDIRECTORY( es )
++#ADD_SUBDIRECTORY( ru )
++#ADD_SUBDIRECTORY( ja )
+ ENDIF(ASCIIDOC_FOUND)
+
+ ENDIF(ENABLE_MAN OR ENABLE_DOC)
Index: patches/patch-src_core_wee-config_c
===
RCS file: patches/patch-src_core_wee-config_c
diff -N patches/patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 3 Jun 2013 20:35:23 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_core_wee-config_c,v 1.3 2013/06/03 20:35:23 sthen Exp $
src/core/wee-config.c.orig Mon May 20 10:06:14 2013
-+++ src/core/wee-config.c Sat May 25 21:55:06 2013
-@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
- gnutls_ca_file, string,
- N_(file containing the certificate authorities (\%h\ will be
-replaced by WeeChat home, \~/.weechat\ by default)),
--NULL, 0, 0, /etc/ssl/certs/ca-certificates.crt, NULL, 0, NULL, NULL,
-+NULL, 0, 0, /etc/ssl/cert.pem, NULL, 0, NULL, NULL,
- config_change_network_gnutls_ca_file, NULL, NULL, NULL);
- config_network_gnutls_handshake_timeout = config_file_new_option (
- weechat_config_file, ptr_section,
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
Re: Update: net/weechat 0.4.1
Hi,
On Tue, May 28, 2013 at 01:03:14PM +0100, Stuart Henderson wrote:
On 2013/05/27 09:09, Simon Kuhnle wrote:
Hi,
this is an update for weechat 0.4.1
Changelog:
http://dev.weechat.org/post/2013/05/20/Version-0.4.1
Works for me on amd64/sparc64.
Patch for missing include is reported upstream.
Where should the icon file go?
That looks like a reasonable place for the icon, but it also wants
a dep on x11/gtk+2,-guic and this goo in PLIST:
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
I see, never had to deal with this.
Brian Callahan pointed out the exact same thing offlist.
OTOH I'm not sure if it's particularly useful to have this without an
accompanying .desktop file..
To be honest, I don't really see the benefit of the icon file then.
Also adding a dependency only for it...
Attached is a patch that doesn't install the icon file.
Would this be acceptable, too?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile3 Jun 2013 13:01:12 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo3 Jun 2013 13:01:12 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt3 Jun 2013 13:01:12 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.origMon Jun 3 14:21:15 2013
CMakeLists.txt Mon Jun 3 14:20:56 2013
+@@ -133,7 +133,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION
${LIBDIR}/../pkgconfig)
+
+ # icon
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
++#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
+
+ # packages
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY Fast, light and extensible chat
client)
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 13:01:12 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
gnutls_ca_file, string,
N_(file containing the certificate authorities (\%h\ will be
replaced by WeeChat home, \~/.weechat\ by default)),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 13:01:12 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include stdlib.h
+ #include unistd.h
++#include string.h
+ #include sys/types.h
+ #include sys/stat.h
+ #include sys/socket.h
Re: Update: net/weechat 0.4.1
On 2013/06/03 15:12, Simon Kuhnle wrote:
Attached is a patch that doesn't install the icon file.
Would this be acceptable, too?
personally I'd rather just @comment it in PLIST..
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 11 Mar 2013 11:35:58 - 1.11
+++ Makefile 3 Jun 2013 13:01:12 -
@@ -6,7 +6,7 @@
COMMENT-ruby=Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME=weechat-${V}
PKGNAME-main=weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 25 Jan 2013 08:42:08 - 1.3
+++ distinfo 3 Jun 2013 13:01:12 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt 3 Jun 2013 13:01:12 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Mon Jun 3 14:21:15 2013
CMakeLists.txt Mon Jun 3 14:20:56 2013
+@@ -133,7 +133,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION
${LIBDIR}/../pkgconfig)
+
+ # icon
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
++#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
+
+ # packages
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY Fast, light and extensible chat
client)
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 -
1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 13:01:12 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.cFri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.cSat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
gnutls_ca_file, string,
N_(file containing the certificate authorities (\%h\ will be
replaced by WeeChat home, \~/.weechat\ by default)),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 13:01:12 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.c Sun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include stdlib.h
+ #include unistd.h
++#include string.h
+ #include sys/types.h
+ #include sys/stat.h
+ #include sys/socket.h
Re: Update: net/weechat 0.4.1
On Mon, Jun 03, 2013 at 03:22:08PM +0100, Stuart Henderson wrote:
On 2013/06/03 15:12, Simon Kuhnle wrote:
Attached is a patch that doesn't install the icon file.
Would this be acceptable, too?
personally I'd rather just @comment it in PLIST..
Thanks :-)
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile3 Jun 2013 19:33:27 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo3 Jun 2013 19:33:27 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 19:33:27 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
gnutls_ca_file, string,
N_(file containing the certificate authorities (\%h\ will be
replaced by WeeChat home, \~/.weechat\ by default)),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 19:33:27 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include stdlib.h
+ #include unistd.h
++#include string.h
+ #include sys/types.h
+ #include sys/stat.h
+ #include sys/socket.h
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 19 Dec 2012 10:54:51 - 1.2
+++ pkg/PLIST-main 3 Jun 2013 19:33:27 -
@@ -25,6 +25,7 @@
share/doc/weechat/weechat_scripting.en.txt
share/doc/weechat/weechat_tester.en.txt
share/doc/weechat/weechat_user.en.txt
+@comment share/icons/hicolor/32x32/apps/weechat.png
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
share/locale/es/LC_MESSAGES/weechat.mo
Re: Update: net/weechat 0.4.1
On 2013/05/27 09:09, Simon Kuhnle wrote: Hi, this is an update for weechat 0.4.1 Changelog: http://dev.weechat.org/post/2013/05/20/Version-0.4.1 Works for me on amd64/sparc64. Patch for missing include is reported upstream. Where should the icon file go? That looks like a reasonable place for the icon, but it also wants a dep on x11/gtk+2,-guic and this goo in PLIST: @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor OTOH I'm not sure if it's particularly useful to have this without an accompanying .desktop file..
Update: net/weechat 0.4.1
Hi,
this is an update for weechat 0.4.1
Changelog:
http://dev.weechat.org/post/2013/05/20/Version-0.4.1
Works for me on amd64/sparc64.
Patch for missing include is reported upstream.
Where should the icon file go?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile11 Mar 2013 11:35:58 - 1.11
+++ Makefile27 May 2013 07:05:44 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo25 Jan 2013 08:42:08 - 1.3
+++ distinfo27 May 2013 07:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
Index: patches/patch-src_core_wee-config_c
===
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 - 1.2
+++ patches/patch-src_core_wee-config_c 27 May 2013 07:05:44 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
gnutls_ca_file, string,
N_(file containing the certificate authorities (\%h\ will be
replaced by WeeChat home, \~/.weechat\ by default)),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 27 May 2013 07:05:44 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
src/plugins/xfer/xfer-dcc.cSun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include stdlib.h
+ #include unistd.h
++#include string.h
+ #include sys/types.h
+ #include sys/stat.h
+ #include sys/socket.h
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 19 Dec 2012 10:54:51 - 1.2
+++ pkg/PLIST-main 27 May 2013 07:05:44 -
@@ -25,6 +25,11 @@
share/doc/weechat/weechat_scripting.en.txt
share/doc/weechat/weechat_tester.en.txt
share/doc/weechat/weechat_user.en.txt
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/weechat.png
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
share/locale/es/LC_MESSAGES/weechat.mo
UPDATE: net/weechat
Hi,
attached is a simple diff for weechat-0.4.0:
http://dev.weechat.org/post/2013/01/20/Version-0.4.0
Detailed changelog:
http://weechat.org/files/changelog/ChangeLog-0.4.0.html
I have been running the relaese candidates on amd64 for a while now
and successfully compiled and ran it on sparc64, too.
Comments, OKs?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile6 Jan 2013 12:06:20 - 1.9
+++ Makefile21 Jan 2013 14:24:16 -
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.9.2
+V= 0.4.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -14,8 +14,6 @@
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
-
-REVISION-main =0
CATEGORIES=net
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo19 Dec 2012 10:54:51 - 1.2
+++ distinfo21 Jan 2013 14:24:16 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.9.2.tar.gz) = A5Sc/EzWtsHVt3kYBP9UxE8SCdPnU91IRh1ny7FzjIQ=
-SIZE (weechat-0.3.9.2.tar.gz) = 3757977
+SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
+SIZE (weechat-0.4.0.tar.gz) = 2527783
Re: Update: net/weechat 0.3.9
On Sat, Sep 29, 2012 at 06:23:33PM +0200, Simon Kuhnle wrote: I attached a patch to update net/weechat to version 0.3.9. http://dev.weechat.org/post/2012/09/29/Version-0.3.9 patches/ can be removed. Works for me on sparc64 and amd64. Comments, OKs? Ping? Still works for me. Funny thing is, switching between channels on my rusty old sparc64 is terribly slow. Takes a little bit under a second to draw all the lines. I don't have that problem on amd64 (or with irssi ;). FWIW though, it's a nice IRC client, with a very active community (you can't say the same about irssi..) and some nice features (the smart filter for example). Regards Simon
Update: net/weechat 0.3.9
Hi,
I attached a patch to update net/weechat to version 0.3.9.
http://dev.weechat.org/post/2012/09/29/Version-0.3.9
patches/ can be removed.
Works for me on sparc64 and amd64.
Comments, OKs?
Regards
Simon
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile23 Sep 2012 17:05:49 - 1.6
+++ Makefile29 Sep 2012 16:16:22 -
@@ -6,19 +6,14 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.3.8
+V= 0.3.9
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 2
PKGNAME-lua= weechat-lua-${V}
-REVISION-lua= 1
PKGNAME-python=weechat-python-${V}
-REVISION-python=0
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 1
PKGNAME-tcl= weechat-tcl-${V}
-REVISION-tcl= 0
CATEGORIES=net
@@ -78,7 +73,8 @@
-DENABLE_LUA=yes \
-DENABLE_TCL=yes \
-DENABLE_PYTHON=yes \
- -DHAVE_BACKTRACE=no
+ -DHAVE_BACKTRACE=no \
+ -DMANDIR=${PREFIX}/man
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Jun 2012 15:06:42 - 1.1.1.1
+++ distinfo29 Sep 2012 16:16:22 -
@@ -1,5 +1,2 @@
-MD5 (weechat-0.3.8.tar.gz) = 8XRoCfgeVUZiiD68di8ruA==
-RMD160 (weechat-0.3.8.tar.gz) = s5/JdC24ZkqGxx5vg78eGPotXOQ=
-SHA1 (weechat-0.3.8.tar.gz) = ctYMHhc5Dx+1x9JyAWl+kAI2nLk=
-SHA256 (weechat-0.3.8.tar.gz) = QpPrnSnxG47owwEEnVflNay+pne8HcQasS/hu4rw8Q4=
-SIZE (weechat-0.3.8.tar.gz) = 3517366
+SHA256 (weechat-0.3.9.tar.gz) = hmbHiMuyEgNhlzZd87o8+WSiPk9kTXbqUdZtvjvlk7s=
+SIZE (weechat-0.3.9.tar.gz) = 3761786
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt26 Jun 2012 15:06:42 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $
doc/CMakeLists.txt.origTue Jun 26 12:44:21 2012
-+++ doc/CMakeLists.txt Tue Jun 26 12:45:09 2012
-@@ -35,4 +35,4 @@ IF(ENABLE_DOC)
-
- ENDIF(ENABLE_DOC)
-
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${SHAREDIR}/man/man1)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION
${CMAKE_INSTALL_PREFIX}/man/man1)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 26 Jun 2012 15:06:42 - 1.1.1.1
+++ pkg/PLIST-main 29 Sep 2012 16:16:22 -
@@ -13,6 +13,7 @@
lib/weechat/plugins/perl.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/rmodifier.so
+lib/weechat/plugins/script.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat-curses.1
share/doc/weechat/
Re: Update net/weechat,-ruby to ruby 1.9
On Sun, Sep 02, 2012 at 03:13:05PM -0700, Jeremy Evans wrote:
This updates net/weechat,-ruby to use ruby 1.9. I'm not a weechat user,
but I tested this by doing /ruby load in weechat with the following
script and it seems to work:
def weechat_init
Weechat.register(test_ruby, FlashCode, 1.0, GPL3, Test script,
, )
Weechat.print(, Hello, from ruby script! RUBY VERSION = #{RUBY_VERSION})
return Weechat::WEECHAT_RC_OK
end
Looking for OKs.
Not a developer and I didn't test the patch either, but when you say
it builds and looking at the amount of scripts written in Ruby[1] I'd
say go ahead...
If somebody discovers breakage, you could easily contact the scripts
author and patch the script to work with a current Ruby version.
Regards
Simon
[1] http://weechat.org/scripts/stable/sort/language/
Update net/weechat,-ruby to ruby 1.9
This updates net/weechat,-ruby to use ruby 1.9. I'm not a weechat user,
but I tested this by doing /ruby load in weechat with the following
script and it seems to work:
def weechat_init
Weechat.register(test_ruby, FlashCode, 1.0, GPL3, Test script, ,
)
Weechat.print(, Hello, from ruby script! RUBY VERSION = #{RUBY_VERSION})
return Weechat::WEECHAT_RC_OK
end
Looking for OKs.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile10 Jul 2012 15:22:45 - 1.4
+++ Makefile2 Sep 2012 22:01:05 -
@@ -15,6 +15,7 @@ PKGNAME-lua= weechat-lua-${V}
REVISION-lua= 0
PKGNAME-python=weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
+REVISION-ruby= 0
PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES=net
@@ -51,6 +52,7 @@ MODULES= devel/cmake \
MODLUA_RUNDEP= No
MODPY_RUNDEP= No
MODRUBY_RUNDEP=No
+MODRUBY_REV= 1.9
LIB_DEPENDS= security/libgcrypt \
security/gnutls \
