[42265] trunk/dports/lang/ghc

[gwright at macports.org]

Revision: 42265
          http://trac.macports.org/changeset/42265
Author:   gwright at macports.org
Date:     2008-11-17 13:53:03 -0800 (Mon, 17 Nov 2008)
Log Message:
-----------
Fix the builds on ppc/Tiger, i386/Tiger and (maybe) ppc/Leopard.

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

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-aclocal.m4.diff

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2008-11-17 21:51:50 UTC (rev 42264)
+++ trunk/dports/lang/ghc/Portfile	2008-11-17 21:53:03 UTC (rev 42265)
@@ -4,7 +4,7 @@
 
 name		ghc
 version		6.10.1
-revision	1
+revision	2
 categories	lang haskell
 maintainers	gwright
 platforms	darwin
@@ -41,6 +41,7 @@
                     rmd160  34fe542788284c1e2167a955c3219e7e539eff4e
 
 patchfiles	patch-configure.ac.diff		\
+		patch-aclocal.m4.diff		\
 		patch-libraries-Makefile.diff
 
 post-patch	{
@@ -74,13 +75,15 @@
 
 platform darwin 8 powerpc {
 		global ghc_bootversion
-		set ghc_bootversion	6.6.1
+		set ghc_bootversion	6.10.1
 
 		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
 
 		distfiles-append	${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2:bootstrap
 
-                checksums-append	${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2 md5 0842380935d4ce3a2150976eff0f09a0
+                checksums-append	${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2 md5     511f4bec375b51aaa82de999529916ae		\
+                      sha1    cb6974a680168246c6e13a92818b39c559d7a2b4	\
+                      rmd160  be60cfffc0ed223fb39ce2fe40ad501486564f0e
 
 		extract.only		${name}-${version}-src.tar.bz2 \
 					${name}-${version}-src-extralibs.tar.bz2 \
@@ -94,25 +97,27 @@
 
 		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
 
-		distfiles-append	${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap.tar.bz2:bootstrap
+		distfiles-append	${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2:bootstrap
 
-		checksums-append	${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap.tar.bz2 md5 f86c72775f1b1d07867c1e7be46af680
+		checksums-append	${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap.tar.bz2 md5 f01663cecefd50b5f1e1f524f49cd6df
 
 		extract.only		${name}-${version}-src.tar.bz2 \
 					${name}-${version}-src-extralibs.tar.bz2 \
-					${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap.tar.bz2
+					${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2
 }
 
 
 platform darwin 9 powerpc {
 		global ghc_bootversion
-		set ghc_bootversion	6.8.2
+		set ghc_bootversion	6.10.1
 
 		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
 
 		distfiles-append	${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2:bootstrap
 
-		checksums-append	${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2 md5 2b24f840b8b1b6cb69b524aaa885aa59
+                checksums-append	${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2 md5     511f4bec375b51aaa82de999529916ae	\
+                        sha1    cb6974a680168246c6e13a92818b39c559d7a2b4\
+                        rmd160  be60cfffc0ed223fb39ce2fe40ad501486564f0e
 
 		extract.only		${name}-${version}-src.tar.bz2 \
 					${name}-${version}-src-extralibs.tar.bz2 \
@@ -169,7 +174,11 @@
 		set cfg [open "${workpath}/ghc-bootstrap/bin/hsc2hs" w]
 		puts $cfg "#!/bin/sh"
 		puts $cfg "HSC2HSBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/hsc2hs-bin"
-		puts $cfg "tflag=\"--template=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/template-hsc.h\""
+		if {${ghc_bootversion} eq "6.10.1"} {
+			puts $cfg "tflag=\"--template=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/hsc2hs-0.67/template-hsc.h\""
+		} else {
+			puts $cfg "tflag=\"--template=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/template-hsc.h\""
+		}
 		puts $cfg "for arg do"
 		puts $cfg "    case \"\$arg\" in"
 		puts $cfg "        -c*)	         HSC2HS_EXTRA=;;"
@@ -188,7 +197,6 @@
 	  	puts $cfg "#"
 	  	puts $cfg "# Local configuration overrides for MacPorts"
 	  	puts $cfg "#"
-	  	puts $cfg "SRC_CC_OPTS += -I${prefix}/include"
 	  	puts $cfg "SRC_HC_OPTS += -I${prefix}/include -L${prefix}/lib"
 	  	puts $cfg "EXTRA_HSC2HS_OPTS += -I${prefix}/include"
 	  	puts $cfg "EXTRA_LD_OPTS += -L${prefix}/lib"

Added: trunk/dports/lang/ghc/files/patch-aclocal.m4.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-aclocal.m4.diff	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-aclocal.m4.diff	2008-11-17 21:53:03 UTC (rev 42265)
@@ -0,0 +1,11 @@
+--- aclocal.m4.sav	2008-11-13 19:44:03.000000000 -0500
++++ aclocal.m4	2008-11-13 19:45:54.000000000 -0500
+@@ -885,7 +885,7 @@
+ AC_DEFUN([FP_PROG_GHC_PKG],
+ [AC_CACHE_CHECK([for ghc-pkg matching $WithGhc], fp_cv_matching_ghc_pkg,
+ [fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'`
+-if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1; then
++if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1 || "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
+   fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
+ else
+   fp_cv_matching_ghc_pkg=no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081117/257b3c64/attachment.html>