Changeset 14750 for trunk/dports


Ignore:
Timestamp:
Oct 22, 2005, 2:04:21 AM (14 years ago)
Author:
yves
Message:

Bump to 10.30
Bug: also fix gcc build detection (5299)
Submitted by:
Reviewed by:
Approved by:
Obtained from:

Location:
trunk/dports/graphics/netpbm
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/netpbm/Portfile

    r14341 r14750  
    1 # $Id: Portfile,v 1.11 2005/09/30 12:25:37 yves Exp $
     1# $Id: Portfile,v 1.12 2005/10/22 02:04:20 yves Exp $
    22PortSystem 1.0
    33name            netpbm
    4 version         10.29
    5 revision        1
     4version         10.30
    65categories      graphics
    76maintainers     yves@opendarwin.org
     
    2120                port:libpng port:jasper
    2221extract.suffix  .tgz
    23 checksums       md5 606c7ca1f3cd4c722a98961216730aec
     22checksums       md5 f84620e2733fb13eebe1394948077342
    2423
    25 patchfiles      patch-lib-Makefile patch-camera.c patch-cameratopam.c
    26 post-patch {
    27     reinplace "s|INFINITY|infinity|g" \
    28         ${worksrcpath}/editor/pnmaddnoise.c
    29 }
     24set gcc-suffix ""
     25patchfiles      patch-lib-Makefile
    3026
    3127configure {
    32     if { ${xcodeversion} == "2.0orlower"} {
    33         set use_gcc "gcc-3.3"
    34     } else {
    35         set use_gcc "gcc"
    36     }
    3728    system "cd ${worksrcpath} &&
    3829        cat Makefile.config.in ${filespath}/Makefile.config.darwin |
    39         sed -e '/@PREFIX@/s@@${prefix}@' -e '/@GCC@/s@@${use_gcc}@' \
     30        sed -e '/@PREFIX@/s@@${prefix}@' -e '/@GCC_SUFFIX@/s@@${gcc-suffix}@' \
    4031            > Makefile.config";
    4132}
     
    5344        rm -rf README VERSION config_template link misc pkginfo share/man/web"
    5445}
     46
     47# work around bug in Apple's gcc build 4061
     48platform darwin 8 {
     49    set fl [open "| gcc --version"]
     50    set data [read $fl]
     51    if {[regexp "build 4061" $data] } {
     52        set gcc-suffix "-3.3"
     53    }
     54}
  • trunk/dports/graphics/netpbm/files/Makefile.config.darwin

    r13587 r14750  
    77STATICLIB_TOO       = y
    88NETPBM_RUNTIME_PATH = @PREFIX@/lib
    9 CC              = @GCC@ -no-cpp-precomp
     9CC              = gcc@GCC_SUFFIX@ -no-cpp-precomp
    1010CFLAGS          = -O3 -I@PREFIX@/include
    1111CFLAGS_SHLIB    = -fno-common
Note: See TracChangeset for help on using the changeset viewer.