9 files changed, 37 insertions, 45 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index d22edd7b8506..fcde6f72fdfb 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
@@ -19,8 +19,8 @@ CMAKE_ARGS+=	-DENABLE_GUILE=no \
 		-DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
+		libgcrypt.so:security/libgcrypt
 
 OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \
 		GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
@@ -38,12 +38,12 @@ PYTHON_DESC=	Python scripting language support
 RUBY_DESC=	Ruby scripting language support
 
 ASPELL_CMAKE_OFF=	-DENABLE_ASPELL=no
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 
-BACKTRACE_LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+BACKTRACE_LIB_DEPENDS=	libexecinfo.so:devel/libexecinfo
 
 CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 CHARSET_CMAKE_OFF=	-DENABLE_CHARSET=no
 
@@ -51,11 +51,11 @@ DOCS_CMAKE_ON=		-DENABLE_DOC=yes
 
 JAVASCRIPT_CMAKE_OFF=	-DENABLE_JAVASCRIPT=no
 JAVASCRIPT_CMAKE_ON=	-DENABLE_JAVASCRIPT=yes
-JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8
+JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
 
 GNUTLS_CMAKE_OFF=	-DENABLE_GNUTLS=no
 GNUTLS_USES=		pkgconfig
-GNUTLS_LIB_DEPENDS=	libgnutls.so.28:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so.28:security/gnutls
 
 LUA_CMAKE_OFF=		-DENABLE_LUA=no
 LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
@@ -90,10 +90,10 @@ TCL_USES=		tcl:85+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		asciidoc:${PORTSDIR}/textproc/asciidoc \
-		source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
+		docbook-xsl>=0:textproc/docbook-xsl \
+		asciidoc:textproc/asciidoc \
+		source-highlight>=3.1.5:textproc/source-highlight
 .endif
 
 post-patch:
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index eee0dae46319..a231aeb3c651 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-1.3.tar.bz2) = 703dd771f74a2391bab656992712331d9151a227ac3210393a4ecf6458605148
-SIZE (weechat-1.3.tar.bz2) = 2402422
+SHA256 (weechat-1.4.tar.bz2) = e06d9949ccececdd9692c95c41304c2f7fe9ec47b5eedd0d0a8529f6a3c1ddd4
+SIZE (weechat-1.4.tar.bz2) = 2464362
diff --git a/irc/weechat/files/patch-cmake_FindIconv.cmake b/irc/weechat/files/patch-cmake_FindIconv.cmake
index d2f1e366d2a8..1e67d5a6cfec 100644
--- a/irc/weechat/files/patch-cmake_FindIconv.cmake
+++ b/irc/weechat/files/patch-cmake_FindIconv.cmake
@@ -1,4 +1,4 @@
---- cmake/FindIconv.cmake
+--- cmake/FindIconv.cmake.orig	2016-01-10 08:17:50 UTC
 +++ cmake/FindIconv.cmake
 @@ -48,9 +48,8 @@ find_library(ICONV_LIBRARY
  
diff --git a/irc/weechat/files/patch-cmake_FindLua.cmake b/irc/weechat/files/patch-cmake_FindLua.cmake
index c2cfc822af09..6104f9ce4942 100644
--- a/irc/weechat/files/patch-cmake_FindLua.cmake
+++ b/irc/weechat/files/patch-cmake_FindLua.cmake
@@ -1,9 +1,9 @@
---- cmake/FindLua.cmake.orig	2015-01-12 09:12:09.922611844 +0000
-+++ cmake/FindLua.cmake	2015-01-12 09:23:01.083607077 +0000
-@@ -35,5 +35,5 @@
+--- cmake/FindLua.cmake.orig	2016-01-10 08:17:50 UTC
++++ cmake/FindLua.cmake
+@@ -35,5 +35,5 @@ endif()
  
  find_package(PkgConfig)
  if(PKG_CONFIG_FOUND)
--  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
 +  pkg_search_module(LUA lua-${BSD_LUA_VER})
  endif()
diff --git a/irc/weechat/files/patch-cmake_FindPython.cmake b/irc/weechat/files/patch-cmake_FindPython.cmake
index 26198ccef360..4a3fc0428f95 100644
--- a/irc/weechat/files/patch-cmake_FindPython.cmake
+++ b/irc/weechat/files/patch-cmake_FindPython.cmake
@@ -1,6 +1,6 @@
---- cmake/FindPython.cmake.orig	2015-01-12 09:23:34.292562072 +0000
-+++ cmake/FindPython.cmake	2015-01-12 09:32:04.954526522 +0000
-@@ -33,17 +33,9 @@
+--- cmake/FindPython.cmake.orig	2016-01-10 08:17:50 UTC
++++ cmake/FindPython.cmake
+@@ -33,17 +33,9 @@ if(PYTHON_FOUND)
     set(PYTHON_FIND_QUIETLY TRUE)
  endif()
  
@@ -21,7 +21,7 @@
  
  if(PYTHON_EXECUTABLE)
    execute_process(
-@@ -52,11 +44,6 @@
+@@ -52,11 +44,6 @@ if(PYTHON_EXECUTABLE)
      )
  
    execute_process(
@@ -33,7 +33,7 @@
      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
      OUTPUT_VARIABLE PYTHON_LFLAGS
      )
-@@ -65,32 +52,13 @@
+@@ -65,32 +52,13 @@ if(PYTHON_EXECUTABLE)
      NAMES Python.h
      HINTS ${PYTHON_INC_DIR}
      )
