Use the correct renamed symbols for opendir, unsetenv, and times. Solves PR pkg/38263. Bump PKGREVISION.diff -r1.39 -r1.40 pkgsrc/lang/ghc/Makefile
(kristerw)
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.39 2008/03/17 15:33:10 kristerw Exp $ | 1 | # $NetBSD: Makefile,v 1.40 2008/03/24 22:40:23 kristerw Exp $ | |
2 | 2 | |||
3 | DISTNAME= ghc-6.8.2 | 3 | DISTNAME= ghc-6.8.2 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
5 | MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/ | 6 | MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/ | |
6 | DISTFILES= ghc-6.8.2-src.tar.bz2 \ | 7 | DISTFILES= ghc-6.8.2-src.tar.bz2 \ | |
7 | ghc-6.8.2-src-extralibs.tar.bz2 \ | 8 | ghc-6.8.2-src-extralibs.tar.bz2 \ | |
8 | ghc-6.4.2-src.tar.bz2 \ | 9 | ghc-6.4.2-src.tar.bz2 \ | |
9 | ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz | 10 | ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz | |
10 | 11 | |||
11 | MAINTAINER= kristerw@NetBSD.org | 12 | MAINTAINER= kristerw@NetBSD.org | |
12 | HOMEPAGE= http://www.haskell.org/ghc/ | 13 | HOMEPAGE= http://www.haskell.org/ghc/ | |
13 | COMMENT= Compiler for the functional language Haskell | 14 | COMMENT= Compiler for the functional language Haskell | |
14 | 15 | |||
15 | SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/ | 16 | SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/ | |
16 | SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL} | 17 | SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL} |
@@ -1,23 +1,28 @@ | @@ -1,23 +1,28 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2008/03/17 15:33:10 kristerw Exp $ | 1 | $NetBSD: distinfo,v 1.20 2008/03/24 22:40:23 kristerw Exp $ | |
2 | 2 | |||
3 | SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c | 3 | SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c | |
4 | RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de | 4 | RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de | |
5 | Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes | 5 | Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes | |
6 | SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42 | 6 | SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42 | |
7 | RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38 | 7 | RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38 | |
8 | Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes | 8 | Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes | |
9 | SHA1 (ghc-6.8.2-src-extralibs.tar.bz2) = b8c9ff989a87e2699a08e595523faa8d11e6e7dc | 9 | SHA1 (ghc-6.8.2-src-extralibs.tar.bz2) = b8c9ff989a87e2699a08e595523faa8d11e6e7dc | |
10 | RMD160 (ghc-6.8.2-src-extralibs.tar.bz2) = 10e888cb4cf8a05b1213b171877f63505ff30cdf | 10 | RMD160 (ghc-6.8.2-src-extralibs.tar.bz2) = 10e888cb4cf8a05b1213b171877f63505ff30cdf | |
11 | Size (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843 bytes | 11 | Size (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843 bytes | |
12 | SHA1 (ghc-6.8.2-src.tar.bz2) = 1f40b0ee2e51be1208fdb579ce4998181ec36a40 | 12 | SHA1 (ghc-6.8.2-src.tar.bz2) = 1f40b0ee2e51be1208fdb579ce4998181ec36a40 | |
13 | RMD160 (ghc-6.8.2-src.tar.bz2) = dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c | 13 | RMD160 (ghc-6.8.2-src.tar.bz2) = dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c | |
14 | Size (ghc-6.8.2-src.tar.bz2) = 7072545 bytes | 14 | Size (ghc-6.8.2-src.tar.bz2) = 7072545 bytes | |
15 | SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63 | 15 | SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63 | |
16 | SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051 | 16 | SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051 | |
17 | SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa | 17 | SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa | |
18 | SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132 | 18 | SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132 | |
19 | SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb | 19 | SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb | |
20 | SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e | 20 | SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e | |
21 | SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad | 21 | SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad | |
22 | SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269 | 22 | SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269 | |
23 | SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa | 23 | SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa | |
24 | SHA1 (patch-ak) = f188c5b3a57f6d19b49ca0bec9c19149a58034de | |||
25 | SHA1 (patch-al) = 66264014e24c06237911b786bbadb116bd65b5c1 | |||
26 | SHA1 (patch-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0 | |||
27 | SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7 | |||
28 | SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79 |
$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.
$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"
$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
$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 ++ "=")
$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
-- -----------------------------------------------------------------------------