Date: Wed, 1 Mar 2000 23:45:52 GMT From: Simon Marlow <simonmar@microsoft.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17115: Upgrade port lang/ghc to version 4.06 Message-ID: <200003012345.XAA65595@jaffacakes.freeserve.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 17115 >Category: ports >Synopsis: Upgrade port lang/ghc to version 4.06 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 1 15:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Simon Marlow <simonmar@microsoft.com> >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -cr ghc-OLD/Makefile ghc/Makefile *** ghc-OLD/Makefile Wed Nov 10 17:25:28 1999 --- ghc/Makefile Mon Feb 21 16:13:31 2000 *************** *** 1,14 **** # New ports collection makefile for: ghc ! # Version required: 4.04 # Date created: 28 August 1999 # Whom: Simon Marlow <simonmar@microsoft.com> # # $FreeBSD: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp $ ! DISTNAME= ghc-4.04 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} MAINTAINER= simonmar@microsoft.com --- 1,14 ---- # New ports collection makefile for: ghc ! # Version required: 4.06 # Date created: 28 August 1999 # Whom: Simon Marlow <simonmar@microsoft.com> # # $FreeBSD: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp $ ! DISTNAME= ghc-4.06 CATEGORIES= lang ! 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,22 **** --- 17,24 ---- 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,41 **** @${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) 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) .include <bsd.port.mk> --- 34,46 ---- @${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}/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 <bsd.port.mk> diff -cr ghc-OLD/files/build.mk ghc/files/build.mk *** ghc-OLD/files/build.mk Wed Nov 10 17:25:28 1999 --- ghc/files/build.mk Mon Feb 21 15:41:10 2000 *************** *** 1,3 **** --- 1,4 ---- + ProjectsToBuild = glafp-utils hslibs ghc GhcLibHcOpts = -O -split-objs -odir $* SRC_HAPPY_OPTS += -c GhcLibWays= diff -cr ghc-OLD/files/md5 ghc/files/md5 *** ghc-OLD/files/md5 Wed Nov 10 17:25:28 1999 --- ghc/files/md5 Wed Mar 1 22:03:19 2000 *************** *** 1,2 **** ! MD5 (ghc-4.04-src.tar.gz) = e1211129906c45709ecf5159eb6d9d08 ! MD5 (ghc-4.04-x86-hc.tar.gz) = 19287b805f9f528559a46059bbc9c4b9 --- 1,2 ---- ! MD5 (ghc-4.06-src.tar.gz) = 61921dadbe8d0969cd783a01a4ba14fa ! MD5 (ghc-4.06-x86-hc.tar.gz) = 2755da691718ed247d63f8d2f10510dd diff -cr ghc-OLD/patches/patch-aa ghc/patches/patch-aa *** ghc-OLD/patches/patch-aa Mon Jan 24 19:37:26 2000 --- ghc/patches/patch-aa Mon Feb 21 15:38:14 2000 *************** *** 1,36 **** ! --- configure.orig Mon Jan 24 11:27:27 2000 ! +++ configure Mon Jan 24 11:28:16 2000 ! @@ -761,7 +761,16 @@ ! HostVendor_CPP='unknown' ! HostOS_CPP='linux' ! ;; ! -i[3456]86-*-freebsd3*) # FreeBSD 3.0+ uses ELF ! +i[3456]86-*-freebsd2*) # Older FreeBSDs are a.out ! + HostPlatform=i386-unknown-freebsd2 # hack again ! + TargetPlatform=i386-unknown-freebsd2 ! + BuildPlatform=i386-unknown-freebsd2 ! + HostPlatform_CPP='i386_unknown_freebsd2' ! + HostArch_CPP='i386' ! + HostVendor_CPP='unknown' ! + HostOS_CPP='freebsd2' ! + ;; ! +i[3456]86-*-freebsd*) # FreeBSD 3.0+ uses ELF ! HostPlatform=i386-unknown-freebsd3 # hack again ! TargetPlatform=i386-unknown-freebsd3 ! BuildPlatform=i386-unknown-freebsd3 ! @@ -769,15 +778,6 @@ ! HostArch_CPP='i386' ! HostVendor_CPP='unknown' ! HostOS_CPP='freebsd3' ! - ;; ! -i[3456]86-*-freebsd2*) # Older FreeBSDs are a.out ! - HostPlatform=i386-unknown-freebsd2 # hack again ! - TargetPlatform=i386-unknown-freebsd2 ! - BuildPlatform=i386-unknown-freebsd2 ! - HostPlatform_CPP='i386_unknown_freebsd2' ! - HostArch_CPP='i386' ! - HostVendor_CPP='unknown' ! - HostOS_CPP='freebsd2' ! ;; ! i[3456]86-*-netbsd*) ! HostPlatform=i386-unknown-netbsd # hack again --- 1,17 ---- ! *** hslibs/Makefile~ Thu Jan 13 14:13:32 2000 ! --- hslibs/Makefile Sun Jan 30 11:26:50 2000 ! *************** ! *** 5,12 **** ! --- 5,16 ---- ! TOP = .. ! include $(TOP)/mk/boilerplate.mk ! ! + ifeq "$(GhcWithHscBuiltViaC)" "YES" ! + SUBDIRS = lang ! + else ! # order is important here, there are dependencies between the libraries... ! SUBDIRS = lang data concurrent text net posix util ! + endif ! # num ! ! include $(TOP)/mk/target.mk Only in ghc/patches: patch-ab diff -cr ghc-OLD/pkg/PLIST ghc/pkg/PLIST *** ghc-OLD/pkg/PLIST Wed Nov 10 17:25:29 1999 --- ghc/pkg/PLIST Wed Mar 1 23:27:30 2000 *************** *** 1,7 **** bin/ghc ! bin/ghc-4.04 bin/hp2ps - bin/hstags bin/stat2resid lib/ghc/ghc-asm.prl lib/ghc/ghc-consist.prl --- 1,6 ---- bin/ghc ! bin/ghc-4.06 bin/hp2ps bin/stat2resid lib/ghc/ghc-asm.prl lib/ghc/ghc-consist.prl *************** *** 9,15 **** 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 --- 8,13 ---- *************** *** 17,64 **** 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/posix/Posix.hi lib/ghc/imports/posix/PosixDB.hi lib/ghc/imports/posix/PosixErr.hi --- 15,91 ---- lib/ghc/imports/concurrent/Parallel.hi lib/ghc/imports/concurrent/SampleVar.hi lib/ghc/imports/concurrent/Semaphore.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,106 **** 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/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/PrelForeign.hi lib/ghc/imports/std/PrelGHC.hi lib/ghc/imports/std/PrelHandle.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/PrelST.hi lib/ghc/imports/std/PrelShow.hi lib/ghc/imports/std/PrelStable.hi --- 111,135 ---- lib/ghc/imports/std/PrelArr.hi lib/ghc/imports/std/PrelArrExtra.hi lib/ghc/imports/std/PrelBase.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/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,116 **** --- 140,160 ---- 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,135 **** --- 162,183 ---- 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,171 **** lib/ghc/includes/TailCalls.h lib/ghc/includes/Updates.h lib/ghc/includes/config.h lib/ghc/includes/gmp.h lib/ghc/includes/ieee-flpt.h lib/ghc/includes/options.h lib/ghc/includes/sainteger.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/libHSposix.a lib/ghc/libHSposix_cbits.a lib/ghc/libHSrts.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/posix @dirrm lib/ghc/imports/std @dirrm lib/ghc/imports @dirrm lib/ghc/includes @dirrm lib/ghc --- 192,233 ---- 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/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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003012345.XAA65595>