From 3f9a24a5c25972f202e34c03aa7562fde7dcc6fc Mon Sep 17 00:00:00 2001 From: "Chris D. Faulhaber" Date: Sat, 4 Mar 2000 13:50:17 +0000 Subject: Update port to 4.06 PR: 17115 Submitted by: Maintainer --- lang/ghc6/Makefile | 15 +++-- lang/ghc6/distinfo | 4 +- lang/ghc6/files/build.mk | 1 + lang/ghc6/pkg-plist | 166 ++++++++++++++++++++++++++++++++--------------- 4 files changed, 127 insertions(+), 59 deletions(-) (limited to 'lang/ghc6') diff --git a/lang/ghc6/Makefile b/lang/ghc6/Makefile index 9bce4706491d..7849a0b748cb 100644 --- a/lang/ghc6/Makefile +++ b/lang/ghc6/Makefile @@ -1,14 +1,14 @@ # New ports collection makefile for: ghc -# Version required: 4.04 +# Version required: 4.06 # Date created: 28 August 1999 # Whom: Simon Marlow # # $FreeBSD$ -DISTNAME= ghc-4.04 +DISTNAME= ghc-4.06 CATEGORIES= lang -MASTER_SITES= http://www.haskell.org/ghc/dist/4.04/ -DISTFILES= ghc-4.04-src${EXTRACT_SUFX} ghc-4.04-x86-hc${EXTRACT_SUFX} +MASTER_SITES= http://www.haskell.org/ghc/dist/4.06/ +DISTFILES= ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX} MAINTAINER= simonmar@microsoft.com @@ -17,6 +17,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-hc-boot --libdir=${PREFIX}/lib/ghc +# specifying CONFIGURE_TARGET doesn't work for some reason. +CONFIGURE_TARGET= WRKSRC= ${WRKDIR}/fptools @@ -32,10 +34,13 @@ pre-build: @${CP} ${FILESDIR}/build.mk ${WRKSRC}/mk @${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/ghc/compiler/rename/ParseIface.hs @${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/ghc/compiler/parser/Parser.hs - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot) + @(cd ${WRKSRC}/glafp-utils; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot) + @(cd ${WRKSRC}/ghc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot) + @(cd ${WRKSRC}/hslibs; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot) post-build: @echo "GhcWithHscBuiltViaC=NO" >>${WRKSRC}/mk/build.mk @(cd ${WRKSRC}/ghc/lib; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean boot all) + @(cd ${WRKSRC}/hslibs; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean boot all) .include diff --git a/lang/ghc6/distinfo b/lang/ghc6/distinfo index bc313febc41c..498f4cd2dcda 100644 --- a/lang/ghc6/distinfo +++ b/lang/ghc6/distinfo @@ -1,2 +1,2 @@ -MD5 (ghc-4.04-src.tar.gz) = e1211129906c45709ecf5159eb6d9d08 -MD5 (ghc-4.04-x86-hc.tar.gz) = 19287b805f9f528559a46059bbc9c4b9 +MD5 (ghc-4.06-src.tar.gz) = 61921dadbe8d0969cd783a01a4ba14fa +MD5 (ghc-4.06-x86-hc.tar.gz) = 2755da691718ed247d63f8d2f10510dd diff --git a/lang/ghc6/files/build.mk b/lang/ghc6/files/build.mk index ce2b100c9ee4..04d306bc4848 100644 --- a/lang/ghc6/files/build.mk +++ b/lang/ghc6/files/build.mk @@ -1,3 +1,4 @@ +ProjectsToBuild = glafp-utils hslibs ghc GhcLibHcOpts = -O -split-objs -odir $* SRC_HAPPY_OPTS += -c GhcLibWays= diff --git a/lang/ghc6/pkg-plist b/lang/ghc6/pkg-plist index 45cee650b61c..d34c904235d4 100644 --- a/lang/ghc6/pkg-plist +++ b/lang/ghc6/pkg-plist @@ -1,7 +1,6 @@ bin/ghc -bin/ghc-4.04 +bin/ghc-4.06 bin/hp2ps -bin/hstags bin/stat2resid lib/ghc/ghc-asm.prl lib/ghc/ghc-consist.prl @@ -9,7 +8,6 @@ lib/ghc/ghc-iface.prl lib/ghc/ghc-split.prl lib/ghc/hsc lib/ghc/hscpp -lib/ghc/hstags-help lib/ghc/imports/concurrent/Channel.hi lib/ghc/imports/concurrent/ChannelVar.hi lib/ghc/imports/concurrent/Concurrent.hi @@ -17,48 +15,77 @@ lib/ghc/imports/concurrent/Merge.hi lib/ghc/imports/concurrent/Parallel.hi lib/ghc/imports/concurrent/SampleVar.hi lib/ghc/imports/concurrent/Semaphore.hi -lib/ghc/imports/exts/Addr.hi -lib/ghc/imports/exts/Bits.hi -lib/ghc/imports/exts/ByteArray.hi -lib/ghc/imports/exts/CCall.hi -lib/ghc/imports/exts/Dynamic.hi -lib/ghc/imports/exts/Exception.hi -lib/ghc/imports/exts/Foreign.hi -lib/ghc/imports/exts/GetOpt.hi -lib/ghc/imports/exts/GlaExts.hi -lib/ghc/imports/exts/IOExts.hi -lib/ghc/imports/exts/Int.hi -lib/ghc/imports/exts/LazyST.hi -lib/ghc/imports/exts/MutableArray.hi -lib/ghc/imports/exts/NativeInfo.hi -lib/ghc/imports/exts/NumExts.hi -lib/ghc/imports/exts/ST.hi -lib/ghc/imports/exts/Stable.hi -lib/ghc/imports/exts/Weak.hi -lib/ghc/imports/exts/Word.hi -lib/ghc/imports/misc/BSD.hi -lib/ghc/imports/misc/Bag.hi -lib/ghc/imports/misc/BitSet.hi -lib/ghc/imports/misc/ByteOps.hi -lib/ghc/imports/misc/CString.hi -lib/ghc/imports/misc/CharSeq.hi -lib/ghc/imports/misc/FiniteMap.hi -lib/ghc/imports/misc/ListSetOps.hi -lib/ghc/imports/misc/MD5.hi -lib/ghc/imports/misc/MatchPS.hi -lib/ghc/imports/misc/Maybes.hi -lib/ghc/imports/misc/Memo.hi -lib/ghc/imports/misc/Native.hi -lib/ghc/imports/misc/PackedString.hi -lib/ghc/imports/misc/Pretty.hi -lib/ghc/imports/misc/Printf.hi -lib/ghc/imports/misc/Readline.hi -lib/ghc/imports/misc/Regex.hi -lib/ghc/imports/misc/RegexString.hi -lib/ghc/imports/misc/Set.hi -lib/ghc/imports/misc/Socket.hi -lib/ghc/imports/misc/SocketPrim.hi -lib/ghc/imports/misc/Util.hi +lib/ghc/imports/concurrent/Strategies.hi +lib/ghc/imports/data/Assoc.hi +lib/ghc/imports/data/AssocDefaults.hi +lib/ghc/imports/data/AssocList.hi +lib/ghc/imports/data/BankersQueue.hi +lib/ghc/imports/data/BinaryRandList.hi +lib/ghc/imports/data/BraunSeq.hi +lib/ghc/imports/data/Collection.hi +lib/ghc/imports/data/CollectionDefaults.hi +lib/ghc/imports/data/CollectionUtils.hi +lib/ghc/imports/data/EdisonPrelude.hi +lib/ghc/imports/data/FiniteMap.hi +lib/ghc/imports/data/JoinList.hi +lib/ghc/imports/data/LazyPairingHeap.hi +lib/ghc/imports/data/LeftistHeap.hi +lib/ghc/imports/data/ListSeq.hi +lib/ghc/imports/data/MinHeap.hi +lib/ghc/imports/data/MyersStack.hi +lib/ghc/imports/data/PatriciaLoMap.hi +lib/ghc/imports/data/QuickCheck.hi +lib/ghc/imports/data/RandList.hi +lib/ghc/imports/data/RevSeq.hi +lib/ghc/imports/data/Sequence.hi +lib/ghc/imports/data/SequenceDefaults.hi +lib/ghc/imports/data/Set.hi +lib/ghc/imports/data/SimpleQueue.hi +lib/ghc/imports/data/SizedSeq.hi +lib/ghc/imports/data/SkewHeap.hi +lib/ghc/imports/data/SplayHeap.hi +lib/ghc/imports/data/TestOrdBag.hi +lib/ghc/imports/data/TestOrdSet.hi +lib/ghc/imports/data/TestSeq.hi +lib/ghc/imports/data/UnbalancedSet.hi +lib/ghc/imports/lang/Addr.hi +lib/ghc/imports/lang/Bits.hi +lib/ghc/imports/lang/ByteArray.hi +lib/ghc/imports/lang/CCall.hi +lib/ghc/imports/lang/CString.hi +lib/ghc/imports/lang/Dynamic.hi +lib/ghc/imports/lang/Exception.hi +lib/ghc/imports/lang/FFI.hi +lib/ghc/imports/lang/Foreign.hi +lib/ghc/imports/lang/ForeignObj.hi +lib/ghc/imports/lang/GlaExts.hi +lib/ghc/imports/lang/IOExts.hi +lib/ghc/imports/lang/Int.hi +lib/ghc/imports/lang/LazyST.hi +lib/ghc/imports/lang/MonadEither.hi +lib/ghc/imports/lang/MonadFix.hi +lib/ghc/imports/lang/MonadIdentity.hi +lib/ghc/imports/lang/MonadRWS.hi +lib/ghc/imports/lang/MonadReader.hi +lib/ghc/imports/lang/MonadState.hi +lib/ghc/imports/lang/MonadTrans.hi +lib/ghc/imports/lang/MonadWriter.hi +lib/ghc/imports/lang/Monoid.hi +lib/ghc/imports/lang/MutableArray.hi +lib/ghc/imports/lang/NativeInfo.hi +lib/ghc/imports/lang/NumExts.hi +lib/ghc/imports/lang/PackedString.hi +lib/ghc/imports/lang/ST.hi +lib/ghc/imports/lang/ShowFunctions.hi +lib/ghc/imports/lang/Stable.hi +lib/ghc/imports/lang/StablePtr.hi +lib/ghc/imports/lang/TimeExts.hi +lib/ghc/imports/lang/Weak.hi +lib/ghc/imports/lang/Word.hi +lib/ghc/imports/net/BSD.hi +lib/ghc/imports/net/Socket.hi +lib/ghc/imports/net/SocketPrim.hi +lib/ghc/imports/net/URI.hi lib/ghc/imports/posix/Posix.hi lib/ghc/imports/posix/PosixDB.hi lib/ghc/imports/posix/PosixErr.hi @@ -84,23 +111,25 @@ lib/ghc/imports/std/PrelAddr.hi lib/ghc/imports/std/PrelArr.hi lib/ghc/imports/std/PrelArrExtra.hi lib/ghc/imports/std/PrelBase.hi -lib/ghc/imports/std/PrelCCall.hi +lib/ghc/imports/std/PrelByteArr.hi lib/ghc/imports/std/PrelConc.hi lib/ghc/imports/std/PrelDynamic.hi lib/ghc/imports/std/PrelEnum.hi lib/ghc/imports/std/PrelErr.hi lib/ghc/imports/std/PrelException.hi +lib/ghc/imports/std/PrelFloat.hi lib/ghc/imports/std/PrelForeign.hi lib/ghc/imports/std/PrelGHC.hi lib/ghc/imports/std/PrelHandle.hi +lib/ghc/imports/std/PrelHugs.hi lib/ghc/imports/std/PrelIOBase.hi lib/ghc/imports/std/PrelList.hi lib/ghc/imports/std/PrelMain.hi lib/ghc/imports/std/PrelMaybe.hi lib/ghc/imports/std/PrelNum.hi -lib/ghc/imports/std/PrelNumExtra.hi lib/ghc/imports/std/PrelPack.hi lib/ghc/imports/std/PrelRead.hi +lib/ghc/imports/std/PrelReal.hi lib/ghc/imports/std/PrelST.hi lib/ghc/imports/std/PrelShow.hi lib/ghc/imports/std/PrelStable.hi @@ -111,6 +140,21 @@ lib/ghc/imports/std/Random.hi lib/ghc/imports/std/Ratio.hi lib/ghc/imports/std/System.hi lib/ghc/imports/std/Time.hi +lib/ghc/imports/text/Html.hi +lib/ghc/imports/text/HtmlBlockTable.hi +lib/ghc/imports/text/MatchPS.hi +lib/ghc/imports/text/Pretty.hi +lib/ghc/imports/text/Regex.hi +lib/ghc/imports/text/RegexString.hi +lib/ghc/imports/util/GetOpt.hi +lib/ghc/imports/util/MD5.hi +lib/ghc/imports/util/Memo.hi +lib/ghc/imports/util/QuickCheck.hi +lib/ghc/imports/util/QuickCheckBatch.hi +lib/ghc/imports/util/QuickCheckPoly.hi +lib/ghc/imports/util/QuickCheckUtils.hi +lib/ghc/imports/util/Readline.hi +lib/ghc/imports/util/Select.hi lib/ghc/includes/Assembler.h lib/ghc/includes/Block.h lib/ghc/includes/CCall.h @@ -118,18 +162,22 @@ lib/ghc/includes/ClosureMacros.h lib/ghc/includes/ClosureTypes.h lib/ghc/includes/Closures.h lib/ghc/includes/Constants.h +lib/ghc/includes/GranSim.h lib/ghc/includes/Hooks.h lib/ghc/includes/InfoMacros.h lib/ghc/includes/InfoTables.h lib/ghc/includes/MachDeps.h lib/ghc/includes/MachRegs.h lib/ghc/includes/NativeDefs.h +lib/ghc/includes/Parallel.h lib/ghc/includes/Prelude.h lib/ghc/includes/PrimOps.h lib/ghc/includes/Profiling.h lib/ghc/includes/Regs.h lib/ghc/includes/Rts.h lib/ghc/includes/RtsAPI.h +lib/ghc/includes/RtsTypes.h +lib/ghc/includes/SMP.h lib/ghc/includes/SchedAPI.h lib/ghc/includes/Stable.h lib/ghc/includes/Stg.h @@ -144,28 +192,42 @@ lib/ghc/includes/TSO.h lib/ghc/includes/TailCalls.h lib/ghc/includes/Updates.h lib/ghc/includes/config.h +lib/ghc/includes/fileObject.h +lib/ghc/includes/floatExtreme.h lib/ghc/includes/gmp.h lib/ghc/includes/ieee-flpt.h lib/ghc/includes/options.h lib/ghc/includes/sainteger.h +lib/ghc/includes/stgerror.h +lib/ghc/includes/stgio.h +lib/ghc/includes/timezone.h lib/ghc/libHS.a lib/ghc/libHS_cbits.a lib/ghc/libHSconcurrent.a -lib/ghc/libHSexts.a -lib/ghc/libHSmisc.a -lib/ghc/libHSmisc_cbits.a +lib/ghc/libHSdata.a +lib/ghc/libHSlang.a +lib/ghc/libHSlang_cbits.a +lib/ghc/libHSnet.a +lib/ghc/libHSnet_cbits.a lib/ghc/libHSposix.a lib/ghc/libHSposix_cbits.a lib/ghc/libHSrts.a +lib/ghc/libHStext.a +lib/ghc/libHStext_cbits.a +lib/ghc/libHSutil.a +lib/ghc/libHSutil_cbits.a lib/ghc/mkdependHS lib/ghc/parse-gcstats.prl lib/ghc/process-gcstats.prl lib/ghc/unlit @dirrm lib/ghc/imports/concurrent -@dirrm lib/ghc/imports/exts -@dirrm lib/ghc/imports/misc +@dirrm lib/ghc/imports/data +@dirrm lib/ghc/imports/lang +@dirrm lib/ghc/imports/net @dirrm lib/ghc/imports/posix @dirrm lib/ghc/imports/std +@dirrm lib/ghc/imports/text +@dirrm lib/ghc/imports/util @dirrm lib/ghc/imports @dirrm lib/ghc/includes @dirrm lib/ghc -- cgit v1.2.3