From c84bd1f78370facb09ee183bd038985b2e017dfc Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Mon, 7 Jul 2008 14:58:00 +0000
Subject: Use the correct renamed symbol for sigprocmask.

Solves PR pkg/38510.

Bump PKGREVISION.
---
 lang/ghc/Makefile         |  4 ++--
 lang/ghc/distinfo         |  6 +++---
 lang/ghc/patches/patch-ak | 20 ++++++++++++++++----
 lang/ghc/patches/patch-al | 15 ++++++++++++---
 4 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'lang/ghc')

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 4b1e16c1ed9..ab770ea9643 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2008/03/31 06:18:12 cjs Exp $
+# $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=	ghc-6.8.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/6.8.2/
 DISTFILES=	ghc-6.8.2-src.tar.bz2 \
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 5a58a2dbf24..5cec3eba3bf 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2008/03/31 06:18:12 cjs Exp $
+$NetBSD: distinfo,v 1.22 2008/07/07 14:58:00 kristerw 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
@@ -21,8 +21,8 @@ SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e
 SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad
 SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269
 SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa
-SHA1 (patch-ak) = f188c5b3a57f6d19b49ca0bec9c19149a58034de
-SHA1 (patch-al) = 66264014e24c06237911b786bbadb116bd65b5c1
+SHA1 (patch-ak) = 5b29f92b0f9c1e33da89c916f9ae93946df3b063
+SHA1 (patch-al) = 3a66b0bf57772c34234fde5713dc02037c476eb2
 SHA1 (patch-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0
 SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7
 SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79
diff --git a/lang/ghc/patches/patch-ak b/lang/ghc/patches/patch-ak
index 5d9edbc2b68..fe1f89f7c8c 100644
--- a/lang/ghc/patches/patch-ak
+++ b/lang/ghc/patches/patch-ak
@@ -1,8 +1,20 @@
-$NetBSD: patch-ak,v 1.3 2008/03/24 22:40:23 kristerw Exp $
+$NetBSD: patch-ak,v 1.4 2008/07/07 14:58:00 kristerw Exp $
 
---- libraries/base/include/HsBase.h.orig	2008-03-24 13:33:49.000000000 +0100
-+++ libraries/base/include/HsBase.h	2008-03-24 13:38:50.000000000 +0100
-@@ -648,6 +648,10 @@
+--- libraries/base/include/HsBase.h.orig	2007-12-10 19:16:54.000000000 +0100
++++ libraries/base/include/HsBase.h	2008-07-07 13:18:57.000000000 +0200
+@@ -254,6 +254,11 @@
+ INLINE int
+ __hscore_sigismember( sigset_t * set, int s )
+ { return sigismember(set,s); }
++
++INLINE int
++__hscore_sigprocmask( int how, const sigset_t * set, sigset_t * oset )
++{ return sigprocmask(how,set,oset); }
++
+ #endif
+ 
+ INLINE void *
+@@ -648,6 +653,10 @@
  #endif
  }
  
diff --git a/lang/ghc/patches/patch-al b/lang/ghc/patches/patch-al
index ca1cfb7a85d..3271c862a39 100644
--- a/lang/ghc/patches/patch-al
+++ b/lang/ghc/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.3 2008/03/24 22:40:23 kristerw Exp $
+$NetBSD: patch-al,v 1.4 2008/07/07 14:58:00 kristerw Exp $
 
---- libraries/base/System/Posix/Internals.hs.orig	2008-03-24 13:34:39.000000000 +0100
-+++ libraries/base/System/Posix/Internals.hs	2008-03-24 13:44:11.000000000 +0100
+--- libraries/base/System/Posix/Internals.hs.orig	2007-12-10 19:16:54.000000000 +0100
++++ libraries/base/System/Posix/Internals.hs	2008-07-07 13:11:44.000000000 +0200
 @@ -354,7 +354,7 @@
  foreign import ccall unsafe "HsBase.h __hscore_open"
     c_open :: CString -> CInt -> CMode -> IO CInt
@@ -11,3 +11,12 @@ $NetBSD: patch-al,v 1.3 2008/03/24 22:40:23 kristerw Exp $
     c_opendir :: CString  -> IO (Ptr CDir)
  
  foreign import ccall unsafe "HsBase.h __hscore_mkdir"
+@@ -418,7 +418,7 @@
+ foreign import ccall unsafe "HsBase.h __hscore_sigaddset"
+    c_sigaddset :: Ptr CSigset -> CInt -> IO CInt
+ 
+-foreign import ccall unsafe "HsBase.h sigprocmask"
++foreign import ccall unsafe "HsBase.h __hscore_sigprocmask"
+    c_sigprocmask :: CInt -> Ptr CSigset -> Ptr CSigset -> IO CInt
+ 
+ foreign import ccall unsafe "HsBase.h tcgetattr"
-- 
cgit v1.2.3