[49191] trunk/dports/www/mod_python25

[raimue at macports.org]

Revision: 49191
          http://trac.macports.org/changeset/49191
Author:   raimue at macports.org
Date:     2009-04-05 00:32:28 -0700 (Sun, 05 Apr 2009)
Log Message:
-----------
www/mod_python25:
Always link against python from MacPorts, closes #19103 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/www/mod_python25/Portfile

Added Paths:
-----------
    trunk/dports/www/mod_python25/files/patch-configure.diff

Modified: trunk/dports/www/mod_python25/Portfile
===================================================================
--- trunk/dports/www/mod_python25/Portfile	2009-04-05 06:53:19 UTC (rev 49190)
+++ trunk/dports/www/mod_python25/Portfile	2009-04-05 07:32:28 UTC (rev 49191)
@@ -26,10 +26,10 @@
 depends_build	port:flex
 depends_lib		port:apache2 port:python25
 
-patchfiles	patch-dist-Makefile.in.diff patch-src-connobject.c.diff
+patchfiles	patch-dist-Makefile.in.diff \
+		patch-src-connobject.c.diff \
+		patch-configure.diff
 
-configure.cppflags	"-I${prefix}/include/python2.5"
-configure.ldflags-append	"-Wl,-F${frameworks_dir}"
 configure.args	--with-apxs=${prefix}/apache2/bin/apxs \
     --with-python=${prefix}/bin/python2.5 \
     --with-flex=${prefix}/bin/flex \

Added: trunk/dports/www/mod_python25/files/patch-configure.diff
===================================================================
--- trunk/dports/www/mod_python25/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/www/mod_python25/files/patch-configure.diff	2009-04-05 07:32:28 UTC (rev 49191)
@@ -0,0 +1,24 @@
+--- configure-old	2009-04-01 04:38:10.000000000 +0200
++++ configure	2009-04-01 04:50:59.000000000 +0200
+@@ -2906,12 +2906,6 @@
+ 
+ save_LDFLAGS="$LDFLAGS"
+ save_LIBS="$LIBS"
+-if test "$PyFRAMEWORKDIR" != "no-framework"; then
+-  if test -n "$PyFRAMEWORK"; then
+-    PyPYTHONLIBS="-framework $PyFRAMEWORK"
+-    LDFLAGS="${LDFLAGS} -Wl,-framework,Python"
+-  fi
+-else
+   LDFLAGS="${LDFLAGS} -L${PyLIBPL}"
+   as_ac_Lib=`echo "ac_cv_lib_python${PyVERSION}''_Py_NewInterpreter" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for Py_NewInterpreter in -lpython${PyVERSION}" >&5
+@@ -2990,8 +2984,6 @@
+                fi
+ 
+ fi
+-
+-fi
+ LIBS="$save_LIBS"
+ 
+ # (actually this check already just happened above)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090405/432777b6/attachment.html>