diff --git a/irc/weechat/files/patch-cmake_FindRuby.cmake b/irc/weechat/files/patch-cmake_FindRuby.cmake
index 75b9fd8da50b..6822535e043d 100644
--- a/irc/weechat/files/patch-cmake_FindRuby.cmake
+++ b/irc/weechat/files/patch-cmake_FindRuby.cmake
@@ -1,4 +1,4 @@
---- cmake/FindRuby.cmake.orig	2015-08-16 06:27:07 UTC
+--- cmake/FindRuby.cmake.orig	2016-01-10 08:17:50 UTC
 +++ cmake/FindRuby.cmake
 @@ -31,22 +31,16 @@ if(RUBY_FOUND)
     set(RUBY_FIND_QUIETLY TRUE)
@@ -14,7 +14,7 @@
    mark_as_advanced(RUBY_LIB)
  else()
    find_program(RUBY_EXECUTABLE
--    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+-    NAMES ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
 -    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
 +    NAMES ${BSD_RUBY_CMD}
      )
diff --git a/irc/weechat/files/patch-cmake_FindTCL.cmake b/irc/weechat/files/patch-cmake_FindTCL.cmake
index f5091cbad70d..5db6d3e6ee5d 100644
--- a/irc/weechat/files/patch-cmake_FindTCL.cmake
+++ b/irc/weechat/files/patch-cmake_FindTCL.cmake
@@ -1,6 +1,6 @@
---- cmake/FindTCL.cmake.orig	2015-01-12 09:49:31.591454833 +0000
-+++ cmake/FindTCL.cmake	2015-01-12 09:52:04.595540774 +0000
-@@ -55,97 +55,18 @@
+--- cmake/FindTCL.cmake.orig	2016-01-10 08:17:50 UTC
++++ cmake/FindTCL.cmake
+@@ -55,97 +55,18 @@ if(TCL_FOUND)
    set(TCL_FIND_QUIETLY TRUE)
  endif()
  
@@ -55,10 +55,8 @@
 -  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)
@@ -83,8 +81,10 @@
 -  /usr/local/include/tcl${TCL_VERSION}
 -  /usr/local/include/tcl8.6
 -  /usr/local/include/tcl8.5
--  )
--
++  tcl${TCL_INT_VERSION}
++  PATHS ${BSD_TCL_LIBDIR}
+   )
+ 
 -if(WIN32)
 -  set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
 -    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
diff --git a/irc/weechat/files/patch-src-plugins-javascript-weechat-js-api.cpp b/irc/weechat/files/patch-src-plugins-javascript-weechat-js-api.cpp
deleted file mode 100644
index 5f48b7cac790..000000000000
--- a/irc/weechat/files/patch-src-plugins-javascript-weechat-js-api.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugins/javascript/weechat-js-api.cpp.orig	2015-08-16 06:27:07 UTC
-+++ src/plugins/javascript/weechat-js-api.cpp
-@@ -25,6 +25,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <string>
-+#include <time.h>
- 
- extern "C"
- {
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index 608ca8303186..a7f5c61c1394 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -12,6 +12,7 @@ lib/weechat/plugins/trigger.so
 lib/weechat/plugins/xfer.so
 libdata/pkgconfig/weechat.pc
 %%MANPAGES%%man/man1/weechat.1.gz
+%%MANPAGES%%man/cs/man1/weechat.1.gz
 %%MANPAGES%%man/de/man1/weechat.1.gz
 %%MANPAGES%%man/fr/man1/weechat.1.gz
 %%MANPAGES%%man/it/man1/weechat.1.gz
@@ -39,6 +40,7 @@ libdata/pkgconfig/weechat.pc
 %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.fr.html
 %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.it.html
 %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.ja.html
+%%DOCS%%%%DOCSDIR%%/weechat_quickstart.cs.html
 %%DOCS%%%%DOCSDIR%%/weechat_quickstart.de.html
 %%DOCS%%%%DOCSDIR%%/weechat_quickstart.en.html
 %%DOCS%%%%DOCSDIR%%/weechat_quickstart.es.html