Index: head/irc/weechat/Makefile =================================================================== --- head/irc/weechat/Makefile (revision 542548) +++ head/irc/weechat/Makefile (revision 542549) @@ -1,100 +1,98 @@ # Created by: clement # $FreeBSD$ PORTNAME= weechat -DISTVERSION= 2.8 +DISTVERSION= 2.9 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 \ + libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error -USES= cmake ncurses libtool tar:xz +USES= cmake ncurses libtool pkgconfig tar:xz USE_LDCONFIG= yes CMAKE_ARGS= -DLIBDATADIR=${LOCALBASE}/libdata -OPTIONS_DEFINE= BACKTRACE DOCS CA_BUNDLE GNUTLS HEADLESS ICON ICONV \ +OPTIONS_DEFINE= BACKTRACE DOCS CA_BUNDLE HEADLESS ICON ICONV \ MANPAGES NLS -OPTIONS_DEFAULT= ASPELL BACKTRACE CA_BUNDLE CHARSET GNUTLS HEADLESS \ +OPTIONS_DEFAULT= ASPELL BACKTRACE CA_BUNDLE CHARSET HEADLESS \ 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 GUILE JAVASCRIPT LUA PERL PHP PYTHON RUBY TCL BACKTRACE_DESC= Provide crash backtraces CA_BUNDLE_DESC= Include CA bundle for certificate verification CHARSET_DESC= Charset plugin (implies ICONV) GUILE_DESC= Guile script support HEADLESS_DESC= Build headless weechat as well ICON_DESC= Desktop icon JAVASCRIPT_DESC= Javascript script support PLUGINS_DESC= Weechat Plugins PYTHON_DESC= Python script support RUBY_DESC= Ruby script support .for _opt in ${OPTIONS_GROUP_PLUGINS} BACKTRACE HEADLESS ICONV GNUTLS NLS ${_opt}_CMAKE_BOOL= ENABLE_${_opt} .endfor ASPELL_CMAKE_BOOL= ENABLE_SPELL ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell 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_IMPLIES= ICONV DOCS_CMAKE_BOOL= ENABLE_DOC DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_USES= pkgconfig GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_CMAKE_BOOL= ENABLE_GUILE ICONV_USES= iconv JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8 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_USES= gettext PERL_USES= perl5 PHP_USES= php:build,embed PYTHON_USES= python RUBY_USE= ruby=yes TCL_CMAKE_ON= -DTCL_VERSION:STRING="${TCL_VER}" \ -DTCL_TCLSH:PATH="${TCLSH}" TCL_USES= tcl .include .if !empty(PORT_OPTIONS:MPYTHON) && ${PYTHON_MAJOR_VER} == 2 CMAKE_ARGS+= -DENABLE_PYTHON2:BOOL=true \ # -DPYTHON_LIBRARIES=${LOCALBASE}/lib .endif post-patch: - @${REINPLACE_CMD} '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} 's|/usr/local|${LOCALBASE}|' \ - ${WRKSRC}/${f} -.endfor +.if ${LOCALBASE} != "/usr/local" +. for f in src/core/CMakeLists.txt cmake/*.cmake + @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/$f +. endfor +.endif @${REINPLACE_CMD} 's|python${PYTHON_MAJOR_VER}|python-${PYTHON_VER}|' \ ${WRKSRC}/cmake/FindPython.cmake 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 542548) +++ head/irc/weechat/distinfo (revision 542549) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585485484 -SHA256 (weechat-2.8.tar.xz) = 553ea295edad3b03cf88e6029c21e7bde32ff1cc026d35386ba9da3e56a6018c -SIZE (weechat-2.8.tar.xz) = 2248868 +TIMESTAMP = 1595146022 +SHA256 (weechat-2.9.tar.xz) = eab406c385c3a10d0107ddc3aac6596ae8c59af99e9158c6d769e90ec9adfa0e +SIZE (weechat-2.9.tar.xz) = 2206584 Index: head/irc/weechat/files/patch-CMakeLists.txt =================================================================== --- head/irc/weechat/files/patch-CMakeLists.txt (revision 542548) +++ head/irc/weechat/files/patch-CMakeLists.txt (revision 542549) @@ -1,61 +1,50 @@ ---- CMakeLists.txt.orig 2019-06-06 18:43:20 UTC +--- CMakeLists.txt.orig 2020-07-07 18:29:03 UTC +++ CMakeLists.txt -@@ -66,6 +66,10 @@ if(NOT DEFINED WEECHAT_LIBDIR) - set(WEECHAT_LIBDIR ${LIBDIR}/${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() -@@ -90,11 +94,13 @@ option(ENABLE_NLS "Enable Native Language Su - option(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON) +@@ -93,11 +97,13 @@ option(ENABLE_HEADLESS "Compile the headless bina + option(ENABLE_NLS "Enable Native Language Support" ON) option(ENABLE_LARGEFILE "Enable Large File Support" ON) option(ENABLE_ALIAS "Enable Alias plugin" ON) +option(ENABLE_BACKTRACE "Enable backtraces (via libexecinfo)" ON) 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) -@@ -186,6 +192,7 @@ endif() +@@ -195,6 +201,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 -@@ -204,10 +211,12 @@ endif() +@@ -208,10 +215,12 @@ list(APPEND EXTRA_LIBS gnutls) 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 -@@ -266,7 +275,7 @@ set(exec_prefix "\${prefix}") +@@ -280,7 +289,7 @@ set(exec_prefix "\${prefix}") string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}") 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)