7d5781e5ab
port revision where appropriate - Add devel/hs-ghc-paths - Add devel/hs-QuickCheck - Add devel/hs-readline - Add devel/hs-haskeline - Add devel/hs-mmap - Remove lang/ghc-doc - Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4 - Set NHC98 as default compiler for devel/hs-hat as it does not compile with GHC 6.10.4 PR: ports/137055, ports/137058, ports/137059, ports/137060, ports/137061, ports/137062, ports/137063, ports/137063, ports/137064, ports/137065, ports/137066, ports/137067, ports/137068, ports/137069, ports/137070, ports/137071, ports/137072, ports/137074, ports/137075, ports/137076, ports/137077, ports/137078, ports/137079, ports/137080, ports/137081, ports/137082, ports/137083, ports/137084, ports/137085, ports/137086, ports/137087, ports/137088, ports/137090, ports/137091, ports/137092, ports/137093, ports/137094, ports/137095, ports/137096, ports/137097, ports/137098, ports/137099, ports/137102, ports/137103, ports/137104, ports/137107, ports/137108, ports/137109, ports/137110, ports/137111 Submitted by: Jacula Modyun (jacula (at) gmail (dot) com), Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support) Supported by: wxs (review, amd64 testing), tabthorpe (8.x testing) Approved by: tabthorpe (mentor), respective maintainers
22 lines
1 KiB
Haskell
22 lines
1 KiB
Haskell
--- src/hmake/PackageConfig.hs.orig 2008-04-25 10:28:08.000000000 +0000
|
|
+++ src/hmake/PackageConfig.hs 2009-07-16 07:57:07.000000000 +0000
|
|
@@ -55,7 +55,7 @@
|
|
-- ghcpkg <- runAndReadStdout
|
|
-- ("echo `" ++ ghc ++ " --print-libdir`/bin/ghc-pkg")
|
|
-- pkgs <- runAndReadStdout (ghcpkg++" --list-packages")
|
|
- pkgs <- runAndReadStdout (ghcpkg++" -l")
|
|
+ pkgs <- runAndReadStdout (ghcpkg++" list")
|
|
let (ok,bad) = partition (\p-> elemBy versionMatch p (deComma pkgs))
|
|
packages
|
|
when (not (null bad))
|
|
@@ -63,8 +63,8 @@
|
|
++concat (intersperse ", " bad)
|
|
++" not available (according to ghc-pkg)"))
|
|
idirs <- mapM (\p-> runAndReadStdout
|
|
- (ghcpkg++" --show-package="++p
|
|
- ++" --field=import_dirs"))
|
|
+ (ghcpkg++" field "++p
|
|
+ ++" import_dirs"))
|
|
ok
|
|
return (pkgDirs libdir idirs)
|
|
where
|