Index: lang/ghc/Makefile
===================================================================
--- lang/ghc/Makefile
+++ 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
Index: lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
===================================================================
--- lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ 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