irc/weechat: Update to 1.6

  - Update to 1.6
  - Take maintainership
  - OPT_CMAKE_ON= -DENABLE_OPT=yes to OPT_CMAKE_BOOL= OPT
  - Add LICENSE_FILE
  - Drop BSD_LUA_* extra CMAKE_ARGS
  - Add asciidoctor depend for DOCS and MANPAGES
  - Fix build with Python 3.5 / Add warning
  - Transform to post-patch-ICON-off target

PR:		205981
Reported by:	Vladimir Krstulja <vlad-fbsd@acheronmedia.com>

10 files changed, 143 insertions, 315 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 0b9a2290e84f..619e72da50c8 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,98 +2,98 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.6
 CATEGORIES=	irc
-MASTER_SITES=	http://weechat.org/files/src/
+MASTER_SITES=	https://weechat.org/files/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Lightweight and user friendly ncurses based IRC client
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	weechat-devel-[0-9]*
 
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
+
+USES=		cmake:outsource ncurses tar:bzip2
 USE_LDCONFIG=	yes
-USES=		cmake iconv localbase ncurses tar:bzip2
+
 CMAKE_ARGS+=	-DENABLE_GUILE=no \
-		-DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
+		-DLIBDATADIR=${LOCALBASE}/libdata
 
-LIB_DEPENDS+=	libcurl.so:ftp/curl \
-		libgcrypt.so:security/libgcrypt
+OPTIONS_DEFINE=		BACKTRACE DOCS CA_BUNDLE GNUTLS ICON ICONV MANPAGES NLS
+OPTIONS_DEFAULT=	ASPELL BACKTRACE CA_BUNDLE CHARSET GNUTLS ICON LUA MANPAGES PERL PYTHON RUBY TCL
+OPTIONS_SUB=		yes
 
-OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \
-		GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
-OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
-		GNUTLS CA_BUNDLE ICON MANPAGES
+OPTIONS_GROUP=		PLUGINS
+OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON RUBY TCL
 
-OPTIONS_SUB=	yes
+BACKTRACE_DESC=		Provide crash backtraces
+CA_BUNDLE_DESC=		Include CA bundle for certificate verification
+ICON_DESC=		Desktop icon
 
-BACKTRACE_DESC=	Provide crash backtraces
-CA_BUNDLE_DESC=	Include CA bundle for certificate verification
-CHARSET_DESC=	Charset conversion support
-ICON_DESC=	Desktop icon
-JAVASCRIPT_DESC=Javascript support
-PYTHON_DESC=	Python scripting language support
-RUBY_DESC=	Ruby scripting language support
+PLUGINS_DESC=		Weechat Plugins
+CHARSET_DESC=		Charset plugin (implies ICONV)
+JAVASCRIPT_DESC=	Javascript script support
+PYTHON_DESC=		Python script support
+RUBY_DESC=		Ruby script support
 
-ASPELL_CMAKE_OFF=	-DENABLE_ASPELL=no
+ASPELL_CMAKE_BOOLL=	ENABLE_ASPELL
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 
+BACKTRACE_CMAKE_BOOL=	ENABLE_BACKTRACE
 BACKTRACE_USES=		execinfo
 
 CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-CHARSET_CMAKE_OFF=	-DENABLE_CHARSET=no
+CHARSET_CMAKE_BOOL=	ENABLE_CHARSET
+CHARSET_IMPLIES=	ICONV
+
+DOCS_CMAKE_BOOL=	ENABLE_DOC
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
 
-DOCS_CMAKE_ON=		-DENABLE_DOC=yes
+ICONV_CMAKE_BOOL=	ENABLE_ICONV
+ICONV_USES=		iconv
 
-JAVASCRIPT_CMAKE_OFF=	-DENABLE_JAVASCRIPT=no
-JAVASCRIPT_CMAKE_ON=	-DENABLE_JAVASCRIPT=yes
+JAVASCRIPT_CMAKE_BOOL=	ENABLE_JAVASCRIPT
 JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
 
-GNUTLS_CMAKE_OFF=	-DENABLE_GNUTLS=no
-GNUTLS_USES=		pkgconfig
+GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_USES=		pkgconfig
 
