[arch-commits] Commit in ghc/repos (4 files)

Mon Apr 20 11:09:44 UTC 2009

Date: Monday, April 20, 2009 @ 07:09:44
  Author: vesa
Revision: 36183

Merged revisions 32954,34169,34435,34455 via svnmerge from 
svn+ssh://vesa@archlinux.org/srv/svn-packages/ghc/trunk

........
  r32954 | vesa | 2009-04-03 08:21:00 +0300 (Fri, 03 Apr 2009) | 2 lines
  
  upstream verbump
........
  r34169 | vesa | 2009-04-07 10:15:21 +0300 (Tue, 07 Apr 2009) | 2 lines
  
  deopionofy
........
  r34435 | vesa | 2009-04-09 14:12:44 +0300 (Thu, 09 Apr 2009) | 1 line
  
  upgpkg: ghc 6.10.2-2
........
  r34455 | vesa | 2009-04-09 15:45:27 +0300 (Thu, 09 Apr 2009) | 2 lines
  
  towards 6.10.2-2...
........

Added:
  ghc/repos/extra-i686/ghc.install
    (from rev 34455, ghc/trunk/ghc.install)
Modified:
  ghc/repos/extra-i686/	(properties)
  ghc/repos/extra-i686/PKGBUILD
Deleted:
  ghc/repos/extra-i686/network.patch

---------------+
 PKGBUILD      |   19 ++++++++----
 ghc.install   |   22 +++++++++++++++
 network.patch |   82 --------------------------------------------------------
 3 files changed, 34 insertions(+), 89 deletions(-)


Property changes on: ghc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /ghc/trunk:1-24462
   + /ghc/trunk:1-36182

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-04-20 10:43:18 UTC (rev 36182)
+++ extra-i686/PKGBUILD	2009-04-20 11:09:44 UTC (rev 36183)
@@ -1,23 +1,23 @@
 # $Id$
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 pkgname=ghc
-pkgver=6.10.1
+pkgver=6.10.2
 pkgrel=2
-pkgdesc="A state-of-the-art, open source, compiler and interactive environment for Haskell."
+pkgdesc="The Glasgow Haskell Compiler"
 arch=(i686 x86_64)
 url="http://www.haskell.org/ghc/"
 license=("custom")
 depends=(gmp libedit)
 makedepends=(ghc happy perl)
 provides=(haskell-cabal)
+replaces=("haskell-cabal<1.6.0.3")
+backup=(usr/lib/ghc-6.10.2/package.conf)
+install=(ghc.install)
+
 source=("http://www.haskell.org/ghc/dist/stable/dist/$pkgname-$pkgver-src.tar.bz2" \
     "http://www.haskell.org/ghc/dist/stable/dist/$pkgname-$pkgver-src-extralibs.tar.bz2"
-     build.mk)
+     build.mk ghc.install)
 
-md5sums=('54c676a632b3d73cf526b06347522c32'
-         '4ff4590f1002ae1ff608874da8643c67'
-         'a05681b982aad44cc6770bd021e35b67')
-
 build() {
   cd $startdir/src/$pkgname-$pkgver
 
@@ -29,3 +29,8 @@
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
 }
+
+md5sums=('243d5857e5aa5f2f86e5e4c4437973fb'
+         '9415604386ca69ebe15f1054653aefaf'
+         'a05681b982aad44cc6770bd021e35b67'
+         'd03bca6b591043c0fe996d72dd448919')

Copied: ghc/repos/extra-i686/ghc.install (from rev 34455, ghc/trunk/ghc.install)
===================================================================
--- extra-i686/ghc.install	                        (rev 0)
+++ extra-i686/ghc.install	2009-04-20 11:09:44 UTC (rev 36183)
@@ -0,0 +1,22 @@
+pkgname=ghc
+
+pre_upgrade() {
+    cat << EOF
+    ==> Unregistering cabalized packages...
+EOF
+    cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null )
+    cat << EOF
+    ==> Done.
+EOF
+    
+}
+
+post_upgrade() {
+    cat << EOF
+    ==> All cabalized and yaourt-installed packages need to be reinstalled now.
+    ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.
+EOF
+}
+
+op=$1
+shift

