curl builds incorrectly when +universal ppc i386 x86_64

[jeremyhu (Jeremy Huddleston Sequoia)]

Install curl +universal with ppc i386 x86_64 as the chosen arch. muniversal incorrectly merges the header files. Take this block in ${prefix}/include/curl/curlbuild.h for example:

/* The size of `long', as computed by sizeof. */
#if defined (__i386__) || defined(__x86_64__)
#ifndef __LP64__
#endif
#define CURL_SIZEOF_LONG 4
#if defined (__i386__) || defined(__x86_64__)
#else /* __LP64__ */
#define CURL_SIZEOF_LONG 8
#endif /* __LP64__ */
#endif

This came from -intel (which was correctly merged from i386 and x86_64):

/* The size of `long', as computed by sizeof. */
#ifndef __LP64__
#define CURL_SIZEOF_LONG 4
#else /* __LP64__ */
#define CURL_SIZEOF_LONG 8
#endif /* __LP64__ */

and from -powerpc (which was correctly just powerpc):

/* The size of `long', as computed by sizeof. */
#define CURL_SIZEOF_LONG 4

[jeremyhu (Jeremy Huddleston Sequoia)]

Index: Portfile
===================================================================
--- Portfile	(revision 91542)
+++ Portfile	(working copy)
@@ -8,6 +8,7 @@
 name                        curl
 # keep the version in sync with the curl-ca-bundle port
 version                     7.25.0
+revision                    1
 categories                  net www
 maintainers                 ryandesign
 license                     curl
@@ -78,6 +79,9 @@
     }
 }
 
+global merger_dont_diff merger_configure_env
+set merger_dont_diff "${prefix}/include/curl/curlbuild.h"
+
 post-destroot {
     set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl

[jeremyhu (Jeremy Huddleston Sequoia)]

r92443