From nobody Sun Jan 22 22:04:24 2023 X-Original-To: dev-commits-ports-main@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 4P0S206SJZz2t8Qf; Sun, 22 Jan 2023 22:04:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0S205QyGz4Rqk; Sun, 22 Jan 2023 22:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674425064; 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=/y1j4tp0c0nFHtlPnQrxu8Z8TU4BcANHM1g25YMVw84=; b=ZpO8kzrLnIaj3yURrS7IlglZ/4UFwu3lbJx3G31XIMgHvOMUvWijY/HcwWrIuKWbr4TI4N dgDOsgeI0oHx8KYDfVXutFrCg0Pt1z7B/qJ8rGSIfk5yiHFH/STCC+zwLS6ama7MZ1JC5H 1zOdJXJCGS4wu+luSgXkJw+Qz1rxJ9wFJfx17IkzehK0l736qOiXzv2L+hMJppjrMvh7F5 GP1DXl/xuwaJyVOjVIDGvPemgbcMZ1veNDW+z2jrsIPegsYC94IoNIniYTo0IhvS6pqS44 WCwn125G8BiZGf9AJUTOqWe+zveDPNZMYyo661E+bgu9lVUaiw60VkGidAviLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674425064; 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=/y1j4tp0c0nFHtlPnQrxu8Z8TU4BcANHM1g25YMVw84=; b=LkseqjHKv2xuap6KXkefJpKTntLHiFpARSEgv/GQK8t8hIOzMGyQYN+ErEDjhevwRZ0ALX sn+Lby+WV93rCH7sMLN8VBbzD5im4RHY7w/kofz+5M0Qxve7sCrlQEpwk5y00NtKWZTd3x vAzV3FBGp1Np8spQPJvWhku106FnEvKsGVgotta18utLNcuWxa+vCUJhkp5wUZJv7+5uE9 GsQM0R9tEcvlRNg6i3AF/pY/9tFrUsCrlOGJBHNl9KEOpqsyyXBw9ztfBv8VMnWsMamy4+ 1Ivmm7ZE0R9GiTVTtxjoP+QTassmPJgGJdICcxQhMGp/NB9k+xt9QROWMlU9zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674425064; a=rsa-sha256; cv=none; b=Vc7NFX1aRU6i0/7scZ0RjuTG4rHSI8NOT16/jgOey50ilNiwCF1SMVkhR9YJOQlQpWwiP5 5pCXflFTWQsnR0B9TlioFE2TMDCcYIBQHFOt2cgRj67/46SE1JCY/hQPjKhbh2vQE+gs0B o/wBu9skI87Stc44OPYEJrgjacOUFE76Mp6Pkl9Xm5ZtLIApd+omk/5T8xRdZKZBT5qq6C YaNugiLWFg3Fw7uCzIYPUaJPb8VCNIY48Dtp1GuL/HaY9tp+mX2Be6NHcwgwnzuiadL8V0 40r27nfFdtSUJvqY2own1xYcnIlcYAKFqMFViYuqTroM/xY1Hd6CnCQ4Itd7cA== 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 4P0S204Tl4z15J2; Sun, 22 Jan 2023 22:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30MM4OGR040623; Sun, 22 Jan 2023 22:04:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30MM4O34040622; Sun, 22 Jan 2023 22:04:24 GMT (envelope-from git) Date: Sun, 22 Jan 2023 22:04:24 GMT Message-Id: <202301222204.30MM4O34040622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Martin Matuska Subject: git: 6acfc9703151 - main - ftp/proftpd: add support for pcre2 and make it default List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6acfc9703151eecbc51c936c6fd8a3b37fea0ac9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=6acfc9703151eecbc51c936c6fd8a3b37fea0ac9 commit 6acfc9703151eecbc51c936c6fd8a3b37fea0ac9 Author: Martin Matuska AuthorDate: 2023-01-22 21:54:45 +0000 Commit: Martin Matuska CommitDate: 2023-01-22 22:03:31 +0000 ftp/proftpd: add support for pcre2 and make it default --- ftp/proftpd/Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 8137d6de797a..31e8020950af 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -2,7 +2,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ @@ -87,11 +87,17 @@ PLIST_FILES+= libexec/proftpd/${m}.a \ libexec/proftpd/${m}.so .endfor .else -OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE REDIS -OPTIONS_DEFAULT= PCRE +OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE REDIS +OPTIONS_DEFAULT= PCRE2 + +OPTIONS_RADIO+= PCREVER +OPTIONS_RADIO_PCREVER= PCRE1 PCRE2 HTMLDOCS_DESC= Include HTML documentation MEMCACHE_DESC= Memcache support using libmemcached +PCREVER_DESC= PCRE library to use +PCRE1_DESC= ${PCRE_DESC} +PCRE2_DESC= ${PCRE_DESC} version 2 REDIS_DESC= Redis support using hiredis PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" @@ -148,8 +154,13 @@ IPV6_CONFIGURE_ENABLE=ipv6 NLS_CONFIGURE_ON= --enable-nls NLS_USES= gettext iconv -PCRE_CONFIGURE_ENABLE= pcre -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE1_CONFIGURE_ENABLE= pcre +PCRE1_CONFIGURE_ON= --disable-pcre2 +PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre + +PCRE2_CONFIGURE_ENABLE= pcre2 +PCRE2_CONFIGURE_ON= --disable-pcre +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHE_CONFIGURE_ENABLE= memcache