cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ghc-6.0.1, bugfixes

Browse Source 
From: Don Stewart <dons at cse.unsw.edu.au>
This commit is contained in:
avsm 2003-08-03 18:07:27 +00:00
parent 2067870276
commit 858e226b6b
6 changed files with 955 additions and 916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/ghc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2003/08/01 14:03:39 avsm Exp $
# $OpenBSD: Makefile,v 1.6 2003/08/03 18:07:27 avsm Exp $
# Based on Simon Marlow's port script for FreeBSD:
# $FreeBSD: ports/lang/ghc/Makefile,v 1.13 2002/08/22 12:53:38 obraun Exp $
#
@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386
COMMENT= "compiler for the functional language Haskell"
COMMENT-doc= "documentation for the functional language Haskell"
FULLVER= 6.0
FULLVER= 6.0.1
BOOTVER= 4.08.2
DISTNAME= ghc-${FULLVER}
@ -51,7 +51,7 @@ DOC_DIR= ${PREFIX}/share/doc/ghc
DISTFILES= ghc-${FULLVER}-src.tar.bz2 ghc-${BOOTVER}-src.tar.bz2:0 \
${DOC_FILES:C/(.+)/\1.html.tar.gz:1/g} \
ghc-regress-${FULLVER}.0.tar.bz2:2
ghc-regress-${FULLVER}.tar.bz2:2
.if ${MACHINE_ARCH} == "i386"
HCSRC=ghc-${BOOTVER}-x86-hc.tar.bz2:0
@ -62,7 +62,7 @@ DISTFILES= ghc-${FULLVER}-src.tar.bz2 ghc-${BOOTVER}-src.tar.bz2:0 \
DISTFILES+= ${HCSRC}
REGRESS_DEPENDS=::lang/python/2.2
REGRESS_RESULT=${WRKSRC}/${ARCH}.test.result
REGRESS_RESULT=${WRKSRC}/actual.result
REGRESS_FLAGS=TEST_HC="${WRKSRC}/ghc/compiler/stage2/ghc-inplace"
REGRESS_FLAGS+=EXTRA_RUNTEST_OPTS="--output-summary=${REGRESS_RESULT}"

48
lang/ghc/distinfo
View File

