[82515] trunk/dports/graphics/netpbm/Portfile

[ryandesign at macports.org]

Revision: 82515
          http://trac.macports.org/changeset/82515
Author:   ryandesign at macports.org
Date:     2011-08-14 22:25:58 -0700 (Sun, 14 Aug 2011)
Log Message:
-----------
netpbm:

 * update to 10.47.29
 * add jbigkit dependency (#29710)
 * simplify using [get_canonical_archflags]
 * fix livecheck
 * remove master_sites; this port fetches from svn

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

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2011-08-15 05:11:11 UTC (rev 82514)
+++ trunk/dports/graphics/netpbm/Portfile	2011-08-15 05:25:58 UTC (rev 82515)
@@ -3,9 +3,8 @@
 PortSystem 1.0
 
 name            netpbm
-version         10.47.26
-revision        0
-svn.revision    1402
+version         10.47.29
+svn.revision    1511
 categories      graphics
 license         {BSD GPL-2 IJG Permissive}
 maintainers     mas openmaintainer
@@ -18,7 +17,6 @@
     magnifying and cropping.
 
 homepage        http://netpbm.sourceforge.net/
-master_sites    sourceforge:netpbm
 platforms       darwin freebsd linux
 # Parallel building is not reliable in netpbm 10.26.x.
 # This has been fixed for the next major release of netpbm.
@@ -31,6 +29,7 @@
 
 depends_lib     port:zlib port:jpeg port:tiff \
                 port:libpng port:jasper \
+                port:jbigkit \
                 port:libxml2
 
 fetch.type      svn
@@ -52,13 +51,8 @@
     # we do that for our user.
     file copy ${worksrcpath}/config.mk.in ${worksrcpath}/config.mk
     reinplace "s|^CC =.*\$|CC = ${configure.cc}|" ${worksrcpath}/config.mk
-    if {[variant_isset universal]} {
-        reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} ${configure.universal_cflags}|" ${worksrcpath}/config.mk
-        reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.universal_ldflags}|g" ${worksrcpath}/config.mk
-    } else {
-        reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} ${configure.cc_archflags}|" ${worksrcpath}/config.mk
-        reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} ${configure.ld_archflags}|g" ${worksrcpath}/config.mk
-    }
+    reinplace "s|^#CFLAGS =.*\$|CFLAGS = ${configure.cppflags} ${configure.cflags} [get_canonical_archflags]|" ${worksrcpath}/config.mk
+    reinplace "s|^#LDFLAGS +=.*\$|LDFLAGS = ${configure.ldflags} [get_canonical_archflags]|g" ${worksrcpath}/config.mk
     reinplace "s|^CFLAGS_SHLIB =.*\$|CFLAGS_SHLIB = -fno-common|" ${worksrcpath}/config.mk
     reinplace "s|^TIFFLIB =.*\$|TIFFLIB = -ltiff|" ${worksrcpath}/config.mk
     reinplace "s|^JPEGLIB =.*\$|JPEGLIB = -ljpeg|" ${worksrcpath}/config.mk
@@ -69,12 +63,7 @@
 
 platform darwin {
     post-configure {
-        set ldshlib "${configure.ldflags} -dynamiclib -install_name ${prefix}/lib/libnetpbm.\$(MAJ).dylib -compatibility_version \$(MAJ) -current_version ${version}"
-        if {[variant_isset universal]} {
-            set ldshlib "${ldshlib} ${configure.universal_ldflags}"
-        } else {
-            set ldshlib "${ldshlib} ${configure.ld_archflags}"
-        }
+        set ldshlib "${configure.ldflags} -dynamiclib -install_name ${prefix}/lib/libnetpbm.\$(MAJ).dylib -compatibility_version \$(MAJ) -current_version ${version} [get_canonical_archflags]"
         reinplace "s|^NETPBMLIBTYPE =.*\$|NETPBMLIBTYPE = dylib|" ${worksrcpath}/config.mk
         reinplace "s|^NETPBMLIBSUFFIX =.*\$|NETPBMLIBSUFFIX = dylib|" ${worksrcpath}/config.mk
         reinplace "s|^LDSHLIB =.*\$|LDSHLIB = ${ldshlib}|" ${worksrcpath}/config.mk
@@ -145,4 +134,4 @@
 
 livecheck.type  regex
 livecheck.url   http://${name}.svn.sourceforge.net/viewvc/${name}/stable/
-livecheck.regex {Release ([0-9.]+)}
+livecheck.regex {(?i)(?:release|version) ([0-9.]+)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110814/dbf88340/attachment.html>