From nobody Tue Mar 15 22:14:12 2022 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 0BA681A34D6F; Tue, 15 Mar 2022 22:14:13 +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 4KJ73m6VYXz3lV1; Tue, 15 Mar 2022 22:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647382452; 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=5dxd8tv3xi+jjrspJQbHl74PeJ5iEvxDLIVbloU9yzU=; b=A6kfqEUJUe5IfA0DF4oJtcPlF1aZb7uOxK0t4veoNxESl/1aPhsfKKjax3Z58RE1D+cj+j AvytH20dy4XXfEmy8HEfrwBqU37Qdsd/7Cxa5K1cpxYC/CLv4YUUsoBxOVeaZCWK5oUmML vpFRAJbcn7ocbXt/v0egwbO1yUbAuf9FYSi3CF6ja0W3WkjRbFz9uzN+Uh+tqb1T/NLUoF zqvrrBszxDVQHnGZ8y8DqiZHTQf98PRwZ7c6MFgpYrX4z2zNO1Wc81zHMOfoot733Cd9up YW1vkP7yk/vyvjMCM/h9WrqYfc1HSXDUgxeGq7mWu/gvIIPP8y0RZio2X2V4jw== 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 BEDC71D46; Tue, 15 Mar 2022 22:14:12 +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 22FMEC1I099329; Tue, 15 Mar 2022 22:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FMECPF099328; Tue, 15 Mar 2022 22:14:12 GMT (envelope-from git) Date: Tue, 15 Mar 2022 22:14:12 GMT Message-Id: <202203152214.22FMECPF099328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 4aa6c3b488ae - main - mail/postfix: Use proper PCRE 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4aa6c3b488aeb7b1ff2768c3d541d0377d72ff12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647382452; 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=5dxd8tv3xi+jjrspJQbHl74PeJ5iEvxDLIVbloU9yzU=; b=eqCIMdjWYvz4M+a95G9TBo5XkIVUdgFrXprlaAKfPYH/Fg//Zzl7ysj2b87RQmUs/vJQWk vFglY1rRG8DqFXOSP55E3xCTShqJU0e0bucIwJjU2APPgUuq35KZUrceFw0gI6JtotrOeg v3AiGQdIABoON39jhmZMIiq5PqGSeX0Z3k6ZO4z+BKQlmQw6YY1EDzwXANpnI955e0y/FU 0G2Cmgv9XqzoQsbOCQwfXs+3o51fwIdHiL2Ixf/bp1XfcAkaMtuytKj9UNzfedIwyUUlwI rkwd9VHCBLa9/7r2GQZi1lvSqo0yEN97of0/fLF31j4Tk13aY9UowgDeMKokbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647382452; a=rsa-sha256; cv=none; b=KZomvIz8RmOLw7a1grgE8yztIictD2dK18mdYpYH4RYXC8K3ax6CZqS+/xJml5u6DKnxzx 2cRZYnRd/8jk8fk09etV33B3rQpnJmhddkkxiVVOmYPHBH+7XO/+/uaFVkPuffJZchumdp 4LMKgbxBhfm5ykFKOirWBKCW4d7moKVyRuAvtlh6rOdNS8N3aF/tDFrb7WrtNep+aeDEXX Yyuc8c1spgrQac4uJwNJdk+lzDEVSZxLNw65Eg0vXAVOPsgAbRHB7IYJTCY4mbMbM/RgRI 5A387awFw0uTt93ml/kkIVYfp5c5nTUoFSFzu7Bzvjw06E1bRJthCnpRyXfENg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=4aa6c3b488aeb7b1ff2768c3d541d0377d72ff12 commit 4aa6c3b488aeb7b1ff2768c3d541d0377d72ff12 Author: Olli Hauer AuthorDate: 2022-03-15 22:10:38 +0000 Commit: Juraj Lutter CommitDate: 2022-03-15 22:12:44 +0000 mail/postfix: Use proper PCRE - bump portscout expression to monitor version postfix version 3.7 - adopt SASL description fix from postfix-current --- mail/postfix/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index ea67595bf2bc..63e2637b7817 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -2,7 +2,7 @@ PORTNAME= postfix DISTVERSION= 3.7.0 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ @@ -47,7 +47,7 @@ SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" CONFLICTS_INSTALL= courier-0.* opensmtpd opensmtpd-devel \ postfix-current sendmail sendmail-devel -PORTSCOUT= limit:^3\.6\. +PORTSCOUT= limit:^3\.7\. USERS= postfix GROUPS= mail maildrop postfix @@ -193,7 +193,7 @@ POSTFIX_CCARGS+= -DNO_EAI .if ${PORT_OPTIONS:MPCRE2} DYN_EXT+= pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include +POSTFIX_CCARGS+= -DHAS_PCRE=2 -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre2-config --libs8`" .else POSTFIX_CCARGS+= -DNO_PCRE @@ -312,7 +312,7 @@ post-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ - ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ + ${ECHO_MSG} "Your SASL library is compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \