pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ghc Update ghc to 6.2.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/80d7a01146c2
branches:  trunk
changeset: 475916:80d7a01146c2
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat May 29 14:28:43 2004 +0000

description:
Update ghc to 6.2.1.

There are too many changes compared to version 5.04.3 to list here...
The changes are described in:
  http://www.haskell.org/ghc/docs/6.0.1/html/users_guide/release-6-0.html
  http://www.haskell.org/ghc/docs/6.2.1/html/users_guide/release-6-2.html

diffstat:

 lang/ghc/Makefile         |    75 +-
 lang/ghc/PLIST            |  1396 +++++++++++++++++---------------------------
 lang/ghc/distinfo         |    35 +-
 lang/ghc/files/build.mk   |     5 -
 lang/ghc/patches/patch-aa |    40 +-
 lang/ghc/patches/patch-ab |    37 +-
 lang/ghc/patches/patch-ac |    35 +-
 lang/ghc/patches/patch-ad |    96 +--
 lang/ghc/patches/patch-ae |    25 +-
 lang/ghc/patches/patch-af |    22 -
 lang/ghc/patches/patch-ag |    12 -
 lang/ghc/patches/patch-ah |    13 -
 lang/ghc/patches/patch-ai |    23 -
 lang/ghc/patches/patch-aj |    13 -
 lang/ghc/patches/patch-ak |    12 -
 lang/ghc/patches/patch-al |    13 -
 lang/ghc/patches/patch-am |    17 -
 lang/ghc/patches/patch-an |    30 -
 lang/ghc/patches/patch-ao |    14 -
 lang/ghc/patches/patch-ap |    18 -
 lang/ghc/patches/patch-aq |    64 --
 lang/ghc/patches/patch-ar |    14 -
 lang/ghc/patches/patch-as |    15 -
 lang/ghc/patches/patch-at |    16 -
 24 files changed, 626 insertions(+), 1414 deletions(-)

diffs (truncated from 2170 to 300 lines):

diff -r 389c000c7fe0 -r 80d7a01146c2 lang/ghc/Makefile
--- a/lang/ghc/Makefile Sat May 29 13:42:26 2004 +0000
+++ b/lang/ghc/Makefile Sat May 29 14:28:43 2004 +0000
@@ -1,55 +1,48 @@
-# $NetBSD: Makefile,v 1.16 2004/03/22 03:39:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/29 14:28:43 kristerw Exp $
 
-DISTNAME=      ghc-5.04.3
+DISTNAME=      ghc-6.2.1
 CATEGORIES=    lang
-MASTER_SITES=  http://www.haskell.org/ghc/dist/5.04.3/
-DISTFILES=     ghc-5.04.3-src.tar.bz2 ghc-5.04.3-i386-unknown-netbsd-hc.tar.bz2
+MASTER_SITES=  http://www.haskell.org/ghc/dist/6.2.1/
+DISTFILES=     ghc-6.2.1-src.tar.bz2 \
+               ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz
 
 MAINTAINER=    kristerw%NetBSD.org@localhost
 HOMEPAGE=      http://www.haskell.org/ghc/
 COMMENT=       Compiler for the functional language Haskell
 
-GNU_CONFIGURE= # defined
-USE_X11=       # defined
-CONFIGURE_SCRIPT=      ./distrib/hc-build
-CONFIGURE_ENV+=                LIBS="-L${PREFIX}/lib"
-AUTOCONF_REQD=2.13
+SITES_ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
 
-USE_BUILDLINK2=        #defined
-
-USE_GNU_READLINE=yes
-USE_PERL5=     yes
-USE_GNU_TOOLS+=        make
+GNU_CONFIGURE=         yes
+CONFIGURE_SCRIPT=      ./distrib/hc-build
+CONFIGURE_ARGS+=       --enable-hc-boot-unregisterised
+INSTALL_MAKE_FLAGS+=   stage=1
 
