mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Upgrade ghc to 6.8.3.

Browse Source
This commit is contained in:
Oliver Braun 2008-07-18 20:05:17 +00:00
parent 1ff262e910
commit f5d876d7f6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=217059
30 changed files with 956 additions and 1095 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/hs-c2hs/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= c2hs
PORTVERSION= 0.15.1
PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
PKGNAMEPREFIX= hs-
@ -21,7 +22,7 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
.include <bsd.port.pre.mk>
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
# 'owned' by lang/ghc:
CABALDIR= ${PREFIX}/${SUBDIR}

5
devel/hs-haddock/Makefile
View File

@ -6,6 +6,7 @@
PORTNAME= haddock
PORTVERSION= 2.1.0
PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -26,7 +27,7 @@ NO_PKG_REGISTER=
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//g}
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
HADDOCK_VERSION= ${PORTVERSION}
CABAL_CMD= runghc Setup.lhs
@ -47,7 +48,7 @@ do-configure:
cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
do-build:
cd ${WRKSRC} && ${CABAL_CMD} build
cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1"
.if !defined(SLAVE)
cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
.endif

27
devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs Normal file
View File

@ -0,0 +1,27 @@
--- src/Haddock/GHC/Typecheck.hs.orig 2008-05-01 15:13:13.000000000 +0200
+++ src/Haddock/GHC/Typecheck.hs 2008-06-22 16:52:52.000000000 +0200
@@ -23,6 +23,7 @@
import Data.List
+import FastString
type CheckedMod = (Module, FilePath, FullyCheckedMod)
@@ -69,7 +70,7 @@
mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
ghcModule = mod,
ghcFilename = file,
- ghcMbDocOpts = mbOpts,
+ ghcMbDocOpts = fmap unpackFS mbOpts,
ghcHaddockModInfo = info,
ghcMbDoc = mbDoc,
ghcGroup = group,
@@ -79,6 +80,6 @@
ghcInstances = modInfoInstances modInfo
}
where
- HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed
+ HsModule _ _ _ _ mbOpts _ _ = unLoc parsed
(group, _, mbExports, mbDoc, info) = renamed
(parsed, renamed, _, modInfo) = checkedMod

3
devel/hs-uuagc/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -18,7 +19,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
hs-uulib>=0.9.5:${PORTSDIR}/devel/hs-uulib
LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
GHC_CMD= ${LOCALBASE}/bin/ghc
SETUP_CMD= ./setup

3
devel/hs-uulib/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= uulib
PORTVERSION= 0.9.5
PORTREVISION= 1
CATEGORIES= devel haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -16,7 +17,7 @@ COMMENT= Haskell Utrecht Tools Library
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
UULIB_VERSION= ${PORTVERSION}
GHC_CMD= ${LOCALBASE}/bin/ghc

3
graphics/hs-HGL-ghc/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.0
PORTREVISION= 1
CATEGORIES= graphics haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -18,7 +19,7 @@ COMMENT= A simple graphics library based on X11 or Win32
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
CABAL_CMD= ${LOCALBASE}/bin/runghc Setup.hs

3
graphics/hs-HGL/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.0
PORTREVISION= 1
CATEGORIES= graphics haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -18,7 +19,7 @@ COMMENT= A simple graphics library based on X11 or Win32
BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
CABAL_CMD= ${LOCALBASE}/bin/runghc Setup.hs

8
lang/ghc-doc/Makefile
View File

@ -6,14 +6,14 @@
#
PORTNAME= ghc
PORTVERSION= 6.8.2
PORTVERSION= 6.8.3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/docs/${PORTVERSION}/ \
http://www.haskell.org/ghc/docs/${PORTVERSION}/html/
PKGNAMESUFFIX= -doc
DISTFILES= Cabal.ps.gz Cabal.html.tar.gz \
DISTFILES= Cabal.html.tar.gz \
libraries.html.tar.gz users_guide.html.tar.gz \
users_guide.ps.gz index.html
index.html
DIST_SUBDIR= ghc-${PORTVERSION}
EXTRACT_ONLY=
@ -29,7 +29,7 @@ do-install:
@${ECHO} NOPORTDOCS set, nothing to do!
.else
@${MKDIR} ${DOCSDIR}
.for FILE in Cabal.ps.gz users_guide.ps.gz index.html
.for FILE in index.html
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${FILE} \
${DOCSDIR}
.endfor

30
lang/ghc-doc/distinfo
View File

