<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129623] trunk/dports/www</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129623">129623</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-12-16 18:46:05 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>unify mod_python ports, replace 24 and 25 versions with 27, use notes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwmod_pythonPortfile">trunk/dports/www/mod_python/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwmod_pythonfilespatchconfigurediff">trunk/dports/www/mod_python/files/patch-configure.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/www/mod_python25/</li>
<li>trunk/dports/www/mod_python26/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwmod_pythonPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/mod_python/Portfile (129622 => 129623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/mod_python/Portfile 2014-12-17 02:40:49 UTC (rev 129622)
+++ trunk/dports/www/mod_python/Portfile 2014-12-17 02:46:05 UTC (rev 129623)
</span><span class="lines">@@ -4,55 +4,84 @@
</span><span class="cx">
</span><span class="cx"> name mod_python
</span><span class="cx"> version 3.3.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories www python
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Apache-2
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> description Apache2 module that embeds Python within the server.
</span><del>-long_description \
- Mod_python is an Apache 2 module that embeds the Python interpreter within \
- the server. With mod_python you can write web-based applications in Python \
- that will run many times faster than traditional CGI and will have access \
- to advanced features such as ability to retain database connections and \
- other data between hits and access to Apache internals.
</del><ins>+long_description \
+ Mod_python is an Apache 2 module that embeds the Python interpreter \
+ within the server. With mod_python you can write web-based applications \
+ in Python that will run many times faster than traditional CGI and will \
+ have access to advanced features such as ability to retain database \
+ connections and other data between hits and access to Apache internals.
</ins><span class="cx">
</span><span class="cx"> homepage http://www.modpython.org/
</span><span class="cx"> master_sites apache:httpd/modpython
</span><span class="cx"> extract.suffix .tgz
</span><del>-checksums rmd160 f78f93172963317f4318f8f2455419743c8fb4f5 \
- sha256 ad2331fd5fcfd720ef9e3482973fc2d06eff36ba0c44693cfa42056a62175a6b
</del><span class="cx">
</span><del>-depends_build port:flex
-depends_lib port:apache2 port:python24
</del><ins>+checksums sha1 e538170fd78e09408b6d8593da980b126a0fef93 \
+ rmd160 f78f93172963317f4318f8f2455419743c8fb4f5
</ins><span class="cx">
</span><del>-patchfiles patch-src-connobject.c.diff patch-dist-Makefile.in.diff
</del><ins>+if {$subport ne $name && $subport ne "mod_python25"} {
+ depends_build port:flex
+ depends_lib port:apache2
</ins><span class="cx">
</span><del>-configure.cppflags "-I${prefix}/include/python2.4"
-configure.ldflags-append "-Wl,-F${prefix}/Library/Frameworks"
-configure.args --with-apxs=${prefix}/apache2/bin/apxs \
- --with-python=${prefix}/bin/python2.4 \
- --with-flex=${prefix}/bin/flex \
- --enable-so
</del><ins>+ patchfiles patch-dist-Makefile.in.diff \
+ patch-src-connobject.c.diff \
+ patch-configure.diff
</ins><span class="cx">
</span><del>-pre-destroot {
- xinstall -d -m 755 ${destroot}${prefix}/apache2/modules \
- ${destroot}${prefix}/share/doc
- file copy ${worksrcpath}/doc-html ${destroot}${prefix}/share/doc/${name}
</del><ins>+ configure.args --with-apxs=${prefix}/apache2/bin/apxs \
+ --with-flex=${prefix}/bin/flex \
+ --enable-so
+
+ destroot.violate_mtree yes
+ pre-destroot {
+ xinstall -d -m 755 ${destroot}${prefix}/apache2/modules \
+ ${destroot}${prefix}/share/doc
+ file copy ${worksrcpath}/doc-html ${destroot}${prefix}/share/doc/${subport}
+ }
+
+ notes "To enable ${subport}, add
+ LoadModule python_module modules/mod_python.so
+ to your apache2 config file:
+ ${prefix}/apache2/conf/httpd.conf"
+} elseif {$subport eq $name} {
+ # mod_python used to be for python 2.4
+ replaced_by mod_python27
+ depends_lib port:mod_python27
+ use_configure no
+ build {}
+ destroot {
+ xinstall -d ${destroot}${prefix}/share/doc/${name}
+ system "echo This port is a stub. > ${destroot}${prefix}/share/doc/${name}/README"
+ }
+ supported_archs noarch
+
+ livecheck.type regex
+ livecheck.url http://archive.apache.org/dist/httpd/modpython/
+ livecheck.regex mod_python-(\[0-9\\.\]+)\\.tgz
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-destroot.violate_mtree yes
</del><ins>+subport mod_python27 {
+ conflicts mod_python26
+ revision 0
+ depends_lib-append port:python27
+ configure.args-append --with-python=${prefix}/bin/python2.7
+}
</ins><span class="cx">
</span><del>-post-install {
- ui_msg "########################################################"
- ui_msg "# to enable mod_python add"
- ui_msg "# LoadModule python_module modules/mod_python.so"
- ui_msg "# to your apache2 config file:"
- ui_msg "# ${prefix}/apache2/conf/httpd.conf"
- ui_msg "########################################################"
</del><ins>+subport mod_python26 {
+ conflicts mod_python27
+ revision 0
+ depends_lib-append port:python26
+ configure.args-append --with-python=${prefix}/bin/python2.6
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url http://httpd.apache.org/modules/python-download.cgi
-livecheck.regex mod_python-(\[0-9\\.\]+)\\.tgz
-
</del><ins>+subport mod_python25 {
+ revision 4
+ replaced_by mod_python27
+ pre-fetch {
+ error "This port is only a stub and is replaced by $replaced_by"
+ }
+}
</ins></span></pre></div>
<a id="trunkdportswwwmod_pythonfilespatchconfiguredifffromrev129614trunkdportswwwmod_python26filespatchconfigurediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/www/mod_python/files/patch-configure.diff (from rev 129614, trunk/dports/www/mod_python26/files/patch-configure.diff) (0 => 129623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/mod_python/files/patch-configure.diff (rev 0)
+++ trunk/dports/www/mod_python/files/patch-configure.diff 2014-12-17 02:46:05 UTC (rev 129623)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+--- 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)
</ins></span></pre>
</div>
</div>
</body>
</html>