Index: Makefile =================================================================== RCS file: /home/pcvs/ports/lang/ghc/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- Makefile 19 Apr 2010 16:22:15 -0000 1.84 +++ Makefile 20 Apr 2010 15:55:47 -0000 @@ -19,8 +19,6 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= A Compiler for the functional language Haskell -BROKEN= by the recent gmp update - ONLY_FOR_ARCHS= i386 amd64 GHC_VERSION= ${PORTVERSION} @@ -90,21 +88,31 @@ .endif .if ${ARCH} == "i386" -.if ${OSVERSION} >= 800000 -DISTFILES+= ghc-${GHC_VERSION}-i386-jm0-freebsd8-boot${EXTRACT_SUFX}:boot + +.if ${OSVERSION} >= 900000 +DISTFILES+= ghc-${GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 800000 +DISTFILES+= ghc-${GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${GHC_VERSION}-i386-jm0-freebsd7-boot${EXTRACT_SUFX}:boot +DISTFILES+= ghc-${GHC_VERSION}-i386-freebsd7-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 600000 -DISTFILES+= ghc-${GHC_VERSION}-i386-jm0-freebsd6-boot${EXTRACT_SUFX}:boot +DISTFILES+= ghc-${GHC_VERSION}-i386-freebsd6-boot${EXTRACT_SUFX}:boot +.else +IGNORE= unsupported .endif + .elif ${ARCH} == "amd64" -.if ${OSVERSION} >= 800000 -DISTFILES+= ghc-${GHC_VERSION}-amd64-ash0-freebsd8-boot${EXTRACT_SUFX}:boot + +.if ${OSVERSION} >= 900000 +DISTFILES+= ghc-${GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot +.elif ${OSVERSION} >= 800000 +DISTFILES+= ghc-${GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot .elif ${OSVERSION} >= 700000 -DISTFILES+= ghc-${GHC_VERSION}-amd64-ash0-freebsd7-boot${EXTRACT_SUFX}:boot +DISTFILES+= ghc-${GHC_VERSION}-amd64-freebsd7-boot${EXTRACT_SUFX}:boot .else -IGNORE= unsupported at the moment +IGNORE= unsupported .endif + .endif DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/lang/ghc/distinfo,v retrieving revision 1.38 diff -u -r1.38 distinfo --- distinfo 6 Dec 2009 20:56:52 -0000 1.38 +++ distinfo 20 Apr 2010 15:55:47 -0000 @@ -16,18 +16,24 @@ MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2 SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 SIZE (haddock-2.4.2.tar.gz) = 103033 -MD5 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = e528ad305e12ec45b051acf22a41929f -SHA256 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = ff39d911930e0afd79dcd312583b2ade830e0f4f11db2d6c9ee5658732332ac3 -SIZE (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = 47466113 -MD5 (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 3bb1b91d0f06af390d493d7d936b6086 -SHA256 (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 44f41b1a2d9ffee6ede9aff00288b2b7bc405d68f2cc1a092db6bb2096344e9b -SIZE (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 47556193 -MD5 (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = c4e4ce9daae4bfdda1dcc14813cb9507 -SHA256 (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = 6d411549995acf0a4759759da9c56de1330377bd1c3f65e095b7762fb454df62 -SIZE (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = 47553947 -MD5 (ghc-6.10.4-amd64-ash0-freebsd7-boot.tar.bz2) = e466e916c44be04f3c2480f17bfeef9d -SHA256 (ghc-6.10.4-amd64-ash0-freebsd7-boot.tar.bz2) = e81b511703083f38f180a39af91f5ea31988135d59010cf50b925a1f5b396d7c -SIZE (ghc-6.10.4-amd64-ash0-freebsd7-boot.tar.bz2) = 78412026 -MD5 (ghc-6.10.4-amd64-ash0-freebsd8-boot.tar.bz2) = c85ebe7ac505320a910c7b0493bce00f -SHA256 (ghc-6.10.4-amd64-ash0-freebsd8-boot.tar.bz2) = 2ef34c2f3b49bff4f611405186398c21b7f4e0c5a228ce737853f0f845945fb4 -SIZE (ghc-6.10.4-amd64-ash0-freebsd8-boot.tar.bz2) = 78499098 +MD5 (ghc-6.10.4-i386-freebsd6-boot.tar.bz2) = bd6fdae8fefff966530a3b5da7d3c678 +SHA256 (ghc-6.10.4-i386-freebsd6-boot.tar.bz2) = 4e4099c4ad723544dc97ee0c6cd9e38e1eaa00763222dad571083d2f0756f02c +SIZE (ghc-6.10.4-i386-freebsd6-boot.tar.bz2) = 39490742 +MD5 (ghc-6.10.4-i386-freebsd7-boot.tar.bz2) = f1141ac580afeffd5eb1f4acc2d04618 +SHA256 (ghc-6.10.4-i386-freebsd7-boot.tar.bz2) = bf9f983785a56538ab234b29316b01c0510a6f1c30e3e5cd43878f65d5e5d9b3 +SIZE (ghc-6.10.4-i386-freebsd7-boot.tar.bz2) = 39561575 +MD5 (ghc-6.10.4-i386-freebsd8-boot.tar.bz2) = b80dd4113dc88a84437de9911f64a9c4 +SHA256 (ghc-6.10.4-i386-freebsd8-boot.tar.bz2) = bd14311612459764f06dbad80492e69f771cac1dfa37f8bd84f7e2c9b826c762 +SIZE (ghc-6.10.4-i386-freebsd8-boot.tar.bz2) = 39575088 +MD5 (ghc-6.10.4-i386-freebsd9-boot.tar.bz2) = cf70888e7470a1b61037d2be2860aa95 +SHA256 (ghc-6.10.4-i386-freebsd9-boot.tar.bz2) = 98cb2c4015b1d99940560cd1206358d568ca2e7779aacbf44901a7541cbfb129 +SIZE (ghc-6.10.4-i386-freebsd9-boot.tar.bz2) = 39578143 +MD5 (ghc-6.10.4-amd64-freebsd7-boot.tar.bz2) = af74b5fe017b912cd69434a4b250cfb3 +SHA256 (ghc-6.10.4-amd64-freebsd7-boot.tar.bz2) = 94aebe9b4163de908463c51d923aa4b9de001fafa6a43625f32f14d9f0ba5f65 +SIZE (ghc-6.10.4-amd64-freebsd7-boot.tar.bz2) = 39398495 +MD5 (ghc-6.10.4-amd64-freebsd8-boot.tar.bz2) = 4322b97116f1fad7140782a0520a1aa1 +SHA256 (ghc-6.10.4-amd64-freebsd8-boot.tar.bz2) = 4297776df0204f40a960521870ba10165f3ab0602df2f431a31af316fc238e1a +SIZE (ghc-6.10.4-amd64-freebsd8-boot.tar.bz2) = 39414489 +MD5 (ghc-6.10.4-amd64-freebsd9-boot.tar.bz2) = c71f717821b43be98f290e13cdca753a +SHA256 (ghc-6.10.4-amd64-freebsd9-boot.tar.bz2) = dddb9e8b14c326ca517c673c6494dd16de9473ad87816f895ad4661ab203ee41 +SIZE (ghc-6.10.4-amd64-freebsd9-boot.tar.bz2) = 39414446