[50419] trunk/dports/graphics/netpbm

[mcalhoun at macports.org]

Revision: 50419
          http://trac.macports.org/changeset/50419
Author:   mcalhoun at macports.org
Date:     2009-04-30 13:15:17 -0700 (Thu, 30 Apr 2009)
Log Message:
-----------
netpbm: Update version 10.26.60 -> 10.26.61.
Make having an incompatible compiler an error instead of using gcc 3.3.
Remove unused files.

Modified Paths:
--------------
    trunk/dports/graphics/netpbm/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/netpbm/files/Makefile.config.darwin
    trunk/dports/graphics/netpbm/files/Makefile.config.freebsd
    trunk/dports/graphics/netpbm/files/Makefile.config.linux

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2009-04-30 19:52:42 UTC (rev 50418)
+++ trunk/dports/graphics/netpbm/Portfile	2009-04-30 20:15:17 UTC (rev 50419)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            netpbm
-version         10.26.60
-revision        1
+version         10.26.61
 categories      graphics
 maintainers     mas openmaintainer
 description     Image manipulation
@@ -30,9 +29,9 @@
 depends_lib     port:zlib port:jpeg port:tiff \
                 port:libpng port:jasper
 extract.suffix  .tgz
-checksums       md5     deff5832271d724b07837f172527dddf \
-                sha1    722f1fda5eb5bfdb0a9a0a859c5784443527d8c7 \
-                rmd160  1d3015615292f9a8b92b9f73d72076d90168ad3a
+checksums       md5     1f6224210265ad9a9d196b9f83109a6d \
+                sha1    38e47c96adcfdaa8a8cc4741b6985f82f0100260 \
+                rmd160  18a8ee7160edeaf99e98125b9af01352f359f4ec
 
 patchfiles      patch-lib-Makefile.diff patch-pm_config.in.h.diff
 
@@ -59,7 +58,7 @@
 
 platform darwin {
     post-configure {
-        set ldshlib "-dynamiclib -install_name ${prefix}/lib/libnetpbm.\$(MAJ).dylib -compatibility_version \$(MAJ) -current_version \$(MAJ).\$(MIN)"
+        set ldshlib "-dynamiclib -install_name ${prefix}/lib/libnetpbm.\$(MAJ).dylib -compatibility_version \$(MAJ) -current_version ${version}"
         reinplace "s|^NETPBMLIBTYPE =.*\$|NETPBMLIBTYPE = dylib|" ${worksrcpath}/Makefile.config
         reinplace "s|^NETPBMLIBSUFFIX =.*\$|NETPBMLIBSUFFIX = dylib|" ${worksrcpath}/Makefile.config
         reinplace "s|^LDSHLIB =.*\$|LDSHLIB = ${ldshlib}|" ${worksrcpath}/Makefile.config
@@ -122,10 +121,11 @@
 
 # work around bug in Apple's gcc build 4061
 platform darwin 8 {
-    set fl [open "| gcc --version"]
+    set fl [open "| ${configure.cc} --version"]
     set data [read $fl]
     close $fl
     if {[regexp "build 4061" $data]} {
-        configure.compiler gcc-3.3
+        ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} does not work with gcc version \"${data}\"."
+        return -code error "incompatible gcc version"
     }
 }

Deleted: trunk/dports/graphics/netpbm/files/Makefile.config.darwin
===================================================================
--- trunk/dports/graphics/netpbm/files/Makefile.config.darwin	2009-04-30 19:52:42 UTC (rev 50418)
+++ trunk/dports/graphics/netpbm/files/Makefile.config.darwin	2009-04-30 20:15:17 UTC (rev 50419)
@@ -1,22 +0,0 @@
-#
-# Mac OS X (Darwin) configuration
-#
-DEFAULT_TARGET      = nonmerge
-NETPBMLIBTYPE       = dylib
-NETPBMLIBSUFFIX     = dylib
-STATICLIB_TOO       = y
-NETPBM_RUNTIME_PATH = @PREFIX@/lib
-CC              = gcc at GCC_SUFFIX@ -no-cpp-precomp
-CFLAGS          = -O3 -I at PREFIX@/include
-CFLAGS_SHLIB    = -fno-common
-LDFLAGS         = -L at PREFIX@/lib
-LDSHLIB         = -dynamiclib \
-                  -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.dylib \
-                  -compatibility_version $(MAJ) \
-                  -current_version $(MAJ).$(MIN)
-TIFFLIB         = -ltiff
-JPEGLIB         = -ljpeg
-PNGLIB          = -lpng
-ZLIB            = -lz
-JASPERHDR_DIR   = @PREFIX@/include
-JASPERLIB       = -ljasper

Deleted: trunk/dports/graphics/netpbm/files/Makefile.config.freebsd
===================================================================
--- trunk/dports/graphics/netpbm/files/Makefile.config.freebsd	2009-04-30 19:52:42 UTC (rev 50418)
+++ trunk/dports/graphics/netpbm/files/Makefile.config.freebsd	2009-04-30 20:15:17 UTC (rev 50419)
@@ -1,19 +0,0 @@
-#
-# FreeBSD configuration
-#
-DEFAULT_TARGET      = nonmerge
-NETPBMLIBTYPE       = unixshared
-NETPBMLIBSUFFIX     = so
-STATICLIB_TOO       = y
-NETPBM_RUNTIME_PATH = @PREFIX@/lib
-CC              = gcc
-CFLAGS          = -O3 -I at PREFIX@/include
-CFLAGS_SHLIB    = -fno-common
-LD              = glibtool --mode=link gcc
-LDFLAGS         = -L at PREFIX@/lib
-TIFFLIB         = -ltiff
-JPEGLIB         = -ljpeg
-PNGLIB          = -lpng
-ZLIB            = -lz
-JASPERHDR_DIR   = @PREFIX@/include
-JASPERLIB       = @PREFIX@/lib/libjasper.la

Deleted: trunk/dports/graphics/netpbm/files/Makefile.config.linux
===================================================================
--- trunk/dports/graphics/netpbm/files/Makefile.config.linux	2009-04-30 19:52:42 UTC (rev 50418)
+++ trunk/dports/graphics/netpbm/files/Makefile.config.linux	2009-04-30 20:15:17 UTC (rev 50419)
@@ -1,23 +0,0 @@
-#
-# GNU/Linux configuration
-#
-DEFAULT_TARGET      = nonmerge
-NETPBMLIBTYPE       = unixshared
-NETPBMLIBSUFFIX     = so
-STATICLIB_TOO       = y
-NETPBM_RUNTIME_PATH = @PREFIX@/lib
-CC              = gcc
-CFLAGS          = -O3 -I at PREFIX@/include
-CFLAGS_SHLIB    = -fno-common
-LDRELOC         = ld --reloc
-LDFLAGS         = -L at PREFIX@/lib
-LDSHLIB         = -shared \
-                  -Wl,-soname,$(SONAME)
-LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
-LINKERISCOMPILER = Y
-TIFFLIB         = -ltiff
-JPEGLIB         = -ljpeg
-PNGLIB          = -lpng
-ZLIB            = -lz
-JASPERHDR_DIR   = @PREFIX@/include
-JASPERLIB       = -ljasper
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090430/7068e6bb/attachment.html>