-LUA_CMAKE_OFF=		-DENABLE_LUA=no
-LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
-			-DBSD_LUA_INCDIR=${LUA_INCDIR} \
-			-DBSD_LUA_VER=${LUA_VER}
-LUA_USES=		lua:51
+LUA_CMAKE_BOOL=		ENABLE_LUA
+LUA_USES=		lua pkgconfig
 
-MANPAGES_CMAKE_ON=	-DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man
+MANPAGES_CMAKE_BOOL=	ENABLE_MAN
+MANPAGES_CMAKE_ON=	-DMANDIR=${MANPREFIX}/man
+MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
 
-NLS_CMAKE_OFF=		-DENABLE_NLS=no
+NLS_CMAKE_BOOL=		ENABLE_NLS
 NLS_USES=		gettext
 
-PERL_CMAKE_OFF=		-DENABLE_PERL=no
+PERL_CMAKE_BOOL=	ENABLE_PERL
 PERL_USES=		perl5
 
-PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=no
-PYTHON_CMAKE_ON=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
-			-DBSD_PYTHON_VER=${PYTHON_VERSION}
+PYTHON_CMAKE_BOOL=	ENABLE_PYTHON
 PYTHON_USES=		python
 
-RUBY_CMAKE_OFF=		-DENABLE_RUBY=no
-RUBY_CMAKE_ON=		-DBSD_RUBY_CMD=${RUBY} \
-			-DBSD_RUBY_VER=${RUBY_NAME}
+RUBY_CMAKE_BOOL=	ENABLE_RUBY
 RUBY_USE=		ruby=yes
 
-TCL_CMAKE_OFF=		-DENABLE_TCL=no
-TCL_CMAKE_ON=		-DBSD_TCL_VER=${TCL_VER} \
-			-DBSD_TCL_LIBDIR=${LOCALBASE}/lib \
-			-DBSD_TCL_INCDIR=${TCL_INCLUDEDIR}
+TCL_CMAKE_BOOL=		ENABLE_TCL
 TCL_USES=		tcl:85+
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
-		docbook-xsl>=0:textproc/docbook-xsl \
-		asciidoc:textproc/asciidoc \
-		source-highlight>=3.1.5:textproc/source-highlight
+.if ${PYTHON_MAJOR_VER} >= 3
+WARNING=	"Using Python 3.x is NOT recommended because many \"official\" scripts won\'t work"
+CMAKE_ARGS+=	-DENABLE_PYTHON3:BOOL=true \
+		-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/libpython${PYTHON_VER}m.so
 .endif
 
 post-patch:
@@ -103,16 +103,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/${f}
 .endfor
