This is not to be committed. I'm now running make regress (on amd64)
and will compare results against 7.0.3 and report any new test
failures to the ghc guys.
If anyone has an i386 and want's to burn some cpu time, feel free
to do the same ;-)
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 25 Apr 2011 22:06:43 -0000 1.55
+++ Makefile 5 Jun 2011 22:47:27 -0000
@@ -42,7 +42,7 @@ WANTLIB-main = ${WANTLIB} c gmp m ncurs
WANTLIB-doc =
-MASTER_SITES = ${HOMEPAGE}dist/${MODGHC_VER}/ \
+MASTER_SITES = ${HOMEPAGE}dist/7.0.4-rc1/ \
${HOMEPAGE}dist/stable/dist/
MASTER_SITES0 = http://openbsd.dead-parrot.de/distfiles/
@@ -90,7 +90,8 @@ FAKE_FLAGS += CREATE_DATA="${INSTALL_DA
# For mktexpk (via dvips when building the PostScript documentation):
PORTHOME = ${WRKDIR}
-BUILD_DEPENDS += devel/haddock,no_deps:patch
+# Not for the release candidate:
+#BUILD_DEPENDS += devel/haddock,no_deps:patch
REGRESS_DEPENDS = print/ghostscript/gnu
@@ -100,12 +101,13 @@ post-extract:
./configure --prefix=${WRKDIR} && \
${MAKE_PROGRAM} install
rm -rf ${WRKDIR}/ghc-${BIN_VER}
-# - Replace utils/haddock by the version from the ports tree.
- mv ${WRKSRC}/utils/haddock{,-ghcdist}
- mv ${WRKDIR}/devel/haddock/haddock-* ${WRKSRC}/utils/haddock
-. for f in ghc.mk doc/ghc.mk haddock.wrapper
- cp -p ${WRKSRC}/utils/haddock{-ghcdist,}/$f
-. endfor
+# Not for the release candidate:
+## - Replace utils/haddock by the version from the ports tree.
+# mv ${WRKSRC}/utils/haddock{,-ghcdist}
+# mv ${WRKDIR}/devel/haddock/haddock-* ${WRKSRC}/utils/haddock
+#. for f in ghc.mk doc/ghc.mk haddock.wrapper
+# cp -p ${WRKSRC}/utils/haddock{-ghcdist,}/$f
+#. endfor
post-patch:
${SUBST_CMD} ${WRKSRC}/docs/index.html
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ghc/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo 23 Apr 2011 20:52:00 -0000 1.24
+++ distinfo 5 Jun 2011 22:47:27 -0000
@@ -1,20 +1,20 @@
MD5 (ghc/ghc-6.12.3.20101121-amd64-unknown-openbsd.tar.bz2) =
IQ6FvB0LOTvXIY1z7E26dA==
MD5 (ghc/ghc-6.12.3.20101121-i386-unknown-openbsd.tar.bz2) =
zVTNo1qqvM3a6+T+VrYymA==
-MD5 (ghc/ghc-7.0.3-src.tar.bz2) = ELxemuG1gUBDdu+4XyYP8w==
-MD5 (ghc/testsuite-7.0.3.tar.bz2) = XQgF0Ye1xw4xhLkvuDZcog==
+MD5 (ghc/ghc-7.0.3.20110531-src.tar.bz2) = hfEDtoGFWF7rop/fUGbIqQ==
+MD5 (ghc/testsuite-7.0.3.20110531.tar.bz2) = KfAB6uVjrKzLCCSCTG8JVw==
RMD160 (ghc/ghc-6.12.3.20101121-amd64-unknown-openbsd.tar.bz2) =
ItHT3PpKQf3/uWZmrBlSjWk/aNE=
RMD160 (ghc/ghc-6.12.3.20101121-i386-unknown-openbsd.tar.bz2) =
nDDNC7njDaRMkAgjWNiY0vpOBq0=
-RMD160 (ghc/ghc-7.0.3-src.tar.bz2) = vfmzWLyYUkzI0B2OMbAZe+RxJOE=
-RMD160 (ghc/testsuite-7.0.3.tar.bz2) = sxTffUk4WQw8vFwP9cPe24fh6Vs=
+RMD160 (ghc/ghc-7.0.3.20110531-src.tar.bz2) = XTAjSWNlp2YN5t65oTq91HqbdWg=
+RMD160 (ghc/testsuite-7.0.3.20110531.tar.bz2) = WmhSwTBzA8iq8TYUAczdYQEgBdY=
SHA1 (ghc/ghc-6.12.3.20101121-amd64-unknown-openbsd.tar.bz2) =
5QpZOKQh3ohtLnt0MABH4nBJZ0g=
SHA1 (ghc/ghc-6.12.3.20101121-i386-unknown-openbsd.tar.bz2) =
OMLt3oJBN9kH8Zk9jf3T+LED618=
-SHA1 (ghc/ghc-7.0.3-src.tar.bz2) = Ii7tlJQTcjsfRSGKkI1e5pMP2hs=
-SHA1 (ghc/testsuite-7.0.3.tar.bz2) = YrWWEclvtoMSviKzrD34G8Tg6nw=
+SHA1 (ghc/ghc-7.0.3.20110531-src.tar.bz2) = N+lIuEo6MT8JZMdkTGGAvJQr9ww=
+SHA1 (ghc/testsuite-7.0.3.20110531.tar.bz2) = vlHfrkCfZLi1m3NEZ/L+GUhwM/0=
SHA256 (ghc/ghc-6.12.3.20101121-amd64-unknown-openbsd.tar.bz2) =
PpFla5SrgfRNc1VCrKc2lF4orW1pbhZzQ1Euw0roNOE=
SHA256 (ghc/ghc-6.12.3.20101121-i386-unknown-openbsd.tar.bz2) =
oJvspljsABt8DwjULDwjks2kqwM57ke6UkL3b9IHUko=
-SHA256 (ghc/ghc-7.0.3-src.tar.bz2) =
FWFpwo2rg3kiJgoPv8yHPGeZQNgFpzbceK6xtgwTzNk=
-SHA256 (ghc/testsuite-7.0.3.tar.bz2) =
oynKm4VxMl5m96vX0s2J7mPAkOEdCwNduoTsuxzokSE=
+SHA256 (ghc/ghc-7.0.3.20110531-src.tar.bz2) =
DMXFuEMDFuOc/Ghh8P+9KPScAWhLbHo3FPdi2iz40+c=
+SHA256 (ghc/testsuite-7.0.3.20110531.tar.bz2) =
xk9bqkqJpEqC3ZXatKlpUCYPm/Sqzr03z8GtKAaZx3Y=
SIZE (ghc/ghc-6.12.3.20101121-amd64-unknown-openbsd.tar.bz2) = 47974406
SIZE (ghc/ghc-6.12.3.20101121-i386-unknown-openbsd.tar.bz2) = 48561471
-SIZE (ghc/ghc-7.0.3-src.tar.bz2) = 24201117
-SIZE (ghc/testsuite-7.0.3.tar.bz2) = 2734742
+SIZE (ghc/ghc-7.0.3.20110531-src.tar.bz2) = 24201854
+SIZE (ghc/testsuite-7.0.3.20110531.tar.bz2) = 2742985
Index: ghc.port.mk
===================================================================
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.22
diff -u -p -r1.22 ghc.port.mk
--- ghc.port.mk 23 Apr 2011 20:16:38 -0000 1.22
+++ ghc.port.mk 5 Jun 2011 22:47:27 -0000
@@ -4,7 +4,7 @@
# Not yet ported to other architectures
ONLY_FOR_ARCHS = i386 amd64
-MODGHC_VER = 7.0.3
+MODGHC_VER = 7.0.3.20110531
SUBST_VARS += MODGHC_VER
MODGHC_BIN = ${LOCALBASE}/bin/ghc
