Mon Mar 31 06:18:12 2008 UTC ()
Fix another system library symbol versioning problem, this time with
socket(), and bump PKGREVISION.


(cjs)
diff -r1.40 -r1.41 pkgsrc/lang/ghc/Makefile
diff -r1.20 -r1.21 pkgsrc/lang/ghc/distinfo
diff -r0 -r1.3 pkgsrc/lang/ghc/patches/patch-ap
diff -r0 -r1.3 pkgsrc/lang/ghc/patches/patch-aq
cvs diff -r1.40 -r1.41 pkgsrc/lang/ghc/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc/Makefile 2008/03/24 22:40:23 1.40
+++ pkgsrc/lang/ghc/Makefile 2008/03/31 06:18:12 1.41
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.40 2008/03/24 22:40:23 kristerw Exp $ 1# $NetBSD: Makefile,v 1.41 2008/03/31 06:18:12 cjs Exp $
2 2
3DISTNAME= ghc-6.8.2 3DISTNAME= ghc-6.8.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/ 6MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/
7DISTFILES= ghc-6.8.2-src.tar.bz2 \ 7DISTFILES= ghc-6.8.2-src.tar.bz2 \
8 ghc-6.8.2-src-extralibs.tar.bz2 \ 8 ghc-6.8.2-src-extralibs.tar.bz2 \
9 ghc-6.4.2-src.tar.bz2 \ 9 ghc-6.4.2-src.tar.bz2 \
10 ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz 10 ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz
11 11
12MAINTAINER= kristerw@NetBSD.org 12MAINTAINER= kristerw@NetBSD.org
13HOMEPAGE= http://www.haskell.org/ghc/ 13HOMEPAGE= http://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell 14COMMENT= Compiler for the functional language Haskell
15 15
16SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/ 16SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/
17SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL} 17SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
cvs diff -r1.20 -r1.21 pkgsrc/lang/ghc/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc/distinfo 2008/03/24 22:40:23 1.20
+++ pkgsrc/lang/ghc/distinfo 2008/03/31 06:18:12 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.20 2008/03/24 22:40:23 kristerw Exp $ 1$NetBSD: distinfo,v 1.21 2008/03/31 06:18:12 cjs Exp $
2 2
3SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c 3SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
4RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de 4RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
5Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes 5Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes
6SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42 6SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42
7RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38 7RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38
8Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes 8Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes
9SHA1 (ghc-6.8.2-src-extralibs.tar.bz2) = b8c9ff989a87e2699a08e595523faa8d11e6e7dc 9SHA1 (ghc-6.8.2-src-extralibs.tar.bz2) = b8c9ff989a87e2699a08e595523faa8d11e6e7dc
10RMD160 (ghc-6.8.2-src-extralibs.tar.bz2) = 10e888cb4cf8a05b1213b171877f63505ff30cdf 10RMD160 (ghc-6.8.2-src-extralibs.tar.bz2) = 10e888cb4cf8a05b1213b171877f63505ff30cdf
11Size (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843 bytes 11Size (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843 bytes
12SHA1 (ghc-6.8.2-src.tar.bz2) = 1f40b0ee2e51be1208fdb579ce4998181ec36a40 12SHA1 (ghc-6.8.2-src.tar.bz2) = 1f40b0ee2e51be1208fdb579ce4998181ec36a40
13RMD160 (ghc-6.8.2-src.tar.bz2) = dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c 13RMD160 (ghc-6.8.2-src.tar.bz2) = dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c
14Size (ghc-6.8.2-src.tar.bz2) = 7072545 bytes 14Size (ghc-6.8.2-src.tar.bz2) = 7072545 bytes
@@ -16,13 +16,15 @@ SHA1 (patch-aa) = bcb07fa1a18edddf162970 @@ -16,13 +16,15 @@ SHA1 (patch-aa) = bcb07fa1a18edddf162970
16SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051 16SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051
17SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa 17SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa
18SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132 18SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132
19SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb 19SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb
20SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e 20SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e
21SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad 21SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad
22SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269 22SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269
23SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa 23SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa
24SHA1 (patch-ak) = f188c5b3a57f6d19b49ca0bec9c19149a58034de 24SHA1 (patch-ak) = f188c5b3a57f6d19b49ca0bec9c19149a58034de
25SHA1 (patch-al) = 66264014e24c06237911b786bbadb116bd65b5c1 25SHA1 (patch-al) = 66264014e24c06237911b786bbadb116bd65b5c1
26SHA1 (patch-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0 26SHA1 (patch-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0
27SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7 27SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7
28SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79 28SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79
 29SHA1 (patch-ap) = 13afc2f1c51fc10f5bc657528599e2d53b11507b
 30SHA1 (patch-aq) = 554514e160ae2bdcab0dfd444839d333a72b5b4f
File Added: pkgsrc/lang/ghc/patches/patch-ap
$NetBSD: patch-ap,v 1.3 2008/03/31 06:18:12 cjs Exp $

--- libraries/network/include/HsNet.h.orig	2007-12-11 03:25:19.000000000 +0900
+++ libraries/network/include/HsNet.h	2008-03-31 12:36:50.000000000 +0900
@@ -139,3 +139,8 @@
 }
 
 #endif
+
+INLINE int __hsnet_socket(int domain, int type, int protocol)
+{
+    return socket(domain, type, protocol);
+}
File Added: pkgsrc/lang/ghc/patches/patch-aq
$NetBSD: patch-aq,v 1.3 2008/03/31 06:18:12 cjs Exp $

--- libraries/network/Network/Socket.hsc.orig	2008-03-31 12:40:13.000000000 +0900
+++ libraries/network/Network/Socket.hsc	2008-03-31 12:40:41.000000000 +0900
@@ -2499,7 +2499,7 @@
   c_close :: CInt -> IO CInt
 #endif
 
-foreign import CALLCONV unsafe "socket"
+foreign import CALLCONV unsafe "__hsnet_socket"
   c_socket :: CInt -> CInt -> CInt -> IO CInt
 foreign import CALLCONV unsafe "bind"
   c_bind :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt