Changeset 11342


Ignore:
Timestamp:
Mar 15, 2005, 2:07:35 PM (15 years ago)
Author:
gwright
Message:

Version bump to 6.4.
Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

Location:
trunk/dports/lang/ghc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/ghc/Portfile

    r11146 r11342  
    1 # $Id: Portfile,v 1.28 2005/02/27 17:58:21 gwright Exp $
     1# $Id: Portfile,v 1.29 2005/03/15 14:07:34 gwright Exp $
    22
    33PortSystem 1.0
    44name            ghc
    5 version         6.2.2
    6 revision        14
     5version         6.4
    76categories      lang
    87maintainers     gwright@opendarwin.org
     
    2221                and a space and time profiler.
    2322
     23#
     24# The compiler build requires happy version 1.15. 
     25#
     26set happy_version       1.15
     27
    2428homepage        http://www.haskell.org/ghc/
    25 master_sites    ${homepage}/dist/${version}/:source
     29master_sites    ${homepage}/dist/${version}/:source \
     30                http://www.haskell.org/happy/dist/${happy_version}:happy
    2631
    2732use_bzip2       yes
    2833
    29 distfiles       ${name}-${version}-src.tar.bz2:source
     34distfiles       ${name}-${version}-src.tar.bz2:source \
     35                happy-${happy_version}-src.tar.gz:happy
    3036
    31 checksums       ghc-${version}-src.tar.bz2 md5 42088bff4de30e7c3a277cfa55d5589e
     37checksums       ghc-${version}-src.tar.bz2        md5 45ea4e15f135698feb88d12c5000aaf8 \
     38                happy-${happy_version}-src.tar.gz md5 02ceb122b904fa4a4290e6ea1072d59e
     39
     40#
     41# After it extracting the happy parser generator, copy it into the
     42# main ghc tree. The configure argument --enable-src-tree-happy
     43# directs the ghc build to make happy from the freshly downloaded
     44# source before building the compiler.
     45#
     46post-extract    { cd ${workpath}
     47                  system "gzip ${extract.pre_args} ${distpath}/happy-${happy_version}-src.tar.gz ${extract.post_args}"
     48
     49                 file copy ${workpath}/happy-${happy_version}/happy ${worksrcpath}/happy
     50                }
    3251
    3352patchfiles      patch-configure.ac
     53
     54# The following is required because ghc triggers a long-standing bug
     55# in make 3.79 and earlier. (3.79 is standard on Panther.) The bug causes
     56# make to fall into an infinite loop.
     57
     58depends_build   path:${prefix}/bin/gmake:gmake
    3459
    3560depends_lib     lib:libreadline.5:readline              \
     
    4469                  checksums-append      ghc-6.0.1-darwin-bootstrap.tar.bz2 md5 280afe385405fa437ae274bfab2c3250
    4570
     71                  extract.only          ${name}-${version}-src.tar.bz2 \
     72                                        ${name}-6.0.1-darwin-bootstrap.tar.bz2
     73
    4674                  depends_lib-append    lib:libreadline.4.3:readline-4
    4775
    48                   pre-configure { set cfg [open "${worksrcpath}/mk/build.mk" w]
     76                  pre-configure { cd ${worksrcpath}
     77                                  system "autoreconf"
     78
     79                                  set cfg [open "${worksrcpath}/mk/build.mk" w]
    4980                                  puts $cfg "#"
    5081                                  puts $cfg "# Local configuration overrides for DarwinPorts"
     
    74105                  checksums-append      ghc-6.2.2-darwin-bootstrap-v01.tar.bz2 md5 e17a51a96cfcd587dc9bc3bea57006d0
    75106
    76                   pre-configure { set cfg [open "${worksrcpath}/mk/build.mk" w]
     107                  extract.only          ${name}-${version}-src.tar.bz2 \
     108                                        ${name}-6.2.2-darwin-bootstrap-v01.tar.bz2
     109
     110                  pre-configure { cd ${worksrcpath}
     111                                  system "autoreconf"
     112
     113                                  set cfg [open "${worksrcpath}/mk/build.mk" w]
    77114                                  puts $cfg "#"
    78115                                  puts $cfg "# Local configuration overrides for DarwinPorts"
     
    102139#               needs readline 4.3.
    103140
    104 use_autoconf    yes
    105 
    106141configure.env   LDFLAGS="-L${prefix}/lib" CPPFLAGS="-I${prefix}/include" \
    107142                CFLAGS="-I${prefix}/include"
    108143
    109 configure.args  --prefix=${destroot}/${prefix} \
    110                 --mandir=${destroot}/${prefix}/share/man/
     144configure.args  --prefix=${destroot}/${prefix}                  \
     145                --mandir=${destroot}/${prefix}/share/man/       \
     146                --enable-src-tree-happy
    111147
    112 default_variants        +opengl
     148variant noopengl        { configure.args-append --disable-hopengl }
    113149
    114 variant opengl  { configure.args-append --enable-hopengl }
     150build.cmd       gmake
    115151
    116152post-destroot   { reinplace s|${destroot}/${prefix}|${prefix}|g ${destroot}/${prefix}/bin/ghc
     
    122158                  reinplace "s|\\\$@\"\}|\\\$@\"\} -L${prefix}/lib -I${prefix}/include |" ${destroot}/${prefix}/bin/ghc
    123159
     160                  reinplace s|${destroot}/${prefix}|${prefix}|g ${destroot}/${prefix}/lib/${name}-${version}/package.conf
     161
    124162                  cd ${destroot}/${prefix}/lib/ghc-${version}
    125163                  system "ranlib *.a"
     164
     165                  file delete ${destroot}${prefix}/bin/happy
     166                  file delete ${destroot}${prefix}/bin/happy-${happy_version}
     167                  file delete -force ${destroot}${prefix}/lib/happy-${happy_version}
    126168                }
    127169
  • trunk/dports/lang/ghc/files/patch-configure.ac

    r4287 r11342  
    1 --- configure.ac.sav    Mon Dec 22 13:24:02 2003
    2 +++ configure.ac        Mon Dec 22 13:25:26 2003
    3 @@ -1116,17 +1116,17 @@
     1--- configure.ac.sav    Fri Mar 11 14:09:09 2005
     2+++ configure.ac        Fri Mar 11 14:11:11 2005
     3@@ -1046,17 +1046,17 @@
    44 
    5  dnl ** (Mac OS X only: check for HaskellSupport.framework)
    6  HaveFrameworkHaskellSupport=NO
     5 dnl ** (Mac OS X only: check for GMP.framework)
     6 HaveFrameworkGMP=NO
    77-if test $HostPlatform = "powerpc-apple-darwin"; then
    8 - AC_MSG_CHECKING([for HaskellSupport.framework])
     8- AC_MSG_CHECKING([for GMP.framework])
    99- save_libs="$LIBS"
    10 - LIBS="-framework HaskellSupport"
    11 - AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
    12 - if test $HaveFrameworkHaskellSupport = YES; then
    13 -  AC_DEFINE([HAVE_FRAMEWORK_HASKELLSUPPORT], [1], [Define to 1 if the HaskellSupport.framework is installed (Mac OS X only).])
     10- LIBS="-framework GMP"
     11- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
     12- if test $HaveFrameworkGMP = YES; then
     13-  AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
    1414- fi;
    1515- LIBS="$save_libs"
    16 - AC_MSG_RESULT([$HaveFrameworkHaskellSupport])
     16- AC_MSG_RESULT([$HaveFrameworkGMP])
    1717-fi;
    1818+dnl if test $HostPlatform = "powerpc-apple-darwin"; then
    19 +dnl AC_MSG_CHECKING([for HaskellSupport.framework])
    20 +dnl  save_libs="$LIBS"
    21 +dnl  LIBS="-framework HaskellSupport"
    22 +dnl AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
    23 +dnl if test $HaveFrameworkHaskellSupport = YES; then
    24 +dnl  AC_DEFINE([HAVE_FRAMEWORK_HASKELLSUPPORT], [1], [Define to 1 if the HaskellSupport.framework is installed (Mac OS X only).])
     19+dnl  AC_MSG_CHECKING([for GMP.framework])
     20+dnl save_libs="$LIBS"
     21+dnl LIBS="-framework GMP"
     22+dnl AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
     23+dnl if test $HaveFrameworkGMP = YES; then
     24+dnl  AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
    2525+dnl fi;
    2626+dnl LIBS="$save_libs"
    27 +dnl AC_MSG_RESULT([$HaveFrameworkHaskellSupport])
     27+dnl AC_MSG_RESULT([$HaveFrameworkGMP])
    2828+dnl fi;
    29  AC_SUBST(HaveFrameworkHaskellSupport)
     29 AC_SUBST(HaveFrameworkGMP)
    3030 
    3131 dnl ** check for mingwex library
Note: See TracChangeset for help on using the changeset viewer.