[96487] trunk/dports/net/curl

[ryandesign at macports.org]

Revision: 96487
          https://trac.macports.org/changeset/96487
Author:   ryandesign at macports.org
Date:     2012-08-12 01:03:30 -0700 (Sun, 12 Aug 2012)
Log Message:
-----------
curl: fix "curl-config -cflags" to not print an error (#35631); also install libcurl.m4 (#35247)

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

Added Paths:
-----------
    trunk/dports/net/curl/files/patch-curl-config.in.diff

Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile	2012-08-11 21:54:27 UTC (rev 96486)
+++ trunk/dports/net/curl/Portfile	2012-08-12 08:03:30 UTC (rev 96487)
@@ -8,6 +8,7 @@
 name                        curl
 # keep the version in sync with the curl-ca-bundle port
 version                     7.27.0
+revision                    1
 categories                  net www
 maintainers                 ryandesign
 license                     curl
@@ -31,7 +32,8 @@
 checksums                   rmd160  b9ce785cae06911577b5654bb32f55fd2e6b712a \
                             sha256  aba5582135c28470b46084da9747470c1c680485fc91f9f0d3f7928df8169398
 
-patchfiles                  patch-curl.h.diff
+patchfiles                  patch-curl.h.diff \
+                            patch-curl-config.in.diff
 
 configure.args              --enable-ipv6 \
                             --without-gnutls \
@@ -83,7 +85,8 @@
 
 post-destroot {
     set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl
+    xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl \
+        ${destroot}${prefix}/share/aclocal
     xinstall -m 0644 -W ${worksrcpath} \
         CHANGES \
         COPYING \
@@ -105,6 +108,8 @@
         TheArtOfHttpScripting \
         VERSIONS \
         ${destroot}${docdir}
+    xinstall -m 0644 ${worksrcpath}/docs/libcurl/libcurl.m4 \
+        ${destroot}${prefix}/share/aclocal/
     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

Added: trunk/dports/net/curl/files/patch-curl-config.in.diff
===================================================================
--- trunk/dports/net/curl/files/patch-curl-config.in.diff	                        (rev 0)
+++ trunk/dports/net/curl/files/patch-curl-config.in.diff	2012-08-12 08:03:30 UTC (rev 96487)
@@ -0,0 +1,14 @@
+--- curl-config.in.orig	2012-08-12 00:48:14.000000000 +0000
++++ curl-config.in	2012-08-12 00:49:18.000000000 +0000
+@@ -135,9 +135,9 @@
+           CPPFLAG_CURL_STATICLIB=""
+         fi
+        	if test "X at includedir@" = "X/usr/include"; then
+-          echo "$(CPPFLAG_CURL_STATICLIB)"
++          echo "${CPPFLAG_CURL_STATICLIB}"
+         else
+-          echo "$(CPPFLAG_CURL_STATICLIB)-I at includedir@"
++          echo "${CPPFLAG_CURL_STATICLIB}-I at includedir@"
+         fi
+        	;;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120812/a0308575/attachment.html>