-.if empty(PORT_OPTIONS:MBACKTRACE)
-	@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' \
-		${WRKSRC}/src/core/CMakeLists.txt
-.endif
-.if empty(PORT_OPTIONS:MICON)
-	@${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' \
-		${WRKSRC}/CMakeLists.txt
-.endif
+
+post-patch-ICON-off:
+	@${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt
 
 post-install:
-	${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
+	${LN} -sf weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index a231aeb3c651..26469005fd3a 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (weechat-1.4.tar.bz2) = e06d9949ccececdd9692c95c41304c2f7fe9ec47b5eedd0d0a8529f6a3c1ddd4
-SIZE (weechat-1.4.tar.bz2) = 2464362
+TIMESTAMP = 1475608262
+SHA256 (weechat-1.6.tar.bz2) = 73eca5212fadb7056f5f72d9dfc96453dea0342c963d1f1ca36c84def5653c34
+SIZE (weechat-1.6.tar.bz2) = 2558398
diff --git a/irc/weechat/files/patch-CMakeLists.txt b/irc/weechat/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..9f1f8a1ba02b
--- /dev/null
+++ b/irc/weechat/files/patch-CMakeLists.txt
@@ -0,0 +1,60 @@
+--- CMakeLists.txt.orig	2016-05-01 10:50:12 UTC
++++ CMakeLists.txt
+@@ -64,6 +64,10 @@ else()
+   set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+ endif()
+ 
++if(NOT DEFINED LIBDATADIR)
++  set (LIBDATADIR ${CMAKE_INSTALL_PREFIX}/lib)
++endif()
++
+ if(NOT DEFINED SHAREDIR)
+   set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+ endif()
+@@ -88,10 +92,12 @@ option(ENABLE_GNUTLS     "Enable SSLv3/T
+ option(ENABLE_LARGEFILE  "Enable Large File Support"                 ON)
+ option(ENABLE_ALIAS      "Enable Alias plugin"                       ON)
+ option(ENABLE_ASPELL     "Enable Aspell plugin"                      ON)
++option(ENABLE_BACKTRACE  "Enable backtraces (via libexecinfo)"       ON)
+ option(ENABLE_ENCHANT    "Enable Enchant lib for Aspell plugin"      OFF)
+ option(ENABLE_CHARSET    "Enable Charset plugin"                     ON)
+ option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
+ option(ENABLE_FIFO       "Enable FIFO plugin"                        ON)
++option(ENABLE_ICONV      "Enable character conversion support"       ON)
+ option(ENABLE_IRC        "Enable IRC plugin"                         ON)
+ option(ENABLE_LOGGER     "Enable Logger plugin"                      ON)
+ option(ENABLE_RELAY      "Enable Relay plugin"                       ON)
+@@ -167,6 +173,7 @@ endif()
+ # Check for libgcrypt
+ find_package(GCRYPT REQUIRED)
+ add_definitions(-DHAVE_GCRYPT)
++add_definitions(${GCRYPT_CFLAGS})
+ list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
+ 
+ # Check for GnuTLS
+@@ -185,10 +192,12 @@ endif()
+ find_package(ZLIB REQUIRED)
+ add_definitions(-DHAVE_ZLIB)
+ 
+-# Check for iconv
+-find_package(Iconv)
+-if(ICONV_FOUND)
+-  add_definitions(-DHAVE_ICONV)
++if (ENABLE_ICONV)
++  # Check for iconv
++  find_package(Iconv)
++  if(ICONV_FOUND)
++    add_definitions(-DHAVE_ICONV)
++  endif()
+ endif()
+ 
+ # Check for CURL
+@@ -247,7 +256,7 @@ set(exec_prefix "\${prefix}")
+ set(libdir "\${exec_prefix}/lib")
+ set(includedir "\${prefix}/include")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDATADIR}/pkgconfig)
+ 
+ # cygport file (used to build Cygwin packages)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
diff --git a/irc/weechat/files/patch-cmake_FindIconv.cmake b/irc/weechat/files/patch-cmake_FindIconv.cmake
deleted file mode 100644
index 1e67d5a6cfec..000000000000
--- a/irc/weechat/files/patch-cmake_FindIconv.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmake/FindIconv.cmake.orig	2016-01-10 08:17:50 UTC
-+++ cmake/FindIconv.cmake
-@@ -48,9 +48,8 @@ find_library(ICONV_LIBRARY
- 
- if(ICONV_INCLUDE_PATH)
-   if(ICONV_LIBRARY)
--    string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
--    check_library_exists(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
--    check_library_exists(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
-+    check_library_exists("${ICONV_LIBRARY}" libiconv_open "" LIBICONV_OPEN_FOUND)
-+    check_library_exists("${ICONV_LIBRARY}" iconv_open "" ICONV_OPEN_FOUND)
-     if(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
-        set(ICONV_FOUND TRUE)
-     endif()
diff --git a/irc/weechat/files/patch-cmake_FindLua.cmake b/irc/weechat/files/patch-cmake_FindLua.cmake
deleted file mode 100644
index 6104f9ce4942..000000000000
--- a/irc/weechat/files/patch-cmake_FindLua.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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.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
deleted file mode 100644
index 4a3fc0428f95..000000000000
--- a/irc/weechat/files/patch-cmake_FindPython.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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()
- 
--if(ENABLE_PYTHON3)
--  find_program(PYTHON_EXECUTABLE
--    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
--    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
--    )
--else()
--  find_program(PYTHON_EXECUTABLE
--    NAMES python2.7 python2.6 python2.5 python
--    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
--    )
--endif()
-+find_program(PYTHON_EXECUTABLE
-+   NAMES ${BSD_PYTHON_CMD}
-+   )
- 
- if(PYTHON_EXECUTABLE)
-   execute_process(
-@@ -52,11 +44,6 @@ if(PYTHON_EXECUTABLE)
-     )
- 
-   execute_process(
--    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
--    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
--    )
--
--  execute_process(
-     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 @@ if(PYTHON_EXECUTABLE)
-     NAMES Python.h
-     HINTS ${PYTHON_INC_DIR}
-     )
--  if(ENABLE_PYTHON3)
--    find_library(PYTHON_LIBRARY
--      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
--      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
--      )
--  else()
--    find_library(PYTHON_LIBRARY
--      NAMES python2.7 python2.6 python2.5 python
--      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
--      )
--  endif()
-+
-+  find_library(PYTHON_LIBRARY
-+    NAMES ${BSD_PYTHON_VER}
-+  	)
- 
-   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()
-+    set(PYTHON_FOUND TRUE)
-   endif()
- 
-   mark_as_advanced(
diff --git a/irc/weechat/files/patch-cmake_FindRuby.cmake b/irc/weechat/files/patch-cmake_FindRuby.cmake
deleted file mode 100644
index 6822535e043d..000000000000
--- a/irc/weechat/files/patch-cmake_FindRuby.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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)
- endif()
- 
--find_package(PkgConfig)
--if(PKG_CONFIG_FOUND)
--  pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
--endif()
--
- if(RUBY_FOUND)
-   set(RUBY_LIB "")
-   mark_as_advanced(RUBY_LIB)
- else()
-   find_program(RUBY_EXECUTABLE
--    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}
-     )
-   if(RUBY_EXECUTABLE)
-     execute_process(
--      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
-       )
-     execute_process(
-@@ -54,11 +48,11 @@ else()
-       OUTPUT_VARIABLE RUBY_ARCH
-       )
-     execute_process(
--      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 "print RbConfig::CONFIG['rubylibdir']"
-+		COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
-       OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-       )
-     find_path(RUBY_INCLUDE_DIRS
-@@ -67,8 +61,7 @@ else()
-       )
-     set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
-     find_library(RUBY_LIB
--      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 ruby
--      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-+		NAMES ${BSD_RUBY_VER}
-       )
-     if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
-       set(RUBY_FOUND TRUE)
diff --git a/irc/weechat/files/patch-cmake_FindTCL.cmake b/irc/weechat/files/patch-cmake_FindTCL.cmake
deleted file mode 100644
index 5db6d3e6ee5d..000000000000
--- a/irc/weechat/files/patch-cmake_FindTCL.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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()
- 
--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_INCLUDE_PATH_PARENT}/lib64"
--  "${TCL_LIBRARY_PATH}"
--  "${TCL_TCLSH_PATH_PARENT}/lib"
--  "${TCL_TCLSH_PATH_PARENT}/lib64"
--  /usr/lib
--  /usr/lib64
--  /usr/local/lib
--  /usr/local/lib64
--  )
--
--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()
-+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}
--  )
--
--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()
--endif()
--
--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
-+  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"
--    "[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()
--
- 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/files/patch-src_core_CMakeLists.txt b/irc/weechat/files/patch-src_core_CMakeLists.txt
new file mode 100644
index 000000000000..7ef963fb8326
--- /dev/null
+++ b/irc/weechat/files/patch-src_core_CMakeLists.txt
@@ -0,0 +1,23 @@
+--- src/core/CMakeLists.txt.orig	2016-05-01 10:50:12 UTC
++++ src/core/CMakeLists.txt
+@@ -51,12 +51,14 @@ wee-version.c wee-version.h)
+ include(CheckSymbolExists)
+ check_symbol_exists(flock "sys/file.h" HAVE_FLOCK)
+ 
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+-  find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
+-  set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}")
+-  check_function_exists(backtrace HAVE_BACKTRACE)
+-else()
+-  check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
++if(ENABLE_BACKTRACE)
++  if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
++    find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
++    set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}")
++    check_function_exists(backtrace HAVE_BACKTRACE)
++  else()
++    check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
++  endif()
+ endif()
+ 
+ if(GNUTLS_FOUND)
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index a7f5c61c1394..af4e0af4c602 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -80,5 +80,6 @@ libdata/pkgconfig/weechat.pc
 %%NLS%%share/locale/ja/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo