aboutsummaryrefslogtreecommitdiff
path: root/irc/weechat
diff options
context:
space:
mode:
Diffstat (limited to 'irc/weechat')
-rw-r--r--irc/weechat/Makefile29
-rw-r--r--irc/weechat/distinfo4
-rw-r--r--irc/weechat/files/patch-cmake-FindLua_cmake20
-rw-r--r--irc/weechat/files/patch-cmake-FindPython_cmake30
-rw-r--r--irc/weechat/files/patch-cmake-FindRuby_cmake23
-rw-r--r--irc/weechat/files/patch-src-gui-curses-gui_curses_chat_c15
-rw-r--r--irc/weechat/pkg-plist5
7 files changed, 57 insertions, 69 deletions
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 1a727a138cb8..f3decffc6835 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: weechat
-# Date created: 2003-03-07
-# Whom: clement
-#
+# Created by: clement
# $FreeBSD$
-#
PORTNAME= weechat
-PORTVERSION= 0.3.8
-PORTREVISION= 3
+PORTVERSION= 0.3.9
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/
@@ -25,9 +20,10 @@ USE_CMAKE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
WANT_PERL= yes
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \
+ gcrypt:${PORTSDIR}/security/libgcrypt
-OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION SASL COLOR256
+OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION COLOR256
OPTIONS_DEFAULT=CHARSET
BACKTRACE_DESC= Provide crash backtraces
@@ -39,7 +35,6 @@ PERL_DESC= Perl scripting support
PYTHON_DESC= Python scripting support
RUBY_DESC= Ruby scripting support
TCL_DESC= Tcl scripting support
-SASL_DESC= SASL with DH-Blowfish support
COLOR256_DESC= Use ncurses port for 256 color support
.include <bsd.port.options.mk>
@@ -114,9 +109,8 @@ PLIST_SUB+= TCL="@comment "
.endif
.if ${PORT_OPTIONS:MLUA}
-USE_LUA= 5.0+
-CMAKE_ARGS+= -DBSD_LUA_VER=${LUA_VER} \
- -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
+USE_LUA= 5.1+
+CMAKE_ARGS+= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
-DBSD_LUA_INCDIR=${LUA_INCDIR}
PLIST_SUB+= LUA=""
.else
@@ -125,7 +119,6 @@ PLIST_SUB+= LUA="@comment "
.endif
.if ${PORT_OPTIONS:MGUILE}
-IGNORE= guile support currently causes a segfault on exit. Please re-run 'make config' and disable GUILE
LIB_DEPENDS+= guile:${PORTSDIR}/lang/guile
PLIST_SUB+= GUILE=""
.else
@@ -146,14 +139,6 @@ PLIST_SUB+= DOCUMENTATION="@comment "
LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
.endif
-.if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
-PLIST_SUB+= SASL=""
-.else
-CMAKE_ARGS+= -DENABLE_GCRYPT=no
-PLIST_SUB+= SASL="@comment "
-.endif
-
.if ${PORT_OPTIONS:MCOLOR256}
WITH_NCURSES_PORT= yes
CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 520499b5e832..0d764e0f9654 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.8.tar.gz) = 4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e
-SIZE (weechat-0.3.8.tar.gz) = 3517366
+SHA256 (weechat-0.3.9.tar.gz) = 8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb
+SIZE (weechat-0.3.9.tar.gz) = 3761786
diff --git a/irc/weechat/files/patch-cmake-FindLua_cmake b/irc/weechat/files/patch-cmake-FindLua_cmake
index e960bcef3623..a0adcb5157d3 100644
--- a/irc/weechat/files/patch-cmake-FindLua_cmake
+++ b/irc/weechat/files/patch-cmake-FindLua_cmake
@@ -1,6 +1,6 @@
---- cmake/FindLua.cmake.orig 2012-07-06 10:35:11.000000000 +0000
-+++ cmake/FindLua.cmake 2012-07-07 23:45:24.258581623 +0000
-@@ -33,51 +33,25 @@
+--- cmake/FindLua.cmake.orig 2012-07-07 11:41:16.000000000 +0000
++++ cmake/FindLua.cmake 2012-07-08 09:00:30.126123501 +0000
+@@ -33,51 +33,18 @@
SET(LUA_FIND_QUIETLY TRUE)
ENDIF(LUA_FOUND)
@@ -25,7 +25,8 @@
- SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
- SET(LUA_LIBRARY "${LUA51_LIBRARY}")
- SET(LUA_VERSION "5.1")
-- SET(LUA_FOUND TRUE)
++IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
+ SET(LUA_FOUND TRUE)
-ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
- FIND_PATH(
- LUA50_INCLUDE_PATH lua.h
@@ -37,13 +38,8 @@
- LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-+IF(BSD_LUA_VER VERSION_EQUAL "5.0")
-+ FIND_LIBRARY(LUALIB_LIBRARY
-+ NAMES lualib
-+ PATHS ${BSD_LUA_LIBDIR}
- )
-+ENDIF(BSD_LUA_VER VERSION_EQUAL "5.0")
-
+- )
+-
- FIND_LIBRARY(
- LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
@@ -59,8 +55,6 @@
- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-
-+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
-+ SET(LUA_FOUND TRUE)
+ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
MARK_AS_ADVANCED(
diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake-FindPython_cmake
index bf80f23b1fe0..c5a6f8cb9858 100644
--- a/irc/weechat/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat/files/patch-cmake-FindPython_cmake
@@ -1,21 +1,39 @@
---- cmake/FindPython.cmake.orig 2010-12-20 18:43:34.102131358 +0000
-+++ cmake/FindPython.cmake 2010-12-20 19:16:11.918184057 +0000
+--- cmake/FindPython.cmake.orig 2012-09-18 20:21:00.000000000 +0100
++++ cmake/FindPython.cmake 2012-09-19 17:28:30.968900751 +0100
@@ -34,8 +34,7 @@
ENDIF(PYTHON_FOUND)
FIND_PROGRAM(PYTHON_EXECUTABLE
-- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+- NAMES python2.7 python2.6 python2.5 python
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ NAMES ${BSD_PYTHON_CMD}
)
IF(PYTHON_EXECUTABLE)
-@@ -65,7 +64,7 @@
+@@ -60,24 +59,12 @@
)
-
+
FIND_LIBRARY(PYTHON_LIBRARY
-- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+- NAMES python2.7 python2.6 python2.5 python
+ NAMES ${BSD_PYTHON_VER}
PATHS ${PYTHON_POSSIBLE_LIB_PATH}
)
+ IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+- EXECUTE_PROCESS(
+- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+- OUTPUT_VARIABLE PYTHON_VERSION
+- )
+- EXECUTE_PROCESS(
+- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
+- OUTPUT_VARIABLE PYTHON_OLD_VERSION
+- )
+- IF(${PYTHON_OLD_VERSION} STREQUAL "True")
+- MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
+- ELSE()
+- SET(PYTHON_FOUND TRUE)
+- ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True")
++ SET(PYTHON_FOUND TRUE)
+ ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+
+ MARK_AS_ADVANCED(
diff --git a/irc/weechat/files/patch-cmake-FindRuby_cmake b/irc/weechat/files/patch-cmake-FindRuby_cmake
index 46ea01f4c0c3..8488e3070cda 100644
--- a/irc/weechat/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat/files/patch-cmake-FindRuby_cmake
@@ -1,18 +1,18 @@
---- cmake/FindRuby.cmake.orig 2011-11-21 17:12:47.000000000 +0000
-+++ cmake/FindRuby.cmake 2011-11-22 21:04:12.114830585 +0000
+--- cmake/FindRuby.cmake.orig 2012-07-06 10:35:11.000000000 +0000
++++ cmake/FindRuby.cmake 2012-07-07 04:50:51.807510722 +0000
@@ -32,13 +32,12 @@
ENDIF(RUBY_FOUND)
FIND_PROGRAM(RUBY_EXECUTABLE
-- NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+- NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ NAMES ${BSD_RUBY_CMD}
)
IF(RUBY_EXECUTABLE)
EXECUTE_PROCESS(
-- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
-+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
+- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
OUTPUT_VARIABLE RUBY_ARCH_DIR
)
@@ -20,23 +20,24 @@
)
EXECUTE_PROCESS(
-- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
-+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib'"
+- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
++ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'"
OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
)
EXECUTE_PROCESS(
-- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
+- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
)
-@@ -78,7 +77,7 @@
+@@ -71,8 +70,7 @@
"${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
FIND_LIBRARY(RUBY_LIBRARY
-- NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+- NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+- PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+ NAMES ${BSD_RUBY_VER}
- PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
)
+ IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
diff --git a/irc/weechat/files/patch-src-gui-curses-gui_curses_chat_c b/irc/weechat/files/patch-src-gui-curses-gui_curses_chat_c
deleted file mode 100644
index 34c9014d45ac..000000000000
--- a/irc/weechat/files/patch-src-gui-curses-gui_curses_chat_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gui/curses/gui-curses-chat.c.orig 2012-05-21 08:52:17.000000000 +0100
-+++ src/gui/curses/gui-curses-chat.c 2012-08-17 10:56:08.889994341 +0100
-@@ -484,6 +484,12 @@
- if (!simulate)
- {
- wattr_set (GUI_WINDOW_OBJECTS(window)->win_chat, attrs, pair, NULL);
-+ /*
-+ * for unknown reason, the wattr_set function sometimes
-+ * fails to set the color pair under FreeBSD, so we force
-+ * it again with wcolor_set
-+ */
-+ wcolor_set (GUI_WINDOW_OBJECTS(window)->win_chat, pair, NULL);
- gui_window_restore_style ();
- }
- }
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index 7ddb1a07c816..a401c492f46f 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -6,10 +6,12 @@ lib/weechat/plugins/irc.so
lib/weechat/plugins/logger.so
lib/weechat/plugins/relay.so
lib/weechat/plugins/rmodifier.so
+lib/weechat/plugins/script.so
lib/weechat/plugins/xfer.so
libdata/pkgconfig/weechat.pc
%%ASPELL%%lib/weechat/plugins/aspell.so
%%CHARSET%%lib/weechat/plugins/charset.so
+%%GUILE%%lib/weechat/plugins/guile.so
%%LUA%%lib/weechat/plugins/lua.so
%%PERL%%lib/weechat/plugins/perl.so
%%PYTHON%%lib/weechat/plugins/python.so
@@ -38,16 +40,19 @@ libdata/pkgconfig/weechat.pc
%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.en.html
%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.fr.html
%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.it.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.ja.html
%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.pl.html
%%DOCUMENTATION%%share/doc/weechat/weechat_tester.de.html
%%DOCUMENTATION%%share/doc/weechat/weechat_tester.en.html
%%DOCUMENTATION%%share/doc/weechat/weechat_tester.fr.html
%%DOCUMENTATION%%share/doc/weechat/weechat_tester.it.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_tester.ja.html
%%DOCUMENTATION%%share/doc/weechat/weechat_tester.pl.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.de.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.en.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html
%%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/de/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/es/LC_MESSAGES/weechat.mo
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:00:21 +0000