diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 02455b760f3..251647974e0 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.84 2012/10/11 11:05:02 kili Exp $ +# $OpenBSD: Makefile,v 1.85 2012/11/05 20:20:07 kili Exp $ COMMENT-main = compiler for the functional language Haskell COMMENT-doc = documentation for GHC @@ -11,7 +11,7 @@ COMMENT-doc = documentation for GHC DISTNAME = ghc-${MODGHC_VER} PKGNAME-main = ghc-${MODGHC_VER} -REVISION-main = 1 +REVISION-main = 2 PKGNAME-doc = ghc-doc-${MODGHC_VER} CATEGORIES = lang devel HOMEPAGE = http://www.haskell.org/ghc/ diff --git a/lang/ghc/patches/patch-utils_ghc-pkg_Main_hs b/lang/ghc/patches/patch-utils_ghc-pkg_Main_hs new file mode 100644 index 00000000000..a849e7b88d0 --- /dev/null +++ b/lang/ghc/patches/patch-utils_ghc-pkg_Main_hs @@ -0,0 +1,17 @@ +$OpenBSD: patch-utils_ghc-pkg_Main_hs,v 1.1 2012/11/05 20:20:07 kili Exp $ + +Horrible hack to get rid of the annoying warnings when running +pkg_add -u. This means that you do NOT get any such warning when +running ghc-pkg unregister ... -v0 --force. + +--- utils/ghc-pkg/Main.hs.orig Wed Jun 6 19:10:25 2012 ++++ utils/ghc-pkg/Main.hs Sun Nov 4 20:45:43 2012 +@@ -915,7 +915,7 @@ modifyPackage fn pkgid verbosity my_flags force = do + new_broken = map sourcePackageId (brokenPackages (allPackagesInStack new_stack)) + newly_broken = filter (`notElem` map sourcePackageId old_broken) new_broken + -- +- when (not (null newly_broken)) $ ++ when (not (null newly_broken || (force == ForceAll && verbosity <= Silent))) $ + dieOrForceAll force ("unregistering " ++ display pkgid ++ + " would break the following packages: " + ++ unwords (map display newly_broken))