@ -1,24 +1,24 @@
MD5 (ghc-6.0/building.html.tar.gz) = bc51d3e5bf568102620ff222e9a423d0
MD5 (ghc-6.0/ghc-4.08.2-src.tar.bz2) = c5199db1c12cc633970dfe920f50244d
MD5 (ghc-6.0/ghc-4.08.2-x86-hc.tar.bz2) = d25dd1062b09af699f8361fb35394587
MD5 (ghc-6.0/ghc-6.0-src.tar.bz2) = d0eb15ac5a37a2a695bb8c2c638f96b7
MD5 (ghc-6.0/ghc-regress-6.0.0.tar.bz2) = 6b93502584eac865ec4f46ebbecdd254
MD5 (ghc-6.0/hslibs.html.tar.gz) = 449d9cb6790ae6b1fbc3d73d4805f746
MD5 (ghc-6.0/libraries.html.tar.gz) = 11533511f48164eb194b6219b4781110
MD5 (ghc-6.0/users_guide.html.tar.gz) = a22d26752dae8b488092e365bcf42ccb
RMD160 (ghc-6.0/building.html.tar.gz) = d77d20f7c7a4e43e03c24c74cb74cf397649734a
RMD160 (ghc-6.0/ghc-4.08.2-src.tar.bz2) = 3d6e946d8f8cd29ff7e7361fe39d21563c147246
RMD160 (ghc-6.0/ghc-4.08.2-x86-hc.tar.bz2) = 1f6b07d886cbbdbb55ecf49eb089f98bef4d278c
RMD160 (ghc-6.0/ghc-6.0-src.tar.bz2) = 43ef0c979d72238e7351ee923b9af567079e04b7
RMD160 (ghc-6.0/ghc-regress-6.0.0.tar.bz2) = a38895c19bd528e04830779e296a133e205377f5
RMD160 (ghc-6.0/hslibs.html.tar.gz) = 2c835575f9aceb553835827445ac2f652736d05b
RMD160 (ghc-6.0/libraries.html.tar.gz) = 02eb76066a7f24e894dccf4c39b0ab9633f03b2d
RMD160 (ghc-6.0/users_guide.html.tar.gz) = da00d046a3346fb18f47c878f8f2e8367457abb2
SHA1 (ghc-6.0/building.html.tar.gz) = b7432d60e419eaf3b325249e82209048e26377c3
SHA1 (ghc-6.0/ghc-4.08.2-src.tar.bz2) = 6306a50ca98c99dc592744e9d087d20c375fea51
SHA1 (ghc-6.0/ghc-4.08.2-x86-hc.tar.bz2) = 69bec01b08dbf01276541ee42617de6f70bdd626
SHA1 (ghc-6.0/ghc-6.0-src.tar.bz2) = b8e3c07ac38eaa4298776cdd63a6dd0c95f6bb6f
SHA1 (ghc-6.0/ghc-regress-6.0.0.tar.bz2) = 2ea66e2d01d0ffd9a676701723478f2b1bb6e227
SHA1 (ghc-6.0/hslibs.html.tar.gz) = 4fbd935fe8a1a117b92988ff5645595b7973baf7
SHA1 (ghc-6.0/libraries.html.tar.gz) = f3e10f3049acb0f0e2cba5ec6f223335d4938625
SHA1 (ghc-6.0/users_guide.html.tar.gz) = 10b007987c60cb4952770a1f1d424afb728d0e31
MD5 (ghc-6.0.1/building.html.tar.gz) = 1d654d0c522dbd614c8cf8f000974103
MD5 (ghc-6.0.1/ghc-4.08.2-src.tar.bz2) = c5199db1c12cc633970dfe920f50244d
MD5 (ghc-6.0.1/ghc-4.08.2-x86-hc.tar.bz2) = d25dd1062b09af699f8361fb35394587
MD5 (ghc-6.0.1/ghc-6.0.1-src.tar.bz2) = 6e258de758b34905ecfc636a38fa9e23
MD5 (ghc-6.0.1/ghc-regress-6.0.1.tar.bz2) = 2c5db22a8a84e70f5fb9e2f8dfcb6b57
MD5 (ghc-6.0.1/hslibs.html.tar.gz) = 817a4ff412976a2f712593ccf83f5b12
MD5 (ghc-6.0.1/libraries.html.tar.gz) = 2cf4d165c302b9ea3b4ffd759af1bb65
MD5 (ghc-6.0.1/users_guide.html.tar.gz) = 5c4a1873b1279d7cb79a00e821dc3045
RMD160 (ghc-6.0.1/building.html.tar.gz) = 2c42b086d4d41743a45229025de667755deed329
RMD160 (ghc-6.0.1/ghc-4.08.2-src.tar.bz2) = 3d6e946d8f8cd29ff7e7361fe39d21563c147246
RMD160 (ghc-6.0.1/ghc-4.08.2-x86-hc.tar.bz2) = 1f6b07d886cbbdbb55ecf49eb089f98bef4d278c
RMD160 (ghc-6.0.1/ghc-6.0.1-src.tar.bz2) = af7fed1536810be70bd4427b8e1ec53f8f172b01
RMD160 (ghc-6.0.1/ghc-regress-6.0.1.tar.bz2) = a83f4831d272984d7a3c4b96069dcc41f70b351e
RMD160 (ghc-6.0.1/hslibs.html.tar.gz) = 356e76aaaa2a0cd089dfdb90659af0eee2760827
RMD160 (ghc-6.0.1/libraries.html.tar.gz) = ef66cb1940c5d43acfc6c3a9eec0febaffb5bd09
RMD160 (ghc-6.0.1/users_guide.html.tar.gz) = e233eddf51a63182093f53b63d3c5648744796f9
SHA1 (ghc-6.0.1/building.html.tar.gz) = 413d5670dddce3a7f31e39fe83c67f32acacd49d
SHA1 (ghc-6.0.1/ghc-4.08.2-src.tar.bz2) = 6306a50ca98c99dc592744e9d087d20c375fea51
SHA1 (ghc-6.0.1/ghc-4.08.2-x86-hc.tar.bz2) = 69bec01b08dbf01276541ee42617de6f70bdd626
SHA1 (ghc-6.0.1/ghc-6.0.1-src.tar.bz2) = beeeddb18da37d95dd655fdf507dfa0700c7a025
SHA1 (ghc-6.0.1/ghc-regress-6.0.1.tar.bz2) = 4a558414064f3afa257338915e058b9abc805e12
SHA1 (ghc-6.0.1/hslibs.html.tar.gz) = 856fb4154bab2a1501563c6fd65667663a79e0ba
SHA1 (ghc-6.0.1/libraries.html.tar.gz) = 699a823f3d47ae4ec4d72e0f191314f715eb1a9b
SHA1 (ghc-6.0.1/users_guide.html.tar.gz) = 8adf7608dfe05a0e30b83bd964ec21ef93808db8

