[56711] trunk/dports/www/mod_wsgi

[raimue at macports.org]

Revision: 56711
          http://trac.macports.org/changeset/56711
Author:   raimue at macports.org
Date:     2009-09-01 10:56:54 -0700 (Tue, 01 Sep 2009)
Log Message:
-----------
www/mod_wsgi:
Update to version 2.5 and adapt patch for configure script.
Add variants for the different python ports.

Modified Paths:
--------------
    trunk/dports/www/mod_wsgi/Portfile
    trunk/dports/www/mod_wsgi/files/patch-configure.diff

Modified: trunk/dports/www/mod_wsgi/Portfile
===================================================================
--- trunk/dports/www/mod_wsgi/Portfile	2009-09-01 17:54:06 UTC (rev 56710)
+++ trunk/dports/www/mod_wsgi/Portfile	2009-09-01 17:56:54 UTC (rev 56711)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name            mod_wsgi
-version         1.1
-revision        1
+version         2.5
 categories      www python
 platforms       darwin
 maintainers     nomaintainer
@@ -17,17 +16,16 @@
 
 homepage        http://www.modwsgi.org/
 master_sites    googlecode:modwsgi
-checksums       md5 40b56807c8b685133fede6b59c32600f \
-                sha1 a82e79d5d429dba64ef1e0d65b502577f0434649
-                
-depends_lib     port:apache2 port:python24
+checksums       md5     43ad11c477799e2f780c50197c420afd \
+                sha1    a2ed3fd60b390c3a790aca1c859093ab7a7c2d9d \
+                rmd160  c1c2b72deca98eaa9e7bee256b027b5e0488b2fc
 
 patchfiles      patch-configure.diff
 
-configure.args \
-                --with-apxs=${prefix}/apache2/bin/apxs \
-                --with-python=${prefix}/bin/python2.4
+depends_lib     port:apache2
 
+configure.args  --with-apxs=${prefix}/apache2/bin/apxs
+
 destroot.violate_mtree yes
 pre-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/apache2/modules
@@ -41,3 +39,30 @@
     ui_msg "#  ${prefix}/apache2/conf/httpd.conf"
     ui_msg "########################################################"
 }
+
+if {![variant_isset python24]
+    && ![variant_isset python25]
+    && ![variant_isset python26]
+    && ![variant_isset python30]} {
+    default_variants +python26
+}
+
+variant python24 conflicts python25 python26 python30 description {Use Python 2.4} {
+    depends_lib-append port:python24
+    configure.args-append --with-python=${prefix}/bin/python2.4
+}
+
+variant python25 conflicts python24 python26 python30 description {Use Python 2.5} {
+    depends_lib-append port:python25
+    configure.args-append --with-python=${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python24 python25 python30 description {Use Python 2.6} {
+    depends_lib-append port:python26
+    configure.args-append --with-python=${prefix}/bin/python2.6
+}
+
+variant python30 conflicts python24 python25 python26 description {Use Python 3.0} {
+    depends_lib-append port:python30
+    configure.args-append --with-python=${prefix}/bin/python3.0
+}

Modified: trunk/dports/www/mod_wsgi/files/patch-configure.diff
===================================================================
--- trunk/dports/www/mod_wsgi/files/patch-configure.diff	2009-09-01 17:54:06 UTC (rev 56710)
+++ trunk/dports/www/mod_wsgi/files/patch-configure.diff	2009-09-01 17:56:54 UTC (rev 56711)
@@ -1,31 +1,43 @@
---- configure.orig	2007-07-31 06:13:08.000000000 -0600
-+++ configure	2009-03-19 00:14:33.000000000 -0600
-@@ -1357,7 +1357,6 @@
- PYTHONFRAMEWORK=`${PYTHON} -c 'from distutils import sysconfig; \
-     print sysconfig.get_config_var("PYTHONFRAMEWORK")'`
+--- configure.orig	2009-04-15 01:06:28.000000000 +0200
++++ configure	2009-09-01 18:40:50.000000000 +0200
+@@ -1398,7 +1398,6 @@
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
  
 -if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
-     LDFLAGS=`${PYTHON} -c 'import distutils.sysconfig; \
-         print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1, \
-         standard_lib=1) +"/config"'`
-@@ -1367,20 +1366,6 @@
-         print sysconfig.get_config_var("LIBS")'`
+     LDFLAGS1="-L${PYTHONLIBDIR}"
+     LDFLAGS2="-L${PYTHONCFGDIR}"
  
-     LDLIBS="${LDLIBS1} ${LDLIBS2}"
+@@ -1409,32 +1408,6 @@
+     LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
+         from distutils import sysconfig; \
+         stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 -else
--    LDFLAGS1="-framework ${PYTHONFRAMEWORK}"
+-    if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
+-        LDFLAGS2="-L${PYTHONCFGDIR}"
 -
--    VERSION="${PYTHON_VERSION}"
--    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
--    LDFLAGS2=`${PYTHON} -c "from distutils import sysconfig; \
--        print sysconfig.get_config_var(\"LINKFORSHARED\").replace( \
--        \"${STRING}\", '')"`
+-        LDLIBS1="-lpython${PYTHON_VERSION}"
+-        LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
+-            from distutils import sysconfig; \
+-            stdout.write(sysconfig.get_config_var("LIBS"))'`
+-        LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
+-            from distutils import sysconfig; \
+-            stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
+-    else
+-        LDFLAGS1="-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
 -
--    LDFLAGS="${LDFLAGS1} ${LDFLAGS2}"
+-        VERSION="${PYTHON_VERSION}"
+-        STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
+-        LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
+-            from distutils import sysconfig; \
+-            stdout.write(sysconfig.get_config_var(
+-            \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
 -
--    LDLIBS=`${PYTHON} -c 'from distutils import sysconfig; \
--        print sysconfig.get_config_var("LIBS")'`
+-        LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
+-            from distutils import sysconfig; \
+-            stdout.write(sysconfig.get_config_var("LIBS"))'`
+-    fi
 -fi
  
- 
- 
+ CFLAGS=""
+ if test -x /usr/bin/lipo; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090901/715d8145/attachment.html>