From nobody Tue Sep 24 22:57:48 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XCwHd03SKz5WC3K; Tue, 24 Sep 2024 22:57:49 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XCwHc5lqCz4H5G; Tue, 24 Sep 2024 22:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727218668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AoET5pLfhePp18BITNeoP5/jb6kgc8V/+uFfdz5Gies=; b=ABKMcy1Kbh4/Ll5G+HMKbNW5uRu25dN7OwWMTZ6hb0FPrH0PJ7NcYSXPZkunKixCo/exmI qUmW9PunOjyLqfdwUm3s9X9pTDUlHBuL8txzpFneDNZipoLolnoVi90caDzLl7/yxma6s3 jIxt46qTXp6K4WlbwElsMlRhoaQTCkhVnVD5EZ/eM40TV015nBeejujva5OcfhO9HEG9ZI 7WE/HDJh8i85p6SYRL3N4CV8du535HCO3BS13jJuI9Q9mNh23ngBWxa0Wwv4YNUSvdsVpE HXxXruQ9sqnrBzdLnjlmK49sxUSb5FVezf/Xbz1eTdqoSZ/G+usmkj7k12z85Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727218668; a=rsa-sha256; cv=none; b=j/Y4tou3jMI+BDJQLFq8tdEZBuqcgzquurL7F1vL6WmWdbP/9SV4iQocZleIX2ZmzYvtRk 6NcWF0BZGSB92NZHCQk02MO5oOSSFn6q02UA0E/Rp+3Q2nJBc/lXPRiRAkmyEI0rNah4CV mRA/GTx6vwKe7JK2Kczg0vBhR5p/ZM8HBY7NxW4ntfDb6iOqN9SPiuXQXEOUM6whI2vTFK HFFGeSxaF8zaJg4Fb4OtIYU6txo4M8T+wkpnnlygC9CZioR8yP3MBgSs7ukVgp3o8P9s+t pUA35RrUhqjbePDBk+/pyTBBQDCMZqqI9YOEaTwuvGPqOEHxhDJmulTL5tYyKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727218668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AoET5pLfhePp18BITNeoP5/jb6kgc8V/+uFfdz5Gies=; b=ptp/MNADEZ46vKNNXJurPCBg+Tx6FLm+hNqLYTXLZh1WhXQ14rz16dLX2eIKU149dSxWGY reRWpyoVgZi0pcYfxOBEjvIm6zN4w9POthiJgj8aHoam1N2C5OX6YFCW/5rf/6yorYC6Qf fH3kBsCvTUHrLtFOz1BLy8G5aLGmTszAJgsKfk3lSiRQ7BeIb6fzZ91lGCguKQwBqi2Shz +nqqHPaoHBv1mDsuuMjqvngIdKHFYYVto6ULC0vMKn5ojWXEkURCmxS4M8axhFbnH7dnah BXytu8/FYBORbdb3WjG6SFJ/ng2IsNMEV0k5u8HF/PAV1Ljmpd+716HiUg1LjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XCwHc5Ms4znlF; Tue, 24 Sep 2024 22:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48OMvm6N073388; Tue, 24 Sep 2024 22:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OMvmY7073385; Tue, 24 Sep 2024 22:57:48 GMT (envelope-from git) Date: Tue, 24 Sep 2024 22:57:48 GMT Message-Id: <202409242257.48OMvmY7073385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 26fb50b82a5d - main - irc/znc: Improve and simplify port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26fb50b82a5dab65dec324b8b50f6b8e3f48195d Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26fb50b82a5dab65dec324b8b50f6b8e3f48195d commit 26fb50b82a5dab65dec324b8b50f6b8e3f48195d Author: Daniel Engberg AuthorDate: 2024-09-24 22:53:27 +0000 Commit: Daniel Engberg CommitDate: 2024-09-24 22:53:29 +0000 irc/znc: Improve and simplify port * Always build with ICU support * Remove DEBUG menu option, use ports framework instead * Always enable IPv6, kernel support is always enabled * Always enable Python module as Python is already a hard dependency * Do some small layout enhancements to port Makefile This also aligns it more with other distros that packages znc PR: 281346 Approved by: portmgr (maintainer timeout, 2+ weeks) --- irc/znc/Makefile | 58 +++++++++++++++++++++++++++---------------------------- irc/znc/pkg-plist | 22 ++++++++++----------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/irc/znc/Makefile b/irc/znc/Makefile index f927d462d579..e6db2cc63c9d 100644 --- a/irc/znc/Makefile +++ b/irc/znc/Makefile @@ -1,5 +1,6 @@ PORTNAME= znc DISTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://znc.in/releases/ \ https://znc.in/releases/archive/ @@ -11,52 +12,49 @@ WWW= https://wiki.znc.in/ZNC LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++17-lang cpe cmake:run iconv pathfix pkgconfig:both python +BUILD_DEPENDS= swig>=4.0.1:devel/swig +LIB_DEPENDS= libicuuc.so:devel/icu +USES= compiler:c++17-lang cpe cmake:run iconv pathfix \ + perl5 pkgconfig:both python ssl +USE_PERL5= build USE_RC_SUBR= znc -SUB_FILES= pkg-message - USERS= znc GROUPS= znc PORTDOCS= README.md +SUB_FILES= pkg-message + +CMAKE_ON= WANT_ICU \ + WANT_IPV6 \ + WANT_OPENSSL \ + WANT_PYTHON \ + WANT_SWIG +CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ + -DWANT_PYTHON_VERSION:STRING=python-${PYTHON_VER} -OPTIONS_DEFINE= CHARSET CYRUS DEBUG DOCS IPV6 NLS OPENSSL PERL PYTHON TCL -OPTIONS_DEFAULT= CHARSET OPENSSL PERL PYTHON +OPTIONS_DEFINE= CYRUS DOCS NLS PERL TCL +OPTIONS_DEFAULT= PERL OPTIONS_SUB= yes -CHARSET_DESC= Character encoding support via ICU -CYRUS_DESC= Cyrus SASL module -DEBUG_DESC= Debugging support -PERL_DESC= Perl scripting module -PYTHON_DESC= Python scripting module -TCL_DESC= Tcl scripting module +CYRUS_DESC= Cyrus SASL module +PERL_DESC= Perl scripting module +PYTHON_DESC= Python scripting module +TCL_DESC= Tcl scripting module -CHARSET_CMAKE_BOOL= WANT_ICU -CHARSET_LIB_DEPENDS= libicuuc.so:devel/icu -CYRUS_CMAKE_BOOL= WANT_CYRUS CYRUS_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -DEBUG_VARS= CMAKE_BUILD_TYPE=Debug -IPV6_CMAKE_BOOL= WANT_IPV6 -NLS_CMAKE_BOOL= WANT_I18N +CYRUS_CMAKE_BOOL= WANT_CYRUS + NLS_LIB_DEPENDS= libboost_locale.so:devel/boost-libs NLS_USES= gettext -OPENSSL_CMAKE_BOOL= WANT_OPENSSL -OPENSSL_CMAKE_ON= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} -OPENSSL_USES= ssl -PERL_BUILD_DEPENDS= swig>=4.0.1:devel/swig +NLS_CMAKE_BOOL= WANT_I18N + +PERL_USE= perl5=run PERL_CMAKE_BOOL= WANT_PERL WANT_SWIG -PERL_USE= perl5=build,run -PERL_USES= perl5 -PYTHON_CMAKE_BOOL= WANT_PYTHON WANT_SWIG -PYTHON_CMAKE_ON= -DWANT_PYTHON_VERSION:STRING=python-${PYTHON_VER} -PYTHON_BUILD_DEPENDS= swig>=4.0.1:devel/swig -PYTHON_IMPLIES= CHARSET -PYTHON_USE= perl5=build -PYTHON_USES= perl5 -TCL_CMAKE_BOOL= WANT_TCL + TCL_USES= tcl +TCL_CMAKE_BOOL= WANT_TCL post-patch: @${REINPLACE_CMD} -e 's|python3|python${PYTHON_VER}|g' \ diff --git a/irc/znc/pkg-plist b/irc/znc/pkg-plist index 5ce15f3b4450..92286676a520 100644 --- a/irc/znc/pkg-plist +++ b/irc/znc/pkg-plist @@ -1054,22 +1054,22 @@ share/man/man1/znc.1.gz %%NLS%%%%DATADIR%%/translations/pt-PT %%NLS%%%%DATADIR%%/translations/ru-RU %%NLS%%%%DATADIR%%/translations/tr-TR -%%OPENSSL%%lib/znc/awaystore.so -%%OPENSSL%%lib/znc/cert.so -%%OPENSSL%%lib/znc/certauth.so -%%OPENSSL%%lib/znc/crypt.so -%%OPENSSL%%lib/znc/savebuff.so -%%OPENSSL%%lib/znc/schat.so +lib/znc/awaystore.so +lib/znc/cert.so +lib/znc/certauth.so +lib/znc/crypt.so +lib/znc/savebuff.so +lib/znc/schat.so %%PERL%%lib/znc/modperl.so %%PERL%%lib/znc/modperl/startup.pl %%PERL%%lib/znc/modperl/ZNC.pm %%PERL%%lib/znc/modperl/ZNC.so %%PERL%%lib/znc/perleval.pm -%%PYTHON%%lib/znc/pyeval.py -%%PYTHON%%lib/znc/modpython.so -%%PYTHON%%lib/znc/modpython/_znc_core.so -%%PYTHON%%lib/znc/modpython/znc_core.py -%%PYTHON%%lib/znc/modpython/znc.py +lib/znc/pyeval.py +lib/znc/modpython.so +lib/znc/modpython/_znc_core.so +lib/znc/modpython/znc_core.py +lib/znc/modpython/znc.py %%TCL%%lib/znc/modtcl.so %%TCL%%%%DATADIR%%/modtcl/binds.tcl %%TCL%%%%DATADIR%%/modtcl/modtcl.tcl