From nobody Tue Mar 15 21:10:32 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 E8D851A22FA5; Tue, 15 Mar 2022 21:10:32 +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 4KJ5fJ5Zskz3HXg; Tue, 15 Mar 2022 21:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378632; 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=wmXn3XDTjSUV8wSjqlHJNgco3LecDho2YBwNv/vHrjE=; b=hR/jJypzfflU3xecTbMWF1d/PjPoFIy/KOUHP48CR4QSf7yUIqZfn4LZqkpnxhwMH8sck7 slshaqGNlCjQBuRfnhxpmdLZ4SccZyCvoqTkbbUFmYueWGP2t859BYfKzjBgzFU1CZAN+R blKk7/bagEIIAbuQtwV3kkkYdeNH3pkhqrpcQjFsCK7v+Zivc97I3+b7u/oXCZFgzMpaMI xs3yqjwZZFbl5pKyLKzvRG6IJ4e3mrFPWoTq5xQKmmwu73M97zrIERw1vGb7vGcqr3i6TJ zdq2u5/lIWHsXpjZBP+9n/FRdFE3lK+qomrEJu/kfMXnFeAtd6oitttL1RoqVg== 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 8B0171011; Tue, 15 Mar 2022 21:10:32 +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 22FLAWP4013247; Tue, 15 Mar 2022 21:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FLAWmh013246; Tue, 15 Mar 2022 21:10:32 GMT (envelope-from git) Date: Tue, 15 Mar 2022 21:10:32 GMT Message-Id: <202203152110.22FLAWmh013246@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: c3a86ca080b3 - main - mail/postfix-current: Unbreak build 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: c3a86ca080b399946e23b960658d86d618114eb6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647378632; 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=wmXn3XDTjSUV8wSjqlHJNgco3LecDho2YBwNv/vHrjE=; b=l4h0YkH+jP1k5Z4sgbR0TkrvHEz2LEzRKtSMss0xzBN/EdLQIoI0Z/tdaNVyXoMd4R9uAk K7uKfVxh/KUyDs1MOXLyEvPbNWoj5GZuMdQVtnV1xLj0wJVJfUcClFbAXy+No2MtTOhowv BZox/DeldyGTrFUcTW2+mLG60ohop/mTbdE4O+qZoiFX4dDc8L8dsXPBVgNolaReil11Om O1l4MR5KrS14KVOHkf9gYtR2RDTlxu945xRFdJwS58na/5Zb/sQCrz5VCspst8z7PkBZNe rTBQHi0S+Emb50eFQXCLEgAKf2P7G8wok2A9U21LbPyOczP4YoOe7XS3CQhMUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647378632; a=rsa-sha256; cv=none; b=vEHVWGtB0OrIxlCPBLqI0PWS3yUUwIYcvCxFMfvaVtFI3dSo1SP6M2bSNxCMbBn36AUj+a TmPZTY8PmlxN/bZpWvq01gK2qZeITKS2JOEmZpXAab0qi+xAmkvw7jmE1NXSfjCtszWcIc vP/t0g3B90LcmINt7DQ/DUCoerb0R1sN5y8wpPpAAJp7NCaDYVXmm8XqAU4FkplR/dD2/X Vdy/tMuYXWNsvJjc+XuQcgSu+pONPut6JJT13QYucmzsJgjt9LXne4LrA2iEymS5X7omeN HRKs37Jxp09wo/oLoCBxvOaP1qXTY+7/oW33vYcnnDzNHT62d+7D1wG+j10i5w== 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=c3a86ca080b399946e23b960658d86d618114eb6 commit c3a86ca080b399946e23b960658d86d618114eb6 Author: Juraj Lutter AuthorDate: 2022-03-15 21:08:32 +0000 Commit: Juraj Lutter CommitDate: 2022-03-15 21:08:32 +0000 mail/postfix-current: Unbreak build Unbreak build after update to recent 3.8. The breakage was caused by a patch generated using makepatch. Local patches are now applied in post-patch stage. --- mail/postfix-current/Makefile | 5 ++--- mail/postfix-current/files/patch-conf_main.cf | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 008846f1cc63..d75d90e54909 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -315,11 +315,11 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX} s!^(sample_directory =)!\1 ${ETCDIR}!g; \ s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; -pre-patch: +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"; \ @@ -336,7 +336,6 @@ pre-patch: -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -i '' -E -e '${REINPLACE}' -post-patch: .for f in ${HTML1} @${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files diff --git a/mail/postfix-current/files/patch-conf_main.cf b/mail/postfix-current/files/patch-conf_main.cf index ecdcaecc206e..f16769847224 100644 --- a/mail/postfix-current/files/patch-conf_main.cf +++ b/mail/postfix-current/files/patch-conf_main.cf @@ -1,9 +1,9 @@ ---- conf/main.cf.orig 2022-03-12 22:37:09 UTC +--- conf/main.cf.orig 2022-03-15 21:02:43 UTC +++ conf/main.cf -@@ -681,4 +681,7 @@ sample_directory = /etc/postfix +@@ -682,4 +682,7 @@ sample_directory = # readme_directory: The location of the Postfix README files. # - readme_directory = no + readme_directory = -inet_protocols = ipv4 +inet_protocols = all +