diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 2241f20810f8..3507f0eca5bd 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -6,8 +6,7 @@ # PORTNAME= weechat -PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.4 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ @@ -28,6 +27,7 @@ OPTIONS= RUBY "Ruby scripting support." Off \ LUA "Lua scripting support." Off \ CHARSET "Charset support." On \ DEBUG "Debugging." Off \ + BACKTRACE "Backtraces." Off \ ASPELL "Spell checking." Off \ GNUTLS "GNU TLS." Off \ NLS "NLS support." On \ @@ -40,14 +40,14 @@ CMAKE_BUILD_TYPE= Debug .endif .if defined(WITHOUT_CHARSET) -CMAKE_ARGS+= -DDISABLE_CHARSET=yes +CMAKE_ARGS+= -DENABLE_CHARSET=no PLIST_SUB+= CHARSET="@comment " .else PLIST_SUB+= CHARSET="" .endif .if defined(WITHOUT_NLS) -CMAKE_ARGS+= -DDISABLE_NLS=yes +CMAKE_ARGS+= -DENABLE_NLS=no PLIST_SUB+= NLS="@comment " .else USE_GETTEXT= yes @@ -58,54 +58,64 @@ PLIST_SUB+= NLS="" BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell PLIST_SUB+= ASPELL="" .else -CMAKE_ARGS+= -DDISABLE_ASPELL=yes +CMAKE_ARGS+= -DENABLE_ASPELL=no PLIST_SUB+= ASPELL="@comment " .endif .if defined(WITH_PYTHON) -USE_PYTHON= yes +USE_PYTHON= -2.7 +CMAKE_ARGS+= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ + -DBSD_PYTHON_VER=${PYTHON_VERSION} PLIST_SUB+= PYTHON="" .else -CMAKE_ARGS+= -DDISABLE_PYTHON=yes +CMAKE_ARGS+= -DENABLE_PYTHON=no PLIST_SUB+= PYTHON="@comment " .endif .if defined(WITH_RUBY) USE_RUBY= yes +CMAKE_ARGS+= -DBSD_RUBY_CMD=${RUBY} \ + -DBSD_RUBY_VER=${RUBY_NAME} PLIST_SUB+= RUBY="" .else -CMAKE_ARGS+= -DDISABLE_RUBY=yes +CMAKE_ARGS+= -DENABLE_RUBY=no PLIST_SUB+= RUBY="@comment " .endif .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls .else -CMAKE_ARGS+= -DDISABLE_GNUTLS=yes +CMAKE_ARGS+= -DENABLE_GNUTLS=no .endif .if defined(WITH_PERL) USE_PERL5= yes PLIST_SUB+= PERL="" .else -CMAKE_ARGS+= -DDISABLE_PERL=yes +CMAKE_ARGS+= -DENABLE_PERL=no PLIST_SUB+= PERL="@comment " .endif .if defined(WITH_TCL) USE_TCL= 83+ .include "${PORTSDIR}/Mk/bsd.tcl.mk" +CMAKE_ARGS+= -DBSD_TCL_VER=${TCL_VER} \ + -DBSD_TCL_LIBDIR=${LOCALBASE}/lib \ + -DBSD_TCL_INCDIR=${TCL_INCLUDEDIR} PLIST_SUB+= TCL="" .else -CMAKE_ARGS+= -DDISABLE_TCL=yes +CMAKE_ARGS+= -DENABLE_TCL=no PLIST_SUB+= TCL="@comment " .endif .if defined(WITH_LUA) USE_LUA= 5.0+ +CMAKE_ARGS+= -DBSD_LUA_VER=${LUA_VER} \ + -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ + -DBSD_LUA_INCDIR=${LUA_INCDIR} PLIST_SUB+= LUA="" .else -CMAKE_ARGS+= -DDISABLE_LUA=yes +CMAKE_ARGS+= -DENABLE_LUA=no PLIST_SUB+= LUA="@comment " .endif @@ -114,15 +124,25 @@ BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc BUILD_DEPENDS+= source-highlight:${PORTSDIR}/textproc/source-highlight PLIST_SUB+= DOCUMENTATION="" .else -CMAKE_ARGS+= -DDISABLE_DOC=yes +CMAKE_ARGS+= -DENABLE_DOC=no PLIST_SUB+= DOCUMENTATION="@comment " .endif +.if defined(WITH_BACKTRACE) +LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo +.endif + MAN1= weechat-curses.1 post-patch: @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|INSTALL|#INSTALL|' ${WRKSRC}/doc/CMakeLists.txt +.for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${f} +.endfor +.if defined(WITHOUT_BACKTRACE) + @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt +.endif post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MANPREFIX}/man/man1 diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo index 266269af72b7..e5a01ef47d3f 100644 --- a/irc/weechat/distinfo +++ b/irc/weechat/distinfo @@ -1,3 +1,2 @@ -MD5 (weechat-0.3.3.tar.gz) = 96e203ef061ce61053ed7256a738959c -SHA256 (weechat-0.3.3.tar.gz) = 555b0d9304dc12ad5b3fa0d7ee935b9456f8ade0160484c4247385c3c51d0bdd -SIZE (weechat-0.3.3.tar.gz) = 2542603 +SHA256 (weechat-0.3.4.tar.gz) = cfddc87141038337a71f35c59efb70995bd277529fddb2bd048fa0024d3ec685 +SIZE (weechat-0.3.4.tar.gz) = 2786555 diff --git a/irc/weechat/files/patch-cmake-FindLua_cmake b/irc/weechat/files/patch-cmake-FindLua_cmake new file mode 100644 index 000000000000..820b311b2195 --- /dev/null +++ b/irc/weechat/files/patch-cmake-FindLua_cmake @@ -0,0 +1,67 @@ +--- cmake/FindLua.cmake.orig 2010-12-10 15:13:27.000000000 +0000 ++++ cmake/FindLua.cmake 2010-12-12 04:00:45.000000000 +0000 +@@ -33,51 +33,24 @@ + SET(LUA_FIND_QUIETLY TRUE) + ENDIF(LUA_FOUND) + +-FIND_PATH( +- LUA51_INCLUDE_PATH lua.h +- PATHS /usr/include /usr/local/include /usr/pkg/include +- PATH_SUFFIXES lua51 lua5.1 lua-5.1 ++FIND_PATH(LUA_INCLUDE_PATH lua.h ++ PATHS ${BSD_LUA_INCDIR} + ) + +-FIND_LIBRARY( +- LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua +- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib +- PATH_SUFFIXES lua51 lua5.1 lua-5.1 ++FIND_LIBRARY(LUA_LIBRARY ++ NAMES lua ++ PATHS ${BSD_LUA_LIBDIR} + ) + +-IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) +- SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}") +- SET(LUA_LIBRARY "${LUA51_LIBRARY}") +- SET(LUA_VERSION "5.1") +- SET(LUA_FOUND TRUE) +-ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) +- FIND_PATH( +- LUA50_INCLUDE_PATH lua.h +- PATHS /usr/include /usr/local/include /usr/pkg/include +- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua +- ) +- +- FIND_LIBRARY( +- 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 +- ) +- +- FIND_LIBRARY( +- LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib +- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib +- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua +- ) +- +- IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) +- SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}") +- SET(LUA_LIBRARY "${LUA50_LIBRARY}") +- SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}") +- SET(LUA_VERSION "5.0") +- SET(LUA_FOUND TRUE) +- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) +-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) ++SET(LUA_VERSION ${BSD_LUA_VER}) ++ ++IF(LUA_VERSION STREQUAL "5.0") ++ SET(LUALIB_LIBRARY ${LUA_LIBRARY}) ++ENDIF(LUA_VERSION STREQUAL "5.0") + ++IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) ++ SET(LUA_FOUND TRUE) ++ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY) + + MARK_AS_ADVANCED( + LUA_INCLUDE_PATH diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake-FindPython_cmake new file mode 100644 index 000000000000..bf80f23b1fe0 --- /dev/null +++ b/irc/weechat/files/patch-cmake-FindPython_cmake @@ -0,0 +1,21 @@ +--- cmake/FindPython.cmake.orig 2010-12-20 18:43:34.102131358 +0000 ++++ cmake/FindPython.cmake 2010-12-20 19:16:11.918184057 +0000 +@@ -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 +- PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ NAMES ${BSD_PYTHON_CMD} + ) + + IF(PYTHON_EXECUTABLE) +@@ -65,7 +64,7 @@ + ) + + FIND_LIBRARY(PYTHON_LIBRARY +- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 ++ NAMES ${BSD_PYTHON_VER} + PATHS ${PYTHON_POSSIBLE_LIB_PATH} + ) + diff --git a/irc/weechat/files/patch-cmake-FindRuby_cmake b/irc/weechat/files/patch-cmake-FindRuby_cmake index 83d132cd2319..05a378acb002 100644 --- a/irc/weechat/files/patch-cmake-FindRuby_cmake +++ b/irc/weechat/files/patch-cmake-FindRuby_cmake @@ -1,6 +1,13 @@ ---- cmake/FindRuby.cmake.orig 2010-01-05 21:12:22.000000000 +0000 -+++ cmake/FindRuby.cmake 2010-01-05 21:14:40.000000000 +0000 -@@ -35,7 +35,7 @@ +--- cmake/FindRuby.cmake.orig 2011-01-18 19:54:43.825973597 +0000 ++++ cmake/FindRuby.cmake 2011-01-18 19:57:33.943672013 +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 +- PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ NAMES ${BSD_RUBY_CMD} + ) IF(RUBY_EXECUTABLE) EXECUTE_PROCESS( @@ -9,7 +16,7 @@ OUTPUT_VARIABLE RUBY_ARCH_DIR ) -@@ -45,12 +45,12 @@ +@@ -48,12 +47,12 @@ ) EXECUTE_PROCESS( @@ -24,3 +31,12 @@ OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH ) +@@ -78,7 +77,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 ${BSD_RUBY_VER} + PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} + ) + diff --git a/irc/weechat/files/patch-cmake-FindTCL_cmake b/irc/weechat/files/patch-cmake-FindTCL_cmake new file mode 100644 index 000000000000..bbde7bc2ecda --- /dev/null +++ b/irc/weechat/files/patch-cmake-FindTCL_cmake @@ -0,0 +1,102 @@ +--- cmake/FindTCL.cmake.orig 2010-12-10 15:13:27.000000000 +0000 ++++ cmake/FindTCL.cmake 2010-12-12 19:23:43.000000000 +0000 +@@ -55,94 +55,18 @@ + SET(TCL_FIND_QUIETLY TRUE) + ENDIF(TCL_FOUND) + +-INCLUDE(CMakeFindFrameworks) +-INCLUDE(FindTclsh) +- +-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) +-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) +-STRING(REGEX REPLACE +- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") +- +-GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) +- +-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) +-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) +-STRING(REGEX REPLACE +- "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}") +- +-SET(TCL_POSSIBLE_LIB_PATHS +- "${TCL_INCLUDE_PATH_PARENT}/lib" +- "${TCL_LIBRARY_PATH}" +- "${TCL_TCLSH_PATH_PARENT}/lib" +- /usr/lib +- /usr/local/lib +- ) +- +-IF(WIN32) +- GET_FILENAME_COMPONENT( +- ActiveTcl_CurrentVersion +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" +- NAME) +- SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS} +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib" +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib" +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib" +- "$ENV{ProgramFiles}/Tcl/Lib" +- "C:/Program Files/Tcl/lib" +- "C:/Tcl/lib" +- ) +-ENDIF(WIN32) ++SET(TCL_VERSION ${BSD_TCL_VER}) ++STRING(REPLACE "." "" TCL_INT_VERSION ${TCL_VERSION}) + + FIND_LIBRARY(TCL_LIBRARY + NAMES +- tcl86 tcl8.6 +- tcl85 tcl8.5 +- tcl +- tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION} +- PATHS ${TCL_POSSIBLE_LIB_PATHS} ++ tcl${TCL_INT_VERSION} ++ PATHS ${BSD_TCL_LIBDIR} + ) + +-CMAKE_FIND_FRAMEWORKS(Tcl) +- +-SET(TCL_FRAMEWORK_INCLUDES) +-IF(Tcl_FRAMEWORKS) +- IF(NOT TCL_INCLUDE_PATH) +- FOREACH(dir ${Tcl_FRAMEWORKS}) +- SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers) +- ENDFOREACH(dir) +- ENDIF(NOT TCL_INCLUDE_PATH) +-ENDIF(Tcl_FRAMEWORKS) +- +-SET(TCL_POSSIBLE_INCLUDE_PATHS +- "${TCL_LIBRARY_PATH_PARENT}/include" +- "${TCL_INCLUDE_PATH}" +- ${TCL_FRAMEWORK_INCLUDES} +- "${TCL_TCLSH_PATH_PARENT}/include" +- /usr/include/tcl8.6 +- /usr/include/tcl8.5 +- /usr/include +- /usr/local/include +- /usr/include/tcl${TCL_VERSION} +- /usr/local/include/tcl${TCL_VERSION} +- /usr/local/include/tcl8.6 +- /usr/local/include/tcl8.5 +- ) +- +- +-IF(WIN32) +- SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS} +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include" +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include" +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include" +- "$ENV{ProgramFiles}/Tcl/include" +- "C:/Program Files/Tcl/include" +- "C:/Tcl/include" +- ) +-ENDIF(WIN32) +- + FIND_PATH(TCL_INCLUDE_PATH + NAMES tcl.h +- PATHS ${TCL_POSSIBLE_INCLUDE_PATHS} ++ PATHS ${BSD_TCL_INCDIR} + ) + + IF(TCL_LIBRARY AND TCL_INCLUDE_PATH) diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist index 5f266ce52902..b721fbe3865c 100644 --- a/irc/weechat/pkg-plist +++ b/irc/weechat/pkg-plist @@ -4,6 +4,8 @@ lib/weechat/plugins/alias.so lib/weechat/plugins/fifo.so lib/weechat/plugins/irc.so lib/weechat/plugins/logger.so +lib/weechat/plugins/relay.so +lib/weechat/plugins/rmodifier.so lib/weechat/plugins/xfer.so libdata/pkgconfig/weechat.pc %%ASPELL%%lib/weechat/plugins/aspell.so @@ -48,8 +50,9 @@ libdata/pkgconfig/weechat.pc %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo %%NLS%%share/locale/it/LC_MESSAGES/weechat.mo %%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo @dirrmtry lib/weechat/plugins @dirrmtry lib/weechat -@dirrmtry share/doc/weechat +%%DOCUMENTATION%%@dirrmtry share/doc/weechat @dirrm include/weechat