<!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>[125614] trunk/dports/textproc/sphinx</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/125614">125614</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-09-22 15:00:30 -0700 (Mon, 22 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>textproc/sphinx:
- Update version to 2.2.4.
- Configure data and log dirs.
- Add startupitem.
- Add conf file on activation if none exist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocsphinxPortfile">trunk/dports/textproc/sphinx/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextprocsphinxfilesorgmacportssphinxplist">trunk/dports/textproc/sphinx/files/org.macports.sphinx.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocsphinxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/sphinx/Portfile (125613 => 125614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/sphinx/Portfile 2014-09-22 21:49:55 UTC (rev 125613)
+++ trunk/dports/textproc/sphinx/Portfile 2014-09-22 22:00:30 UTC (rev 125614)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name sphinx
</span><del>-version 2.1.4
</del><ins>+version 2.2.4
</ins><span class="cx"> categories textproc net
</span><span class="cx"> license GPL-2
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,20 +24,53 @@
</span><span class="cx"> master_sites ${homepage}files/
</span><span class="cx"> distname ${name}-${version}-release
</span><span class="cx">
</span><del>-checksums rmd160 0b09b8233204edc7778f56b587f8723d2ab00abc \
- sha256 d57b97f39ed302da68399e55363e8c69a299ddddc20573995c8e4897c1b1e434
</del><ins>+checksums rmd160 44d282421b62bbeb7dc269849bcc366bd16722a9 \
+ sha256 c76a88789ca1d7d86df9869718ad217ae8a72740b9e84f2b98b61fa47feb64ef
</ins><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> depends_lib port:expat \
</span><span class="cx"> port:libiconv
</span><span class="cx">
</span><del>-patchfiles endian.patch
</del><ins>+post-extract {
+ # Copy launchd plists to worksrcpath
+ file copy ${filespath}/org.macports.${name}.plist ${worksrcpath}/org.macports.${name}.plist
+}
</ins><span class="cx">
</span><ins>+#patchfiles endian.patch
+post-patch {
+ reinplace "s|@NAME@|${name}|g" ${worksrcpath}/org.macports.${name}.plist
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/org.macports.${name}.plist
+}
+
</ins><span class="cx"> configure.args --datadir=${prefix}/share/doc \
</span><del>- --sysconfdir=${prefix}/etc/sphinx \
</del><ins>+ --sysconfdir=${prefix}/etc/${name} \
+ --localstatedir=${prefix}/var/${name} \
</ins><span class="cx"> --without-mysql \
</span><span class="cx"> --without-unixodbc
</span><span class="cx">
</span><ins>+destroot.keepdirs ${destroot}${prefix}/var/${name}/data \
+ ${destroot}${prefix}/var/${name}/log
+post-destroot {
+ file mkdir ${destroot}${prefix}/share/${name}
+ copy ${worksrcpath}/api \
+ ${destroot}${prefix}/share/${name}/api
+ file mkdir ${destroot}${prefix}/var/${name}/data
+ file mkdir ${destroot}${prefix}/var/${name}/log
+ file mkdir ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${name}
+ file copy ${worksrcpath}/org.macports.${name}.plist \
+ ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${name}/
+}
+
+post-activate {
+ if {![file exists ${prefix}/etc/${name}/${name}.conf]} {
+ copy ${prefix}/etc/${name}/${name}.conf.dist \
+ ${prefix}/etc/${name}/${name}.conf
+ }
+}
+
+startupitem.create yes
+startupitem.executable ${prefix}/bin/searchd --nodetach
+
</ins><span class="cx"> test.run yes
</span><span class="cx">
</span><span class="cx"> variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Enable PostgreSQL 8.2 support} {
</span><span class="lines">@@ -99,36 +132,31 @@
</span><span class="cx"> variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description {Enable MySQL 5.1 support} {
</span><span class="cx"> depends_lib-append port:mysql51
</span><span class="cx"> configure.args-delete --without-mysql
</span><del>- configure.args-append --with-mysql-includes=${prefix}/include/mysql51/mysql \
- --with-mysql-libs=${prefix}/lib/mysql51/mysql
</del><ins>+ configure.args-append --with-mysql=${prefix}/lib/mysql51
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description {Enable MySQL 5.5 support} {
</span><span class="cx"> depends_lib-append port:mysql55
</span><span class="cx"> configure.args-delete --without-mysql
</span><del>- configure.args-append --with-mysql-includes=${prefix}/include/mysql55/mysql \
- --with-mysql-libs=${prefix}/lib/mysql55/mysql
</del><ins>+ configure.args-append --with-mysql=${prefix}/lib/mysql55
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description {Enable MySQL 5.6 support} {
</span><span class="cx"> depends_lib-append port:mysql56
</span><span class="cx"> configure.args-delete --without-mysql
</span><del>- configure.args-append --with-mysql-includes=${prefix}/include/mysql56/mysql \
- --with-mysql-libs=${prefix}/lib/mysql56/mysql
</del><ins>+ configure.args-append --with-mysql=${prefix}/lib/mysql56
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mariadb conflicts mysql5 mysql51 mysql55 percona description {Enable MariaDB support} {
</span><span class="cx"> depends_lib-append port:mariadb
</span><span class="cx"> configure.args-delete --without-mysql
</span><del>- configure.args-append --with-mysql-includes=${prefix}/include/mariadb/mysql \
- --with-mysql-libs=${prefix}/lib/mariadb/mysql
</del><ins>+ configure.args-append --with-mysql=${prefix}/lib/mariadb
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant percona conflicts mysql5 mysql51 mysql55 mariadb description {Enable Percona support} {
</span><span class="cx"> depends_lib-append port:percona
</span><span class="cx"> configure.args-delete --without-mysql
</span><del>- configure.args-append --with-mysql-includes=${prefix}/include/percona/mysql \
- --with-mysql-libs=${prefix}/lib/percona/mysql
</del><ins>+ configure.args-append --with-mysql=${prefix}/lib/percona
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92] && ![variant_isset postgresql93] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><span class="lines">@@ -156,3 +184,28 @@
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx"> }
</span><ins>+
+set mysql.ports {mysql51 mysql55 mysql56 mariadb mariadb-10.0 mariadb-11.0 percona}
+foreach mysql.port ${mysql.ports} {
+
+ lappend mysql.plugin.ports "${mysql.port}-${name}se-plugin"
+}
+foreach mysql.plugin.port ${mysql.plugin.ports} {
+
+ set idx [lsearch ${mysql.plugin.ports} ${mysql.plugin.port}]
+ set mysql.port [lindex ${mysql.ports} $idx]
+
+ subport ${mysql.port}-${name}se-plugin {
+
+ PortGroup cmake 1.0
+
+ license LGPL-2
+ description Sphinx mysql plugin.
+ long_description ${description}
+
+ worksrcdir ${worksrcdir}/mysqlse
+
+ set mysql.name ${mysql.port}
+ depends_lib-append port:${name} port:${mysql.port}
+ }
+}
</ins></span></pre></div>
<a id="trunkdportstextprocsphinxfilesorgmacportssphinxplist"></a>
<div class="binary"><h4>Added: trunk/dports/textproc/sphinx/files/org.macports.sphinx.plist</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/dports/textproc/sphinx/files/org.macports.sphinx.plist
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
</div>
</body>
</html>