Changeset 14750 for trunk/dports/graphics

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:

• Portfile (modified) (3 diffs)
• files/Makefile.config.darwin (modified) (1 diff)
• files/patch-camera.c (deleted)
• files/patch-cameratopam.c (deleted)

trunk/dports/graphics/netpbm/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.11 2005/09/30 12:25:37 yves Exp $
+# $Id: Portfile,v 1.12 2005/10/22 02:04:20 yves Exp $
 PortSystem 1.0
 name            netpbm
-version         10.29
-revision        1
+version         10.30
 categories      graphics
 maintainers     yves@opendarwin.org
@@ -21 +20 @@
                 port:libpng port:jasper
 extract.suffix  .tgz
-checksums       md5 606c7ca1f3cd4c722a98961216730aec
+checksums       md5 f84620e2733fb13eebe1394948077342
 
-patchfiles      patch-lib-Makefile patch-camera.c patch-cameratopam.c
-post-patch {
-    reinplace "s|INFINITY|infinity|g" \
-        ${worksrcpath}/editor/pnmaddnoise.c
-}
+set gcc-suffix ""
+patchfiles      patch-lib-Makefile
 
 configure {
-    if { ${xcodeversion} == "2.0orlower"} {
-        set use_gcc "gcc-3.3"
-    } else { 
-        set use_gcc "gcc"
-    }
     system "cd ${worksrcpath} &&
         cat Makefile.config.in ${filespath}/Makefile.config.darwin |
-        sed -e '/@PREFIX@/s@@${prefix}@' -e '/@GCC@/s@@${use_gcc}@' \
+        sed -e '/@PREFIX@/s@@${prefix}@' -e '/@GCC_SUFFIX@/s@@${gcc-suffix}@' \
             > Makefile.config";
 }
@@ -53 +44 @@
         rm -rf README VERSION config_template link misc pkginfo share/man/web"
 }
+
+# work around bug in Apple's gcc build 4061
+platform darwin 8 {
+    set fl [open "| gcc --version"]
+    set data [read $fl]
+    if {[regexp "build 4061" $data] } {
+        set gcc-suffix "-3.3"
+    }
+}

trunk/dports/graphics/netpbm/files/Makefile.config.darwin

@@ -7 +7 @@
 STATICLIB_TOO       = y
 NETPBM_RUNTIME_PATH = @PREFIX@/lib
-CC              = @GCC@ -no-cpp-precomp
+CC              = gcc@GCC_SUFFIX@ -no-cpp-precomp
 CFLAGS          = -O3 -I@PREFIX@/include
 CFLAGS_SHLIB    = -fno-common