Stagify;

Use new LIB_DEPENDS format;
USE_GMAKE --> USES=gmake;
update to 1.5.12 (the only fetchable version in 1.5.x branch).

5 files changed, 50 insertions, 30 deletions

diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile
index 76942b84b9ef..9d9457e86646 100644
--- a/textproc/srilm/Makefile
+++ b/textproc/srilm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	srilm
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.12
 CATEGORIES=	textproc
 DISTNAME=	srilm
 EXTRACT_SUFX?=	.tgz
@@ -10,11 +10,11 @@ EXTRACT_SUFX?=	.tgz
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Toolkit for building and applying statistical language models
 
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
 
 DOWNLOAD_URL?=	http://www.speech.sri.com/projects/srilm/download.html
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV+=	SRILM=${WRKSRC}
 ALL_TARGET=	World
 ONLY_FOR_ARCHS=	i386 amd64
@@ -47,17 +47,7 @@ GAWK_SCRIPTS=	add-classes-to-pfsg add-dummy-bows add-pauses-to-pfsg \
 		reverse-ngram-counts sentid-to-sclite sentid-to-ctm \
 		subtract-ppls uniform-classes vp2text wlat-to-dot \
 		wlat-to-pfsg wlat-stats wordlat-to-lisp prettify
-MAN1=		ngram.1 ngram-count.1 ngram-class.1 ngram-merge.1 disambig.1 \
-		nbest-lattice.1 nbest-optimize.1 nbest-mix.1 \
-		nbest-pron-score.1 segment.1 segment-nbest.1 hidden-ngram.1 \
-		anti-ngram.1 multi-ngram.1 lattice-tool.1 training-scripts.1 \
-		lm-scripts.1 ppl-scripts.1 pfsg-scripts.1 nbest-scripts.1 \
-		select-vocab.1
-MAN3=		Prob.3 Vocab.3 LM.3 File.3
-MAN5=		ngram-format.5 nbest-format.5 classes-format.5 \
-		pfsg-format.5 wlat-format.5
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -79,21 +69,21 @@ do-extract:
 post-patch:
 	@cd ${WRKSRC} && \
 	${REINPLACE_CMD} -e 's,$$WRKSRC,${WRKSRC},g' \
