Date: Sat, 10 Oct 2015 20:52:20 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399019 - in head/irc/weechat: . files Message-ID: <201510102052.t9AKqKpD036602@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Sat Oct 10 20:52:20 2015 New Revision: 399019 URL: https://svnweb.freebsd.org/changeset/ports/399019 Log: Upgrade irc/weechat to 1.3 Added: head/irc/weechat/files/patch-cmake_FindIconv.cmake - copied unchanged from r399012, head/irc/weechat/files/patch-cmake-FindIconv.cmake head/irc/weechat/files/patch-cmake_FindLua.cmake - copied unchanged from r399012, head/irc/weechat/files/patch-cmake-FindLua_cmake head/irc/weechat/files/patch-cmake_FindPython.cmake - copied unchanged from r399012, head/irc/weechat/files/patch-cmake-FindPython_cmake head/irc/weechat/files/patch-cmake_FindRuby.cmake - copied, changed from r399012, head/irc/weechat/files/patch-cmake-FindRuby_cmake head/irc/weechat/files/patch-cmake_FindTCL.cmake - copied unchanged from r399012, head/irc/weechat/files/patch-cmake-FindTCL_cmake Deleted: 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 Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/pkg-plist Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Sat Oct 10 20:38:42 2015 (r399018) +++ head/irc/weechat/Makefile Sat Oct 10 20:52:20 2015 (r399019) @@ -2,13 +2,9 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= irc -MASTER_SITES= http://weechat.org/files/src/ \ - http://perturb.me.uk/distfiles/weechat/:mandocs \ - LOCAL/jase/weechat/:mandocs -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= http://weechat.org/files/src/ MAINTAINER= jase@FreeBSD.org COMMENT= Lightweight and user friendly ncurses based IRC client @@ -18,119 +14,100 @@ LICENSE= GPLv3 CONFLICTS= weechat-devel-[0-9]* USE_LDCONFIG= yes -USES= cmake iconv ncurses +USES= cmake iconv ncurses tar:bzip2 CMAKE_ARGS+= -DENABLE_GUILE=no \ -DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH} -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt + libgcrypt.so:${PORTSDIR}/security/libgcrypt OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ - GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS + GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ - GNUTLS CA_BUNDLE ICON MANPAGES + GNUTLS CA_BUNDLE ICON MANPAGES OPTIONS_SUB= yes BACKTRACE_DESC= Provide crash backtraces CA_BUNDLE_DESC= Include CA bundle for certificate verification CHARSET_DESC= Charset conversion support -ICON_DESC= Desktop icon +ICON_DESC= Desktop icon PYTHON_DESC= Python scripting language support -RUBY_DESC= Ruby scripting language support +RUBY_DESC= Ruby scripting language support ASPELL_CMAKE_OFF= -DENABLE_ASPELL=no ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell BACKTRACE_LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -CA_BUNDLE_CMAKE_ON= -DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt +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 CHARSET_CMAKE_OFF= -DENABLE_CHARSET=no +DOCS_CMAKE_ON= -DENABLE_DOC=yes + GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no GNUTLS_USES= pkgconfig GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls 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 + -DBSD_LUA_INCDIR=${LUA_INCDIR} \ + -DBSD_LUA_VER=${LUA_VER} +LUA_USES= lua:51 + +MANPAGES_CMAKE_ON= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man NLS_CMAKE_OFF= -DENABLE_NLS=no -NLS_USES= gettext +NLS_USES= gettext PERL_CMAKE_OFF= -DENABLE_PERL=no -PERL_USES= perl5 +PERL_USES= perl5 PYTHON_CMAKE_OFF= -DENABLE_PYTHON=no PYTHON_CMAKE_ON= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ - -DBSD_PYTHON_VER=${PYTHON_VERSION} + -DBSD_PYTHON_VER=${PYTHON_VERSION} PYTHON_USES= python RUBY_CMAKE_OFF= -DENABLE_RUBY=no RUBY_CMAKE_ON= -DBSD_RUBY_CMD=${RUBY} \ - -DBSD_RUBY_VER=${RUBY_NAME} -RUBY_USE= ruby=yes + -DBSD_RUBY_VER=${RUBY_NAME} +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_USES= tcl:85+ - -.if defined(MAINTAINER_MODE) -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 -CMAKE_ARGS+= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man -DENABLE_DOC=yes -.else -CMAKE_ARGS+= -DENABLE_MAN=no -DENABLE_DOC=no -.endif + -DBSD_TCL_LIBDIR=${LOCALBASE}/lib \ + -DBSD_TCL_INCDIR=${TCL_INCLUDEDIR} +TCL_USES= tcl:85+ .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE) -DISTFILES+= ${DISTNAME}-docs.txz:mandocs -.endif - -.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE) -DISTFILES+= ${DISTNAME}-manpages.txz:mandocs +.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 .endif 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 + @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/CMakeLists.txt .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${f} + @${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 + @${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 + @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' \ + ${WRKSRC}/CMakeLists.txt .endif post-install: -.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE) - ${INSTALL_MAN} ${WRKDIR}/manpages/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/man1 -.for f in de fr it ja pl - @${MKDIR} ${STAGEDIR}${PREFIX}/man/${f}/man1 - ${INSTALL_MAN} ${WRKDIR}/manpages/${f}/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/${f}/man1 -.endfor -.endif -.if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/docs/* ${STAGEDIR}${DOCSDIR}/ -.endif ${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses -# Make build fail to be able to take the generated manpages/docs from the archived wrkdir -.if defined(MAINTAINER_MODE) && defined(MAINTAINER_BREAK_BUILD) - @${FALSE} -.endif .include <bsd.port.mk> Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Sat Oct 10 20:38:42 2015 (r399018) +++ head/irc/weechat/distinfo Sat Oct 10 20:52:20 2015 (r399019) @@ -1,6 +1,2 @@ -SHA256 (weechat-1.1.1.tar.gz) = a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349 -SIZE (weechat-1.1.1.tar.gz) = 3294132 -SHA256 (weechat-1.1.1-docs.txz) = efb8f40e7e389b80420067889062215ac0a4636f80c55d573e9f235939abaa61 -SIZE (weechat-1.1.1-docs.txz) = 726876 -SHA256 (weechat-1.1.1-manpages.txz) = efcce2d00462371a9f9a47af1b5586dcac23e79542ad8b2340677ea37c20426b -SIZE (weechat-1.1.1-manpages.txz) = 13288 +SHA256 (weechat-1.3.tar.bz2) = 703dd771f74a2391bab656992712331d9151a227ac3210393a4ecf6458605148 +SIZE (weechat-1.3.tar.bz2) = 2402422 Copied: head/irc/weechat/files/patch-cmake_FindIconv.cmake (from r399012, head/irc/weechat/files/patch-cmake-FindIconv.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/weechat/files/patch-cmake_FindIconv.cmake Sat Oct 10 20:52:20 2015 (r399019, copy of r399012, head/irc/weechat/files/patch-cmake-FindIconv.cmake) @@ -0,0 +1,14 @@ +--- cmake/FindIconv.cmake ++++ 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() Copied: head/irc/weechat/files/patch-cmake_FindLua.cmake (from r399012, head/irc/weechat/files/patch-cmake-FindLua_cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/weechat/files/patch-cmake_FindLua.cmake Sat Oct 10 20:52:20 2015 (r399019, copy of r399012, head/irc/weechat/files/patch-cmake-FindLua_cmake) @@ -0,0 +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 @@ + + 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 lua-${BSD_LUA_VER}) + endif() Copied: head/irc/weechat/files/patch-cmake_FindPython.cmake (from r399012, head/irc/weechat/files/patch-cmake-FindPython_cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/weechat/files/patch-cmake_FindPython.cmake Sat Oct 10 20:52:20 2015 (r399019, copy of r399012, head/irc/weechat/files/patch-cmake-FindPython_cmake) @@ -0,0 +1,73 @@ +--- 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 @@ + 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 @@ + ) + + 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 @@ + 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( Copied and modified: head/irc/weechat/files/patch-cmake_FindRuby.cmake (from r399012, head/irc/weechat/files/patch-cmake-FindRuby_cmake) ============================================================================== --- head/irc/weechat/files/patch-cmake-FindRuby_cmake Sat Oct 10 19:15:56 2015 (r399012, copy source) +++ head/irc/weechat/files/patch-cmake_FindRuby.cmake Sat Oct 10 20:52:20 2015 (r399019) @@ -1,12 +1,12 @@ ---- cmake/FindRuby.cmake.orig 2015-01-12 09:32:28.592525659 +0000 -+++ cmake/FindRuby.cmake 2015-01-12 09:49:05.649456415 +0000 -@@ -31,22 +31,16 @@ +--- cmake/FindRuby.cmake.orig 2015-08-16 06:27:07 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.1 ruby-2.0 ruby-1.9 ruby-1.8) +- pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) -endif() - if(RUBY_FOUND) @@ -16,7 +16,7 @@ find_program(RUBY_EXECUTABLE - NAMES 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} ++ NAMES ${BSD_RUBY_CMD} ) if(RUBY_EXECUTABLE) execute_process( @@ -25,7 +25,7 @@ OUTPUT_VARIABLE RUBY_ARCH_DIR ) execute_process( -@@ -54,11 +48,11 @@ +@@ -54,11 +48,11 @@ else() OUTPUT_VARIABLE RUBY_ARCH ) execute_process( @@ -39,7 +39,7 @@ OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH ) find_path(RUBY_INCLUDE_DIRS -@@ -67,8 +61,7 @@ +@@ -67,8 +61,7 @@ else() ) set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") find_library(RUBY_LIB Copied: head/irc/weechat/files/patch-cmake_FindTCL.cmake (from r399012, head/irc/weechat/files/patch-cmake-FindTCL_cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/weechat/files/patch-cmake_FindTCL.cmake Sat Oct 10 20:52:20 2015 (r399019, copy of r399012, head/irc/weechat/files/patch-cmake-FindTCL_cmake) @@ -0,0 +1,105 @@ +--- 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 @@ + 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} ++ 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() +-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 +- ) +- +-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) Modified: head/irc/weechat/pkg-plist ============================================================================== --- head/irc/weechat/pkg-plist Sat Oct 10 20:38:42 2015 (r399018) +++ head/irc/weechat/pkg-plist Sat Oct 10 20:52:20 2015 (r399019) @@ -17,6 +17,7 @@ libdata/pkgconfig/weechat.pc %%MANPAGES%%man/it/man1/weechat.1.gz %%MANPAGES%%man/ja/man1/weechat.1.gz %%MANPAGES%%man/pl/man1/weechat.1.gz +%%MANPAGES%%man/ru/man1/weechat.1.gz %%ASPELL%%lib/weechat/plugins/aspell.so %%CHARSET%%lib/weechat/plugins/charset.so %%LUA%%lib/weechat/plugins/lua.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510102052.t9AKqKpD036602>