Revision
38757
Author
mww@macports.org
Date
2008-07-30 04:08:30 -0700 (Wed, 30 Jul 2008)

Log Message

fix build on 10.5:
-correct call to APR_BRIGADE_SENTINEL  (#15791, https://issues.apache.org/jira/browse/MODPYTHON-249);
-add CC variable to dist/Makefile (will not find compiler otherwise)

Modified Paths

Added Paths

Diff

Modified: trunk/dports/www/mod_python/Portfile (38756 => 38757)


--- trunk/dports/www/mod_python/Portfile	2008-07-30 10:13:23 UTC (rev 38756)
+++ trunk/dports/www/mod_python/Portfile	2008-07-30 11:08:30 UTC (rev 38757)
@@ -4,6 +4,7 @@
 
 name			mod_python
 version			3.3.1
+revision		1
 categories		www python
 platforms		darwin
 maintainers		mww
@@ -24,6 +25,8 @@
 depends_build	port:flex
 depends_lib		port:apache2 port:python24
 
+patchfiles		patch-src-connobject.c.diff patch-dist-Makefile.in.diff
+
 configure.cppflags	"-I${prefix}/include/python2.4"
 configure.ldflags-append	"-Wl,-F${prefix}/Library/Frameworks"
 configure.args	--with-apxs=${prefix}/apache2/bin/apxs \
@@ -37,6 +40,8 @@
 	file copy ${worksrcpath}/doc-html ${destroot}${prefix}/share/doc/${name}
 }
 
+destroot.violate_mtree	yes
+
 post-install {
 	ui_msg "########################################################"
 	ui_msg "# to enable mod_python add"

Added: trunk/dports/www/mod_python/files/patch-dist-Makefile.in.diff (0 => 38757)


--- trunk/dports/www/mod_python/files/patch-dist-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/www/mod_python/files/patch-dist-Makefile.in.diff	2008-07-30 11:08:30 UTC (rev 38757)
@@ -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@
+

Added: trunk/dports/www/mod_python/files/patch-src-connobject.c.diff (0 => 38757)


--- trunk/dports/www/mod_python/files/patch-src-connobject.c.diff	                        (rev 0)
+++ trunk/dports/www/mod_python/files/patch-src-connobject.c.diff	2008-07-30 11:08:30 UTC (rev 38757)
@@ -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;