Ticket #28573: patch-fltk-devel.diff

File patch-fltk-devel.diff, 2.8 KB (added by jarno.rajahalme@…, 13 years ago)

patch from the current fltk-devel/Portfile

  • ./Portfile

     
    11# -*- Mode: Tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 75769 2011-02-08 00:30:43Z jmr@macports.org $
     2# $Id: $
    33
    44PortSystem      1.0
    55
    66name            fltk-devel
    77conflicts       fltk
    8 version         1.3.x-r7794
    9 revision        1
     8version         1.3.x-r8472
    109categories      aqua devel
    1110platforms       macosx
    1211maintainers     nomaintainer
    … …  
    3130distname        fltk-${version}
    3231use_bzip2       yes
    3332
    34 checksums       md5     1500dacd85587b02aa6009090c661ccb \
    35                 sha1    cb6ed7681b81a5126dcec8be57ac4cb39aef0243 \
    36                 rmd160  668f3b5cad382d72495400e9dadb37b62147f2e4
    37 
    38 depends_lib     port:jpeg \
    39                 port:libpng \
    40                 port:zlib
     33checksums       md5     b27b9d75effbd88505ed22851e9babf3 \
     34                sha1    8258df43f9a60ebe1b4560075a0a8fd85b9127ec \
     35                rmd160  7b672d5adb99ffef6cedbdbb4a76b12f5313b82c
    4136
    4237worksrcdir      ${distname}
    4338
    … …  
    4843    reinplace "s|/Applications|${applications_dir}/fltk|g" \
    4944        ${worksrcpath}/fluid/Makefile \
    5045        ${worksrcpath}/test/Makefile
    51 
    52     # allow for 64-bit installs
    53     reinplace "s| -arch i386||g" ${worksrcpath}/configure
    5446}
    5547
    5648pre-configure {
    … …  
    5951    } else {
    6052        set archflags ${configure.cc_archflags}
    6153    }
    62     configure.env         DSOFLAGS=\"${archflags}\"
    6354    configure.args-append --with-archflags=\"${archflags}\"
    64 }
    6555
    66 configure.cflags
    67 configure.cppflags
    68 configure.cxxflags
    69 configure.ldflags
    70 configure.universal_cflags
    71 configure.universal_cppflags
    72 configure.universal_cxxflags
    73 configure.universal_ldflags
    74 configure.args  --enable-shared \
    75                 --mandir=${prefix}/share/man
     56    # arch flags are in ARCHFLAGS due to --with-archflags, remove them from other flags
     57    configure.cflags-replace "g/-arch \[^ \]* *//"
     58    configure.cppflags-replace "g/-arch \[^ \]* *//"
     59    configure.cxxflags-replace "g/-arch \[^ \]* *//"
     60    configure.ldflags-replace "g/-arch \[^ \]* *//"
     61    configure.universal_cflags-replace "g/-arch \[^ \]* *//"
     62    configure.universal_cppflags-replace "g/-arch \[^ \]* *//"
     63    configure.universal_cxxflags-replace "g/-arch \[^ \]* *//"
     64    configure.universal_ldflags-replace "g/-arch \[^ \]* *//"
     65
     66    configure.args-append  --enable-shared
     67}
    7668
    7769destroot.target install \
    7870                install-desktop
    7971
    8072universal_variant   yes
     73# Make universal variant the default, so that both 32-bit and 64-bit apps can depend on this
     74default_variants    +universal
    8175
    8276livecheck.type  regexm
    8377livecheck.url   ${homepage}
    84 livecheck.regex "Developmental Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
     78livecheck.regex "Snapshots:.*VERSION=(1\\.3\\.x-r\\d+)'"