From owner-svn-ports-all@freebsd.org Thu Jun 4 15:29:21 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1978F2F750E; Thu, 4 Jun 2020 15:29:21 +0000 (UTC) (envelope-from ler@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d8p872Lyz45fZ; Thu, 4 Jun 2020 15:29:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECC8F21B13; Thu, 4 Jun 2020 15:29:20 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054FTKJk073264; Thu, 4 Jun 2020 15:29:20 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054FTKND073263; Thu, 4 Jun 2020 15:29:20 GMT (envelope-from ler@FreeBSD.org) Message-Id: <202006041529.054FTKND073263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Thu, 4 Jun 2020 15:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r537905 - branches/2020Q2/mail/dovecot X-SVN-Group: ports-branches X-SVN-Commit-Author: ler X-SVN-Commit-Paths: branches/2020Q2/mail/dovecot X-SVN-Commit-Revision: 537905 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 15:29:21 -0000 Author: ler Date: Thu Jun 4 15:29:20 2020 New Revision: 537905 URL: https://svnweb.freebsd.org/changeset/ports/537905 Log: MFH: r537587 r537837 mail/dovecot: restore the REINPLACE_CMD for the example config. Overzealous removal. PR: 246947 Submitted by: gwbr0601@yahoo.de Pointy Hat To: ler mail/dovecot: fix example config *.conf.ext REINPLACE missed in r537587. PR: 246963 Submitted by: kfv@irbug.org Approved by: ports-secteam (joneum) Modified: branches/2020Q2/mail/dovecot/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/dovecot/Makefile ============================================================================== --- branches/2020Q2/mail/dovecot/Makefile Thu Jun 4 15:26:25 2020 (r537904) +++ branches/2020Q2/mail/dovecot/Makefile Thu Jun 4 15:29:20 2020 (r537905) @@ -9,6 +9,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.10.1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -133,6 +134,10 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: + @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ + s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ + ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \ + ${WRKSRC}/doc/example-config/*.conf.ext @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/