[41599] trunk/dports/lang/ghc
gwright at macports.org
gwright at macports.org
Thu Nov 6 15:15:20 PST 2008
Revision: 41599
http://trac.macports.org/changeset/41599
Author: gwright at macports.org
Date: 2008-11-06 15:15:19 -0800 (Thu, 06 Nov 2008)
Log Message:
-----------
Version bump to 6.10.1.
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
Added Paths:
-----------
trunk/dports/lang/ghc/files/patch-configure.ac.diff
Removed Paths:
-------------
trunk/dports/lang/ghc/files/patch-PprMach.hs.diff
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
trunk/dports/lang/ghc/files/patch-libraries-network-Socket.hsc.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/Portfile 2008-11-06 23:15:19 UTC (rev 41599)
@@ -3,10 +3,9 @@
PortSystem 1.0
name ghc
-version 6.8.3
-revision 1
+version 6.10.1
categories lang haskell
-maintainers gwright at macports.org
+maintainers gwright
platforms darwin
description The Glorious Glasgow Haskell Compilation System
long_description \
@@ -22,37 +21,27 @@
GHC comes with a generational garbage collector, \
and a space and time profiler.
-homepage http://haskell.org/
-master_sites ${homepage}${name}/dist/${version}/
+homepage http://haskell.org/${name}
+#master_sites ${homepage}/dist/${version}/
+master_sites ${homepage}/dist/stable/dist/
use_bzip2 yes
distfiles ${name}-${version}-src.tar.bz2 \
${name}-${version}-src-extralibs.tar.bz2
-checksums ${name}-${version}-src.tar.bz2 \
- md5 dfa31028b4d06d1d226f55fe3a2ab7b3 \
- sha1 f908b0e0293014dde587abd8c7912eb490f9b3d2 \
- rmd160 415cd144f0641a0c5887ad7325e2e775e93044f0 \
- ${name}-${version}-src-extralibs.tar.bz2 \
- md5 5ac72f5d5433151cf6b718dc6601dc41 \
- sha1 800258df7d86f5538fd2cc54829e29e90183b882 \
- rmd160 f701da7129075ae62dfb6c524efd39103f944ad3 \
+checksums ${name}-${version}-src.tar.bz2 \
+ md5 54c676a632b3d73cf526b06347522c32 \
+ sha1 5b3759d6a1177f0cc8f754673b52bfd31923280f \
+ rmd160 4768e7246edd494367232e3af030ffed77990c10 \
+ ${name}-${version}-src-extralibs.tar.bz2 \
+ md5 4ff4590f1002ae1ff608874da8643c67 \
+ sha1 279072813e265bb143c7e612d5900bb324c72f6c \
+ rmd160 34fe542788284c1e2167a955c3219e7e539eff4e
-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 \
- patch-libraries-network-Socket.hsc.diff
+patchfiles patch-configure.ac.diff
-depends_lib port:readline \
+depends_lib port:libedit \
port:gmp
# Yes, it some situations (-fvia-C) we really need perl
@@ -61,12 +50,13 @@
#
depends_run port:perl5.8
+worksrcdir ${name}-${version}
platform darwin 6 {
pre-fetch {
return -code error "${name} is not supported on Mac OS X 10.2.x (Jaguar)"
}
- }
+}
platform darwin 7 {
@@ -80,11 +70,11 @@
global ghc_bootversion
set ghc_bootversion 6.6.1
- master_sites-append ${homepage}${name}/dist/${ghc_bootversion}/:bootstrap
+ master_sites-append ${homepage}/dist/${ghc_bootversion}/:bootstrap
distfiles-append ${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2:bootstrap
- checksums-append ${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2 md5 0842380935d4ce3a2150976eff0f09a0
+ checksums-append ${name}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2 md5 0842380935d4ce3a2150976eff0f09a0
extract.only ${name}-${version}-src.tar.bz2 \
${name}-${version}-src-extralibs.tar.bz2 \
@@ -96,7 +86,7 @@
global ghc_bootversion
set ghc_bootversion 6.6
- master_sites-append ${homepage}${name}/dist/${ghc_bootversion}/:bootstrap
+ master_sites-append ${homepage}/dist/${ghc_bootversion}/:bootstrap
distfiles-append ${name}-${ghc_bootversion}-darwin-i386-tiger-bootstrap.tar.bz2:bootstrap
@@ -112,14 +102,12 @@
global ghc_bootversion
set ghc_bootversion 6.8.2
- master_sites-append ${homepage}${name}/dist/${ghc_bootversion}/:bootstrap
+ master_sites-append ${homepage}/dist/${ghc_bootversion}/:bootstrap
distfiles-append ${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2:bootstrap
checksums-append ${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2 md5 2b24f840b8b1b6cb69b524aaa885aa59
- patchfiles-append patch-PprMach.hs.diff
-
extract.only ${name}-${version}-src.tar.bz2 \
${name}-${version}-src-extralibs.tar.bz2 \
${name}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2
@@ -130,7 +118,7 @@
global ghc_bootversion
set ghc_bootversion 6.8.2
- master_sites-append ${homepage}${name}/dist/${ghc_bootversion}/:bootstrap
+ master_sites-append ${homepage}/dist/${ghc_bootversion}/:bootstrap
distfiles-append ${name}-${ghc_bootversion}-darwin-i386-leopard-bootstrap.tar.bz2:bootstrap
@@ -143,7 +131,7 @@
post-patch {
- reinplace "s|/opt/local|${workpath}/ghc-bootstrap|g" ${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
+ reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
reinplace "s|GHCBIN=/opt/local|GHCBIN=${workpath}/${name}-bootstrap|" ${workpath}/${name}-bootstrap/bin/ghc
@@ -162,9 +150,16 @@
pre-configure {
system "autoreconf ${worksrcpath}"
- system "autoreconf ${worksrcpath}/libraries/base"
- system "autoreconf ${worksrcpath}/libraries/hpc"
+ set cfg [open "${workpath}/ghc-bootstrap/bin/ghc-pkg" w]
+ puts $cfg "#!/bin/sh"
+ puts $cfg "GHCPKGBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/ghc-pkg.bin"
+ puts $cfg "PKGCONF=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf"
+ puts $cfg "exec \$GHCPKGBIN --global-conf \$PKGCONF \${1+\"\$@\"}"
+ close $cfg
+
+ system "chmod +x ${workpath}/ghc-bootstrap/bin/ghc-pkg"
+
set cfg [open "${worksrcpath}/mk/build.mk" w]
puts $cfg "#"
puts $cfg "# Local configuration overrides for MacPorts"
@@ -185,12 +180,10 @@
configure.cflags-append "-I${prefix}/include"
configure.env DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
-configure.args --prefix=${destroot}${prefix} \
- --mandir=${destroot}${prefix}/share/man/ \
- --with-gmp-includes=${prefix}/include \
- --with-gmp-libraries=${prefix}/lib \
- --with-readline-includes=${prefix}/include \
- --with-readline-libraries=${prefix}/lib \
+configure.args --prefix=${destroot}${prefix} \
+ --datadir=${destroot}${prefix}/share/${name}-${version} \
+ --with-gmp-includes=${prefix}/include \
+ --with-gmp-libraries=${prefix}/lib \
--with-ghc='${workpath}/${name}-bootstrap/bin/ghc'
variant no_opengl description {omit OpenGL support} {
@@ -218,11 +211,14 @@
reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc
reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghci
reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc-pkg
- reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghcprof
+ reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/haddock
reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/hsc2hs
+ reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/runghc
reinplace "s|\\\$@\"\}|\\\$@\"\} -L${prefix}/lib -I${prefix}/include |" ${destroot}${prefix}/bin/ghc
reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/lib/${name}-${version}/package.conf
+ file rename ${destroot}${prefix}/bin/haddock ${destroot}${prefix}/bin/haddock-${name}
+
system "ranlib ${destroot}${prefix}/lib/ghc-${version}/*.a"
}
Deleted: trunk/dports/lang/ghc/files/patch-PprMach.hs.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-PprMach.hs.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-PprMach.hs.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -1,11 +0,0 @@
---- compiler/nativeGen/PprMach.hs.sav 2008-03-13 12:24:23.000000000 -0400
-+++ compiler/nativeGen/PprMach.hs 2008-03-13 12:27:13.000000000 -0400
-@@ -657,7 +657,7 @@
- SLIT(".section .data\n\t.align 4"))
- ,IF_ARCH_x86_64(IF_OS_darwin(SLIT(".const_data\n.align 3"),
- SLIT(".section .data\n\t.align 8"))
-- ,IF_ARCH_powerpc(IF_OS_darwin(SLIT(".const_data\n.align 2"),
-+ ,IF_ARCH_powerpc(IF_OS_darwin(SLIT(".text\n.align 2"),
- SLIT(".data\n\t.align 2"))
- ,)))))
- pprSectionHeader UninitialisedData
Deleted: trunk/dports/lang/ghc/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-configure.ac.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
Added: trunk/dports/lang/ghc/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-configure.ac.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -0,0 +1,35 @@
+--- configure.ac.sav 2008-11-05 17:01:38.000000000 -0500
++++ configure.ac 2008-11-05 17:01:51.000000000 -0500
+@@ -1126,19 +1126,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-Makefile.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-Makefile.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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)
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-aclocal.m4.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.buildinfo.in.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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@
-+
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-base.cabal.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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 {
Deleted: trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-base-configure.ac.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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])
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-Setup.hs.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-aclocal.m4.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
-+
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-configure.ac.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
-+
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.buildinfo.in.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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@
-+
Deleted: trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-hpc-hpc.cabal.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -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
-+
Deleted: trunk/dports/lang/ghc/files/patch-libraries-network-Socket.hsc.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-libraries-network-Socket.hsc.diff 2008-11-06 22:24:25 UTC (rev 41598)
+++ trunk/dports/lang/ghc/files/patch-libraries-network-Socket.hsc.diff 2008-11-06 23:15:19 UTC (rev 41599)
@@ -1,11 +0,0 @@
---- libraries/network/Network/Socket.hsc.sav 2008-08-08 21:12:59.000000000 -0700
-+++ libraries/network/Network/Socket.hsc 2008-08-08 19:32:52.000000000 -0700
-@@ -524,7 +524,7 @@
- #if defined(darwin_TARGET_OS)
- zeroMemory p (#const sizeof(struct sockaddr_in6))
- #endif
--#if defined(netbsd_TARGET_OS)
-+#if defined(SIN6_LEN)
- (#poke struct sockaddr_in6, sin6_len) p ((#const sizeof(struct sockaddr_in6)) :: Word8)
- #endif
- (#poke struct sockaddr_in6, sin6_family) p ((#const AF_INET6) :: CSaFamily)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081106/482f465d/attachment-0001.html>
More information about the macports-changes
mailing list