[79336] trunk/dports/devel/apr

[dluke at macports.org]

Revision: 79336
          http://trac.macports.org/changeset/79336
Author:   dluke at macports.org
Date:     2011-06-09 10:59:13 -0700 (Thu, 09 Jun 2011)
Log Message:
-----------
apr: add patch for building on Darwin < 10 (#29748)

Modified Paths:
--------------
    trunk/dports/devel/apr/Portfile

Added Paths:
-----------
    trunk/dports/devel/apr/files/
    trunk/dports/devel/apr/files/apr_h_patch.diff

Modified: trunk/dports/devel/apr/Portfile
===================================================================
--- trunk/dports/devel/apr/Portfile	2011-06-09 17:55:08 UTC (rev 79335)
+++ trunk/dports/devel/apr/Portfile	2011-06-09 17:59:13 UTC (rev 79336)
@@ -4,6 +4,7 @@
 
 name		apr
 version		1.4.5
+revision	1
 categories	devel
 maintainers	geeklair.net:dluke
 platforms	darwin
@@ -29,6 +30,8 @@
 		--enable-nonportable-atomics \
 		ac_cv_func_setpgrp_void=no
 
+patchfiles	apr_h_patch.diff
+
 test.run	yes
 test.target	check
 test.env	DYLD_LIBRARY_PATH=${worksrcpath}/.libs

Added: trunk/dports/devel/apr/files/apr_h_patch.diff
===================================================================
--- trunk/dports/devel/apr/files/apr_h_patch.diff	                        (rev 0)
+++ trunk/dports/devel/apr/files/apr_h_patch.diff	2011-06-09 17:59:13 UTC (rev 79336)
@@ -0,0 +1,49 @@
+--- include/apr.h.in.orig	2011-06-09 13:31:47.000000000 -0400
++++ include/apr.h.in	2011-06-09 13:31:25.000000000 -0400
+@@ -331,7 +331,7 @@
+  * flag. Since we need to support both, we have to
+  * handle OS X unqiuely.
+  */
++#ifdef DARWIN
+-#ifdef DARWIN_10
+ #undef APR_SIZEOF_VOIDP
+ #undef INT64_C
+ #undef UINT64_C
+@@ -537,7 +537,7 @@
+ /*
+  * Ensure we work with universal binaries on Darwin
+  */
++#ifdef DARWIN
+-#ifdef DARWIN_10
+ 
+ #undef APR_HAS_LARGE_FILES
+ #undef APR_SIZEOF_VOIDP
+@@ -569,7 +569,7 @@
+ #undef APR_OFF_T_FMT
+ #define APR_OFF_T_FMT "lld"
+ 
++#endif /* DARWIN */
+-#endif /* DARWIN_10 */
+ 
+ /* Does the proc mutex lock threads too */
+ #define APR_PROC_MUTEX_IS_GLOBAL      @proc_mutex_is_global@
+--- include/arch/unix/apr_private.h.in.orig	2011-06-09 13:32:21.000000000 -0400
++++ include/arch/unix/apr_private.h.in	2011-06-09 13:31:59.000000000 -0400
+@@ -946,7 +946,7 @@
+  * flag. Since we need to support both, we have to
+  * handle OS X unqiuely.
+  */
++#ifdef DARWIN
+-#ifdef DARWIN_10
+ 
+ #undef APR_OFF_T_STRFN
+ #undef APR_INT64_STRFN
+@@ -983,7 +983,7 @@
+ /* #undef SETPGRP_VOID */
+ #endif
+  
++#endif /* DARWIN */
+-#endif /* DARWIN_10 */
+ 
+ /*
+  * Include common private declarations.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110609/9a252cef/attachment.html>