Revision: 38805
http://trac.macosforge.org/projects/macports/changeset/38805
Author: mww at macports.org
Date: 2008-07-31 15:17:42 -0700 (Thu, 31 Jul 2008)
Log Message:
-----------
fix compilation with apr 1.3.2 (#16153)
Modified Paths:
--------------
trunk/dports/www/mod_python25/Portfile
Added Paths:
-----------
trunk/dports/www/mod_python25/files/
trunk/dports/www/mod_python25/files/patch-dist-Makefile.in.diff
trunk/dports/www/mod_python25/files/patch-src-connobject.c.diff
Modified: trunk/dports/www/mod_python25/Portfile
===================================================================
--- trunk/dports/www/mod_python25/Portfile 2008-07-31 22:04:23 UTC (rev 38804)
+++ trunk/dports/www/mod_python25/Portfile 2008-07-31 22:17:42 UTC (rev 38805)
@@ -4,6 +4,7 @@
name mod_python25
version 3.3.1
+revision 1
categories www python
platforms darwin
maintainers mww jwa
@@ -25,6 +26,8 @@
depends_build port:flex
depends_lib port:apache2 port:python25
+patchfiles patch-dist-Makefile.in.diff patch-src-connobject.c.diff
+
configure.cppflags "-I${prefix}/include/python2.5"
configure.ldflags-append "-Wl,-F${prefix}/Library/Frameworks"
configure.args --with-apxs=${prefix}/apache2/bin/apxs \
Copied: trunk/dports/www/mod_python25/files (from rev 38756, trunk/dports/www/mod_python/files)
Copied: trunk/dports/www/mod_python25/files/patch-dist-Makefile.in.diff (from rev 38757, trunk/dports/www/mod_python/files/patch-dist-Makefile.in.diff)
===================================================================
--- trunk/dports/www/mod_python25/files/patch-dist-Makefile.in.diff (rev 0)
+++ trunk/dports/www/mod_python25/files/patch-dist-Makefile.in.diff 2008-07-31 22:17:42 UTC (rev 38805)
@@ -0,0 +1,11 @@
+--- dist/Makefile.in 2005-10-15 17:43:35.000000000 +0200
++++ dist/Makefile.in 2008-07-30 13:02:11.000000000 +0200
+@@ -17,6 +17,8 @@
+ # $Id: Makefile.in 321360 2005-10-15 15:43:35Z jgallacher $
+ #
+
++CC=@CC@
++
+ PYTHON_BIN=@PYTHON_BIN@
+ MP_VERSION=@MP_VERSION@
+
Copied: trunk/dports/www/mod_python25/files/patch-src-connobject.c.diff (from rev 38757, trunk/dports/www/mod_python/files/patch-src-connobject.c.diff)
===================================================================
--- trunk/dports/www/mod_python25/files/patch-src-connobject.c.diff (rev 0)
+++ trunk/dports/www/mod_python25/files/patch-src-connobject.c.diff 2008-07-31 22:17:42 UTC (rev 38805)
@@ -0,0 +1,11 @@
+--- src/connobject.c 2006-12-03 05:36:37.000000000 +0100
++++ src/connobject.c 2008-07-30 12:30:10.000000000 +0200
+@@ -139,7 +139,7 @@
+ bytes_read = 0;
+
+ while ((bytes_read < len || len == 0) &&
+- !(b == APR_BRIGADE_SENTINEL(b) ||
++ !(b == APR_BRIGADE_SENTINEL(bb) ||
+ APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
+
+ const char *data;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080731/0cc5851f/attachment.html