-# Note: this package contains a Haskell compiler that is itself
-# written in Haskell. There are basically two ways we can solve the
-# bootstrap problem:
-# 1. bootstrap from pre-generated C files.
-# 2. first download a binary pre-built compiler and use it to compile.
-# We currently use way 1.
-# The problem with 2. is that it may make the package more sensitive
-# to the exact NetBSD versions involved (the version of the build
-# system compared to the version used to build the pre-built binary).
-# On the other hand, bootstrapping GHC from C is very fragile and it
-# may be harder to update the package with method 1.
-# For comparison, FreeBSD currently uses method 2.
+USE_BUILDLINK3=                yes
 
-# Note: a number of non-i386 platforms, including solaris/sparc,
-# osf/alpha etc are supported natively by ghc. pkg support for those
-# platforms and their NetBSD varients is left as a mid-level exercise
-# for the reader
-ONLY_FOR_PLATFORM= NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
+USE_GNU_READLINE=      yes     # uses the UNDO_ constants
+USE_PERL5=             yes
+USE_GNU_TOOLS+=                make
+
+# Everything is done in the configure target.
+NO_BUILD=              yes
 
 pre-configure:
-       cd ${WRKSRC}; file=configure.in;                                \
-       ${SED} -e "s|@PREFIX@|${PREFIX}|g" $${file} > $${file}.fixed;   \
-       ${MV} -f $${file}.fixed $${file};                               \
-       ${AUTOCONF}
+       ${MV} ${WRKSRC}/mk/bootstrap.mk ${WRKSRC}/mk/bootstrap.mk.tmp
+       ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+               < ${WRKSRC}/mk/bootstrap.mk.tmp \
+               > ${WRKSRC}/mk/bootstrap.mk
+       ${MV} ${WRKSRC}/libraries/readline/package.conf.in \
+               ${WRKSRC}/libraries/readline/package.conf.in.tmp
+       ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+               < ${WRKSRC}/libraries/readline/package.conf.in.tmp \
+               > ${WRKSRC}/libraries/readline/package.conf.in
+       ${MV} ${WRKSRC}/ghc/rts/package.conf.in \
+               ${WRKSRC}/ghc/rts/package.conf.in.tmp
+       ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+               < ${WRKSRC}/ghc/rts/package.conf.in.tmp \
+               > ${WRKSRC}/ghc/rts/package.conf.in
 
-do-build:
-
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/autoconf.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 389c000c7fe0 -r 80d7a01146c2 lang/ghc/PLIST
--- a/lang/ghc/PLIST    Sat May 29 13:42:26 2004 +0000
+++ b/lang/ghc/PLIST    Sat May 29 14:28:43 2004 +0000
@@ -1,871 +1,533 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/29 11:27:40 augustss Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/29 14:28:43 kristerw Exp $
+bin/ghc
+bin/${PKGNAME}
+bin/ghc-pkg
+bin/ghc-pkg-${PKGVERSION}
+bin/ghci
+bin/ghci-${PKGVERSION}
+bin/ghcprof
 bin/hasktags
-bin/ghc-pkg
-bin/ghc-pkg-5.04.3
 bin/hp2ps
 bin/hsc2hs
 bin/stat2resid
