[62440] trunk/dports/net/curl/Portfile

[ryandesign at macports.org]

Revision: 62440
          http://trac.macports.org/changeset/62440
Author:   ryandesign at macports.org
Date:     2010-01-08 01:45:35 -0800 (Fri, 08 Jan 2010)
Log Message:
-----------
curl:

 * remove +ipv6 variant; always enable ipv6 support
 * remove +doc variant; always install all documentation, now to an unversioned directory
 * enable +ssl variant by default unless user has already requested +gnutls variant

See #23177.

Modified Paths:
--------------
    trunk/dports/net/curl/Portfile

Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile	2010-01-08 08:51:58 UTC (rev 62439)
+++ trunk/dports/net/curl/Portfile	2010-01-08 09:45:35 UTC (rev 62440)
@@ -7,6 +7,7 @@
 name                    curl
 # keep the version in sync with the curl-ca-bundle port
 version                 7.19.7
+revision                1
 categories              net www
 maintainers             ryandesign
 license                 curl
@@ -37,7 +38,7 @@
     rmd160  b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4
 
 configure.args \
-    --disable-ipv6 \
+    --enable-ipv6 \
     --without-libidn \
     --without-libssh2 \
     --without-ssl \
@@ -68,10 +69,9 @@
     }
 }
 
-set docdir ${prefix}/share/doc/${name}-${version}
-
 post-destroot {
-    xinstall -d ${destroot}${docdir}
+    set docdir ${prefix}/share/doc/${name}
+    xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl
     xinstall -m 0644 -W ${worksrcpath} \
         CHANGES \
         COPYING \
@@ -90,10 +90,19 @@
         RESOURCES \
         THANKS \
         TODO \
+        TheArtOfHttpScripting \
         VERSIONS \
         ${destroot}${docdir}
+    eval xinstall -m 0644 [glob ${worksrcpath}/docs/*.html] ${destroot}${docdir}/html
+    eval xinstall -m 0644 [glob ${worksrcpath}/docs/libcurl/*.html] ${destroot}${docdir}/html/libcurl
+    eval xinstall -m 0644 [glob ${worksrcpath}/docs/*.pdf] ${destroot}${docdir}/pdf
+    eval xinstall -m 0644 [glob ${worksrcpath}/docs/libcurl/*.pdf] ${destroot}${docdir}/pdf/libcurl
 }
 
+if {![variant_isset gnutls]} {
+    default_variants +ssl
+}
+
 variant ssl {
     depends_lib-append      port:openssl \
                             port:curl-ca-bundle
@@ -102,11 +111,6 @@
     configure.args-delete   --without-ssl
 }
 
-variant ipv6 {
-    configure.args-delete   --disable-ipv6
-    configure.args-append   --enable-ipv6
-}
-
 variant ares description {Add support for resolving names asynchronously} {
     depends_lib-append      port:c-ares
     archcheck.files-append  lib/libcares.dylib
@@ -148,19 +152,5 @@
     configure.args-delete   --without-libssh2
 }
 
-variant doc {
-    post-destroot {
-        xinstall -d ${destroot}${docdir}/html/libcurl
-        xinstall -m 0644 -W ${worksrcpath}/docs TheArtOfHttpScripting ${destroot}${docdir}/html
-        eval xinstall -m 0644 [glob ${worksrcpath}/docs/*.html] ${destroot}${docdir}/html
-        eval xinstall -m 0644 [glob ${worksrcpath}/docs/libcurl/*.html] \
-            ${destroot}${docdir}/html/libcurl
-
-        xinstall -d ${destroot}${docdir}/pdf/libcurl
-        xinstall -m 0644 -W ${worksrcpath}/docs curl-config.pdf curl.pdf ${destroot}${docdir}/pdf
-        eval xinstall -m 0644 [glob ${worksrcpath}/docs/libcurl/*.pdf] ${destroot}${docdir}/pdf/libcurl
-    }
-}
-
 livecheck.type              freshmeat
 livecheck.regex             (?i)<title>curl and libcurl (.*)</title>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100108/6a33a8f9/attachment.html>