From d4e00fcf72b2e17e65e1cf9d9e60a267b03cf0d6 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Thu, 10 Aug 2017 20:55:04 +0000
Subject: [PATCH] Fix patch for ar/ld/gcc paths.

* In r447548 the updated patch unfortunately contained the sed'ed values.
* Also make the sed call not echo during build again.

Reported by:	Gleb Popov <6yearold@gmail.com>
Approved by:	pgj
Differential Revision:	https://reviews.freebsd.org/D11961
---
 lang/ghc/Makefile                                           | 3 ++-
 ..._Cabal__Cabal__Distribution__Simple__Program__Builtin.hs | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 1ab40a2ca9ac..5b39c08b81d8 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	${GHC_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		LOCAL/pgj/:boot
@@ -190,7 +191,7 @@ post-install-script:
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
 		s|%%AR%%|${AR}|; \
 		s|%%LD%%|${LD}|' \
 		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index daf5ea981ba1..18f937335935 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -15,13 +15,13 @@
  gccProgram = (simpleProgram "gcc") {
 -    programFindVersion = findProgramVersion "-dumpversion" id
 -  }
-+     programFindLocation = \v p -> findProgramOnSearchPath v p "cc"
++     programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
 +}
  
  arProgram :: Program
 -arProgram = simpleProgram "ar"
 +arProgram = (simpleProgram "ar") {
-+     programFindLocation = \v p -> findProgramOnSearchPath v p "ar"
++     programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%"
 +}
  
  stripProgram :: Program
@@ -32,7 +32,7 @@
  ldProgram :: Program
 -ldProgram = simpleProgram "ld"
 +ldProgram = (simpleProgram "ld") {
-+    programFindLocation = \v p -> findProgramOnSearchPath v p "ld"
++    programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%"
 +  }
  
  tarProgram :: Program