Add support for SunOS-*-i386. Tested on 32-bit SmartOS.

7 files changed, 32 insertions, 15 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 870d8e5c9f0..888858403e5 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2012/08/14 17:07:57 asau Exp $
+# $NetBSD: Makefile,v 1.47 2012/08/17 15:49:35 jperkin Exp $
 
 DISTNAME=	ghc-6.8.3
 PKGREVISION=	2
@@ -16,7 +16,7 @@ COMMENT=	Compiler for the functional language Haskell
 SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/
 SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
 
-ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386
+ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 SunOS-*-i386
 
 PKG_DESTDIR_SUPPORT=	none
 
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 6a75413f754..0a530052ccc 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2012/02/02 12:32:32 wiz Exp $
+$NetBSD: distinfo,v 1.28 2012/08/17 15:49:35 jperkin Exp $
 
 SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
 RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@@ -14,11 +14,11 @@ RMD160 (ghc-6.8.3-src.tar.bz2) = 415cd144f0641a0c5887ad7325e2e775e93044f0
 Size (ghc-6.8.3-src.tar.bz2) = 7092076 bytes
 SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63
 SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051
-SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa
-SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132
+SHA1 (patch-ac) = 65ba6ec7a78d938af965ebc07aa65fc00fb6b5ce
+SHA1 (patch-ad) = 3d1e88785651dedf582b53e54e4aac6dcf278a2e
 SHA1 (patch-ae) = 85a7e38fb2b54787199b59a695f8112ea3f2aed3
-SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb
-SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e
+SHA1 (patch-af) = 67c83651dac90560f0ac2c1314a0400a7d741bea
+SHA1 (patch-ag) = b679e9c3e595d2dd695d484556b6c1879efd8ab1
 SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad
 SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269
 SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa
@@ -32,3 +32,4 @@ SHA1 (patch-aq) = 554514e160ae2bdcab0dfd444839d333a72b5b4f
 SHA1 (patch-ar) = 0cc6fedc5ee6304b201da79b7cc0104a804501cd
 SHA1 (patch-as) = cebeefbeada25b1d52a528c4d83d66b7a2766e1a
 SHA1 (patch-at) = f97dd308c238cfc98d9579a63f591514e9c70fee
+SHA1 (patch-au) = 4eb10fb1558a758ce9919c422ec7f15fa5b466e1
diff --git a/lang/ghc/patches/patch-ac b/lang/ghc/patches/patch-ac
index 23a7b03e6fb..59a464133cc 100644
--- a/lang/ghc/patches/patch-ac
+++ b/lang/ghc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
+$NetBSD: patch-ac,v 1.8 2012/08/17 15:49:35 jperkin Exp $
 
 --- rts/package.conf.in.orig	2007-12-10 16:11:32.000000000 -0200
 +++ rts/package.conf.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
  cc-options:
  
 -ld-options:
-+ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib",
++ld-options: "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib",
  #ifdef LEADING_UNDERSCORE
             "-u", "_base_GHCziBase_Izh_static_info"
           , "-u", "_base_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
index 519a26b5268..36d09a0bce7 100644
--- a/lang/ghc/patches/patch-ad
+++ b/lang/ghc/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
+$NetBSD: patch-ad,v 1.10 2012/08/17 15:49:35 jperkin Exp $
 
 --- libraries/readline/readline.cabal.orig	2007-12-10 16:20:29.000000000 -0200
 +++ libraries/readline/readline.cabal
@@ -6,4 +6,4 @@ $NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
    includes:	HsReadline.h
    install-includes:	HsReadline.h HsReadlineConfig.h
    c-sources:	HsReadline_cbits.c
-+  ld-options:    "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
++  ld-options:    "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib"
diff --git a/lang/ghc/patches/patch-af b/lang/ghc/patches/patch-af
index 4f4b6b07ad1..f9077215858 100644
--- a/lang/ghc/patches/patch-af
+++ b/lang/ghc/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-af,v 1.8 2012/08/17 15:49:35 jperkin Exp $
 
 --- ../ghc-6.4.2/ghc/rts/package.conf.in.orig	2005-05-20 21:07:55.000000000 +0200
 +++ ../ghc-6.4.2/ghc/rts/package.conf.in	2005-05-20 21:08:58.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.7 2007/03/24 17:57:20 kristerw Exp $
  cc-options:
  
 -ld-options:
-+ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib",
++ld-options: "-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib",
  #ifdef LEADING_UNDERSCORE
             "-u", "_GHCziBase_Izh_static_info"
           , "-u", "_GHCziBase_Czh_static_info"
diff --git a/lang/ghc/patches/patch-ag b/lang/ghc/patches/patch-ag
index 34cec76b659..690fea6a7c9 100644
--- a/lang/ghc/patches/patch-ag
+++ b/lang/ghc/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-ag,v 1.6 2012/08/17 15:49:36 jperkin Exp $
 
 --- ../ghc-6.4.2/libraries/readline/package.conf.in.orig	2005-05-20 20:59:44.000000000 +0200
 +++ ../ghc-6.4.2/libraries/readline/package.conf.in	2005-05-20 21:07:43.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.5 2007/03/24 17:57:20 kristerw Exp $
  hugs-options:
  cc-options:
 -ld-options:
-+ld-options:	"-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
++ld-options:	"-Wl,-R@PREFIX@/lib","-L@PREFIX@/lib"
  framework-dirs:
  frameworks:
  haddock-interfaces:	HADDOCK_IFACE
diff --git a/lang/ghc/patches/patch-au b/lang/ghc/patches/patch-au
new file mode 100644
index 00000000000..6f784ccdd93
--- /dev/null
+++ b/lang/ghc/patches/patch-au
@@ -0,0 +1,16 @@
+$NetBSD: patch-au,v 1.1 2012/08/17 15:49:36 jperkin Exp $
+
+--- ../ghc-6.4.2/ghc/rts/RtsUtils.c.orig	2012-08-17 14:05:20.740303579 +0000
++++ ../ghc-6.4.2/ghc/rts/RtsUtils.c	2012-08-17 14:06:13.029606465 +0000
+@@ -187,7 +187,11 @@
+     if (now == 0) {
+ 	time(&now);
+ #if HAVE_CTIME_R
++#  ifdef __sun
++	ctime_r(&now, nowstr, sizeof(nowstr));
++#  else
+ 	ctime_r(&now, nowstr);
++#  endif
+ #else
+ 	strcpy(nowstr, ctime(&now));
+ #endif