Index: head/irc/weechat/Makefile =================================================================== --- head/irc/weechat/Makefile (revision 455408) +++ head/irc/weechat/Makefile (revision 455409) @@ -1,117 +1,118 @@ # Created by: clement # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 1.9.1 +PORTVERSION= 2.0 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ MAINTAINER= brnrd@FreeBSD.org COMMENT= Lightweight and user friendly ncurses based IRC client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error -USES= cmake:outsource,noninja ncurses tar:xz +USES= cmake:outsource,noninja autoreconf ncurses libtool tar:xz USE_LDCONFIG= yes +GNU_CONFIGURE= yes CMAKE_ARGS+= -DENABLE_GUILE=no \ -DLIBDATADIR=${LOCALBASE}/libdata 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 # BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute OPTIONS_EXCLUDE_powerpc64= RUBY OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON RUBY TCL BACKTRACE_DESC= Provide crash backtraces CA_BUNDLE_DESC= Include CA bundle for certificate verification ICON_DESC= Desktop icon 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_BOOLL= ENABLE_ASPELL ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell BACKTRACE_CMAKE_BOOL= ENABLE_BACKTRACE 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_BOOL= ENABLE_CHARSET CHARSET_IMPLIES= ICONV DOCS_CMAKE_BOOL= ENABLE_DOC DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor ICONV_CMAKE_BOOL= ENABLE_ICONV ICONV_USES= iconv JAVASCRIPT_CMAKE_BOOL= ENABLE_JAVASCRIPT JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8 GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig LUA_CMAKE_BOOL= ENABLE_LUA LUA_USES= lua pkgconfig MANPAGES_CMAKE_BOOL= ENABLE_MAN MANPAGES_CMAKE_ON= -DMANDIR=${MANPREFIX}/man MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor NLS_CMAKE_BOOL= ENABLE_NLS NLS_USES= gettext PERL_CMAKE_BOOL= ENABLE_PERL PERL_USES= perl5 PYTHON_CMAKE_BOOL= ENABLE_PYTHON PYTHON_USES= python RUBY_CMAKE_BOOL= ENABLE_RUBY RUBY_USE= ruby=yes TCL_CMAKE_BOOL= ENABLE_TCL TCL_USES= tcl:85+ .include .if !empty(PORT_OPTIONS:MPYTHON) && ${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 .if !empty(PORT_OPTIONS:MRUBY) && (${ARCH} == "amd64" || ${ARCH} == "i386") LIB_DEPENDS+= libunwind.so:devel/libunwind .endif post-patch: @${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} .endfor post-patch-ICON-off: @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt post-install: ${LN} -sf weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses .include Index: head/irc/weechat/distinfo =================================================================== --- head/irc/weechat/distinfo (revision 455408) +++ head/irc/weechat/distinfo (revision 455409) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506337543 -SHA256 (weechat-1.9.1.tar.xz) = c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd -SIZE (weechat-1.9.1.tar.xz) = 1877428 +TIMESTAMP = 1512301125 +SHA256 (weechat-2.0.tar.xz) = a9172dbacfd9c96e3e9bddc7134dae09b3b3e292e9cf44e82e5d964cf38fa2c7 +SIZE (weechat-2.0.tar.xz) = 1967636 Index: head/irc/weechat/files/patch-CMakeLists.txt =================================================================== --- head/irc/weechat/files/patch-CMakeLists.txt (revision 455408) +++ head/irc/weechat/files/patch-CMakeLists.txt (revision 455409) @@ -1,61 +1,62 @@ ---- CMakeLists.txt.orig 2017-05-13 05:07:57 UTC +--- CMakeLists.txt.orig 2017-12-03 10:55:08 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,11 +92,13 @@ option(ENABLE_GNUTLS "Enable SSLv3/T +@@ -88,12 +92,14 @@ 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_BUFLIST "Enable Buflist plugin" ON) option(ENABLE_CHARSET "Enable Charset plugin" ON) option(ENABLE_EXEC "Enable Exec plugin" ON) option(ENABLE_FIFO "Enable FIFO plugin" ON) + option(ENABLE_FSET "Enable Fast Set 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) -@@ -168,6 +174,7 @@ endif() +@@ -170,6 +176,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 -@@ -186,10 +193,12 @@ endif() +@@ -188,10 +195,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 -@@ -248,7 +257,7 @@ set(exec_prefix "\${prefix}") +@@ -250,7 +259,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) Index: head/irc/weechat/pkg-plist =================================================================== --- head/irc/weechat/pkg-plist (revision 455408) +++ head/irc/weechat/pkg-plist (revision 455409) @@ -1,86 +1,87 @@ bin/weechat bin/weechat-curses include/weechat/weechat-plugin.h lib/weechat/plugins/alias.so lib/weechat/plugins/buflist.so lib/weechat/plugins/exec.so lib/weechat/plugins/fifo.so +lib/weechat/plugins/fset.so lib/weechat/plugins/irc.so lib/weechat/plugins/logger.so lib/weechat/plugins/relay.so lib/weechat/plugins/script.so 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 %%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 %%JAVASCRIPT%%lib/weechat/plugins/javascript.so %%LUA%%lib/weechat/plugins/lua.so %%PERL%%lib/weechat/plugins/perl.so %%PYTHON%%lib/weechat/plugins/python.so %%RUBY%%lib/weechat/plugins/ruby.so %%TCL%%lib/weechat/plugins/tcl.so %%DOCS%%%%DOCSDIR%%/weechat_dev.en.html %%DOCS%%%%DOCSDIR%%/weechat_dev.fr.html %%DOCS%%%%DOCSDIR%%/weechat_dev.ja.html %%DOCS%%%%DOCSDIR%%/weechat_faq.de.html %%DOCS%%%%DOCSDIR%%/weechat_faq.en.html %%DOCS%%%%DOCSDIR%%/weechat_faq.fr.html %%DOCS%%%%DOCSDIR%%/weechat_faq.it.html %%DOCS%%%%DOCSDIR%%/weechat_faq.ja.html %%DOCS%%%%DOCSDIR%%/weechat_faq.pl.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.en.html %%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 %%DOCS%%%%DOCSDIR%%/weechat_quickstart.fr.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.ja.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.it.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.pl.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.ru.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.en.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.fr.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.ja.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.de.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.en.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.fr.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.it.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.ja.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.pl.html %%DOCS%%%%DOCSDIR%%/weechat_tester.de.html %%DOCS%%%%DOCSDIR%%/weechat_tester.en.html %%DOCS%%%%DOCSDIR%%/weechat_tester.fr.html %%DOCS%%%%DOCSDIR%%/weechat_tester.ja.html %%DOCS%%%%DOCSDIR%%/weechat_tester.it.html %%DOCS%%%%DOCSDIR%%/weechat_tester.pl.html %%DOCS%%%%DOCSDIR%%/weechat_user.de.html %%DOCS%%%%DOCSDIR%%/weechat_user.en.html %%DOCS%%%%DOCSDIR%%/weechat_user.fr.html %%DOCS%%%%DOCSDIR%%/weechat_user.it.html %%DOCS%%%%DOCSDIR%%/weechat_user.ja.html %%DOCS%%%%DOCSDIR%%/weechat_user.pl.html %%ICON%%share/icons/hicolor/32x32/apps/weechat.png %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo %%NLS%%share/locale/fr/LC_MESSAGES/weechat.mo %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo %%NLS%%share/locale/it/LC_MESSAGES/weechat.mo %%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