From owner-svn-ports-all@freebsd.org Thu Sep 24 20:35:58 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 34380427545; Thu, 24 Sep 2020 20:35:58 +0000 (UTC) (envelope-from cmt@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 4By6JG0dbwz49LY; Thu, 24 Sep 2020 20:35:58 +0000 (UTC) (envelope-from cmt@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 ED6F98062; Thu, 24 Sep 2020 20:35:57 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08OKZvfJ087477; Thu, 24 Sep 2020 20:35:57 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08OKZvqx087476; Thu, 24 Sep 2020 20:35:57 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202009242035.08OKZvqx087476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Thu, 24 Sep 2020 20:35:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549948 - head/mail/mboxgrep X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: head/mail/mboxgrep X-SVN-Commit-Revision: 549948 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, 24 Sep 2020 20:35:58 -0000 Author: cmt Date: Thu Sep 24 20:35:57 2020 New Revision: 549948 URL: https://svnweb.freebsd.org/changeset/ports/549948 Log: fix staging of mboxgrep - post-patch happens after configure, at which point modifying Makefile.in is pointless, but we have pre-configure, which does the job. - patching in $(DESTDIR) into src/Makefile.in already happens in patch-src_Makefile.in, so remove it from the REINPLACEing Modified: head/mail/mboxgrep/Makefile Modified: head/mail/mboxgrep/Makefile ============================================================================== --- head/mail/mboxgrep/Makefile Thu Sep 24 20:29:35 2020 (r549947) +++ head/mail/mboxgrep/Makefile Thu Sep 24 20:35:57 2020 (r549948) @@ -29,10 +29,9 @@ OPTIONS_DEFINE= DOCS PCRE PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -pre-build: +pre-configure: @${REINPLACE_CMD} -e 's,void \*tmpp,FILE \*tmpp,g' ${WRKSRC}/src/main.c - @${REINPLACE_CMD} -e 's,$$(prefix),$$(DESTDIR)$$(prefix),g' \ - -e 's,$$(mandir),$$(DESTDIR)$$(mandir),g' \ + @${REINPLACE_CMD} -e 's,$$(mandir),$$(DESTDIR)$$(mandir),g' \ -e 's,$$(infodir),$$(DESTDIR)$$(infodir),g' \ ${WRKSRC}/src/Makefile.in ${WRKSRC}/doc/Makefile.in