[20451] trunk/dports/lang/ghc

[source_changes at macosforge.org]

Revision: 20451
          http://trac.macosforge.org/projects/macports/changeset/20451
Author:   gwright at macports.org
Date:     2006-11-02 23:43:36 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
Make the Cabal build system play nicely with MacPorts.  (Cabal
creates an empty directory in the destroot which it does not
expect to be deleted.  The added patch drops a zero length
file into this directory, .cabalTurd, so it is preserved when
MacPorts deletes empty directories.)

Modified Paths:
--------------
    trunk/dports/lang/ghc/Portfile

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-GHC.hs

Removed Paths:
-------------
    trunk/dports/lang/ghc/files/patch-ghc-compiler-Makefile

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2006-11-03 06:17:10 UTC (rev 20450)
+++ trunk/dports/lang/ghc/Portfile	2006-11-03 07:43:36 UTC (rev 20451)
@@ -3,8 +3,9 @@
 PortSystem 1.0
 name		ghc
 version		6.6
+revision	1
 categories	lang
-maintainers	gwright at opendarwin.org
+maintainers	gwright at macports.org
 platforms	darwin
 description	The Glorious Glasgow Haskell Compilation System
 long_description	\
@@ -31,7 +32,8 @@
 checksums	${name}-${version}-src.tar.bz2			md5 2427a8d7d14f86e0878df6b54938acf7 \
 		${name}-${version}-src-extralibs.tar.bz2	md5 14b22fce36caffa509046361724bc119
 
-patchfiles	patch-configure.ac
+patchfiles	patch-configure.ac	\
+		patch-GHC.hs
 
 depends_lib	port:readline \
 		port:gmp

Added: trunk/dports/lang/ghc/files/patch-GHC.hs
===================================================================
--- trunk/dports/lang/ghc/files/patch-GHC.hs	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-GHC.hs	2006-11-03 07:43:36 UTC (rev 20451)
@@ -0,0 +1,14 @@
+--- libraries/Cabal/Distribution/Simple/GHC.hs.sav	2006-11-01 11:27:49.000000000 -0500
++++ libraries/Cabal/Distribution/Simple/GHC.hs	2006-11-01 11:38:09.000000000 -0500
+@@ -414,6 +414,11 @@
+ installIncludeFiles verbose pkg_descr at PackageDescription{library=Just l} libdir
+  = do
+    createDirectoryIfMissing True incdir
++
++   -- Hack to make cabal work with packaging systems
++   -- that expect to be able to delete empty directories:
++   writeFile (incdir `joinFileName` ".cabalTurd") ""
++
+    incs <- mapM (findInc relincdirs) (installIncludes lbi)
+    sequence_ [ copyFileVerbose verbose path (incdir `joinFileName` f)
+ 	     | (f,path) <- incs ]

Deleted: trunk/dports/lang/ghc/files/patch-ghc-compiler-Makefile
===================================================================
--- trunk/dports/lang/ghc/files/patch-ghc-compiler-Makefile	2006-11-03 06:17:10 UTC (rev 20450)
+++ trunk/dports/lang/ghc/files/patch-ghc-compiler-Makefile	2006-11-03 07:43:36 UTC (rev 20451)
@@ -1,12 +0,0 @@
---- ghc/compiler/Makefile.sav	2006-05-26 12:44:17.000000000 -0400
-+++ ghc/compiler/Makefile	2006-05-26 12:44:58.000000000 -0400
-@@ -395,7 +395,8 @@
- SRC_HC_OPTS += -DGHCI -package template-haskell
- 
- # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
--SRC_HC_OPTS += -threaded
-+# Disable threading for 6.4.2 on darwin (causes RTS crashes):
-+# SRC_HC_OPTS += -threaded
- 
- ALL_DIRS += ghci
- 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061102/e68bbfae/attachment.html