From owner-svn-ports-head@freebsd.org Tue Jan 12 17:39:05 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E962A6DEAB; Tue, 12 Jan 2016 17:39:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 760E81DAF; Tue, 12 Jan 2016 17:39:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CHd4D4000542; Tue, 12 Jan 2016 17:39:04 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CHd3Is000534; Tue, 12 Jan 2016 17:39:03 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201601121739.u0CHd3Is000534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 12 Jan 2016 17:39:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405897 - in head/irc/weechat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 17:39:05 -0000 Author: garga Date: Tue Jan 12 17:39:03 2016 New Revision: 405897 URL: https://svnweb.freebsd.org/changeset/ports/405897 Log: Update irc/weechat to 1.4 Deleted: head/irc/weechat/files/patch-src-plugins-javascript-weechat-js-api.cpp Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/files/patch-cmake_FindIconv.cmake head/irc/weechat/files/patch-cmake_FindLua.cmake head/irc/weechat/files/patch-cmake_FindPython.cmake head/irc/weechat/files/patch-cmake_FindRuby.cmake head/irc/weechat/files/patch-cmake_FindTCL.cmake head/irc/weechat/pkg-plist Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/Makefile Tue Jan 12 17:39:03 2016 (r405897) @@ -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 s 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 .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: Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/distinfo Tue Jan 12 17:39:03 2016 (r405897) @@ -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 Modified: head/irc/weechat/files/patch-cmake_FindIconv.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindIconv.cmake Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/files/patch-cmake_FindIconv.cmake Tue Jan 12 17:39:03 2016 (r405897) @@ -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 Modified: head/irc/weechat/files/patch-cmake_FindLua.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindLua.cmake Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/files/patch-cmake_FindLua.cmake Tue Jan 12 17:39:03 2016 (r405897) @@ -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() Modified: head/irc/weechat/files/patch-cmake_FindPython.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindPython.cmake Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/files/patch-cmake_FindPython.cmake Tue Jan 12 17:39:03 2016 (r405897) @@ -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} ) Modified: head/irc/weechat/files/patch-cmake_FindRuby.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindRuby.cmake Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/files/patch-cmake_FindRuby.cmake Tue Jan 12 17:39:03 2016 (r405897) @@ -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} ) Modified: head/irc/weechat/files/patch-cmake_FindTCL.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindTCL.cmake Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/files/patch-cmake_FindTCL.cmake Tue Jan 12 17:39:03 2016 (r405897) @@ -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" Modified: head/irc/weechat/pkg-plist ============================================================================== --- head/irc/weechat/pkg-plist Tue Jan 12 17:33:42 2016 (r405896) +++ head/irc/weechat/pkg-plist Tue Jan 12 17:39:03 2016 (r405897) @@ -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