Changeset 82515

Timestamp:

08/14/11 22:25:58 (4 years ago)

Author:

ryandesign@…

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

File:

• trunk/dports/graphics/netpbm/Portfile (modified) (6 diffs)

trunk/dports/graphics/netpbm/Portfile

@@ -4 +4 @@
 
 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}
@@ -19 +18 @@
 
 homepage        http://netpbm.sourceforge.net/
-master_sites    sourceforge:netpbm
 platforms       darwin freebsd linux
 # Parallel building is not reliable in netpbm 10.26.x.
@@ -32 +30 @@
 depends_lib     port:zlib port:jpeg port:tiff \
                 port:libpng port:jasper \
+                port:jbigkit \
                 port:libxml2
 
@@ -53 +52 @@
     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
@@ -70 +64 @@
 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
@@ -146 +135 @@
 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.]+)}