Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2020 20:35:57 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549948 - head/mail/mboxgrep
Message-ID:  <202009242035.08OKZvqx087476@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009242035.08OKZvqx087476>