From nobody Sat Oct 30 12:55:54 2021 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 87765183B8BD; Sat, 30 Oct 2021 12:55:54 +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 4HhK6L3MDqz3jST; Sat, 30 Oct 2021 12:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 52D892BCF; Sat, 30 Oct 2021 12:55:54 +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 19UCts4R043254; Sat, 30 Oct 2021 12:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19UCts8s043253; Sat, 30 Oct 2021 12:55:54 GMT (envelope-from git) Date: Sat, 30 Oct 2021 12:55:54 GMT Message-Id: <202110301255.19UCts8s043253@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: 4c9b48d1b6bb - main - mail/postfix: Fix multiple build issues 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: 4c9b48d1b6bb64ee6b27e0ed5a98358266ce74da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c9b48d1b6bb64ee6b27e0ed5a98358266ce74da commit 4c9b48d1b6bb64ee6b27e0ed5a98358266ce74da Author: Juraj Lutter AuthorDate: 2021-10-30 12:54:07 +0000 Commit: Juraj Lutter CommitDate: 2021-10-30 12:54:07 +0000 mail/postfix: Fix multiple build issues - Add ssl to USES - Fix plist issues - Install sample files properly PR: 259530 --- mail/postfix/Makefile | 9 ++++++--- mail/postfix/pkg-plist | 8 ++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 90528b943dff..e05582fe6959 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -2,7 +2,7 @@ PORTNAME= postfix DISTVERSION= 3.6.2 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ @@ -36,7 +36,7 @@ sasl_CONFLICTS_INSTALL= postfix-[0-9]* postfix-base-[0-9]* \ COMMENT_ldap= (with OpenLDAP and Cyrus SASL support) COMMENT_sasl= (with Cyrus SASL support) -USES= cpe shebangfix +USES= cpe shebangfix ssl USE_RC_SUBR= postfix USE_SUBMAKE= yes @@ -290,7 +290,7 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX} )/etc/postfix!\1$$config_directory!g; \ s!/etc/postfix!${ETCDIR}!g; s!^(sample_directory =)!\1 \ ${ETCDIR}!g; \ - s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; + s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; pre-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @@ -359,6 +359,9 @@ do-install: ${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} +.for SAMPLEFILE in access aliases canonical generic header_checks relocated transport virtual + ${MV} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE}.sample +.endfor # == chop dynamicmaps.cf entries into dedicated .cf files # for future sub-packages support diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist index 09e304898f33..a3cc7b594290 100644 --- a/mail/postfix/pkg-plist +++ b/mail/postfix/pkg-plist @@ -12,6 +12,14 @@ bin/rmail %%PFETC%%/main.cf.default @sample %%PFETC%%/main.cf.sample @sample %%PFETC%%/master.cf.sample +@sample %%PFETC%%/access.sample +@sample %%PFETC%%/aliases.sample +@sample %%PFETC%%/canonical.sample +@sample %%PFETC%%/generic.sample +@sample %%PFETC%%/header_checks.sample +@sample %%PFETC%%/relocated.sample +@sample %%PFETC%%/transport.sample +@sample %%PFETC%%/virtual.sample lib/postfix/libpostfix-dns.so lib/postfix/libpostfix-global.so lib/postfix/libpostfix-master.so