[106187] trunk/dports/textproc/irstlm

Sat May 18 05:32:25 PDT 2013

Revision: 106187
          https://trac.macports.org/changeset/106187
Author:   hum at macports.org
Date:     2013-05-18 05:32:25 -0700 (Sat, 18 May 2013)
Log Message:
-----------
irstlm: update to 5.80.03; add patch-configure.in.diff to fix for automake 1.13 update.

Modified Paths:
--------------
    trunk/dports/textproc/irstlm/Portfile
    trunk/dports/textproc/irstlm/files/patch-scripts.diff

Added Paths:
-----------
    trunk/dports/textproc/irstlm/files/patch-configure.in.diff

Modified: trunk/dports/textproc/irstlm/Portfile
===================================================================

--- trunk/dports/textproc/irstlm/Portfile	2013-05-18 09:58:49 UTC (rev 106186)
+++ trunk/dports/textproc/irstlm/Portfile	2013-05-18 12:32:25 UTC (rev 106187)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                irstlm
-version             5.80.01
-revision            2
+version             5.80.03
 categories          textproc math
 maintainers         hum openmaintainer
 
@@ -22,8 +21,8 @@
 license             LGPL
 
 master_sites        http://sourceforge.net/projects/irstlm/files/irstlm/irstlm-5.80/
-checksums           rmd160  93e6d412a4eee5c68075cd46233336deef2b1a1c \
-                    sha256  3d79155828a2fa25a425c60efb12a4357d7be994c15e37105d7814a638372ee9
+checksums           rmd160  08b9506e2dc388217e33070ebc1b06d7667d3d5c \
+                    sha256  500c64e90cae73c2f06ed34ad078423cc100f4e16e6dd98a9e466b17367d31e7
 extract.suffix      .tgz
 
 depends_lib         port:zlib
@@ -33,8 +32,10 @@
 # binaries and scripts are installed at ${libexec_dir}.
 set libexec_dir     ${prefix}/libexec/${name}
 
-# replace the value of the IRSTLM environmental variable with ${libexec_dir}.
-patchfiles          patch-scripts.diff
+# patch-scripts.diff: replace the value of the IRSTLM environmental variable with ${libexec_dir}.
+# patch-configure.in.diff: fix for automake 1.13 update; see #37549.
+patchfiles          patch-scripts.diff \
+                    patch-configure.in.diff
 
 post-patch {
     foreach f {build-lm-qsub.sh build-lm.sh lm-stat.pl split-ngt.sh} {

Added: trunk/dports/textproc/irstlm/files/patch-configure.in.diff
===================================================================
--- trunk/dports/textproc/irstlm/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/textproc/irstlm/files/patch-configure.in.diff	2013-05-18 12:32:25 UTC (rev 106187)
@@ -0,0 +1,11 @@
+--- configure.in.orig	2013-05-18 21:15:19.000000000 +0900
++++ configure.in	2013-05-18 21:15:35.000000000 +0900
+@@ -5,7 +5,7 @@
+ CXXFLAGS="$CXXFLAGS"
+ 
+ AC_PREFIX_DEFAULT(/usr/local/irstlm)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE(irstlm, 5.70.03)
+ WEBSITE="http://hlt.fbk.eu/en/irstlm"
+ 

Modified: trunk/dports/textproc/irstlm/files/patch-scripts.diff
===================================================================
--- trunk/dports/textproc/irstlm/files/patch-scripts.diff	2013-05-18 09:58:49 UTC (rev 106186)
+++ trunk/dports/textproc/irstlm/files/patch-scripts.diff	2013-05-18 12:32:25 UTC (rev 106187)
@@ -1,6 +1,6 @@
---- scripts/build-lm-qsub.sh.orig	2012-04-11 18:54:15.000000000 +0900
-+++ scripts/build-lm-qsub.sh	2012-10-07 00:40:14.000000000 +0900
-@@ -33,13 +33,12 @@
+--- scripts/build-lm-qsub.sh.orig	2013-04-06 00:31:56.000000000 +0900
++++ scripts/build-lm-qsub.sh	2013-05-18 14:01:30.000000000 +0900
+@@ -36,13 +36,12 @@
  fi
  
  if [ ! $IRSTLM ]; then
@@ -17,9 +17,9 @@
  gzip=`which gzip 2> /dev/null`;
  gunzip=`which gunzip 2> /dev/null`;
  
---- scripts/build-lm.sh.orig	2012-08-02 21:53:02.000000000 +0900
-+++ scripts/build-lm.sh	2012-10-07 00:40:30.000000000 +0900
-@@ -27,13 +27,12 @@
+--- scripts/build-lm.sh.orig	2012-10-02 16:25:08.000000000 +0900
++++ scripts/build-lm.sh	2013-05-18 14:01:30.000000000 +0900
+@@ -30,13 +30,12 @@
  }
  
  if [ ! $IRSTLM ]; then
@@ -36,9 +36,9 @@
  gzip=`which gzip 2> /dev/null`;
  gunzip=`which gunzip 2> /dev/null`;
  
---- scripts/lm-stat.pl.orig	2011-04-15 21:54:01.000000000 +0900
-+++ scripts/lm-stat.pl	2012-10-07 00:40:48.000000000 +0900
-@@ -39,14 +39,7 @@
+--- scripts/lm-stat.pl.orig	2012-10-02 16:25:08.000000000 +0900
++++ scripts/lm-stat.pl	2013-05-18 14:01:30.000000000 +0900
+@@ -46,14 +46,7 @@
    exit(1);
  }
  
@@ -54,9 +54,9 @@
  
  open (OUT,"$clm $lm --eval $txt --debug 1|");
  while (<OUT>){
---- scripts/split-ngt.sh.orig	2012-04-11 18:54:15.000000000 +0900
-+++ scripts/split-ngt.sh	2012-10-07 00:41:22.000000000 +0900
-@@ -6,9 +6,9 @@
+--- scripts/split-ngt.sh.orig	2012-10-02 16:25:08.000000000 +0900
++++ scripts/split-ngt.sh	2013-05-18 14:01:30.000000000 +0900
+@@ -38,9 +38,9 @@
  #containing ngram statistics (of <order> length) in Google format
  #These files are a partition of the whole set of ngrams
  
@@ -69,14 +69,11 @@
  
  unset par
  while [ $# -gt 0 ]
---- scripts/Makefile.am.orig	2012-08-02 21:53:02.000000000 +0900
-+++ scripts/Makefile.am	2012-10-07 00:52:13.000000000 +0900
-@@ -3,7 +3,7 @@
- perl_programs = build-sublm.pl goograms2ngrams.pl lm-stat.pl merge-sublm.pl ngram-split.pl sort-lm.pl split-dict.pl
- dist_programs = wrapper $(sh_programs) $(perl_programs) 
- 
+--- scripts/Makefile.am.orig	2012-10-12 06:19:19.000000000 +0900
++++ scripts/Makefile.am	2013-05-18 20:54:50.000000000 +0900
+@@ -1,4 +1,4 @@
 -wrapperbindir = @prefix@/bin
 +wrapperbindir = @libexecdir@/irstlm
  
- install:
- 	for p in $(sh_programs) $(perl_programs) ; do \
+ dist_wrapperbin_SCRIPTS = \
+ add-start-end.sh build-lm-qsub.sh build-lm.sh rm-start-end.sh split-ngt.sh mdtsel.sh \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130518/48056cab/attachment-0001.html>
