[75683] trunk/dports/www/libwww

4 Feb 2011

Revision: 75683
          http://trac.macports.org/changeset/75683
Author:   jmr@macports.org
Date:     2011-02-03 19:20:50 -0800 (Thu, 03 Feb 2011)
Log Message:
-----------
libwww: update libs in libwww-config as per upstream CVS (#22520), fix build_arch support, use port: style deps

Modified Paths:
--------------
    trunk/dports/www/libwww/Portfile

Added Paths:
-----------
    trunk/dports/www/libwww/files/libwww-config.in.diff

Modified: trunk/dports/www/libwww/Portfile
===================================================================

--- trunk/dports/www/libwww/Portfile	2011-02-04 03:07:33 UTC (rev 75682)
+++ trunk/dports/www/libwww/Portfile	2011-02-04 03:20:50 UTC (rev 75683)
@@ -5,7 +5,7 @@
 
 name            libwww
 version         5.4.0
-revision        2
+revision        3
 categories      www
 platforms       darwin
 maintainers     nomaintainer
@@ -34,7 +34,8 @@
                 ltmain13 \
                     md5 e094ae92724c4015dbab97de151c2525
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.diff \
+                libwww-config.in.diff
 
 post-patch {
     system "cp ${distpath}/ltconfig13 ${worksrcpath}/config/ltconfig"
@@ -48,18 +49,19 @@
                 --with-ssl
 configure.ccache no
 
-if {[variant_isset universal]} {
-    pre-build {
+pre-build {
+    if {[variant_isset universal]} {
         reinplace "s|dynamiclib|dynamiclib ${configure.universal_ldflags}|" ${worksrcpath}/libtool
+    } else {
+        reinplace "s|dynamiclib|dynamiclib ${configure.ld_archflags}|" ${worksrcpath}/libtool
     }
 }
 
 variant expat description {builds against expat} {
-    depends_build-append    lib:libexpat.0:expat
+    depends_build-append    port:expat
     configure.args-append   --with-expat
 }
 
 livecheck.type  regex
 livecheck.url   http://www.w3.org/Library/Distribution/
 livecheck.regex "w3c-${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-

Added: trunk/dports/www/libwww/files/libwww-config.in.diff
===================================================================
--- trunk/dports/www/libwww/files/libwww-config.in.diff	                        (rev 0)
+++ trunk/dports/www/libwww/files/libwww-config.in.diff	2011-02-04 03:20:50 UTC (rev 75683)
@@ -0,0 +1,25 @@
+===================================================================
+RCS file: /sources/public/libwww/libwww-config.in,v
+retrieving revision 1.6
+retrieving revision 1.8
+diff -u -r1.6 -r1.8
+--- libwww-config.in	1999/06/23 18:05:01	1.6
++++ libwww-config.in	2005/03/10 03:16:05	1.8
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # (c) COPYRIGHT MIT 1995.
+ # Please first read the full copyright statement in the file COPYRIGH.
+-# @(#) $Id: libwww-config.in,v 1.6 1999/06/23 18:05:01 frystyk Exp $
++# @(#) $Id: libwww-config.in,v 1.8 2005/03/10 03:16:05 vbancrof Exp $
+ #
+ # Thanks to Soren Sandmann for providing first version of this script!
+ 
+@@ -48,7 +48,7 @@
+       echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@
+       ;;
+     --libs)
+-      echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
++      echo -L@libdir@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LWWWSSL@ @LIBS@ 
+       ;;
+     *)
+       echo "${usage}" 1>&2

    

jmr＠macports.org

tags

participants (1)