From owner-svn-ports-all@freebsd.org Sun Jul 19 09:17:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB1BC35969A; Sun, 19 Jul 2020 09:17:47 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8fQg5vkNz4LGs; Sun, 19 Jul 2020 09:17:47 +0000 (UTC) (envelope-from brnrd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE46D1978F; Sun, 19 Jul 2020 09:17:47 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06J9HlVU030488; Sun, 19 Jul 2020 09:17:47 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06J9Hlqo030485; Sun, 19 Jul 2020 09:17:47 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202007190917.06J9Hlqo030485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 19 Jul 2020 09:17:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542549 - in head/irc/weechat: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/irc/weechat: . files X-SVN-Commit-Revision: 542549 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jul 2020 09:17:48 -0000 Author: brnrd Date: Sun Jul 19 09:17:46 2020 New Revision: 542549 URL: https://svnweb.freebsd.org/changeset/ports/542549 Log: irc/weechat: Update to 2.9 * Fix REINPLACE_CMD warnings Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/files/patch-CMakeLists.txt Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Sun Jul 19 09:11:25 2020 (r542548) +++ head/irc/weechat/Makefile Sun Jul 19 09:17:46 2020 (r542549) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= weechat -DISTVERSION= 2.8 +DISTVERSION= 2.9 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ @@ -14,16 +14,17 @@ 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 @@ -55,8 +56,6 @@ CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-roo 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 @@ -82,12 +81,11 @@ CMAKE_ARGS+= -DENABLE_PYTHON2:BOOL=true \ .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 Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Sun Jul 19 09:11:25 2020 (r542548) +++ head/irc/weechat/distinfo Sun Jul 19 09:17:46 2020 (r542549) @@ -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 Modified: head/irc/weechat/files/patch-CMakeLists.txt ============================================================================== --- head/irc/weechat/files/patch-CMakeLists.txt Sun Jul 19 09:11:25 2020 (r542548) +++ head/irc/weechat/files/patch-CMakeLists.txt Sun Jul 19 09:17:46 2020 (r542549) @@ -1,18 +1,7 @@ ---- 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) @@ -25,7 +14,7 @@ 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) @@ -33,7 +22,7 @@ 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) @@ -50,7 +39,7 @@ 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)