@ -1,18 +1,12 @@
MD5 (ghc-6.8.2/Cabal.ps.gz) = 9000d62c9b877fff108cec9e1e7ed007
SHA256 (ghc-6.8.2/Cabal.ps.gz) = c60db87077f6f94e64ff6932a4aba6b18a60775764a5037d9fc3d41330ca75a7
SIZE (ghc-6.8.2/Cabal.ps.gz) = 64254
MD5 (ghc-6.8.2/Cabal.html.tar.gz) = 354e4813a4fe978b2d7b17e1c3d76912
SHA256 (ghc-6.8.2/Cabal.html.tar.gz) = 44cb9fc22a7db9436dc31aec7f1ca717939b295841db67244dc0c03e53b604ff
SIZE (ghc-6.8.2/Cabal.html.tar.gz) = 26902
MD5 (ghc-6.8.2/libraries.html.tar.gz) = f90770f88906fe370d328f0eed38345d
SHA256 (ghc-6.8.2/libraries.html.tar.gz) = 8cee420146c6141f15f752b4726a2190ef6683e1d030f5f3c39de297bcd5c286
SIZE (ghc-6.8.2/libraries.html.tar.gz) = 4146150
MD5 (ghc-6.8.2/users_guide.html.tar.gz) = aab5836c50d9b92a2f4266df5ed2ff48
SHA256 (ghc-6.8.2/users_guide.html.tar.gz) = 6b21d4a00357f049ba029d2a62382fbb0854c293c7e0421477bb90d5833885eb
SIZE (ghc-6.8.2/users_guide.html.tar.gz) = 282292
MD5 (ghc-6.8.2/users_guide.ps.gz) = 2430b9b36ef9670c545e5f7a80f3ebea
SHA256 (ghc-6.8.2/users_guide.ps.gz) = 177296683b35ea56fcc8e3242d48c587f1c91e1ee6b05ca79542dc77c1cc4fbf
SIZE (ghc-6.8.2/users_guide.ps.gz) = 617464
MD5 (ghc-6.8.2/index.html) = ed7a0368fee505993e788a82081636ec
SHA256 (ghc-6.8.2/index.html) = 571a616b6f32bd7891ef943ccead027e56f5286e8a32905522820e66654d2a8f
SIZE (ghc-6.8.2/index.html) = 1337
MD5 (ghc-6.8.3/Cabal.html.tar.gz) = bf1a14c0236d712ab9402645ad764e6e
SHA256 (ghc-6.8.3/Cabal.html.tar.gz) = f99b2acb8f3d73dfbedfabf6ba6e8aada6e34487bbdbc9b65dc74efcbbf4b6b6
SIZE (ghc-6.8.3/Cabal.html.tar.gz) = 29411
MD5 (ghc-6.8.3/libraries.html.tar.gz) = afe44e4743e6da9594d3839f39ca34b4
SHA256 (ghc-6.8.3/libraries.html.tar.gz) = e1c1926c02b0144698156c7a38d4999531f345976cf3bb5b40831e362780e4ce
SIZE (ghc-6.8.3/libraries.html.tar.gz) = 4113111
MD5 (ghc-6.8.3/users_guide.html.tar.gz) = 8e9195b30ff3c62eea1e422bd9cb6744
SHA256 (ghc-6.8.3/users_guide.html.tar.gz) = 499e97c5c923d41c10171f92111b9f5838b9d697c0d2240bf8015c92c22ab038
SIZE (ghc-6.8.3/users_guide.html.tar.gz) = 285478
MD5 (ghc-6.8.3/index.html) = ed7a0368fee505993e788a82081636ec
SHA256 (ghc-6.8.3/index.html) = 571a616b6f32bd7891ef943ccead027e56f5286e8a32905522820e66654d2a8f
SIZE (ghc-6.8.3/index.html) = 1337

5
lang/ghc/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= ghc
PORTVERSION= 6.8.2
PORTREVISION= 1
PORTVERSION= 6.8.3
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot \
@ -65,8 +64,6 @@ DISTFILES+= ghc-${PORTVERSION}-x86_64-unknown-freebsd7-boot${EXTRACT_SUFX}:boot
.else
IGNORE= unsupported at the moment
.endif
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rts-Linker.c \
${PATCHDIR}/extra-patch-driver-mangler-ghc-asm.lprl
.endif
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}

30
lang/ghc/distinfo
View File

