<!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>[154202] trunk/dports/textproc/extractopinion</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 { white-space: pre-line; 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/154202">154202</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-10-24 13:53:58 +0200 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>extractopinion: properly patch paths to perl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocextractopinionPortfile">trunk/dports/textproc/extractopinion/Portfile</a></li>
<li><a href="#trunkdportstextprocextractopinionfilespatchcrftrainshdiff">trunk/dports/textproc/extractopinion/files/patch-crftrain.sh.diff</a></li>
<li><a href="#trunkdportstextprocextractopinionfilespatchextractshdiff">trunk/dports/textproc/extractopinion/files/patch-extract.sh.diff</a></li>
<li><a href="#trunkdportstextprocextractopinionfilespatchlib_tsvpmdiff">trunk/dports/textproc/extractopinion/files/patch-lib_tsv.pm.diff</a></li>
<li><a href="#trunkdportstextprocextractopinionfilespatchmakemdlshdiff">trunk/dports/textproc/extractopinion/files/patch-makemdl.sh.diff</a></li>
<li><a href="#trunkdportstextprocextractopinionfilespatchperldiff">trunk/dports/textproc/extractopinion/files/patch-perl.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocextractopinionPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/Portfile (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/Portfile 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/Portfile 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup perl5 1.0
</ins><span class="cx">
</span><span class="cx"> name extractopinion
</span><span class="cx"> version 1.2
</span><span class="lines">@@ -26,10 +27,12 @@
</span><span class="cx"> patch-lib_tsv.pm.diff \
</span><span class="cx"> patch-perl.diff
</span><span class="cx">
</span><ins>+perl5.branches 5.24
+
</ins><span class="cx"> depends_lib port:crfpp \
</span><span class="cx"> port:libiconv \
</span><span class="cx"> port:gawk \
</span><del>- port:p5.24-text-csv_xs \
</del><ins>+ port:p${perl5.major}-text-csv_xs \
</ins><span class="cx"> port:juman6 \
</span><span class="cx"> port:knp3
</span><span class="cx">
</span><span class="lines">@@ -41,6 +44,13 @@
</span><span class="cx"> copy ${filespath}/Makefile ${worksrcpath}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-patch {
+ foreach script {extract.sh makemdl.sh lib/in2tsv.pl lib/tsv2out.pl \
+ makemodel/csv/csv2tsv.pl makemodel/csv/csv2tsv.sh} {
+ reinplace "s|@PERL@|${perl5.bin}|" ${worksrcpath}/${script}
+ }
+}
+
</ins><span class="cx"> build.args CC=${configure.cc} CFLAGS="${configure.cflags} [get_canonical_archflags]"
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="lines">@@ -55,10 +65,6 @@
</span><span class="cx"> xpr/otag2tsv xpr/tsv2tag} {
</span><span class="cx"> reinplace -locale C "s|/usr/bin/gawk|${prefix}/bin/gawk|" ${worksrcpath}/${script}.awk
</span><span class="cx"> }
</span><del>- foreach script {extract.sh lib/in2tsv.pl lib/tsv2out.pl makemdl.sh \
- makemodel/csv/csv2tsv.pl makemodel/csv/csv2tsv.sh} {
- reinplace -locale C "s|@prefix@|${prefix}|" ${worksrcpath}/${script}
- }
</del><span class="cx"> copy ${worksrcpath}/extract.sh ${destroot}${prefix}/bin/extractopinion.sh
</span><span class="cx"> copy ${worksrcpath}/makemdl.sh ${destroot}${prefix}/bin/extractopinion-makemdl.sh
</span><span class="cx"> copy ${worksrcpath} ${destroot}${prefix}/share
</span></span></pre></div>
<a id="trunkdportstextprocextractopinionfilespatchcrftrainshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/files/patch-crftrain.sh.diff (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/files/patch-crftrain.sh.diff 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/files/patch-crftrain.sh.diff 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/crftrain.sh.orig 2012-03-01 09:38:37.000000000 +0900
-+++ src/crftrain.sh 2012-03-07 01:36:37.000000000 +0900
</del><ins>+--- src/crftrain.sh.orig
++++ src/crftrain.sh
</ins><span class="cx"> @@ -21,6 +21,6 @@
</span><span class="cx"> tagfile=$tmp/crftrain.$$.tag
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportstextprocextractopinionfilespatchextractshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/files/patch-extract.sh.diff (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/files/patch-extract.sh.diff 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/files/patch-extract.sh.diff 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -1,6 +1,12 @@
</span><del>---- extract.sh.orig 2012-03-01 09:38:37.000000000 +0900
-+++ extract.sh 2012-03-07 01:30:02.000000000 +0900
-@@ -20,13 +20,35 @@
</del><ins>+--- extract.sh.orig
++++ extract.sh
+@@ -15,18 +15,41 @@ fi
+ dir=`cd $(dirname $0) && pwd`
+ . $dir/conf.sh
+
++PERL=@PERL@
+ export LANG=C
+ export LC_ALL=C
</ins><span class="cx"> export EXOPLIB=$dir/lib
</span><span class="cx"> export EXOPDIC=$dir/dic
</span><span class="cx">
</span><span class="lines">@@ -33,8 +39,9 @@
</span><span class="cx"> # $B;XDjJ8;z%3!<%I$O4D6-$K$h$C$FI=5-$,0c$&$?$a(Biconv -l$B$G3NG'(B
</span><span class="cx"> -iconv -c -f UTF-8 -t EUC-JP < $1 > $1.euc
</span><span class="cx"> -perl -I $EXOPLIB $EXOPLIB/in2tsv.pl $1.euc $2 > $tsvfile
</span><ins>+-$dir/_extract.sh $model $tsvfile | perl -I $EXOPLIB $EXOPLIB/tsv2out.pl
</ins><span class="cx"> +iconv -c -f UTF-8 -t EUC-JP < $file_name > $euc_file
</span><del>-+perl -I $EXOPLIB $EXOPLIB/in2tsv.pl $euc_file $topic_str > $tsvfile
- $dir/_extract.sh $model $tsvfile | perl -I $EXOPLIB $EXOPLIB/tsv2out.pl
</del><ins>++$PERL -I $EXOPLIB $EXOPLIB/in2tsv.pl $euc_file $topic_str > $tsvfile
++$dir/_extract.sh $model $tsvfile | $PERL -I $EXOPLIB $EXOPLIB/tsv2out.pl
</ins><span class="cx">
</span><span class="cx"> rm -f $tsvfile
</span></span></pre></div>
<a id="trunkdportstextprocextractopinionfilespatchlib_tsvpmdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/files/patch-lib_tsv.pm.diff (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/files/patch-lib_tsv.pm.diff 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/files/patch-lib_tsv.pm.diff 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- lib/tsv.pm.orig 2012-03-01 09:38:37.000000000 +0900
-+++ lib/tsv.pm 2012-03-07 01:40:10.000000000 +0900
</del><ins>+--- lib/tsv.pm.orig
++++ lib/tsv.pm
</ins><span class="cx"> @@ -11,7 +11,7 @@
</span><span class="cx"> use utf8;
</span><span class="cx"> binmode STDOUT, ":encoding(utf8)";
</span></span></pre></div>
<a id="trunkdportstextprocextractopinionfilespatchmakemdlshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/files/patch-makemdl.sh.diff (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/files/patch-makemdl.sh.diff 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/files/patch-makemdl.sh.diff 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- makemdl.sh.orig 2012-03-01 09:38:37.000000000 +0900
-+++ makemdl.sh 2012-03-07 01:36:42.000000000 +0900
</del><ins>+--- makemdl.sh.orig
++++ makemdl.sh
</ins><span class="cx"> @@ -6,19 +6,48 @@
</span><span class="cx">
</span><span class="cx"> export LANG=C
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> +for file in $csvfiles
</span><span class="cx"> +do
</span><span class="cx"> + f=`basename $file .csv`
</span><del>-+ perl -I $dir/lib $dir/makemodel/csv/csv2tsv.pl $file > $workdir/tsv/$f.tsv
</del><ins>++ @PERL@ -I $dir/lib $dir/makemodel/csv/csv2tsv.pl $file > $workdir/tsv/$f.tsv
</ins><span class="cx"> +done
</span><span class="cx"> +
</span><span class="cx"> +cat $workdir/tsv/*.tsv > $workdir/data.tsv
</span></span></pre></div>
<a id="trunkdportstextprocextractopinionfilespatchperldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/extractopinion/files/patch-perl.diff (154201 => 154202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/extractopinion/files/patch-perl.diff 2016-10-24 08:24:17 UTC (rev 154201)
+++ trunk/dports/textproc/extractopinion/files/patch-perl.diff 2016-10-24 11:53:58 UTC (rev 154202)
</span><span class="lines">@@ -1,96 +1,35 @@
</span><del>-*** extract.sh.orig Mon Jul 9 21:55:38 2012
---- extract.sh Sat Jul 14 10:18:41 2012
-***************
-*** 48,54 ****
- #nkf -e -W --fb-skip < $1 > $1.euc
- # $B;XDjJ8;z%3!<%I$O4D6-$K$h$C$FI=5-$,0c$&$?$a(Biconv -l$B$G3NG'(B
- iconv -c -f UTF-8 -t EUC-JP < $file_name > $euc_file
-! perl -I $EXOPLIB $EXOPLIB/in2tsv.pl $euc_file $topic_str > $tsvfile
-! $dir/_extract.sh $model $tsvfile | perl -I $EXOPLIB $EXOPLIB/tsv2out.pl
-
- rm -f $tsvfile
---- 48,54 ----
- #nkf -e -W --fb-skip < $1 > $1.euc
- # $B;XDjJ8;z%3!<%I$O4D6-$K$h$C$FI=5-$,0c$&$?$a(Biconv -l$B$G3NG'(B
- iconv -c -f UTF-8 -t EUC-JP < $file_name > $euc_file
-! @prefix@/bin/perl5.12 -I $EXOPLIB $EXOPLIB/in2tsv.pl $euc_file $topic_str > $tsvfile
-! $dir/_extract.sh $model $tsvfile | @prefix@/bin/perl5.12 -I $EXOPLIB $EXOPLIB/tsv2out.pl
-
- rm -f $tsvfile
-*** lib/in2tsv.pl.orig Thu Mar 1 09:38:37 2012
---- lib/in2tsv.pl Sat Jul 14 10:17:49 2012
-***************
-*** 1,4 ****
-! #!/bin/env perl
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
---- 1,4 ----
-! #!@prefix@/bin/perl5.12
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
-*** lib/tsv2out.pl.orig Thu Mar 1 09:38:37 2012
---- lib/tsv2out.pl Sat Jul 14 10:18:02 2012
-***************
-*** 1,4 ****
-! #!/bin/env perl
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
---- 1,4 ----
-! #!@prefix@/bin/perl5.12
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
-*** makemdl.sh.orig Mon Jul 9 21:55:38 2012
---- makemdl.sh Sat Jul 14 10:19:14 2012
-***************
-*** 42,48 ****
- for file in $csvfiles
- do
- f=`basename $file .csv`
-! perl -I $dir/lib $dir/makemodel/csv/csv2tsv.pl $file > $workdir/tsv/$f.tsv
- done
-
- cat $workdir/tsv/*.tsv > $workdir/data.tsv
---- 42,48 ----
- for file in $csvfiles
- do
- f=`basename $file .csv`
-! @prefix@/bin/perl5.12 -I $dir/lib $dir/makemodel/csv/csv2tsv.pl $file > $workdir/tsv/$f.tsv
- done
-
- cat $workdir/tsv/*.tsv > $workdir/data.tsv
-*** makemodel/csv/csv2tsv.pl.orig Thu Mar 1 09:38:37 2012
---- makemodel/csv/csv2tsv.pl Sat Jul 14 10:16:06 2012
-***************
-*** 1,4 ****
-! #!/bin/env perl
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
---- 1,4 ----
-! #!@prefix@/bin/perl5.12
-
- #
- # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
-*** makemodel/csv/csv2tsv.sh.orig Thu Mar 1 09:38:37 2012
---- makemodel/csv/csv2tsv.sh Sat Jul 14 10:15:35 2012
-***************
-*** 8,14 ****
- for f in *.csv
- do
- f=`basename $f .csv`
-! perl -I ../../lib ./csv2tsv.pl $f.csv > ../tsv/$f.tsv
- done
-
-
---- 8,14 ----
- for f in *.csv
- do
- f=`basename $f .csv`
-! @prefix@/bin/perl5.12 -I ../../lib ./csv2tsv.pl $f.csv > ../tsv/$f.tsv
- done
-
-
</del><ins>+--- lib/in2tsv.pl.orig
++++ lib/in2tsv.pl
+@@ -1,4 +1,4 @@
+-#!/bin/env perl
++#!@PERL@
+
+ #
+ # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
+--- lib/tsv2out.pl.orig
++++ lib/tsv2out.pl
+@@ -1,4 +1,4 @@
+-#!/bin/env perl
++#!@PERL@
+
+ #
+ # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
+--- makemodel/csv/csv2tsv.pl.orig
++++ makemodel/csv/csv2tsv.pl
+@@ -1,4 +1,4 @@
+-#!/bin/env perl
++#!@PERL@
+
+ #
+ # Copyright(C) 2007-2012 National Institute of Information and Communications Technology
+--- makemodel/csv/csv2tsv.sh.orig
++++ makemodel/csv/csv2tsv.sh
+@@ -8,7 +8,7 @@
+ for f in *.csv
+ do
+ f=`basename $f .csv`
+- perl -I ../../lib ./csv2tsv.pl $f.csv > ../tsv/$f.tsv
++ @PERL@ -I ../../lib ./csv2tsv.pl $f.csv > ../tsv/$f.tsv
+ done
+
+
</ins></span></pre>
</div>
</div>
</body>
</html>