From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 16:53:18 2021 Return-Path: Delivered-To: dev-commits-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 D2B4A5D72EC; Mon, 12 Apr 2021 16:53:18 +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 4FJvv25XC9z4gJL; Mon, 12 Apr 2021 16:53:18 +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 B07EE1B0AB; Mon, 12 Apr 2021 16:53:18 +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 13CGrIVK095425; Mon, 12 Apr 2021 16:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CGrIbu095424; Mon, 12 Apr 2021 16:53:18 GMT (envelope-from git) Date: Mon, 12 Apr 2021 16:53:18 GMT Message-Id: <202104121653.13CGrIbu095424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 57de0ecc339a - main - mail/dcc-dccd: fix build on 13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57de0ecc339a32d4ca601e67a8cf7f342e9528b3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 16:53:18 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=57de0ecc339a32d4ca601e67a8cf7f342e9528b3 commit 57de0ecc339a32d4ca601e67a8cf7f342e9528b3 Author: Piotr Kubaj AuthorDate: 2021-04-12 16:52:07 +0000 Commit: Piotr Kubaj CommitDate: 2021-04-12 16:52:07 +0000 mail/dcc-dccd: fix build on 13.0 PR: 252996 --- mail/dcc-dccd/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile index d83b793036cc..4889715002cc 100644 --- a/mail/dcc-dccd/Makefile +++ b/mail/dcc-dccd/Makefile @@ -67,6 +67,8 @@ IPV6_CONFIGURE_OFF= --disable-IPv6 PORTS_MILTER_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:mail/libmilter PORTS_MILTER_CONFIGURE_ON= --with-sendmail=yes +CFLAGS+= -fcommon + ## User for DCC files and SUID binaries # DCCUSER?= dcc @@ -98,8 +100,8 @@ PLIST_SUB+= IFD_MILT="@comment " post-patch: ${REINPLACE_CMD} -e 's,md5.c ,,' ${WRKSRC}/clntlib/Makefile.in - ${REINPLACE_CMD} -e 's,^\(BININSTALL.*\),\1 -s,p' \ - -e 's,^BIN\(INSTALL\s*=\s*.*\) -s$$,SCRIPT\1,' ${WRKSRC}/Makefile.inc.in + ${REINPLACE_CMD} -E -e 's,^(BININSTALL.*),\1 -s,p' \ + -e 's,^BIN(INSTALL[:space:]*=[:space:]*.*) -s$$,SCRIPT\1,' ${WRKSRC}/Makefile.inc.in ${REINPLACE_CMD} -e 's,BININSTALL,SCRIPTINSTALL,g' \ ${WRKSRC}/homedir/Makefile.in ${WRKSRC}/misc/Makefile.in