Ticket #29307: patch-guile-Portfile.diff

File patch-guile-Portfile.diff, 5.4 KB (added by jul_bsd@…, 10 years ago)

  • lang/guile/Portfile

    old new  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 114328 2013-12-05 10:21:52Z ryandesign@macports.org $
     2# $Id$
    33
    44PortSystem 1.0
    55PortGroup       muniversal 1.0
    66
    77name            guile
    8 version         1.8.8
     8version         2.0.11
    99categories      lang
    1010maintainers     nomaintainer
    1111platforms       darwin
    1212license     LGPL-2.1+
    1313
    14 description     GNU's Ubiquitous Intelligent Language for Extension (guile)
     14description     GNU's Ubiquitous Intelligent Language for Extension (guile) v2
    1515long_description        \
    1616                Guile is an interpreter for the Scheme programming      \
    1717                language, packaged for use in a wide variety of         \
    … …  
    2727                interface, powerful string processing, and many other   \
    2828                features needed for programming in the real world.
    2929
    30 #user_notes     You may need to set the environment variable            \
    31 #               DYLD_LIBRARY_PATH to ${prefix}/lib (or wherever         \
    32 #               the guile libraries have been installed) if you want    \
    33 #               to load guile modules from an application linked with   \
    34 #               libguile.  This should only apply to developers using   \
    35 #               guile as an extension language.
    36 
    3730distname        guile-${version}
    3831homepage        http://www.gnu.org/software/guile/guile.html
    39 master_sites    gnu
     32master_sites    gnu:guile
    4033
    41 checksums       md5     18661a8fdfef13e2fcb7651720aa53f3 \
    42                 sha1    548d6927aeda332b117f8fc5e4e82c39a05704f9 \
    43                 rmd160  8ac185a72ad8394b14d5377549e5bbf02889faaa
    44 
    45 patchfiles      patch-srfi-60.c.diff \
    46                 patch-libguile-fports.c.diff \
    47                 patch-no-stack-checking.diff
     34checksums           rmd160  e375607a569cba8ebecd9a15d4c25abe10abfd85 \
     35                    sha256  e6786c934346fa2e38e46d8d81a622bb1c16d130153523f6129fcd79ef1fb040
    4836
    4937depends_lib     port:readline \
    5038                port:gettext \
    5139                port:libiconv \
    52                 port:libtool \
    53                 port:gmp
     40                port:gmp port:libunistring port:boehmgc port:libffi
     41depends_run     port:libtool
    5442
     43## https://github.com/Homebrew/homebrew/blob/67995a62d81e9ea9d53213e2cd221dae81fa9436/Library/Formula/guile.rb
     44## http://fink.cvs.sourceforge.net/fink/dists/10.7/stable/main/finkinfo/languages/guile20.info?view=markup
     45use_autoconf        yes
     46use_automake        yes
    5547configure.args  CPPFLAGS="-I${prefix}/include"          \
    5648                LDFLAGS="-L${prefix}/lib"               \
    5749                --infodir="${prefix}/share/info"        \
    5850                --mandir="${prefix}/share/man"          \
    59                 --enable-regex                          \
    60                 --disable-error-on-warning
    61 
    62 post-patch {
    63     # This changes configure to do what the author actually intended based on their comments
    64     reinplace "s|-Werror -Wmissing-braces|-Werror=missing-braces|" ${worksrcpath}/configure
    65 }
     51                --enable-regex
    6652
    67 # Unable to cross compile, so we need to be able to run the built code
    68 if {${os.arch} eq "i386" && ${os.major} >= 11} {
    69     supported_archs i386 x86_64
    70     set universal_archs_supported {i386 x86_64}
    71 } elseif {${os.arch} eq "i386" && ${build_arch} eq "x86_64"} {
    72     supported_archs i386 x86_64 ppc
    73     set universal_archs_supported {i386 x86_64 ppc}
    74 } elseif {${os.arch} eq "i386"} {
    75     supported_archs i386 ppc
    76     set universal_archs_supported {i386 ppc}
    77 } elseif {${build_arch} eq "ppc64"} {
    78     supported_archs ppc ppc64
    79     set universal_archs_supported {ppc ppc64}
    80 } else {
    81     supported_archs ${build_arch}
    82     set universal_archs_supported ${build_arch}
     53if {${os.platform} == "darwin" && ($build_arch == "x86_64" || $build_arch == "ppc64")} {
     54    configure.args-append --build=${build_arch}-apple-darwin${os.version}
    8355}
    8456
    85 platform darwin {
    86     if {[variant_isset universal]} {
    87         set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
    88         set merger_host(i386) i686-apple-${os.platform}${os.major}
    89         set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
    90         set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
    91         set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}"
    92         set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
    93         set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
    94         set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
    95     } elseif {${build_arch} eq "i386"} {
    96         configure.args-append \
    97             --host=i686-apple-${os.platform}${os.major} \
    98             --build=i686-apple-${os.platform}${os.major}
    99     } elseif {${build_arch} eq "x86_64"} {
    100         configure.args-append \
    101             --host=x86_64-apple-${os.platform}${os.major} \
    102             --build=x86_64-apple-${os.platform}${os.major}
    103     } elseif {${build_arch} eq "ppc"} {
    104         configure.args-append \
    105             --host=powerpc-apple-${os.platform}${os.major} \
    106             --build=powerpc-apple-${os.platform}${os.major}
    107     } elseif {${build_arch} eq "ppc64"} {
    108         configure.args-append \
    109             --host=powerpc64-apple-${os.platform}${os.major} \
    110             --build=powerpc64-apple-${os.platform}${os.major}
    111     }
    112 }
    113 
    114 set merger_dont_diff "${prefix}/include/libguile/scmconfig.h"
    115 
    116 #post-destroot  {
    117 #                 file delete ${destroot}${prefix}/share/${name}/1.6/ice-9/and-let\*.scm
    118 #               }
    119 
    12057livecheck.type  regex
    12158livecheck.url   "http://ftp.gnu.org/pub/gnu/guile/?C=N;O=D"
    12259livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"