[116967] trunk/dports/textproc/cicada
hum at macports.org
hum at macports.org
Tue Feb 11 06:00:59 PST 2014
Revision: 116967
https://trac.macports.org/changeset/116967
Author: hum at macports.org
Date: 2014-02-11 06:00:59 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
cicada: update to 0.3.1; add sentence.hpp to build; replace with openmpi-default; add optflags; fix expressions.
Modified Paths:
--------------
trunk/dports/textproc/cicada/Portfile
trunk/dports/textproc/cicada/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/textproc/cicada/files/sentence.hpp
Modified: trunk/dports/textproc/cicada/Portfile
===================================================================
--- trunk/dports/textproc/cicada/Portfile 2014-02-11 13:53:32 UTC (rev 116966)
+++ trunk/dports/textproc/cicada/Portfile 2014-02-11 14:00:59 UTC (rev 116967)
@@ -4,7 +4,7 @@
PortSystem 1.0
name cicada
-version 0.3.0
+version 0.3.1
categories textproc
maintainers hum openmaintainer
@@ -16,12 +16,12 @@
license LGPL-3+
master_sites ${homepage}
-checksums rmd160 895cc333fa335ec74fb1808b1cea72e01c556179 \
- sha256 dd2102812953a6d1093fe23688ddf7f80fe86e98cd0e9f217ad650a5beb5b524
+checksums rmd160 26aa37cc9783bfe4a4f92f7005f07304a1c24dbb \
+ sha256 58a68e108315ab4cb11c659fd38cb9edf761f5601eb04d4cdd9ab23149e0b6d3
depends_lib port:expgram \
port:boost \
- port:openmpi \
+ port:openmpi-default \
port:icu
depends_build port:py27-docutils \
@@ -30,29 +30,35 @@
patchfiles patch-configure.diff \
patch-samples.diff
+post-extract {
+ copy ${filespath}/sentence.hpp ${worksrcpath}/cicada/
+}
+
+configure.optflags -O3
+
post-build {
system -W ${worksrcpath}/doc "${build.cmd} index.html"
}
post-destroot {
# install additional documents.
- set dest_doc ${destroot}${prefix}/share/doc/${name}
- xinstall -d ${dest_doc}
+ set docdir ${prefix}/share/doc/${name}
+ xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} \
COPYING.GPL COPYING.LGPL FAQ LICENSE NEWS.rst README.rst TODO.rst \
doc/index.html \
- ${dest_doc}
+ ${destroot}${docdir}
foreach rst [glob ${worksrcpath}/doc/*.rst] {
- xinstall -m 644 ${rst} ${dest_doc}
+ xinstall -m 644 ${rst} ${destroot}${docdir}
}
# install sample data and scripts.
xinstall -d ${destroot}${prefix}/share/examples
- set dest_ex ${destroot}${prefix}/share/examples/${name}
- copy ${worksrcpath}/samples ${dest_ex}
+ set exdir ${prefix}/share/examples/${name}
+ copy ${worksrcpath}/samples ${destroot}${exdir}
foreach f {Makefile Makefile.am Makefile.in} {
- delete ${dest_ex}/${f}
+ delete ${destroot}${exdir}/${f}
}
- foreach sh [glob ${dest_ex}/*/*.sh ${dest_ex}/*/*/*.sh ${dest_ex}/*/*/*/*.sh] {
+ foreach sh [glob ${destroot}${exdir}/*/*.sh ${destroot}${exdir}/*/*/*.sh ${destroot}${exdir}/*/*/*/*.sh] {
reinplace "s|@PREFIX@|${prefix}|g" ${sh}
}
}
@@ -63,4 +69,4 @@
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
-livecheck.regex ${name}-(\[0-9.\]+)\\.tar
+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Modified: trunk/dports/textproc/cicada/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/cicada/files/patch-configure.diff 2014-02-11 13:53:32 UTC (rev 116966)
+++ trunk/dports/textproc/cicada/files/patch-configure.diff 2014-02-11 14:00:59 UTC (rev 116967)
@@ -1,20 +1,11 @@
---- configure.orig 2013-10-26 06:39:46.000000000 +0900
-+++ configure 2013-10-26 18:58:40.000000000 +0900
-@@ -16576,7 +16576,7 @@
+--- configure.orig 2014-01-12 09:47:00.000000000 +0900
++++ configure 2014-02-09 16:22:12.000000000 +0900
+@@ -20750,7 +20750,7 @@
- # Check for binaries...
- # Extract the first word of "rst2man.py", so it can be a program name with args.
--set dummy rst2man.py; ac_word=$2
-+set dummy rst2man-2.7.py; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_RST2MAN+:} false; then :
-@@ -16626,7 +16626,7 @@
-
- # Extract the first word of "rst2html.py", so it can be a program name with args.
--set dummy rst2html.py; ac_word=$2
-+set dummy rst2html-2.7.py; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_RST2HTML+:} false; then :
+ ### check for MPI
+-for ac_prog in openmpic++ openmpicxx openmpiCC mpic++ mpicxx mpiCC
++for ac_prog in mpicxx-openmpi-mp openmpic++ openmpicxx openmpiCC mpic++ mpicxx mpiCC
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
Added: trunk/dports/textproc/cicada/files/sentence.hpp
===================================================================
--- trunk/dports/textproc/cicada/files/sentence.hpp (rev 0)
+++ trunk/dports/textproc/cicada/files/sentence.hpp 2014-02-11 14:00:59 UTC (rev 116967)
@@ -0,0 +1,157 @@
+// -*- mode: c++ -*-
+//
+// Copyright(C) 2010-2011 Taro Watanabe <taro.watanabe at nict.go.jp>
+//
+
+#ifndef __CICADA__SENTENCE__HPP__
+#define __CICADA__SENTENCE__HPP__ 1
+
+#include <iostream>
+#include <vector>
+#include <string>
+
+#include <cicada/symbol.hpp>
+
+#include <utils/hashmurmur3.hpp>
+#include <utils/piece.hpp>
+
+namespace cicada
+{
+
+ class Sentence
+ {
+ public:
+ typedef cicada::Symbol symbol_type;
+ typedef cicada::Symbol word_type;
+
+ private:
+ typedef std::vector<word_type, std::allocator<word_type> > sent_type;
+
+ public:
+ typedef sent_type::size_type size_type;
+ typedef sent_type::difference_type difference_type;
+ typedef sent_type::value_type value_type;
+
+ typedef sent_type::iterator iterator;
+ typedef sent_type::const_iterator const_iterator;
+ typedef sent_type::reverse_iterator reverse_iterator;
+ typedef sent_type::const_reverse_iterator const_reverse_iterator;
+ typedef sent_type::reference reference;
+ typedef sent_type::const_reference const_reference;
+
+ public:
+ Sentence() : __sent() {}
+ Sentence(size_type __n) : __sent(__n) {}
+ Sentence(size_type __n, const word_type& __word) : __sent(__n, __word) {}
+ template <typename Iterator>
+ Sentence(Iterator first, Iterator last) : __sent(first, last) {}
+ Sentence(const utils::piece& x) { assign(x); }
+
+ void assign(size_type __n, const word_type& __word) { __sent.assign(__n, __word); }
+ template <typename Iterator>
+ void assign(Iterator first, Iterator last) { __sent.assign(first, last); }
+ void assign(const utils::piece& x);
+
+ bool assign(std::string::const_iterator& iter, std::string::const_iterator end);
+ bool assign(utils::piece::const_iterator& iter, utils::piece::const_iterator end);
+
+ // insert/erase...
+ iterator insert(iterator pos, const word_type& word) { return __sent.insert(pos, word); }
+ void insert(iterator pos, size_type n, const word_type& word) { __sent.insert(pos, n, word); }
+ template <typename Iterator>
+ void insert(iterator pos, Iterator first, Iterator last) { __sent.insert(pos, first, last); }
+
+ iterator erase(iterator pos) { return __sent.erase(pos); }
+ iterator erase(iterator first, iterator last) { return __sent.erase(first, last); }
+
+ void push_back(const word_type& word) { __sent.push_back(word); }
+ void pop_back() { __sent.pop_back(); }
+
+ void swap(Sentence& __x) { __sent.swap(__x.__sent); }
+
+ void clear() { __sent.clear(); }
+ void reserve(size_type __n) { __sent.reserve(__n); }
+ void resize(size_type __n) { __sent.resize(__n); }
+ void resize(size_type __n, const word_type& __word) { __sent.resize(__n, __word); }
+
+ size_type size() const { return __sent.size(); }
+ bool empty() const { return __sent.empty(); }
+
+ inline const_iterator begin() const { return __sent.begin(); }
+ inline iterator begin() { return __sent.begin(); }
+
+ inline const_iterator end() const { return __sent.end(); }
+ inline iterator end() { return __sent.end(); }
+
+ inline const_reverse_iterator rbegin() const { return __sent.rbegin(); }
+ inline reverse_iterator rbegin() { return __sent.rbegin(); }
+
+ inline const_reverse_iterator rend() const { return __sent.rend(); }
+ inline reverse_iterator rend() { return __sent.rend(); }
+
+ inline const_reference operator[](size_type pos) const { return __sent[pos]; }
+ inline reference operator[](size_type pos) { return __sent[pos]; }
+
+ inline const_reference front() const { return __sent.front(); }
+ inline reference front() { return __sent.front(); }
+
+ inline const_reference back() const { return __sent.back(); }
+ inline reference back() { return __sent.back(); }
+
+ public:
+
+ friend
+ size_t hash_value(Sentence const& x);
+
+ friend
+ std::ostream& operator<<(std::ostream& os, const Sentence& x);
+ friend
+ std::istream& operator>>(std::istream& is, Sentence& x);
+
+ friend
+ bool operator==(const Sentence& x, const Sentence& y);
+ friend
+ bool operator!=(const Sentence& x, const Sentence& y);
+ friend
+ bool operator<(const Sentence& x, const Sentence& y);
+ friend
+ bool operator>(const Sentence& x, const Sentence& y);
+ friend
+ bool operator<=(const Sentence& x, const Sentence& y);
+ friend
+ bool operator>=(const Sentence& x, const Sentence& y);
+
+ private:
+ sent_type __sent;
+ };
+
+ inline
+ size_t hash_value(Sentence const& x) { return utils::hashmurmur3<size_t>()(x.__sent.begin(), x.__sent.end(), 0); }
+
+ inline
+ bool operator==(const Sentence& x, const Sentence& y) { return x.__sent == y.__sent; }
+ inline
+ bool operator!=(const Sentence& x, const Sentence& y) { return x.__sent != y.__sent; }
+ inline
+ bool operator<(const Sentence& x, const Sentence& y) { return x.__sent < y.__sent; }
+ inline
+ bool operator>(const Sentence& x, const Sentence& y) { return x.__sent > y.__sent; }
+ inline
+ bool operator<=(const Sentence& x, const Sentence& y) { return x.__sent <= y.__sent; }
+ inline
+ bool operator>=(const Sentence& x, const Sentence& y) { return x.__sent >= y.__sent; }
+
+
+
+};
+
+namespace std
+{
+ inline
+ void swap(cicada::Sentence& x, cicada::Sentence& y)
+ {
+ x.swap(y);
+ }
+};
+
+#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140211/9c4e46fe/attachment-0001.html>
More information about the macports-changes
mailing list