Use the correct renamed symbols for opendir, unsetenv, and times.

Solves PR pkg/38263.

Bump PKGREVISION.

7 files changed, 85 insertions, 2 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index bc90c817a6e..3a387b636c8 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2008/03/17 15:33:10 kristerw Exp $
+# $NetBSD: Makefile,v 1.40 2008/03/24 22:40:23 kristerw Exp $
 
 DISTNAME=	ghc-6.8.2
+PKGREVISION=	1
 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 2e6ca5be04a..6a3440f230b 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2008/03/17 15:33:10 kristerw Exp $
+$NetBSD: distinfo,v 1.20 2008/03/24 22:40:23 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,3 +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-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0
+SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7
+SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79
diff --git a/lang/ghc/patches/patch-ak b/lang/ghc/patches/patch-ak
new file mode 100644
index 00000000000..5d9edbc2b68
--- /dev/null
+++ b/lang/ghc/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.3 2008/03/24 22:40:23 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 @@
+ #endif
+ }
+ 
++INLINE DIR* __hscore_opendir (const char *filename) {
++	return opendir(filename);
++}
++
+ // These are wrapped because on some OSs (eg. Linux) they are
+ // macros which redirect to the 64-bit-off_t versions when large file
+ // support is enabled.
diff --git a/lang/ghc/patches/patch-al b/lang/ghc/patches/patch-al
new file mode 100644
index 00000000000..ca1cfb7a85d
--- /dev/null
+++ b/lang/ghc/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.3 2008/03/24 22:40:23 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
+@@ -354,7 +354,7 @@
+ foreign import ccall unsafe "HsBase.h __hscore_open"
+    c_open :: CString -> CInt -> CMode -> IO CInt
+ 
+-foreign import ccall unsafe "HsBase.h opendir" 
++foreign import ccall unsafe "HsBase.h __hscore_opendir" 
+    c_opendir :: CString  -> IO (Ptr CDir)
+ 
+ foreign import ccall unsafe "HsBase.h __hscore_mkdir"
diff --git a/lang/ghc/patches/patch-am b/lang/ghc/patches/patch-am
new file mode 100644
index 00000000000..91495703e66
--- /dev/null
+++ b/lang/ghc/patches/patch-am
@@ -0,0 +1,23 @@
+$NetBSD: patch-am,v 1.3 2008/03/24 22:40:23 kristerw Exp $
+
+--- libraries/unix/include/HsUnix.h.orig	2008-03-24 17:06:03.000000000 +0100
++++ libraries/unix/include/HsUnix.h	2008-03-24 17:12:35.000000000 +0100
+@@ -140,6 +140,18 @@
+     return mknod(pathname,mode,dev);
+ }
+ 
++#ifdef HAVE_UNSETENV
++INLINE int __hsunix_unsetenv(const char *name)
++{
++    return unsetenv(name);
++}
++#endif
++
++INLINE clock_t __hsunix_times(struct tms *tp)
++{
++    return times(tp);
++}
++
+ #ifdef HAVE_PTSNAME
+ // I cannot figure out how to make the definitions of the following
+ // functions visible in <stdlib.h> on Linux.  But these definitions
diff --git a/lang/ghc/patches/patch-an b/lang/ghc/patches/patch-an
new file mode 100644
index 00000000000..f1b476ea287
--- /dev/null
+++ b/lang/ghc/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.3 2008/03/24 22:40:23 kristerw Exp $
+
+--- libraries/unix/System/Posix/Env.hsc.orig	2008-03-24 17:09:39.000000000 +0100
++++ libraries/unix/System/Posix/Env.hsc	2008-03-24 17:10:41.000000000 +0100
+@@ -81,7 +81,7 @@
+ 
+ unsetEnv name = withCString name c_unsetenv
+ 
+-foreign import ccall unsafe "unsetenv"
++foreign import ccall unsafe "__hsunix_unsetenv"
+    c_unsetenv :: CString -> IO ()
+ #else
+ unsetEnv name = putEnv (name ++ "=")
diff --git a/lang/ghc/patches/patch-ao b/lang/ghc/patches/patch-ao
new file mode 100644
index 00000000000..e5b86248e96
--- /dev/null
+++ b/lang/ghc/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.3 2008/03/24 22:40:23 kristerw Exp $
+
+--- libraries/unix/System/Posix/Process.hsc.orig	2008-03-24 17:10:54.000000000 +0100
++++ libraries/unix/System/Posix/Process.hsc	2008-03-24 17:11:30.000000000 +0100
+@@ -177,7 +177,7 @@
+ 
+ type CTms = ()
+ 
+-foreign import ccall unsafe "times"
++foreign import ccall unsafe "__hsunix_times"
+   c_times :: Ptr CTms -> IO CClock
+ 
+ -- -----------------------------------------------------------------------------