[96145] trunk/dports/audio/julius

[hum at macports.org]

Revision: 96145
          https://trac.macports.org/changeset/96145
Author:   hum at macports.org
Date:     2012-08-01 18:04:47 -0700 (Wed, 01 Aug 2012)
Log Message:
-----------
julius: update to 4.2.2; delete patch-ngram_read_bin.diff, which was integrated into the upstream; add zlib to depends_lib; support mountain lion (osx 10.8) and add '-locale C' to reinplace (sed).

Modified Paths:
--------------
    trunk/dports/audio/julius/Portfile

Removed Paths:
-------------
    trunk/dports/audio/julius/files/patch-ngram_read_bin.c.diff

Modified: trunk/dports/audio/julius/Portfile
===================================================================
--- trunk/dports/audio/julius/Portfile	2012-08-02 00:36:44 UTC (rev 96144)
+++ trunk/dports/audio/julius/Portfile	2012-08-02 01:04:47 UTC (rev 96145)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                julius
-version             4.2.1
-revision            1
+version             4.2.2
 categories          audio japanese
 platforms           darwin
 maintainers         hum openmaintainer
@@ -21,35 +20,29 @@
                     PCs with small amount of memory.
 
 homepage            http://julius.sourceforge.jp/
-master_sites        sourceforge_jp:julius/54278/
+master_sites        sourceforge_jp:julius/56549/
 
 checksums           ${distname}${extract.suffix} \
-                    rmd160  9a3a3af38f4a9e1f66ec63879b18d08f29ade26f \
-                    sha256  4e6f69f33967d7a958672a6b6d216405dcae8a3f008ae73cd115428923aed57a \
+                    rmd160  b3417358c3c3e2e0573b6ea0e3588942e5b8d176 \
+                    sha256  f53caf18be4fb8266b988071855565dccb78c09f00f1d36a8e258b7be6b3cef5
 
 patchfiles          patch-configure.diff \
                     patch-Makefile.in.diff \
                     patch-clang.diff
 
-depends_lib         port:libiconv
+depends_lib         port:libiconv \
+                    port:zlib
 
 # Note: '--enable-words-int' should be declared ahead of '--with-mictype'.
 variant words_int description {Use integer for word ID to extend vocabulary limit} {
-    # http://sourceforge.jp/cvs/view/julius/julius4/libsent/src/ngram/ngram_read_bin.c?r1=1.8&r2=1.9
-    patchfiles-append          patch-ngram_read_bin.c.diff
     configure.pre_args-append  --enable-words-int
 }
 
-platform darwin 10 {
+if {${os.platform} == "darwin" && ${os.major} >= 10} {
     depends_lib-append      port:portaudio
     configure.args-append   --with-mictype=portaudio
 }
 
-platform darwin 11 {
-    depends_lib-append      port:portaudio
-    configure.args-append   --with-mictype=portaudio
-}
-
 destroot.target-append  install.man
 destroot.destdir        prefix=${destroot}${prefix}
 
@@ -91,13 +84,13 @@
         copy ${workpath}/${dictation_kit}/model ${lib_dest}
         # configure the dictation kit.
         set conf_dest    ${lib_dest}/fast.jconf
-        reinplace "s| model/| ${prefix}/lib/${name}/model/|g"    ${conf_dest}
-        reinplace "s|#-charconv from to|-charconv EUC-JP UTF-8|" ${conf_dest}
+        reinplace -locale C "s| model/| ${prefix}/lib/${name}/model/|g"    ${conf_dest}
+        reinplace -locale C "s|#-charconv from to|-charconv EUC-JP UTF-8|" ${conf_dest}
         # configure an executable demo script file.
         set script_name  julius_demo
         set script_dest  ${destroot}${prefix}/bin/${script_name}
         xinstall -m 755  ${filespath}/${script_name} ${script_dest}
-        reinplace "s|@prefix@|${prefix}|g"           ${script_dest}
+        reinplace -locale C "s|@prefix@|${prefix}|g" ${script_dest}
         # copy documentation.
         set kit_docdir   ${destroot}${prefix}/share/doc/${name}/${kit_name}
         xinstall -d ${kit_docdir}

Deleted: trunk/dports/audio/julius/files/patch-ngram_read_bin.c.diff
===================================================================
--- trunk/dports/audio/julius/files/patch-ngram_read_bin.c.diff	2012-08-02 00:36:44 UTC (rev 96144)
+++ trunk/dports/audio/julius/files/patch-ngram_read_bin.c.diff	2012-08-02 01:04:47 UTC (rev 96145)
@@ -1,46 +0,0 @@
---- libsent/src/ngram/ngram_read_bin.c	2011/04/29 05:09:17	1.8
-+++ libsent/src/ngram/ngram_read_bin.c	2012/03/05 03:50:05	1.9
-@@ -48,7 +48,7 @@
-  * @author Akinobu LEE
-  * @date   Wed Feb 16 17:12:08 2005
-  *
-- * $Revision: 1.8 $
-+ * $Revision: 1.9 $
-  * 
-  */
- /*
-@@ -300,9 +300,17 @@
- 	rdn(fp, t->bgn, sizeof(NNID), t->bgnlistlen);
-       }
-       t->num = (WORD_ID *)mymalloc_big(sizeof(WORD_ID), t->bgnlistlen);
-+#ifdef WORDS_INT
-+      rdn_wordid(fp, t->num, t->bgnlistlen, need_conv);
-+#else
-       rdn(fp, t->num, sizeof(WORD_ID), t->bgnlistlen);
-+#endif
-       t->nnid2wid = (WORD_ID *)mymalloc_big(sizeof(WORD_ID), t->totalnum);
-+#ifdef WORDS_INT
-+      rdn_wordid(fp, t->nnid2wid, t->totalnum, need_conv);
-+#else
-       rdn(fp, t->nnid2wid, sizeof(WORD_ID), t->totalnum);
-+#endif
-     } else {
-       t->bgn_upper = NULL;
-       t->bgn_lower = NULL;
-@@ -342,6 +350,7 @@
-   }
-   rdn(fp, &i, sizeof(int), 1);
-   if (i == 1) {
-+    jlog("Stat: ngram_read_bin_v5: reading additional LR 2-gram\n");
-     ndata->p_2 = (LOGPROB *)mymalloc_big(sizeof(LOGPROB), ndata->d[1].totalnum);
-     rdn(fp, ndata->p_2, sizeof(LOGPROB), ndata->d[1].totalnum);
-   } else {
-@@ -606,6 +615,8 @@
- 
-   /* check initial header */
-   if (check_header(fp) == FALSE) return FALSE;
-+
-+  jlog("Stat: ngram_read_bin: file version: %d\n", file_version);
-   
- #ifdef WORDS_INT
-   /* in retry mode, force word_id conversion  */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120801/0ed22de7/attachment.html>