Let Cabal-generated register.sh and unregister.sh scripts pass
paraemters to ghc-pkg. Remove the (now obsolete) patch for Register.hs.
Ports that build ghc libraries should now use the following
@exec/@unexec magic (('ve already diffs for all the hs-* ports in
my tree):
lib/${DISTNAME}/register.sh
@exec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/register.sh -v0
@unexec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/unregister.sh -v0
--force
lib/${DISTNAME}/unregister.sh
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 16 May 2010 13:51:26 -0000 1.33
+++ Makefile 16 May 2010 19:05:18 -0000
@@ -4,7 +4,7 @@ COMMENT-main = compiler for the functio
COMMENT-doc = documentation for GHC
DISTNAME = ghc-${MODGHC_VER}
-PKGNAME-main = ghc-${MODGHC_VER}p2
+PKGNAME-main = ghc-${MODGHC_VER}p3
PKGNAME-doc = ghc-doc-${MODGHC_VER}p0
CATEGORIES = lang devel
HOMEPAGE = http://www.haskell.org/ghc/
Index: patches/patch-libraries_Cabal_Distribution_Simple_Program_Script_hs
===================================================================
RCS file: patches/patch-libraries_Cabal_Distribution_Simple_Program_Script_hs
diff -N patches/patch-libraries_Cabal_Distribution_Simple_Program_Script_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_Cabal_Distribution_Simple_Program_Script_hs 16 May
2010 19:05:18 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Pass additional parameters in generated shell scripts (and simplify).
+
+--- libraries/Cabal/Distribution/Simple/Program/Script.hs.orig Tue Apr 20
20:10:12 2010
++++ libraries/Cabal/Distribution/Simple/Program/Script.hs Sun May 16
11:52:14 2010
+@@ -50,7 +50,7 @@ invocationAsShellScript
+ ++ [ (case minput of
+ Nothing -> ""
+ Just input -> "echo " ++ quote input ++ " | ")
+- ++ quote path ++ concatMap (\arg -> ' ':quote arg) args ]
++ ++ unwords (map quote $ path : args) ++ " \"$...@\""]
+
+ where
+ quote :: String -> String
Index: patches/patch-libraries_Cabal_Distribution_Simple_Register_hs
===================================================================
RCS file: patches/patch-libraries_Cabal_Distribution_Simple_Register_hs
diff -N patches/patch-libraries_Cabal_Distribution_Simple_Register_hs
--- patches/patch-libraries_Cabal_Distribution_Simple_Register_hs 22 Apr
2010 21:49:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libraries_Cabal_Distribution_Simple_Register_hs,v 1.2
2010/04/22 21:49:37 kili Exp $
---- libraries/Cabal/Distribution/Simple/Register.hs.orig Wed Mar 31
20:10:21 2010
-+++ libraries/Cabal/Distribution/Simple/Register.hs Fri Apr 2 09:45:09 2010
-@@ -404,7 +404,7 @@ unregister pkg lbi regFlags = do
- case compilerFlavor (compiler lbi) of
- GHC ->
- let Just ghcPkg = lookupProgram ghcPkgProgram (withPrograms lbi)
-- invocation = HcPkg.unregisterInvocation ghcPkg Verbosity.normal
-+ invocation = HcPkg.unregisterInvocation ghcPkg Verbosity.silent
- packageDb pkgid
- in if genScript
- then writeFileAtomic unregScriptFileName