11
lang/ghc/patches/patch-Makefile
View File

@ -1,14 +1,15 @@
Add a "check" target to make regress work nicely.
--- Makefile.orig Thu May 29 23:55:03 2003
+++ Makefile Fri Jul 11 00:42:00 2003
@@ -421,3 +421,16 @@
--- Makefile.orig Sat Jul 26 00:44:43 2003
+++ Makefile Sun Aug 3 15:46:52 2003
@@ -420,3 +420,17 @@
# -----------------------------------------------------------------------------
+check::
+ ( cd testsuite/tests/ghc-regress ; $(MAKE) $(MFLAGS) )
+ @(if cmp -s expected.result i386.test.result ; then \
+ @(sed 's/ started at .*$$//' actual.result > actual.result_)
+ @(if cmp -s expected.result actual.result_ ; then \
+ echo "All is good!" ; \
+ else \
+ echo ;\
@ -17,5 +18,5 @@ Add a "check" target to make regress work nicely.
+ echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@";\
+ echo ;\
+ echo "here is a diff:" ;\
+ diff -u expected.result i386.test.result ;\
+ diff -u expected.result actual.result_ ;\
+ fi ; exit 0 )

15
lang/ghc/patches/patch-___ghc-4_08_2_distrib_hc-build Normal file
View File

@ -0,0 +1,15 @@
This knocks five minutes of the build time on my 2.4Ghz x86,
probably hours on really slow machines. There is no semantic
difference.
--- ../ghc-4.08.2/distrib/hc-build.orig Sun Aug 3 17:20:59 2003
+++ ../ghc-4.08.2/distrib/hc-build Sun Aug 3 17:21:05 2003
@@ -16,6 +16,7 @@
GhcLibHcOpts = -O
SRC_HAPPY_OPTS += -c
GhcLibWays=
+SplitObjs=NO
END
# touch happy generated files; so that in non-bootstrapping mode for

1781
lang/ghc/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff

8
lang/ghc/pkg/PLIST-doc
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-doc,v 1.2 2003/07/20 21:57:11 avsm Exp $
@comment $OpenBSD: PLIST-doc,v 1.3 2003/08/03 18:07:27 avsm Exp $
share/doc/ghc/base/Control.Arrow.html
share/doc/ghc/base/Control.Concurrent.Chan.html
share/doc/ghc/base/Control.Concurrent.MVar.html
@ -648,10 +648,10 @@ share/doc/ghc/users_guide/win32-dlls.html
share/doc/ghc/users_guide/win32.html
share/doc/ghc/users_guide/wrong-compilee.html
share/doc/ghc/users_guide/wrong.html
share/doc/ghc/users_guide/x10563.html
share/doc/ghc/users_guide/x10567.html
share/doc/ghc/users_guide/x10576.html
share/doc/ghc/users_guide/x10580.html
share/doc/ghc/users_guide/x1097.html
share/doc/ghc/users_guide/x1713.html
share/doc/ghc/users_guide/x1714.html
share/doc/ghc/users_guide/x978.html
@dirrm share/doc/ghc/users_guide/stylesheet-images
@dirrm share/doc/ghc/users_guide