[51205] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Wed May 20 12:34:46 PDT 2009
Revision: 51205
http://trac.macports.org/changeset/51205
Author: gwright at macports.org
Date: 2009-05-20 12:34:46 -0700 (Wed, 20 May 2009)
Log Message:
-----------
Version bump to 6.10.3.
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
trunk/dports/lang/ghc/files/patch-aclocal.m4.diff
trunk/dports/lang/ghc/files/patch-configure.ac.diff
trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
Removed Paths:
-------------
trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff
trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff
trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/Portfile 2009-05-20 19:34:46 UTC (rev 51205)
@@ -4,7 +4,7 @@
name ghc
set canonicalname ghc
-version 6.10.2
+version 6.10.3
categories lang haskell
maintainers gwright
platforms darwin
@@ -32,17 +32,17 @@
testsuite-${version}.tar.bz2
checksums ${canonicalname}-${version}-src.tar.bz2 \
- md5 243d5857e5aa5f2f86e5e4c4437973fb \
- sha1 55a7bae8f9f114b3dddd19cba87479ddfb91c804 \
- rmd160 a943a30c6ee91d4c4f92dd5d14e4fe80eb78567e \
+ md5 3de6a6d434c2b43def10c4cc613b265e \
+ sha1 598bef94c99011a4f6791b8fbb7153ba7dffaf92 \
+ rmd160 90b01fefd474a64cf6b6b507f224abf6250745d3 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
- md5 9415604386ca69ebe15f1054653aefaf \
- sha1 faef7d9aa3f08e24bf5a6b9aed234d05c649829d \
- rmd160 08d4ecb6b3042bde066ec0368112d74f5b7c2fdc \
+ md5 d0fe09625556ea274df11d601c1b2a15 \
+ sha1 4c208e0d4e604b39bcd7da753183a9f259408864 \
+ rmd160 7a0b46f9934f154fc897fcd44f7f79d4d98c1e94 \
testsuite-${version}.tar.bz2 \
- md5 ed6f38347a791a69f1c3d0bc5a6780cb \
- sha1 6622e2009b994a75b32f2cb96f6ba6dc7501db19 \
- rmd160 ce8f850e504ade151de6146732de05ff24c341db \
+ md5 8db949b5bca633b665952daaf2c4ad1c \
+ sha1 f857e5642f1beda71d0f96d96e02c45d953edd23 \
+ rmd160 723b12fed8250647ceaf89233153765a09a7b743 \
# ghc does not support a universal build:
universal_variant no
@@ -52,10 +52,7 @@
#
patchfiles patch-configure.ac.diff \
patch-aclocal.m4.diff \
- patch-libraries-Makefile.diff \
- patch-compiler-ghc.cabal.in.diff \
- patch-testsuite-timeout-Makefile.diff \
- patch-testsuite-mk-boilerplate.mk.diff
+ patch-libraries-Makefile.diff
depends_lib port:libedit \
port:gmp
@@ -101,6 +98,15 @@
extract.only ${canonicalname}-${version}-src.tar.bz2 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
${canonicalname}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2
+
+ pre-fetch {
+ set minimum_xcodeversion 2.5
+ set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+ if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ return -code error "incompatible Xcode version"
+ }
+ }
}
@@ -117,6 +123,15 @@
extract.only ${canonicalname}-${version}-src.tar.bz2 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
${canonicalname}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2
+
+ pre-fetch {
+ set minimum_xcodeversion 3.1.2
+ set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+ if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ return -code error "incompatible Xcode version"
+ }
+ }
}
@@ -135,6 +150,15 @@
extract.only ${canonicalname}-${version}-src.tar.bz2 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
${canonicalname}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2
+
+ pre-fetch {
+ set minimum_xcodeversion 3.1.2
+ set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+ if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ return -code error "incompatible Xcode version"
+ }
+ }
}
@@ -151,6 +175,15 @@
extract.only ${canonicalname}-${version}-src.tar.bz2 \
${canonicalname}-${version}-src-extralibs.tar.bz2 \
${canonicalname}-${ghc_bootversion}-darwin-i386-leopard-bootstrap.tar.bz2
+
+ pre-fetch {
+ set minimum_xcodeversion 3.1.1
+ set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+ if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ return -code error "incompatible Xcode version"
+ }
+ }
}
@@ -162,7 +195,7 @@
post-patch {
reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
- reinplace "s|XXPATH_TO_GMP_LIBRARYXX|${prefix}/lib|" ${worksrcpath}/compiler/ghc.cabal.in
+# reinplace "s|XXPATH_TO_GMP_LIBRARYXX|${prefix}/lib|" ${worksrcpath}/compiler/ghc.cabal.in
reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
@@ -222,6 +255,8 @@
puts $cfg "SRC_HC_OPTS += -I${prefix}/include -L${prefix}/lib"
puts $cfg "EXTRA_HSC2HS_OPTS += -I${prefix}/include --lflag=\"-L${prefix}/lib\""
puts $cfg "EXTRA_LD_OPTS += -L${prefix}/lib"
+ puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${prefix}/include"
+ puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${prefix}/lib"
close $cfg
}
Modified: trunk/dports/lang/ghc/files/patch-aclocal.m4.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-aclocal.m4.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-aclocal.m4.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,11 +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 @@
+--- aclocal.m4.sav 2009-05-19 11:44:21.000000000 -0400
++++ aclocal.m4 2009-05-19 11:44:38.000000000 -0400
+@@ -805,7 +805,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
+ elif "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
+ # from 6.10, ghc-pkg doesn't support the old -l syntax any more
Deleted: trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-compiler-ghc.cabal.in.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,10 +0,0 @@
---- compiler/ghc.cabal.in.sav 2008-11-20 11:22:10.000000000 -0500
-+++ compiler/ghc.cabal.in 2008-11-20 11:24:13.000000000 -0500
-@@ -76,6 +76,7 @@
- CPP-Options: -DUSE_EDITLINE
-
- GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
-+ extra-lib-dirs: XXPATH_TO_GMP_LIBRARYXX
-
- if flag(ghci)
- Build-Depends: template-haskell
Modified: trunk/dports/lang/ghc/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-configure.ac.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,6 +1,6 @@
---- configure.ac.sav 2008-11-05 17:01:38.000000000 -0500
-+++ configure.ac 2008-11-05 17:01:51.000000000 -0500
-@@ -1126,19 +1126,19 @@
+--- configure.ac.sav 2009-05-19 11:45:21.000000000 -0400
++++ configure.ac 2009-05-19 11:45:35.000000000 -0400
+@@ -1138,19 +1138,19 @@
dnl ** (Mac OS X only: check for GMP.framework)
HaveFrameworkGMP=NO
Modified: trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,6 +1,6 @@
---- libraries/Makefile.sav 2008-11-11 13:35:39.000000000 -0500
-+++ libraries/Makefile 2008-11-11 13:39:03.000000000 -0500
-@@ -145,7 +145,7 @@
+--- libraries/Makefile.sav 2009-05-19 11:46:49.000000000 -0400
++++ libraries/Makefile 2009-05-19 11:47:02.000000000 -0400
+@@ -153,7 +153,7 @@
cd Cabal && $(CABAL) build --distpref=dist-bootstrapping
cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace
-cd hpc && $(CABAL) clean --distpref=dist-bootstrapping
Deleted: trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-testsuite-mk-boilerplate.mk.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,41 +0,0 @@
---- testsuite-6.10.2/mk/boilerplate.mk.sav 2009-04-03 09:33:32.000000000 -0400
-+++ testsuite-6.10.2/mk/boilerplate.mk 2009-04-03 09:54:26.000000000 -0400
-@@ -53,6 +53,7 @@
- OLD_BUILD_SYSTEM_STAGE2_GHC := $(abspath $(TOP)/../ghc/stage2-inplace/ghc)
- OLD_BUILD_SYSTEM_STAGE3_GHC := $(abspath $(TOP)/../ghc/stage3-inplace/ghc)
- OLD_BUILD_SYSTEM_GHC_PKG := $(abspath $(TOP)/../utils/ghc-pkg/install-inplace/bin/ghc-pkg)
-+OLD_BUILD_SYSTEM_HSC2HS := $(abspath $(TOP)/../utils/hsc2hs/install-inplace/bin/hsc2hs)
- OLD_BUILD_SYSTEM_HP2PS := $(abspath $(TOP)/../utils/hp2ps/hp2ps)
- ifneq "$(wildcard $(OLD_BUILD_SYSTEM_STAGE1_GHC) $(OLD_BUILD_SYSTEM_STAGE1_GHC).exe)" ""
-
-@@ -67,6 +68,7 @@
- endif
- endif
- GHC_PKG := $(OLD_BUILD_SYSTEM_GHC_PKG)
-+HSC2HS := $(OLD_BUILD_SYSTEM_HSC2HS)
- HP2PS_ABS := $(OLD_BUILD_SYSTEM_HP2PS)
- # XXX This GCC definition is a hack. Once the in-tree GHC has a gcc in the
- # right place we won't need to do this, as Cabal will be able to find
-@@ -105,6 +107,10 @@
- GHC_PKG := $(dir $(TEST_HC))/ghc-pkg
- endif
-
-+ifeq "$(HSC2HS)" ""
-+HSC2HS := $(dir $(TEST_HC))/hsc2hs
-+endif
-+
- ifeq "$(HP2PS_ABS)" ""
- HP2PS_ABS := $(dir $(TEST_HC))/hp2ps
- endif
-@@ -119,6 +125,11 @@
- $(error Cannot find ghc-pkg: $(GHC_PKG))
- endif
-
-+$(eval $(call canonicaliseExecutable,HSC2HS))
-+ifeq "$(wildcard $(HSC2HS))" ""
-+$(error Cannot find ghc-pkg: $(HSC2HS))
-+endif
-+
- $(eval $(call canonicaliseExecutable,HP2PS_ABS))
- ifeq "$(wildcard $(HP2PS_ABS))" ""
- $(error Cannot find hp2ps: $(HP2PS_ABS))
Deleted: trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff 2009-05-20 19:21:01 UTC (rev 51204)
+++ trunk/dports/lang/ghc/files/patch-testsuite-timeout-Makefile.diff 2009-05-20 19:34:46 UTC (rev 51205)
@@ -1,10 +0,0 @@
---- testsuite-6.10.2/timeout/Makefile.sav 2009-04-03 09:03:11.000000000 -0400
-+++ testsuite-6.10.2/timeout/Makefile 2009-04-03 08:45:16.000000000 -0400
-@@ -32,6 +32,7 @@
- $(TEST_HC) --make Setup
- ./Setup configure --with-compiler=$(TEST_HC) \
- --with-hc-pkg=$(GHC_PKG) \
-+ --with-hsc2hs=$(HSC2HS) \
- $(WITH_GCC) \
- --ghc-option=-threaded --prefix=$(PREFIX)
- ./Setup build
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090520/b702a55c/attachment-0001.html>
More information about the macports-changes
mailing list