-bin/ghcprof
-bin/ghc
-bin/ghc-5.04.3
-bin/ghci
-bin/ghci-5.04.3
-bin/DrIFT
-bin/DtdToHaskell
-bin/Xtract
-lib/ghc-5.04.3/include/Block.h
-lib/ghc-5.04.3/include/Bytecodes.h
-lib/ghc-5.04.3/include/CCall.h
-lib/ghc-5.04.3/include/ClosureMacros.h
-lib/ghc-5.04.3/include/ClosureTypes.h
-lib/ghc-5.04.3/include/Closures.h
-lib/ghc-5.04.3/include/Constants.h
-lib/ghc-5.04.3/include/Derived.h
-lib/ghc-5.04.3/include/DerivedConstants.h
-lib/ghc-5.04.3/include/DietHEP.h
-lib/ghc-5.04.3/include/GranSim.h
-lib/ghc-5.04.3/include/Hooks.h
-lib/ghc-5.04.3/include/HsFFI.h
-lib/ghc-5.04.3/include/InfoMacros.h
-lib/ghc-5.04.3/include/InfoTables.h
-lib/ghc-5.04.3/include/Linker.h
-lib/ghc-5.04.3/include/MachDeps.h
-lib/ghc-5.04.3/include/MachRegs.h
-lib/ghc-5.04.3/include/NativeDefs.h
-lib/ghc-5.04.3/include/Parallel.h
-lib/ghc-5.04.3/include/PosixSource.h
-lib/ghc-5.04.3/include/PrimOps.h
-lib/ghc-5.04.3/include/Regs.h
-lib/ghc-5.04.3/include/Rts.h
-lib/ghc-5.04.3/include/RtsAPI.h
-lib/ghc-5.04.3/include/RtsFlags.h
-lib/ghc-5.04.3/include/RtsTypes.h
-lib/ghc-5.04.3/include/SMP.h
-lib/ghc-5.04.3/include/SchedAPI.h
-lib/ghc-5.04.3/include/Stable.h
-lib/ghc-5.04.3/include/Stg.h
-lib/ghc-5.04.3/include/StgDLL.h
-lib/ghc-5.04.3/include/StgLdvProf.h
-lib/ghc-5.04.3/include/StgMacros.h
-lib/ghc-5.04.3/include/StgMiscClosures.h
-lib/ghc-5.04.3/include/StgProf.h
-lib/ghc-5.04.3/include/StgStorage.h
-lib/ghc-5.04.3/include/StgTicky.h
-lib/ghc-5.04.3/include/StgTypes.h
-lib/ghc-5.04.3/include/TSO.h
-lib/ghc-5.04.3/include/TailCalls.h
-lib/ghc-5.04.3/include/Updates.h
-lib/ghc-5.04.3/include/config.h
-lib/ghc-5.04.3/include/ieee-flpt.h
-lib/ghc-5.04.3/include/gmp.h
-lib/ghc-5.04.3/include/CTypes.h
-lib/ghc-5.04.3/include/Dynamic.h
-lib/ghc-5.04.3/include/HsBase.h
-lib/ghc-5.04.3/include/dirUtils.h
-lib/ghc-5.04.3/include/errUtils.h
-lib/ghc-5.04.3/include/ghc_errno.h
-lib/ghc-5.04.3/include/lockFile.h
-lib/ghc-5.04.3/include/timeUtils.h
-lib/ghc-5.04.3/include/HsNet.h
-lib/ghc-5.04.3/include/HsLang.h
-lib/ghc-5.04.3/include/HsPosix.h
-lib/ghc-5.04.3/include/HsUtil.h
-lib/ghc-5.04.3/include/HsText.h
-lib/ghc-5.04.3/ghc-pkg.bin
-lib/ghc-5.04.3/hsc2hs-bin
-lib/ghc-5.04.3/template-hsc.h
-lib/ghc-5.04.3/parse-gcstats.prl
-lib/ghc-5.04.3/process-gcstats.prl
-lib/ghc-5.04.3/cgprof
-lib/ghc-5.04.3/icons/absdelta.xbm
-lib/ghc-5.04.3/icons/absolute.xbm
-lib/ghc-5.04.3/icons/comm.xbm
-lib/ghc-5.04.3/icons/commslack.xbm
-lib/ghc-5.04.3/icons/comp.xbm
-lib/ghc-5.04.3/icons/compress.xbm
-lib/ghc-5.04.3/icons/compslack.xbm
-lib/ghc-5.04.3/icons/delete.xbm
-lib/ghc-5.04.3/icons/help.xbm
-lib/ghc-5.04.3/icons/hrel.xbm
-lib/ghc-5.04.3/icons/hrelslack.xbm
-lib/ghc-5.04.3/icons/jump.xbm
-lib/ghc-5.04.3/icons/mycomm.xbm
-lib/ghc-5.04.3/icons/oxpara.xbm
-lib/ghc-5.04.3/icons/percent.xbm
-lib/ghc-5.04.3/icons/reldelta.xbm
-lib/ghc-5.04.3/icons/sync.xbm
-lib/ghc-5.04.3/icons/time.xbm
-lib/ghc-5.04.3/icons/time1.xbm
-lib/ghc-5.04.3/icons/uncompress.xbm
-lib/ghc-5.04.3/icons/undo.xbm
-lib/ghc-5.04.3/icons/wait.xbm
-lib/ghc-5.04.3/icons/weightdelta.xbm
-lib/ghc-5.04.3/unlit
-lib/ghc-5.04.3/package.conf
-lib/ghc-5.04.3/ghc-usage.txt
-lib/ghc-5.04.3/ghc-asm
-lib/ghc-5.04.3/ghc-split
-lib/ghc-5.04.3/ghc-5.04.3
-lib/ghc-5.04.3/libHSrts.a
-lib/ghc-5.04.3/HSrts.o
-lib/ghc-5.04.3/libHSrts_p.a
-lib/ghc-5.04.3/imports/base/Control/Concurrent/Chan.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/MVar.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/QSem.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/QSemN.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/SampleVar.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/Chan.p_hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/MVar.p_hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/QSem.p_hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/QSemN.p_hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent/SampleVar.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST/Lazy.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST/Strict.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST/Lazy.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST/Strict.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Cont.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Error.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Fix.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Identity.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/List.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Monoid.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/RWS.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Reader.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/State.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Trans.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Writer.hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Cont.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Error.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Fix.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Identity.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/List.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Monoid.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/RWS.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Reader.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/ST.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/State.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Trans.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad/Writer.p_hi
-lib/ghc-5.04.3/imports/base/Control/Arrow.hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent.hi
-lib/ghc-5.04.3/imports/base/Control/Exception.hi
-lib/ghc-5.04.3/imports/base/Control/Monad.hi
-lib/ghc-5.04.3/imports/base/Control/Parallel.hi
-lib/ghc-5.04.3/imports/base/Control/Arrow.p_hi
-lib/ghc-5.04.3/imports/base/Control/Concurrent.p_hi
-lib/ghc-5.04.3/imports/base/Control/Exception.p_hi
-lib/ghc-5.04.3/imports/base/Control/Monad.p_hi
-lib/ghc-5.04.3/imports/base/Control/Parallel.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/Base.hi
-lib/ghc-5.04.3/imports/base/Data/Array/Diff.hi
-lib/ghc-5.04.3/imports/base/Data/Array/IArray.hi
-lib/ghc-5.04.3/imports/base/Data/Array/IO.hi
-lib/ghc-5.04.3/imports/base/Data/Array/MArray.hi
-lib/ghc-5.04.3/imports/base/Data/Array/ST.hi
-lib/ghc-5.04.3/imports/base/Data/Array/Storable.hi
-lib/ghc-5.04.3/imports/base/Data/Array/Unboxed.hi
-lib/ghc-5.04.3/imports/base/Data/Array/Base.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/Diff.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/IArray.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/IO.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/MArray.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/ST.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/Storable.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array/Unboxed.p_hi
-lib/ghc-5.04.3/imports/base/Data/STRef/Lazy.hi
-lib/ghc-5.04.3/imports/base/Data/STRef/Strict.hi
-lib/ghc-5.04.3/imports/base/Data/STRef/Lazy.p_hi
-lib/ghc-5.04.3/imports/base/Data/STRef/Strict.p_hi
-lib/ghc-5.04.3/imports/base/Data/Array.hi
-lib/ghc-5.04.3/imports/base/Data/Bits.hi
-lib/ghc-5.04.3/imports/base/Data/Bool.hi
-lib/ghc-5.04.3/imports/base/Data/Char.hi
-lib/ghc-5.04.3/imports/base/Data/Complex.hi
-lib/ghc-5.04.3/imports/base/Data/Dynamic.hi
-lib/ghc-5.04.3/imports/base/Data/Either.hi
-lib/ghc-5.04.3/imports/base/Data/FiniteMap.hi
-lib/ghc-5.04.3/imports/base/Data/Generics.hi
-lib/ghc-5.04.3/imports/base/Data/IORef.hi
-lib/ghc-5.04.3/imports/base/Data/Int.hi
-lib/ghc-5.04.3/imports/base/Data/Ix.hi
-lib/ghc-5.04.3/imports/base/Data/List.hi
-lib/ghc-5.04.3/imports/base/Data/Maybe.hi
-lib/ghc-5.04.3/imports/base/Data/PackedString.hi
-lib/ghc-5.04.3/imports/base/Data/Ratio.hi



Home | Main Index | Thread Index | Old Index