-		test/go.run-test
+		sbin/go.run-test
 
 do-install:
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/bin/freebsd && \
-		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
-		${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${EXAMPLESDIR} && \
+		${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \
+		${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${STAGEDIR}${EXAMPLESDIR} && \
 	cd ${WRKSRC}/man/man1 && \
-		${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
+		${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 && \
 	cd ${WRKSRC}/man/man3 && \
-		${INSTALL_MAN} ${MAN3} ${MAN3PREFIX}/man/man3 && \
+		${INSTALL_MAN} *.3 ${STAGEDIR}${MAN3PREFIX}/man/man3 && \
 	cd ${WRKSRC}/man/man5 && \
-		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
+		${INSTALL_MAN} *.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 && \
 	cd ${WRKSRC}/bin && \
-		${INSTALL_SCRIPT} ${SCRIPTS} ${EXAMPLESDIR}
+		${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/textproc/srilm/distinfo b/textproc/srilm/distinfo
index b13b82397f3c..779ee6a82b0c 100644
--- a/textproc/srilm/distinfo
+++ b/textproc/srilm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (srilm.tgz) = 7db33faf0861a439aca520c36ec92c79ee27770db4576a84af5f4234e9cbce85
-SIZE (srilm.tgz) = 48508015
+SHA256 (srilm.tgz) = e7b8bb1a077f4f6fdd8ea8e2e69b87f1870f5995570293b2e84da373ed3ad914
+SIZE (srilm.tgz) = 48291926
diff --git a/textproc/srilm/files/patch-compare-outputs b/textproc/srilm/files/patch-compare-outputs
index 4b3592d89d9e..0c2e2f774e92 100644
--- a/textproc/srilm/files/patch-compare-outputs
+++ b/textproc/srilm/files/patch-compare-outputs
@@ -1,5 +1,5 @@
---- test/compare-outputs.orig	Fri Feb 28 10:04:35 2003
-+++ test/compare-outputs	Sat Apr  3 16:45:20 2004
+--- sbin/compare-outputs.orig	Fri Feb 28 10:04:35 2003
++++ sbin/compare-outputs	Sat Apr  3 16:45:20 2004
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/gawk -f 
 +#!/usr/bin/awk -f 
diff --git a/textproc/srilm/files/patch-go.run-test b/textproc/srilm/files/patch-go.run-test
index b173ead3400c..accd14867823 100644
--- a/textproc/srilm/files/patch-go.run-test
+++ b/textproc/srilm/files/patch-go.run-test
@@ -1,7 +1,7 @@
---- test/go.run-test.orig	Tue Mar  4 12:51:40 2003
-+++ test/go.run-test	Sat Apr  3 16:46:12 2004
+--- sbin/go.run-test.orig	2009-12-02 23:15:49.000000000 +0300
++++ sbin/go.run-test	2014-03-28 11:45:04.000000000 +0400
 @@ -6,6 +6,9 @@
- # $Header: /home/srilm/devel/test/RCS/go.run-test,v 1.11 2003/03/04 04:51:27 stolcke Exp $
+ # $Header: /home/srilm/devel/lattice/test/../../sbin/RCS/go.run-test,v 1.13 2009/12/02 20:15:39 stolcke Exp $
  #
  
 +PATH=$PATH:$WRKSRC/bin:$WRKSRC/bin/freebsd
@@ -14,8 +14,8 @@
  
  #diff=cmp
  # ignore different whitespace and EOL conventions
--diff="gawk -f compare-outputs 2>/dev/null"
-+diff="awk -f compare-outputs 2>/dev/null"
+-diff="gawk -f $SRILM/sbin/compare-outputs 2>/dev/null"
++diff="awk -f $SRILM/sbin/compare-outputs 2>/dev/null"
  
  test -d output || mkdir output
  
diff --git a/textproc/srilm/pkg-plist b/textproc/srilm/pkg-plist
index 65fffdbe4698..adcbf8f5079c 100644
--- a/textproc/srilm/pkg-plist
+++ b/textproc/srilm/pkg-plist
@@ -81,4 +81,34 @@ bin/segment-nbest
 %%EXAMPLESDIR%%/wlat-to-dot
 %%EXAMPLESDIR%%/wlat-to-pfsg
 %%EXAMPLESDIR%%/wordlat-to-lisp
+man/man1/anti-ngram.1.gz
+man/man1/disambig.1.gz
+man/man1/hidden-ngram.1.gz
+man/man1/lattice-tool.1.gz
+man/man1/lm-scripts.1.gz
+man/man1/multi-ngram.1.gz
+man/man1/nbest-lattice.1.gz
+man/man1/nbest-mix.1.gz
+man/man1/nbest-optimize.1.gz
+man/man1/nbest-pron-score.1.gz
+man/man1/nbest-scripts.1.gz
+man/man1/ngram-class.1.gz
+man/man1/ngram-count.1.gz
+man/man1/ngram-merge.1.gz
+man/man1/ngram.1.gz
+man/man1/pfsg-scripts.1.gz
+man/man1/ppl-scripts.1.gz
+man/man1/segment-nbest.1.gz
+man/man1/segment.1.gz
+man/man1/select-vocab.1.gz
+man/man1/training-scripts.1.gz
+man/man3/File.3.gz
+man/man3/LM.3.gz
+man/man3/Prob.3.gz
+man/man3/Vocab.3.gz
+man/man5/classes-format.5.gz
+man/man5/nbest-format.5.gz
+man/man5/ngram-format.5.gz
+man/man5/pfsg-format.5.gz
+man/man5/wlat-format.5.gz
 @dirrm %%EXAMPLESDIR%%