[csw-devel] SF.net SVN: gar:[3563] csw/mgar/pkg/mod_python/trunk

[valholla at users.sourceforge.net]

Revision: 3563
          http://gar.svn.sourceforge.net/gar/?rev=3563&view=rev
Author:   valholla
Date:     2009-03-02 22:36:22 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
compiled for python2.6

Modified Paths:
--------------
    csw/mgar/pkg/mod_python/trunk/Makefile
    csw/mgar/pkg/mod_python/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mod_python/trunk/files/connobject.diff

Modified: csw/mgar/pkg/mod_python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_python/trunk/Makefile	2009-03-02 22:11:08 UTC (rev 3562)
+++ csw/mgar/pkg/mod_python/trunk/Makefile	2009-03-02 22:36:22 UTC (rev 3563)
@@ -19,7 +19,6 @@
 CATALOGNAME_CSWap2modpython   = ap2_modpython
 SPKG_DESC_CSWap2modpython     = an Apache/Python integration module
 
-PATCHFILES  = configure.diff
 PATCHFILES += connobject.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -33,19 +32,13 @@
 
 include gar/category.mk
 
-#pre-configure:
-	#@( cd $(WORKSRC) ; autoconf )
-	#@$(MAKECOOKIE)
+DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython
 
-#DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython
+post-install-modulated:
+	@install -d $(DESTDOC)
+	@for file in COPYRIGHT CREDITS LICENSE NEWS NOTICE README ; do \
+	  ginstall -m 0644 $(WORKSRC)/$$file $(DESTDOC) ; \
+	done
+	@( cd $(WORKSRC) ; gcp -vR examples doc-html $(DESTDOC) )
+	@$(DONADA)
 
-#post-install: install-doc
-
-#install-doc:
-	#@install -d $(DESTDOC)
-	#@for file in COPYRIGHT CREDITS LICENSE NEWS NOTICE README ; do \
-	  #ginstall -m 0644 $(WORKSRC)/$$file $(DESTDOC) ; \
-	#done
-	#@( cd $(WORKSRC) ; gcp -vR examples doc-html $(DESTDOC) )
-	#@$(MAKECOOKIE)
-

Modified: csw/mgar/pkg/mod_python/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_python/trunk/checksums	2009-03-02 22:11:08 UTC (rev 3562)
+++ csw/mgar/pkg/mod_python/trunk/checksums	2009-03-02 22:36:22 UTC (rev 3563)
@@ -2,5 +2,4 @@
 6fda2f740f138af54536b87fb598426b  download/postinstall
 6892dd209d16d2c565581e9de272cf3e  download/preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/space
-783e43fd9ed17cbea81abfabc852001e  download/configure.diff
-efd99b53da7ae63dab49edbcc8bd65c2  download/connobject.diff
+44e80c5a863ba40809ad889f9c5d0307  download/connobject.diff

Added: csw/mgar/pkg/mod_python/trunk/files/connobject.diff
===================================================================
--- csw/mgar/pkg/mod_python/trunk/files/connobject.diff	                        (rev 0)
+++ csw/mgar/pkg/mod_python/trunk/files/connobject.diff	2009-03-02 22:36:22 UTC (rev 3563)
@@ -0,0 +1,11 @@
+--- mod_python-3.3.1/src/connobject.c.orig	2009-03-02 16:21:31.870869598 -0600
++++ mod_python-3.3.1/src/connobject.c	2009-03-02 16:22:11.934909344 -0600
+@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.