From nobody Sat Apr 29 17:33:01 2023 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 4Q7xQ56XNMz482tv; Sat, 29 Apr 2023 17:33:01 +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 4Q7xQ55yrFz4lM6; Sat, 29 Apr 2023 17:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682789581; 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=toq3RHpH/1Wp8nAu3IwfiEUS7mnly9K+h5P4enBlp+g=; b=r/CzxLazUvY7MepmsTb5Bxvk05ye0GrnJNft5rK0MVgRULcEQHA/V7FZugjIj0hDkVo1CL njjME+5UF/rFjif1LoeEf2NLUQTx/V+2tsMRSy4wRI6F9rLVmULxXIm37GLl7QSshu+vYv hrKyX6RFhJnpHWyJ0yOuXWjCK1U46Y004kXZJiPGL9jFDEN88Aex++ctSsldO5CWBJYGTX vEUiv6CvI5HTq0A0pJudm1h1ByOtYqJra5s3njfClqpj95kMpwy3j2uY8x/4LzHXsTwstU L0HbCkMvCWvJzCKM362aTO6/6Kr3Kp+nA/m7SOFJofoPmQ37OLCzQ1sdLDtH2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682789581; 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=toq3RHpH/1Wp8nAu3IwfiEUS7mnly9K+h5P4enBlp+g=; b=Gnbtwmj0hoTCv4u1KTyK5fJ1uXneo1nNkQ/QZRzyBgulR7g/BzKxdvdWvSesVtLxVPNp1A sOzO0EyZLHM9Tnd5ycKqsv/y51BtV3A4QMHa0vwvvUAbCLJkTJjSKX+FEhhr+zj0NzD3iU iZFmD7CBfBD72PSw2TtmObqXuGXq+asLIffTtogJfC0qRDP9/qL6vEodgDLd8UiCvFDLVF o7zmUNkpqlrpBve7KJtzKtuafjhQ7PInE1vBc+PA6HTdOiEZBdqC3tOjgRQ/LV1WXjKWpT 3JKY6i9YB31feHTqOuVOAohRk/q8OwejNUX10r55pzOkb4oD1lriK1buJrb+lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682789581; a=rsa-sha256; cv=none; b=OqC2I8Aws4r96KO6hsg9N2v8+av6v5htCqKh4UtLuPcX7RspeE6C/3JF8C6TsJ9leVq3Eu 1lHLyxGbswcRPwmE0ya4mzOA3X3xoaVxaNWHJ9iqq/WfUM2sJkLDtOALkcxYeBqCZyfd15 CPKfytEgiVmxznnfqWhpJZi58ab0JVsDVmQyKoHSPRg2MC+21FilNK/GbWEavtapl8R/bv RwkeWQv7v0PivqZoCZF7t0CilTbB7Ig5692gDovs9LZx+OGLfz8TwdG1R8G0jkGeG1toQ1 TOznid5r6vpsUVMmkAjFlZa9PSNKyMViolfRCOy491mMN1tOEcyLUS805rY5wQ== 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 4Q7xQ553LfzrB2; Sat, 29 Apr 2023 17:33:01 +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 33THX1Pv052129; Sat, 29 Apr 2023 17:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33THX1fh052128; Sat, 29 Apr 2023 17:33:01 GMT (envelope-from git) Date: Sat, 29 Apr 2023 17:33:01 GMT Message-Id: <202304291733.33THX1fh052128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: be22e4e5f1fb - main - mail/meta1: Unbreak on HEAD 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be22e4e5f1fb06d357fcb7f6e78501d78ccf26dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=be22e4e5f1fb06d357fcb7f6e78501d78ccf26dc commit be22e4e5f1fb06d357fcb7f6e78501d78ccf26dc Author: Muhammad Moinur Rahman AuthorDate: 2023-04-29 15:16:56 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-04-29 17:32:35 +0000 mail/meta1: Unbreak on HEAD - Utilize OPTIONSNG while I am here Approved by: portmgr (blanket) --- mail/meta1/Makefile | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index 30b538c9685c..25cf0c4c1521 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -47,40 +47,33 @@ OPTIONS_DEFAULT= PMILTER DKIM SASL2 TLS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes -PMILTER_DESC= Adds policy milter support DKIM_DESC= Enable DKIM signing support MSP_DESC= Enable mail submision program -SASL2_DESC= Adds SASL2 support +PMILTER_DESC= Adds policy milter support SASL2AUTHD_DESC= Enable plaintext authentication via SASL2 +SASL2_DESC= Adds SASL2 support -PMILTER_USES= ssl -PMILTER_CONFIGURE_ENABLE= pmilter DKIM_CONFIGURE_ENABLE= DKIM +IPV6_MAKE_ENV= MTA_NETINET6=1 MSP_CONFIGURE_ENABLE= msp +MSP_CONFLICTS= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-* +PMILTER_USES= ssl +PMILTER_CONFIGURE_ENABLE= pmilter +SASL2AUTHD_IMPLIES= SASL2 +SASL2AUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd SASL2_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL2_CONFIGURE_ENABLE= SASL SASL2_CONFIGURE_ON= --with-sasl-incdir=${LOCALBASE}/include \ --with-sasl-libdir=${LOCALBASE}/lib -SASL2AUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd +SASL2_CONFIGURE_ENABLE= SASL TLS_USES= ssl TLS_CONFIGURE_ENABLE= TLS TLS_CPPFLAGS= -I${LOCALBASE}/include TLS_LDFLAGS= -L${LOCALBASE}/lib -.include - -.if ${PORT_OPTIONS:MIPV6} -MAKE_ENV+= MTA_NETINET6=1 -.endif - -.if ${PORT_OPTIONS:MMSP} -CONFLICTS+= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-* -.endif +.include -.if ${PORT_OPTIONS:MSASL2AUTHD} -.if empty(PORT_OPTIONS:MSASL2) -IGNORE= option SASL2AUTHD needs option SASL2 -.endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CFLAGS+= -Wno-error=int-conversion .endif post-configure: @@ -120,4 +113,4 @@ post-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include