<!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>[120853] trunk/dports/devel/swig</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/120853">120853</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-06-09 17:48:02 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>swig-php:
+ make swig-php5 replaced by swig-php;
+ add +pnp5X variants to select the correct PHP version;
+ add patch to allow configuration to correctly find php config executable;
+ these ports did not work before, so no need to rev-bump.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelswigPortfile">trunk/dports/devel/swig/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/swig/files/</li>
<li><a href="#trunkdportsdevelswigfilespatchconfigurediff">trunk/dports/devel/swig/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelswigPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/swig/Portfile (120852 => 120853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/swig/Portfile 2014-06-09 23:34:12 UTC (rev 120852)
+++ trunk/dports/devel/swig/Portfile 2014-06-10 00:48:02 UTC (rev 120853)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> ocaml {port:ocaml ocaml}
</span><span class="cx"> octave {path:bin/octave:octave octave}
</span><span class="cx"> perl {path:bin/perl:perl5 perl5=${prefix}/bin/perl}
</span><del>- php {port:php_select php}
</del><ins>+ php {port:php55 "php=${prefix}/bin/php55"}
</ins><span class="cx"> php5 {path:bin/php:php5 php}
</span><span class="cx"> pike {port:pike pike}
</span><span class="cx"> python {port:python_select python}
</span><span class="lines">@@ -88,6 +88,57 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+subport swig-php5 {
+ replaced_by swig-php
+ pre-configure {
+ ui_error "This port has been replaced by 'swig-php'."
+ return -code error
+ }
+ distfiles
+}
+
+subport swig-php {
+
+ patchfiles-append patch-configure.diff
+
+ variant php52 conflicts php53 php54 php55 php56 description {build using PHP 5.2} {
+ depends_lib-delete port:php55
+ depends_lib-append port:php52
+ configure.args-delete --with-php=${prefix}/bin/php55
+ configure.args-append --with-php=${prefix}/bin/php52
+ }
+ variant php53 conflicts php52 php54 php55 php56 description {build using PHP 5.3} {
+ depends_lib-delete port:php55
+ depends_lib-append port:php53
+ configure.args-delete --with-php=${prefix}/bin/php55
+ configure.args-append --with-php=${prefix}/bin/php53
+ }
+ variant php54 conflicts php52 php53 php55 php56 description {build using PHP 5.4} {
+ depends_lib-delete port:php55
+ depends_lib-append port:php54
+ configure.args-delete --with-php=${prefix}/bin/php55
+ configure.args-append --with-php=${prefix}/bin/php54
+ }
+ variant php55 conflicts php52 php53 php54 php56 description {build using PHP 5.5} {}
+
+ variant php56 conflicts php52 php53 php54 php55 description {build using PHP 5.6} {
+ depends_lib-delete port:php55
+ depends_lib-append port:php56
+ configure.args-delete --with-php=${prefix}/bin/php55
+ configure.args-append --with-php=${prefix}/bin/php56
+ }
+
+ if {![variant_isset php52] && ![variant_isset php53] && ![variant_isset php54] &&
+ ![variant_isset php55] && ![variant_isset php56]} {
+ default_variants +php55
+ }
+ if {![variant_isset php52] && ![variant_isset php53] && ![variant_isset php54] &&
+ ![variant_isset php55] && ![variant_isset php56]} {
+ ui_error "\n\nA +php5X variant must be selected; the variant '-php55' cannot be used alone.\n"
+ return -code error "Invalid variant selection"
+ }
+}
+
</ins><span class="cx"> subport swig-gcj {
</span><span class="cx"> variant gcc43 conflicts gcc44 gcc45 gcc47 gcc48 description {build using GCJ 4.3} {
</span><span class="cx"> depends_lib-delete port:gcc47
</span></span></pre></div>
<a id="trunkdportsdevelswigfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/swig/files/patch-configure.diff (0 => 120853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/swig/files/patch-configure.diff (rev 0)
+++ trunk/dports/devel/swig/files/patch-configure.diff 2014-06-10 00:48:02 UTC (rev 120853)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- configure.orig 2014-06-08 15:27:19.000000000 -0400
++++ configure 2014-06-08 15:27:45.000000000 -0400
+@@ -9612,8 +9612,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHP header files" >&5
+ $as_echo_n "checking for PHP header files... " >&6; }
+ case $PHP in
+- *5)
+- PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;;
++ *5*)
++ PHPCONFIG=`echo "$PHP"|sed 's/\(5.*\)$/-config\1/'` ;;
+ *)
+ PHPCONFIG=$PHP-config ;;
+ esac
</ins></span></pre>
</div>
</div>
</body>
</html>