@ -1,18 +1,18 @@
MD5 (ghc-6.8.2-src.tar.bz2) = 43108417594be7eba0918c459e871e40
SHA256 (ghc-6.8.2-src.tar.bz2) = 2d10f973c35e8d7d9f62b53e26fef90177a9a15105cda4b917340ba7696a22d9
SIZE (ghc-6.8.2-src.tar.bz2) = 7072545
MD5 (ghc-6.8.2-src-extralibs.tar.bz2) = d199c50814188fb77355d41058b8613c
SHA256 (ghc-6.8.2-src-extralibs.tar.bz2) = 96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510
SIZE (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843
MD5 (ghc-6.8.2-i386-unknown-freebsd6-boot.tar.bz2) = 92b190827dc6c815c7b95fbfdac497c2
SHA256 (ghc-6.8.2-i386-unknown-freebsd6-boot.tar.bz2) = f4e7c2cc5b1a4fa7423dbb84958ebef73760a0c9792676ba18e4295b4f15beeb
SIZE (ghc-6.8.2-i386-unknown-freebsd6-boot.tar.bz2) = 28890579
MD5 (ghc-6.8.2-i386-unknown-freebsd7-boot.tar.bz2) = 1761930aff8e7e55569ed9a69937fab7
SHA256 (ghc-6.8.2-i386-unknown-freebsd7-boot.tar.bz2) = 54f66813e8abca0e77aa15709f482f11dbd1850d3f06ba31be73fdc600cc6136
SIZE (ghc-6.8.2-i386-unknown-freebsd7-boot.tar.bz2) = 28717650
MD5 (ghc-6.8.2-x86_64-unknown-freebsd7-boot.tar.bz2) = 6e5d98be9f098fcb25ec3cfc29c1d7fd
SHA256 (ghc-6.8.2-x86_64-unknown-freebsd7-boot.tar.bz2) = 1fda769618460c4b656205f52b30fe801386fd8333b1f1b9513b698cf2422f41
SIZE (ghc-6.8.2-x86_64-unknown-freebsd7-boot.tar.bz2) = 41041294
MD5 (ghc-6.8.3-src.tar.bz2) = dfa31028b4d06d1d226f55fe3a2ab7b3
SHA256 (ghc-6.8.3-src.tar.bz2) = 1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b
SIZE (ghc-6.8.3-src.tar.bz2) = 7092076
MD5 (ghc-6.8.3-src-extralibs.tar.bz2) = 5ac72f5d5433151cf6b718dc6601dc41
SHA256 (ghc-6.8.3-src-extralibs.tar.bz2) = ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2
SIZE (ghc-6.8.3-src-extralibs.tar.bz2) = 1912647
MD5 (ghc-6.8.3-i386-unknown-freebsd6-boot.tar.bz2) = 5cdcf4433a655e456c00f64cb1b73820
SHA256 (ghc-6.8.3-i386-unknown-freebsd6-boot.tar.bz2) = 2693ce11867996dc15fdcea91d6c7da67c04bf87fd501b660c8ebfe18c2d2fb6
SIZE (ghc-6.8.3-i386-unknown-freebsd6-boot.tar.bz2) = 28974145
MD5 (ghc-6.8.3-i386-unknown-freebsd7-boot.tar.bz2) = b039eed7bc8b7fda4aab34bb77d914a6
SHA256 (ghc-6.8.3-i386-unknown-freebsd7-boot.tar.bz2) = eacc27978d66eb52634d25f5d7b148a7a4816465d6b26a7aaefbf65c1e7947ca
SIZE (ghc-6.8.3-i386-unknown-freebsd7-boot.tar.bz2) = 28899621
MD5 (ghc-6.8.3-x86_64-unknown-freebsd7-boot.tar.bz2) = 02bf1e86c20d6e841ec20fa38dfefce6
SHA256 (ghc-6.8.3-x86_64-unknown-freebsd7-boot.tar.bz2) = b08a287a7c828934bf8d9c5ccbcf75212a366599e7d3d5d737e7c3e98f07aa5b
SIZE (ghc-6.8.3-x86_64-unknown-freebsd7-boot.tar.bz2) = 28805632
MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6
SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7
SIZE (haddock-2.1.0.tar.gz) = 95531

11
lang/ghc/files/extra-patch-driver-mangler-ghc-asm.lprl
View File

@ -1,11 +0,0 @@
--- driver/mangler/ghc-asm.lprl.orig 2007-12-10 19:11:31.000000000 +0100
+++ driver/mangler/ghc-asm.lprl 2008-03-02 14:26:51.000000000 +0100
@@ -216,7 +216,7 @@
$T_HDR_vector = "\.text\n\t\.align 8\n";
#--------------------------------------------------------#
- } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd)$/m ) {
+ } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd)$/m ) {
$T_STABBY = 0; # 1 iff .stab things (usually if a.out format)
$T_US = ''; # _ if symbols have an underscore on the front

118
lang/ghc/files/extra-patch-rts-Linker.c
View File

@ -1,118 +0,0 @@
--- rts/Linker.c.orig 2007-12-10 19:11:32.000000000 +0100
+++ rts/Linker.c 2008-01-09 22:17:46.459941137 +0100
@@ -59,12 +59,12 @@
#include <sys/wait.h>
#endif
-#if defined(ia64_HOST_ARCH) || defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
+#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
#define USE_MMAP
#include <fcntl.h>
#include <sys/mman.h>
-#if defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -1199,8 +1199,10 @@
struct stat st;
int r, n;
#ifdef USE_MMAP
+ /* In the absence of a MAP_32BIT flag to mmap() we map objects one
+ * after the other starting from a fixed location in memory. */
int fd, pagesize;
- void *map_addr = NULL;
+ static void *map_addr = (void *)0x40000000L;
#else
FILE *f;
#endif
@@ -1262,6 +1264,7 @@
#ifdef USE_MMAP
#define ROUND_UP(x,size) ((x + size - 1) & ~(size - 1))
+#define ROUND_DOWN(x,size) (x & ~(size - 1))
/* On many architectures malloc'd memory isn't executable, so we need to use mmap. */
@@ -1278,7 +1281,7 @@
#ifdef ia64_HOST_ARCH
/* The PLT needs to be right before the object */
n = ROUND_UP(PLTSize(), pagesize);
- oc->plt = mmap(NULL, n, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ oc->plt = mmap(map_addr, n, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if (oc->plt == MAP_FAILED)
barf("loadObj: can't allocate PLT");
@@ -1297,7 +1300,7 @@
#if defined(x86_64_HOST_ARCH) && defined(MAP_32BIT)
#define EXTRA_MAP_FLAGS MAP_32BIT
#else
-#define EXTRA_MAP_FLAGS 0
+#define EXTRA_MAP_FLAGS MAP_FIXED
#endif
/* MAP_ANONYMOUS is MAP_ANON on some systems, e.g. OpenBSD */
@@ -1309,6 +1312,7 @@
MAP_PRIVATE|EXTRA_MAP_FLAGS, fd, 0);
if (oc->image == MAP_FAILED)
barf("loadObj: can't map `%s'", path);
+ map_addr += n;
close(fd);
@@ -2596,10 +2600,12 @@
#define Elf_Sym Elf64_Sym
#define Elf_Rel Elf64_Rel
#define Elf_Rela Elf64_Rela
+#if !defined(freebsd_HOST_OS)
#define ELF_ST_TYPE ELF64_ST_TYPE
#define ELF_ST_BIND ELF64_ST_BIND
#define ELF_R_TYPE ELF64_R_TYPE
#define ELF_R_SYM ELF64_R_SYM
+#endif
#else
#define ELFCLASS ELFCLASS32
#define Elf_Addr Elf32_Addr
@@ -2772,15 +2778,35 @@
x86_64_high_symbol( char *lbl, void *addr )
{
x86_64_bounce *bounce;
+ int pagesize;
+
+ pagesize = getpagesize();
- if ( x86_64_bounce_buffer == NULL ||
+ if ( x86_64_bounce_buffer == NULL ||
x86_64_bb_next_off >= X86_64_BB_SIZE ) {
- x86_64_bounce_buffer =
- mmap(NULL, X86_64_BB_SIZE * sizeof(x86_64_bounce),
- PROT_EXEC|PROT_READ|PROT_WRITE,
- MAP_PRIVATE|EXTRA_MAP_FLAGS|MAP_ANONYMOUS, -1, 0);
+#ifdef MAP_32BIT
+ x86_64_bounce_buffer =
+ mmap(NULL, X86_64_BB_SIZE * sizeof(x86_64_bounce),
+ PROT_EXEC|PROT_READ|PROT_WRITE,
+ MAP_PRIVATE|EXTRA_MAP_FLAGS|MAP_ANONYMOUS, -1, 0);
+#else
+#define X86_64_BOUNCE_BUFFER_TOP 0x80000000L;
+ x86_64_bounce *map_addr;
+
+ x86_64_bounce_buffer = x86_64_bounce_buffer ?
+ x86_64_bounce_buffer : (x86_64_bounce *)X86_64_BOUNCE_BUFFER_TOP;
+ map_addr = x86_64_bounce_buffer - X86_64_BB_SIZE;
+ map_addr = ROUND_DOWN((int)map_addr, pagesize);
+ /* In the absence of MAP_32BIT we allocate the bounce
+ * buffers at a fixed address, one after the other,
+ * starting from the top and growing downwards. */
+ x86_64_bounce_buffer =
+ mmap(map_addr, X86_64_BB_SIZE * sizeof(x86_64_bounce),
+ PROT_EXEC|PROT_READ|PROT_WRITE,
+ MAP_PRIVATE|EXTRA_MAP_FLAGS|MAP_ANONYMOUS, -1, 0);
+#endif
if (x86_64_bounce_buffer == MAP_FAILED) {
- barf("x86_64_high_symbol: mmap failed");
+ barf("x86_64_high_symbol: mmap failed at %p", x86_64_bounce_buffer);
}
x86_64_bb_next_off = 0;
}

16
lang/ghc/files/patch-ghc-rts-package.conf.in
View File

@ -1,18 +1,10 @@
--- rts/package.conf.in.orig 2007-12-10 19:11:32.000000000 +0100
+++ rts/package.conf.in 2007-12-31 08:32:19.000000000 +0100
@@ -66,6 +66,7 @@
include-dirs: FPTOOLS_TOP_ABS"/includes"
FPTOOLS_TOP_ABS"/rts"
FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+ GMP_INCLUDE_DIRS
#endif
includes: Stg.h
@@ -143,6 +144,7 @@
--- rts/package.conf.in.orig 2008-06-16 19:27:16.000000000 +0200
+++ rts/package.conf.in 2008-06-21 21:46:49.000000000 +0200
@@ -144,6 +144,7 @@
, "-u", "base_GHCziIOBase_NestedAtomically_closure"
, "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
#endif
+ , "-L/usr/local/lib"
+ , "-L/usr/local/lib"
#ifdef LEADING_UNDERSCORE
, "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"

11
lang/ghc/files/patch-libraries-Cabal-Distribution-Simple-Haddock.hs
View File

@ -1,11 +0,0 @@
--- libraries/Cabal/Distribution/Simple/Haddock.hs.orig 2007-12-10 18:18:23.000000000 +0000
+++ libraries/Cabal/Distribution/Simple/Haddock.hs 2008-02-20 15:02:53.000000000 +0000
@@ -122,7 +122,7 @@
then "--hoogle"
else "--html"
let Just version = programVersion confHaddock
- let have_src_hyperlink_flags = version >= Version [0,8] [] && version < Version [2,0] []
+ let have_src_hyperlink_flags = version >= Version [0,8] []
isVersion2 = version >= Version [2,0] []
let mockFlags

20
lang/ghc/files/patch-utils-hsc2hs-Makefile
View File

@ -1,20 +0,0 @@
diff -rNup ./utils/hsc2hs/Makefile.orig ./utils/hsc2hs/Makefile
--- ./utils/hsc2hs/Makefile.orig Mon Dec 10 19:11:32 2007
+++ ./utils/hsc2hs/Makefile Sun Dec 30 21:53:09 2007
@@ -39,9 +39,15 @@ else
extra_flags=
endif
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+gmp_includes=-I$(GMP_INCLUDE_DIRS)
+else
+gmp_includes=
+endif
+
$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
echo "import System.Cmd; import System.Environment; import System.Exit" > $@
- echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild\":args) >>= exitWith" >> $@
+ echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild\":\"$(gmp_includes)\":args) >>= exitWith" >> $@
$(INPLACE_PROG): $(INPLACE_HS)
$(HC) --make $< -o $@

1702
lang/ghc/pkg-plist
View File

File diff suppressed because it is too large Load Diff

3
print/hs-hscolour/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= hscolour
PORTVERSION= 1.9
PORTREVISION= 1
CATEGORIES= print haskell
MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/
PKGNAMEPREFIX= hs-
@ -20,7 +21,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
NO_PKG_REGISTER=
.endif
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
HSCOLOUR_VERSION= ${PORTVERSION}
CABAL_CMD= runghc Setup.hs

4
x11-toolkits/hs-GLUT/Makefile
View File

@ -6,7 +6,7 @@
PORTNAME= glut
PORTVERSION= 2.1.1.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -18,7 +18,7 @@ COMMENT= A Compiler for the functional language Haskell
USE_GL= glut
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \

3
x11-toolkits/hs-OpenGL/Makefile
View File

@ -6,6 +6,7 @@
PORTNAME= opengl
PORTVERSION= 2.2.1.1
PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${GHC_VERSION}/
PKGNAMEPREFIX= hs-
@ -21,7 +22,7 @@ COMMENT= OpenGL bindings for Haskell programs
USE_BZIP2= yes
USE_GL= yes
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \

6
x11-toolkits/hs-OpenGL/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ghc-6.8.2-src-extralibs.tar.bz2) = d199c50814188fb77355d41058b8613c
SHA256 (ghc-6.8.2-src-extralibs.tar.bz2) = 96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510
SIZE (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843
MD5 (ghc-6.8.3-src-extralibs.tar.bz2) = 5ac72f5d5433151cf6b718dc6601dc41
SHA256 (ghc-6.8.3-src-extralibs.tar.bz2) = ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2
SIZE (ghc-6.8.3-src-extralibs.tar.bz2) = 1912647

4
x11-toolkits/hs-glut-ghc/Makefile
View File

@ -6,7 +6,7 @@
PORTNAME= glut
PORTVERSION= 2.1.1.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-toolkits haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -18,7 +18,7 @@ COMMENT= A Compiler for the functional language Haskell
USE_GL= glut
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \

3
x11-toolkits/hs-opengl-ghc/Makefile
View File

@ -6,6 +6,7 @@
PORTNAME= opengl
PORTVERSION= 2.2.1.1
PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${GHC_VERSION}/
PKGNAMEPREFIX= hs-
@ -21,7 +22,7 @@ COMMENT= OpenGL bindings for Haskell programs
USE_BZIP2= yes
USE_GL= yes
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \

6
x11-toolkits/hs-opengl-ghc/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ghc-6.8.2-src-extralibs.tar.bz2) = d199c50814188fb77355d41058b8613c
SHA256 (ghc-6.8.2-src-extralibs.tar.bz2) = 96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510
SIZE (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843
MD5 (ghc-6.8.3-src-extralibs.tar.bz2) = 5ac72f5d5433151cf6b718dc6601dc41
SHA256 (ghc-6.8.3-src-extralibs.tar.bz2) = ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2
SIZE (ghc-6.8.3-src-extralibs.tar.bz2) = 1912647

4
x11-wm/hs-xmonad-contrib/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
@ -23,7 +23,7 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
USE_XORG= x11
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
SUBDIR= lib/${PORTNAME}-${PORTVERSION}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \

4
x11-wm/hs-xmonad/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmonad
PORTVERSION= 0.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
@ -21,7 +21,7 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
USE_XORG= x11
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
SUBDIR= lib/${PORTNAME}-${PORTVERSION}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \

4
x11-wm/xmonad-contrib/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
@ -23,7 +23,7 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
USE_XORG= x11
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
SUBDIR= lib/${PORTNAME}-${PORTVERSION}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \

4
x11-wm/xmonad/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmonad
PORTVERSION= 0.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
@ -21,7 +21,7 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
USE_XORG= x11
CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
SUBDIR= lib/${PORTNAME}-${PORTVERSION}
PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \

4
x11/hs-X11/Makefile
View File

@ -6,7 +6,7 @@
PORTNAME= x11
PORTVERSION= 1.4.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -19,7 +19,7 @@ COMMENT= X11 bindings for Haskell programs
# include the version verbatim. This will require a revision bump
# on updates, but the correct quoting of `ghc --numeric-version` in the various
# places is a real nightmare.
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \

4
x11/hs-x11-ghc/Makefile
View File

@ -6,7 +6,7 @@
PORTNAME= x11
PORTVERSION= 1.4.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@ -19,7 +19,7 @@ COMMENT= X11 bindings for Haskell programs
# include the version verbatim. This will require a revision bump
# on updates, but the correct quoting of `ghc --numeric-version` in the various
# places is a real nightmare.
GHC_VERSION= 6.8.2
GHC_VERSION= 6.8.3
PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
PORTVERSION=${PORTVERSION} \
PORTNAME=${PORTNAME} \