[37701] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Thu Jun 19 17:54:41 PDT 2008
Revision: 37701
http://trac.macosforge.org/projects/macports/changeset/37701
Author: gwright at macports.org
Date: 2008-06-19 17:54:35 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Version bump to 6.8.3 and fix portlint warnings.
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
Added Paths:
-----------
trunk/dports/lang/ghc/files/patch-configure.ac.diff
trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff
trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff
trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff
trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff
trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff
trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff
trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff
trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff
trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff
trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff
Removed Paths:
-------------
trunk/dports/lang/ghc/files/patch-config.mk.in.diff
trunk/dports/lang/ghc/files/patch-configure.ac
trunk/dports/lang/ghc/files/patch-libraries-Cabal-Distribution-Simple-Configure.hs
trunk/dports/lang/ghc/files/patch-libraries-Makefile
trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4
trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in
trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal
trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac
trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs
trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4
trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac
trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in
trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal
trunk/dports/lang/ghc/files/patch-rts-posix-FileLock.c
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/Portfile 2008-06-20 00:54:35 UTC (rev 37701)
@@ -3,8 +3,7 @@
PortSystem 1.0
name ghc
-version 6.8.2
-revision 3
+version 6.8.3
categories lang
maintainers gwright at macports.org
platforms darwin
@@ -20,7 +19,7 @@
existential and universal quantification, unboxed \
types, exceptions, weak pointers, and so on. \
GHC comes with a generational garbage collector, \
- and a space and time profiler.
+ and a space and time profiler.
homepage http://haskell.org/
master_sites ${homepage}${name}/dist/${version}/
@@ -30,23 +29,26 @@
distfiles ${name}-${version}-src.tar.bz2 \
${name}-${version}-src-extralibs.tar.bz2
-checksums ${name}-${version}-src.tar.bz2 md5 43108417594be7eba0918c459e871e40 \
- ${name}-${version}-src-extralibs.tar.bz2 md5 d199c50814188fb77355d41058b8613c \
+checksums ${name}-${version}-src.tar.bz2 \
+ md5 dfa31028b4d06d1d226f55fe3a2ab7b3 \
+ sha1 f908b0e0293014dde587abd8c7912eb490f9b3d2 \
+ rmd160 415cd144f0641a0c5887ad7325e2e775e93044f0 \
+ ${name}-${version}-src-extralibs.tar.bz2 \
+ md5 5ac72f5d5433151cf6b718dc6601dc41 \
+ sha1 800258df7d86f5538fd2cc54829e29e90183b882 \
+ rmd160 f701da7129075ae62dfb6c524efd39103f944ad3 \
-patchfiles patch-configure.ac \
- patch-libraries-Makefile \
- patch-libraries-base-base.cabal \
- patch-libraries-base-base.buildinfo.in \
- patch-libraries-base-configure.ac \
- patch-libraries-base-aclocal.m4 \
- patch-libraries-hpc-Setup.hs \
- patch-libraries-hpc-hpc.cabal \
- patch-libraries-hpc-hpc.buildinfo.in \
- patch-libraries-hpc-configure.ac \
- patch-libraries-hpc-aclocal.m4 \
- patch-rts-posix-FileLock.c \
- patch-libraries-Cabal-Distribution-Simple-Configure.hs \
- patch-config.mk.in.diff
+patchfiles patch-configure.ac.diff \
+ patch-libraries-Makefile.diff \
+ patch-libraries-base-base.cabal.diff \
+ patch-libraries-base-base.buildinfo.in.diff \
+ patch-libraries-base-configure.ac.diff \
+ patch-libraries-base-aclocal.m4.diff \
+ patch-libraries-hpc-Setup.hs.diff \
+ patch-libraries-hpc-hpc.cabal.diff \
+ patch-libraries-hpc-hpc.buildinfo.in.diff \
+ patch-libraries-hpc-configure.ac.diff \
+ patch-libraries-hpc-aclocal.m4.diff
depends_lib port:readline \
port:gmp
Deleted: trunk/dports/lang/ghc/files/patch-config.mk.in.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-config.mk.in.diff 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-config.mk.in.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,15 +0,0 @@
---- mk/config.mk.in.sav 2008-04-30 08:49:05.000000000 -0400
-+++ mk/config.mk.in 2008-04-30 08:49:51.000000000 -0400
-@@ -885,9 +885,9 @@
- # tree). We can refer to "this ghc" as $(GHC_INPLACE):
-
- GHC_INPLACE = $(GHC_COMPILER_DIR)/ghc-inplace
--GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace
--GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace
--GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace
-+GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf
-+GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf
-+GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf
-
- ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" ""
-
Deleted: trunk/dports/lang/ghc/files/patch-configure.ac
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-configure.ac 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,102 +0,0 @@
---- configure.ac.sav 2007-12-17 16:23:37.000000000 -0500
-+++ configure.ac 2007-12-17 16:30:28.000000000 -0500
-@@ -792,6 +792,66 @@
- dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
- dnl fi
-
-+dnl ** Enable the building of OpenGL?
-+dnl --------------------------------------------------------------
-+AC_ARG_ENABLE(opengl,
-+[AC_HELP_STRING([--enable-opengl],
-+[Build the OpenGL bindings. [default=yes]])],
-+[ if test x"$enableval" = x"yes"; then
-+ GhcLibsWithOpenGL=YES
-+ else
-+ GhcLibsWithOpenGL=NO
-+ fi
-+],
-+[GhcLibsWithOpenGL=YES]
-+)
-+AC_SUBST(GhcLibsWithOpenGL)
-+
-+dnl ** Enable the building of GLUT?
-+dnl --------------------------------------------------------------
-+AC_ARG_ENABLE(glut,
-+[AC_HELP_STRING([--enable-glut],
-+[Build the GLUT bindings. [default=yes]])],
-+[ if test x"$enableval" = x"yes"; then
-+ GhcLibsWithGLUT=YES
-+ else
-+ GhcLibsWithGLUT=NO
-+ fi
-+],
-+[GhcLibsWithGLUT=YES]
-+)
-+AC_SUBST(GhcLibsWithGLUT)
-+
-+dnl ** Enable the building of OpenAL?
-+dnl --------------------------------------------------------------
-+AC_ARG_ENABLE(openal,
-+[AC_HELP_STRING([--enable-openal],
-+[Build the OpenAL binding. [default=no]])],
-+[ if test x"$enableval" = x"yes"; then
-+ GhcLibsWithOpenAL=YES
-+ else
-+ GhcLibsWithOpenAL=NO
-+ fi
-+],
-+[GhcLibsWithOpenAL=NO]
-+)
-+AC_SUBST(GhcLibsWithOpenAL)
-+
-+dnl ** Enable the building of ALUT?
-+dnl --------------------------------------------------------------
-+AC_ARG_ENABLE(alut,
-+[AC_HELP_STRING([--enable-alut],
-+[Build OpenAL Utility Toolkit (ALUT). [default=no]])],
-+[ if test x"$enableval" = x"yes"; then
-+ GhcLibsWithALUT=YES
-+ else
-+ GhcLibsWithALUT=NO
-+ fi
-+],
-+[GhcLibsWithALUT=NO]
-+)
-+AC_SUBST(GhcLibsWithALUT)
-+
- dnl ** Enable the building of the ObjectIO?
- dnl --------------------------------------------------------------
- AC_ARG_ENABLE(objectio,
-@@ -1100,19 +1160,19 @@
-
- dnl ** (Mac OS X only: check for GMP.framework)
- HaveFrameworkGMP=NO
--case $HostPlatform in
--*-apple-darwin)
-- AC_MSG_CHECKING([for GMP.framework])
-- save_libs="$LIBS"
-- LIBS="-framework GMP"
-- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
-- if test $HaveFrameworkGMP = YES; then
-- AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
-- fi;
-- LIBS="$save_libs"
-- AC_MSG_RESULT([$HaveFrameworkGMP])
-- ;;
--esac
-+dnl case $HostPlatform in
-+dnl *-apple-darwin)
-+dnl AC_MSG_CHECKING([for GMP.framework])
-+dnl save_libs="$LIBS"
-+dnl LIBS="-framework GMP"
-+dnl AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
-+dnl if test $HaveFrameworkGMP = YES; then
-+dnl AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
-+dnl fi;
-+dnl LIBS="$save_libs"
-+dnl AC_MSG_RESULT([$HaveFrameworkGMP])
-+dnl ;;
-+dnl esac
- AC_SUBST(HaveFrameworkGMP)
-
- dnl ** check for mingwex library
Copied: trunk/dports/lang/ghc/files/patch-configure.ac.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-configure.ac)
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-configure.ac.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,102 @@
+--- configure.ac.sav 2007-12-17 16:23:37.000000000 -0500
++++ configure.ac 2007-12-17 16:30:28.000000000 -0500
+@@ -792,6 +792,66 @@
+ dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
+ dnl fi
+
++dnl ** Enable the building of OpenGL?
++dnl --------------------------------------------------------------
++AC_ARG_ENABLE(opengl,
++[AC_HELP_STRING([--enable-opengl],
++[Build the OpenGL bindings. [default=yes]])],
++[ if test x"$enableval" = x"yes"; then
++ GhcLibsWithOpenGL=YES
++ else
++ GhcLibsWithOpenGL=NO
++ fi
++],
++[GhcLibsWithOpenGL=YES]
++)
++AC_SUBST(GhcLibsWithOpenGL)
++
++dnl ** Enable the building of GLUT?
++dnl --------------------------------------------------------------
++AC_ARG_ENABLE(glut,
++[AC_HELP_STRING([--enable-glut],
++[Build the GLUT bindings. [default=yes]])],
++[ if test x"$enableval" = x"yes"; then
++ GhcLibsWithGLUT=YES
++ else
++ GhcLibsWithGLUT=NO
++ fi
++],
++[GhcLibsWithGLUT=YES]
++)
++AC_SUBST(GhcLibsWithGLUT)
++
++dnl ** Enable the building of OpenAL?
++dnl --------------------------------------------------------------
++AC_ARG_ENABLE(openal,
++[AC_HELP_STRING([--enable-openal],
++[Build the OpenAL binding. [default=no]])],
++[ if test x"$enableval" = x"yes"; then
++ GhcLibsWithOpenAL=YES
++ else
++ GhcLibsWithOpenAL=NO
++ fi
++],
++[GhcLibsWithOpenAL=NO]
++)
++AC_SUBST(GhcLibsWithOpenAL)
++
++dnl ** Enable the building of ALUT?
++dnl --------------------------------------------------------------
++AC_ARG_ENABLE(alut,
++[AC_HELP_STRING([--enable-alut],
++[Build OpenAL Utility Toolkit (ALUT). [default=no]])],
++[ if test x"$enableval" = x"yes"; then
++ GhcLibsWithALUT=YES
++ else
++ GhcLibsWithALUT=NO
++ fi
++],
++[GhcLibsWithALUT=NO]
++)
++AC_SUBST(GhcLibsWithALUT)
++
+ dnl ** Enable the building of the ObjectIO?
+ dnl --------------------------------------------------------------
+ AC_ARG_ENABLE(objectio,
+@@ -1100,19 +1160,19 @@
+
+ dnl ** (Mac OS X only: check for GMP.framework)
+ HaveFrameworkGMP=NO
+-case $HostPlatform in
+-*-apple-darwin)
+- AC_MSG_CHECKING([for GMP.framework])
+- save_libs="$LIBS"
+- LIBS="-framework GMP"
+- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
+- if test $HaveFrameworkGMP = YES; then
+- AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
+- fi;
+- LIBS="$save_libs"
+- AC_MSG_RESULT([$HaveFrameworkGMP])
+- ;;
+-esac
++dnl case $HostPlatform in
++dnl *-apple-darwin)
++dnl AC_MSG_CHECKING([for GMP.framework])
++dnl save_libs="$LIBS"
++dnl LIBS="-framework GMP"
++dnl AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
++dnl if test $HaveFrameworkGMP = YES; then
++dnl AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
++dnl fi;
++dnl LIBS="$save_libs"
++dnl AC_MSG_RESULT([$HaveFrameworkGMP])
++dnl ;;
++dnl esac
+ AC_SUBST(HaveFrameworkGMP)
+
+ dnl ** check for mingwex library
Deleted: trunk/dports/lang/ghc/files/patch-libraries-Cabal-Distribution-Simple-Configure.hs
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Cabal-Distribution-Simple-Configure.hs 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-Cabal-Distribution-Simple-Configure.hs 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,22 +0,0 @@
---- libraries/Cabal/Distribution/Simple/Configure.hs.sav 2008-03-01 17:01:39.000000000 -0500
-+++ libraries/Cabal/Distribution/Simple/Configure.hs 2008-03-01 17:04:25.000000000 -0500
-@@ -130,7 +130,7 @@
- import qualified System.Info
- ( os, arch )
- import System.IO
-- ( hPutStrLn, stderr )
-+ ( hPutStrLn, stderr, openFile, IOMode(..), hGetContents, hClose )
- import Text.PrettyPrint.HughesPJ
- ( comma, punctuate, render, nest, sep )
-
-@@ -146,7 +146,9 @@
- let dieMsg = "error reading " ++ filename ++
- "; run \"setup configure\" command?\n"
- if (not e) then return $ Left dieMsg else do
-- str <- readFile filename
-+ hdl <- openFile filename ReadMode
-+ str <- hGetContents hdl >>= \s -> last s `seq` return s
-+ hClose hdl
- case reads str of
- [(bi,_)] -> return $ Right bi
- _ -> return $ Left dieMsg
Deleted: trunk/dports/lang/ghc/files/patch-libraries-Makefile
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,21 +0,0 @@
---- libraries/Makefile.sav 2007-12-17 16:55:27.000000000 -0500
-+++ libraries/Makefile 2007-12-17 16:55:39.000000000 -0500
-@@ -63,10 +63,18 @@
- SUBDIRS += $(wildcard mtl)
- SUBDIRS += $(wildcard fgl)
- SUBDIRS += $(wildcard time)
-+ifeq "$(GhcLibsWithOpenGL)" "YES"
- SUBDIRS += $(wildcard OpenGL)
-+endif
-+ifeq "$(GhcLibsWithGLUT)" "YES"
- SUBDIRS += $(wildcard GLUT)
-+endif
-+ifeq "$(GhcLibsWithOpenAL)" "YES"
- SUBDIRS += $(wildcard OpenAL)
-+endif
-+ifeq "$(GhcLibsWithALUT)" "YES"
- SUBDIRS += $(wildcard ALUT)
-+endif
- SUBDIRS += $(wildcard stm)
- SUBDIRS += $(wildcard xhtml)
- SUBDIRS += $(wildcard cgi)
Copied: trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-Makefile)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,21 @@
+--- libraries/Makefile.sav 2007-12-17 16:55:27.000000000 -0500
++++ libraries/Makefile 2007-12-17 16:55:39.000000000 -0500
+@@ -63,10 +63,18 @@
+ SUBDIRS += $(wildcard mtl)
+ SUBDIRS += $(wildcard fgl)
+ SUBDIRS += $(wildcard time)
++ifeq "$(GhcLibsWithOpenGL)" "YES"
+ SUBDIRS += $(wildcard OpenGL)
++endif
++ifeq "$(GhcLibsWithGLUT)" "YES"
+ SUBDIRS += $(wildcard GLUT)
++endif
++ifeq "$(GhcLibsWithOpenAL)" "YES"
+ SUBDIRS += $(wildcard OpenAL)
++endif
++ifeq "$(GhcLibsWithALUT)" "YES"
+ SUBDIRS += $(wildcard ALUT)
++endif
+ SUBDIRS += $(wildcard stm)
+ SUBDIRS += $(wildcard xhtml)
+ SUBDIRS += $(wildcard cgi)
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,24 +0,0 @@
---- libraries/base/aclocal.m4.sav 2007-12-17 16:35:32.000000000 -0500
-+++ libraries/base/aclocal.m4 2007-12-17 16:36:23.000000000 -0500
-@@ -1,3 +1,21 @@
-+# FP_ARG_GMP
-+# -------------
-+AC_DEFUN([FP_ARG_GMP],
-+[
-+AC_ARG_WITH([gmp-includes],
-+ [AC_HELP_STRING([--with-gmp-includes],
-+ [directory containing gmp.h])],
-+ [gmp_includes=$withval],
-+ [gmp_includes=NONE])
-+
-+AC_ARG_WITH([gmp-libraries],
-+ [AC_HELP_STRING([--with-gmp-libraries],
-+ [directory containing gmp library])],
-+ [gmp_libraries=$withval],
-+ [gmp_libraries=NONE])
-+])# FP_ARG_GMP
-+
-+
- # FP_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS)
- # --------------------------------------------------------
- # Assign VARIABLE the value of the compile-time EXPRESSION using INCLUDES for
Copied: trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,24 @@
+--- libraries/base/aclocal.m4.sav 2007-12-17 16:35:32.000000000 -0500
++++ libraries/base/aclocal.m4 2007-12-17 16:36:23.000000000 -0500
+@@ -1,3 +1,21 @@
++# FP_ARG_GMP
++# -------------
++AC_DEFUN([FP_ARG_GMP],
++[
++AC_ARG_WITH([gmp-includes],
++ [AC_HELP_STRING([--with-gmp-includes],
++ [directory containing gmp.h])],
++ [gmp_includes=$withval],
++ [gmp_includes=NONE])
++
++AC_ARG_WITH([gmp-libraries],
++ [AC_HELP_STRING([--with-gmp-libraries],
++ [directory containing gmp library])],
++ [gmp_libraries=$withval],
++ [gmp_libraries=NONE])
++])# FP_ARG_GMP
++
++
+ # FP_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS)
+ # --------------------------------------------------------
+ # Assign VARIABLE the value of the compile-time EXPRESSION using INCLUDES for
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,5 +0,0 @@
---- libraries/base/base.buildinfo.in.sav 1969-12-31 19:00:00.000000000 -0500
-+++ libraries/base/base.buildinfo.in 2007-12-17 16:34:51.000000000 -0500
-@@ -0,0 +1,2 @@
-+include-dirs: @GMP_INCLUDE_DIRS@
-+
Copied: trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,5 @@
+--- libraries/base/base.buildinfo.in.sav 1969-12-31 19:00:00.000000000 -0500
++++ libraries/base/base.buildinfo.in 2007-12-17 16:34:51.000000000 -0500
+@@ -0,0 +1,2 @@
++include-dirs: @GMP_INCLUDE_DIRS@
++
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,15 +0,0 @@
---- libraries/base/base.cabal.sav 2007-12-17 16:35:22.000000000 -0500
-+++ libraries/base/base.cabal 2007-12-17 16:36:18.000000000 -0500
-@@ -10,9 +10,11 @@
- structures to parsing combinators and debugging utilities.
- cabal-version: >=1.2
- build-type: Custom
-+extra-source-files:
-+ base.buildinfo.in
- extra-tmp-files:
- config.log config.status autom4te.cache
-- include/HsBaseConfig.h
-+ include/HsBaseConfig.h base.buildinfo
-
-
- Library {
Copied: trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,15 @@
+--- libraries/base/base.cabal.sav 2007-12-17 16:35:22.000000000 -0500
++++ libraries/base/base.cabal 2007-12-17 16:36:18.000000000 -0500
+@@ -10,9 +10,11 @@
+ structures to parsing combinators and debugging utilities.
+ cabal-version: >=1.2
+ build-type: Custom
++extra-source-files:
++ base.buildinfo.in
+ extra-tmp-files:
+ config.log config.status autom4te.cache
+- include/HsBaseConfig.h
++ include/HsBaseConfig.h base.buildinfo
+
+
+ Library {
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,30 +0,0 @@
---- libraries/base/configure.ac.sav 2007-12-17 16:35:12.000000000 -0500
-+++ libraries/base/configure.ac 2007-12-17 16:36:07.000000000 -0500
-@@ -5,6 +5,27 @@
-
- AC_CONFIG_HEADERS([include/HsBaseConfig.h])
-
-+dnl--------------------------------------------------------------------
-+dnl * Deal with arguments telling us gmp is somewhere odd
-+dnl--------------------------------------------------------------------
-+
-+FP_ARG_GMP
-+
-+GMP_INCLUDE_DIRS=
-+GMP_LIB_DIRS=
-+if test "x$gmp_libraries" != "xNONE"; then
-+ LDFLAGS="-L$gmp_libraries $LDFLAGS"
-+ GMP_LIB_DIRS=$gmp_libraries
-+fi
-+if test "x$gmp_includes" != "xNONE"; then
-+ CPPFLAGS="-I$gmp_includes $CPPFLAGS"
-+ GMP_INCLUDE_DIRS=$gmp_includes
-+fi
-+AC_SUBST(GMP_INCLUDE_DIRS)
-+AC_SUBST(GMP_LIB_DIRS)
-+AC_CONFIG_FILES(base.buildinfo)
-+dnl--------------------------------------------------------------------
-+
- AC_ARG_WITH([cc],
- [C compiler],
- [CC=$withval])
Copied: trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,30 @@
+--- libraries/base/configure.ac.sav 2007-12-17 16:35:12.000000000 -0500
++++ libraries/base/configure.ac 2007-12-17 16:36:07.000000000 -0500
+@@ -5,6 +5,27 @@
+
+ AC_CONFIG_HEADERS([include/HsBaseConfig.h])
+
++dnl--------------------------------------------------------------------
++dnl * Deal with arguments telling us gmp is somewhere odd
++dnl--------------------------------------------------------------------
++
++FP_ARG_GMP
++
++GMP_INCLUDE_DIRS=
++GMP_LIB_DIRS=
++if test "x$gmp_libraries" != "xNONE"; then
++ LDFLAGS="-L$gmp_libraries $LDFLAGS"
++ GMP_LIB_DIRS=$gmp_libraries
++fi
++if test "x$gmp_includes" != "xNONE"; then
++ CPPFLAGS="-I$gmp_includes $CPPFLAGS"
++ GMP_INCLUDE_DIRS=$gmp_includes
++fi
++AC_SUBST(GMP_INCLUDE_DIRS)
++AC_SUBST(GMP_LIB_DIRS)
++AC_CONFIG_FILES(base.buildinfo)
++dnl--------------------------------------------------------------------
++
+ AC_ARG_WITH([cc],
+ [C compiler],
+ [CC=$withval])
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,8 +0,0 @@
---- libraries/hpc/Setup.hs.sav 2007-12-17 16:43:33.000000000 -0500
-+++ libraries/hpc/Setup.hs 2007-12-17 16:43:56.000000000 -0500
-@@ -3,4 +3,4 @@
- import Distribution.Simple
-
- main :: IO ()
--main = defaultMain
-+main = defaultMainWithHooks defaultUserHooks
Copied: trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,8 @@
+--- libraries/hpc/Setup.hs.sav 2007-12-17 16:43:33.000000000 -0500
++++ libraries/hpc/Setup.hs 2007-12-17 16:43:56.000000000 -0500
+@@ -3,4 +3,4 @@
+ import Distribution.Simple
+
+ main :: IO ()
+-main = defaultMain
++main = defaultMainWithHooks defaultUserHooks
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,20 +0,0 @@
---- libraries/hpc/aclocal.m4.sav 1969-12-31 19:00:00.000000000 -0500
-+++ libraries/hpc/aclocal.m4 2007-12-17 16:44:44.000000000 -0500
-@@ -0,0 +1,17 @@
-+# FP_ARG_GMP
-+# -------------
-+AC_DEFUN([FP_ARG_GMP],
-+[
-+AC_ARG_WITH([gmp-includes],
-+ [AC_HELP_STRING([--with-gmp-includes],
-+ [directory containing gmp.h])],
-+ [gmp_includes=$withval],
-+ [gmp_includes=NONE])
-+
-+AC_ARG_WITH([gmp-libraries],
-+ [AC_HELP_STRING([--with-gmp-libraries],
-+ [directory containing gmp library])],
-+ [gmp_libraries=$withval],
-+ [gmp_libraries=NONE])
-+])# FP_ARG_GMP
-+
Copied: trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,20 @@
+--- libraries/hpc/aclocal.m4.sav 1969-12-31 19:00:00.000000000 -0500
++++ libraries/hpc/aclocal.m4 2007-12-17 16:44:44.000000000 -0500
+@@ -0,0 +1,17 @@
++# FP_ARG_GMP
++# -------------
++AC_DEFUN([FP_ARG_GMP],
++[
++AC_ARG_WITH([gmp-includes],
++ [AC_HELP_STRING([--with-gmp-includes],
++ [directory containing gmp.h])],
++ [gmp_includes=$withval],
++ [gmp_includes=NONE])
++
++AC_ARG_WITH([gmp-libraries],
++ [AC_HELP_STRING([--with-gmp-libraries],
++ [directory containing gmp library])],
++ [gmp_libraries=$withval],
++ [gmp_libraries=NONE])
++])# FP_ARG_GMP
++
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,31 +0,0 @@
---- libraries/hpc/configure.ac.sav 1969-12-31 19:00:00.000000000 -0500
-+++ libraries/hpc/configure.ac 2007-12-17 16:44:40.000000000 -0500
-@@ -0,0 +1,28 @@
-+AC_INIT([Haskell hpc package], [1.0], [libraries at haskell.org], [hpc])
-+
-+# Safety check: Ensure that we are in the correct source directory.
-+AC_CONFIG_SRCDIR([hpc.cabal])
-+
-+dnl--------------------------------------------------------------------
-+dnl * Deal with arguments telling us gmp is somewhere odd
-+dnl--------------------------------------------------------------------
-+
-+FP_ARG_GMP
-+
-+GMP_INCLUDE_DIRS=
-+GMP_LIB_DIRS=
-+if test "x$gmp_libraries" != "xNONE"; then
-+ LDFLAGS="-L$gmp_libraries $LDFLAGS"
-+ GMP_LIB_DIRS=$gmp_libraries
-+fi
-+if test "x$gmp_includes" != "xNONE"; then
-+ CPPFLAGS="-I$gmp_includes $CPPFLAGS"
-+ GMP_INCLUDE_DIRS=$gmp_includes
-+fi
-+AC_SUBST(GMP_INCLUDE_DIRS)
-+AC_SUBST(GMP_LIB_DIRS)
-+AC_CONFIG_FILES(hpc.buildinfo)
-+dnl--------------------------------------------------------------------
-+
-+AC_OUTPUT
-+
Copied: trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,31 @@
+--- libraries/hpc/configure.ac.sav 1969-12-31 19:00:00.000000000 -0500
++++ libraries/hpc/configure.ac 2007-12-17 16:44:40.000000000 -0500
+@@ -0,0 +1,28 @@
++AC_INIT([Haskell hpc package], [1.0], [libraries at haskell.org], [hpc])
++
++# Safety check: Ensure that we are in the correct source directory.
++AC_CONFIG_SRCDIR([hpc.cabal])
++
++dnl--------------------------------------------------------------------
++dnl * Deal with arguments telling us gmp is somewhere odd
++dnl--------------------------------------------------------------------
++
++FP_ARG_GMP
++
++GMP_INCLUDE_DIRS=
++GMP_LIB_DIRS=
++if test "x$gmp_libraries" != "xNONE"; then
++ LDFLAGS="-L$gmp_libraries $LDFLAGS"
++ GMP_LIB_DIRS=$gmp_libraries
++fi
++if test "x$gmp_includes" != "xNONE"; then
++ CPPFLAGS="-I$gmp_includes $CPPFLAGS"
++ GMP_INCLUDE_DIRS=$gmp_includes
++fi
++AC_SUBST(GMP_INCLUDE_DIRS)
++AC_SUBST(GMP_LIB_DIRS)
++AC_CONFIG_FILES(hpc.buildinfo)
++dnl--------------------------------------------------------------------
++
++AC_OUTPUT
++
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,5 +0,0 @@
---- libraries/hpc/hpc.buildinfo.in.sav 1969-12-31 19:00:00.000000000 -0500
-+++ libraries/hpc/hpc.buildinfo.in 2007-12-17 16:44:09.000000000 -0500
-@@ -0,0 +1,2 @@
-+include-dirs: @GMP_INCLUDE_DIRS@
-+
Copied: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,5 @@
+--- libraries/hpc/hpc.buildinfo.in.sav 1969-12-31 19:00:00.000000000 -0500
++++ libraries/hpc/hpc.buildinfo.in 2007-12-17 16:44:09.000000000 -0500
+@@ -0,0 +1,2 @@
++include-dirs: @GMP_INCLUDE_DIRS@
++
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,12 +0,0 @@
---- libraries/hpc/hpc.cabal.sav 2007-12-17 16:43:39.000000000 -0500
-+++ libraries/hpc/hpc.cabal 2007-12-17 16:44:01.000000000 -0500
-@@ -15,3 +15,9 @@
- Trace.Hpc.Reflect
- build-depends: base, directory, old-time, containers
- extensions: CPP
-+extra-source-files:
-+ hpc.buildinfo.in
-+extra-tmp-files:
-+ config.log config.status autom4te.cache
-+ hpc.buildinfo
-+
Copied: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff (from rev 37662, trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal)
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff 2008-06-20 00:54:35 UTC (rev 37701)
@@ -0,0 +1,12 @@
+--- libraries/hpc/hpc.cabal.sav 2007-12-17 16:43:39.000000000 -0500
++++ libraries/hpc/hpc.cabal 2007-12-17 16:44:01.000000000 -0500
+@@ -15,3 +15,9 @@
+ Trace.Hpc.Reflect
+ build-depends: base, directory, old-time, containers
+ extensions: CPP
++extra-source-files:
++ hpc.buildinfo.in
++extra-tmp-files:
++ config.log config.status autom4te.cache
++ hpc.buildinfo
++
Deleted: trunk/dports/lang/ghc/files/patch-rts-posix-FileLock.c
===================================================================
--- trunk/dports/lang/ghc/files/patch-rts-posix-FileLock.c 2008-06-19 23:58:45 UTC (rev 37700)
+++ trunk/dports/lang/ghc/files/patch-rts-posix-FileLock.c 2008-06-20 00:54:35 UTC (rev 37701)
@@ -1,20 +0,0 @@
---- rts/posix/FileLock.c.sav 2008-03-03 11:40:14.000000000 -0500
-+++ rts/posix/FileLock.c 2008-03-03 11:43:40.000000000 -0500
-@@ -88,6 +88,17 @@
- if (for_writing || lock->readers < 0) {
- return -1;
- }
-+
-+ // have we seen this fd before?
-+ if (lookupHashTable(fd_hash, fd) == NULL) {
-+ insertHashTable(fd_hash, fd, lock);
-+ }
-+ else
-+ {
-+ errorBelch("fd %d tries to lock the same file twice", fd);
-+ return -1;
-+ }
-+
- lock->readers++;
- return 0;
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080619/31492977/attachment-0001.htm
More information about the macports-changes
mailing list