Deleted: extra-i686/network.patch
===================================================================
--- extra-i686/network.patch	2009-04-20 10:43:18 UTC (rev 36182)
+++ extra-i686/network.patch	2009-04-20 11:09:44 UTC (rev 36183)
@@ -1,82 +0,0 @@
-diff -u -r ghc-6.8.2-orig/libraries/network/Network/Socket.hsc ghc-6.8.2/libraries/network/Network/Socket.hsc
---- ghc-6.8.2-orig/libraries/network/Network/Socket.hsc	2007-12-10 20:25:19.000000000 +0200
-+++ ghc-6.8.2/libraries/network/Network/Socket.hsc	2008-08-06 21:36:47.045962479 +0300
-@@ -95,7 +95,7 @@
-     getPeerName,	-- :: Socket -> IO SockAddr
-     getSocketName,	-- :: Socket -> IO SockAddr
- 
--#ifdef SO_PEERCRED
-+#ifdef HAVE_STRUCT_UCRED
- 	-- get the credentials of our domain socket peer.
-     getPeerCred,         -- :: Socket -> IO (CUInt{-pid-}, CUInt{-uid-}, CUInt{-gid-})
- #endif
-@@ -1134,7 +1134,7 @@
-        fromIntegral `liftM` peek ptr_v
- 
- 
--#ifdef SO_PEERCRED
-+#ifdef HAVE_STRUCT_UCRED
- -- | Returns the processID, userID and groupID of the socket's peer.
- --
- -- Only available on platforms that support SO_PEERCRED on domain sockets.
-diff -u -r ghc-6.8.2-orig/libraries/network/configure.ac ghc-6.8.2/libraries/network/configure.ac
---- ghc-6.8.2-orig/libraries/network/configure.ac	2007-12-10 20:25:19.000000000 +0200
-+++ ghc-6.8.2/libraries/network/configure.ac	2008-08-06 21:37:53.285955355 +0300
-@@ -40,6 +40,39 @@
-  AC_MSG_RESULT(no))
- 
- dnl --------------------------------------------------
-+dnl * test for SO_PEERCRED and struct ucred
-+dnl --------------------------------------------------
-+AC_MSG_CHECKING(for SO_PEERCRED and struct ucred in sys/socket.h)
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <sys/socket.h>
-+#ifndef SO_PEERCRED
-+# error no SO_PEERCRED
-+#endif
-+struct ucred u;]])],ac_cv_ucred=yes,ac_cv_ucred=no)
-+if test "x$ac_cv_ucred" = xno; then
-+    old_CFLAGS="$CFLAGS"
-+    CFLAGS="-D_GNU_SOURCE $CFLAGS"
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-+#include <sys/socket.h>
-+#ifndef SO_PEERCRED
-+# error no SO_PEERCRED
-+#endif
-+struct ucred u;]])],ac_cv_ucred=yes,ac_cv_ucred=no)
-+    if test "x$ac_cv_ucred" = xyes; then
-+        EXTRA_CPPFLAGS=-D_GNU_SOURCE
-+    fi
-+else
-+    old_CFLAGS="$CFLAGS"
-+fi
-+if test "x$ac_cv_ucred" = xno; then
-+    CFLAGS="$old_CFLAGS"
-+    AC_MSG_RESULT(no)
-+else
-+    AC_DEFINE([HAVE_STRUCT_UCRED], [1], [Define to 1 if you have both SO_PEERCRED and struct ucred.])
-+    AC_MSG_RESULT(yes)
-+fi
-+
-+dnl --------------------------------------------------
- dnl * test for getaddrinfo as proxy for IPv6 support
- dnl --------------------------------------------------
- AC_CHECK_FUNCS(getaddrinfo)
-@@ -84,6 +117,7 @@
- esac
- AC_SUBST([CALLCONV])
- AC_SUBST([EXTRA_LIBS])
-+AC_SUBST([EXTRA_CPPFLAGS])
- AC_SUBST([EXTRA_SRCS])
- 
- AC_CONFIG_FILES([network.buildinfo])
-diff -u -r ghc-6.8.2-orig/libraries/network/network.buildinfo.in ghc-6.8.2/libraries/network/network.buildinfo.in
---- ghc-6.8.2-orig/libraries/network/network.buildinfo.in	2007-12-10 20:25:19.000000000 +0200
-+++ ghc-6.8.2/libraries/network/network.buildinfo.in	2008-08-06 21:38:52.255190968 +0300
-@@ -1,4 +1,4 @@
--ghc-options: -DCALLCONV=@CALLCONV@
--cc-options: -DCALLCONV=@CALLCONV@
-+ghc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
-+cc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
- c-sources: @EXTRA_SRCS@
- extra-libraries: @EXTRA_LIBS@


