- update to 0.91

4 files changed, 63 insertions, 52 deletions

diff --git a/textproc/p5-Text-NSP/Makefile b/textproc/p5-Text-NSP/Makefile
index 16416931c0a6..f198130bb8e6 100644
--- a/textproc/p5-Text-NSP/Makefile
+++ b/textproc/p5-Text-NSP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Text-NSP
-PORTVERSION=	0.73
+PORTVERSION=	0.91
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Text
@@ -22,10 +22,30 @@ MAN1=	combig.pl.1 count.pl.1 \
 	huge-combine.pl.1 huge-count.pl.1 \
 	kocos.pl.1 rank.pl.1 \
 	sort-bigrams.pl.1 split-data.pl.1 statistic.pl.1
-MAN3=	pmi.3 rightFisher.3 measure3d.3 \
-	tmi.3 leftFisher.3 measure2d.3 \
-	odds.3 ll.3 ll3.3 dice.3 x2.3 \
-	phi.3 tscore.3 tmi3.3
+MAN3=	Text::NSP.3 Text::NSP::Measures.3 \
+	Text::NSP::Measures::2D.3 \
+	Text::NSP::Measures::2D::CHI::tscore.3 \
+	Text::NSP::Measures::2D::Fisher.3 \
+	Text::NSP::Measures::2D::Fisher::right.3 \
+	Text::NSP::Measures::2D::Fisher2.3 \
+	Text::NSP::Measures::2D::Fisher2::left.3 \
+	Text::NSP::Measures::2D::Fisher2::right.3 \
+	Text::NSP::Measures::2D::Fisher2::twotailed.3 \
+	Text::NSP::Measures::2D::MI::ll.3 \
+	Text::NSP::Measures::2D::odds.3 \
+	Text::NSP::Measures::2D::MI::pmi.3 \
+	Text::NSP::Measures::2D::dice.3 \
+	Text::NSP::Measures::2D::CHI.3 \
+	Text::NSP::Measures::2D::Fisher::left.3 \
+	Text::NSP::Measures::2D::CHI::phi.3 \
+	Text::NSP::Measures::2D::MI::tmi.3 \
+	Text::NSP::Measures::2D::Fisher::twotailed.3 \
+	Text::NSP::Measures::2D::MI.3 \
+	Text::NSP::Measures::2D::CHI::x2.3 \
+	Text::NSP::Measures::3D.3 \
+	Text::NSP::Measures::3D::MI.3 \
+	Text::NSP::Measures::3D::MI::ll.3 \
+	Text::NSP::Measures::3D::MI::tmi.3
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -35,6 +55,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local/bin/perl|/usr/bin/env perl|'
 	@${FIND} ${WRKSRC} -name "*.p[lm]" |${XARGS} \
 	${REINPLACE_CMD} -e 's|split.*(/:/, $$ENV{PATH})|@INC|'
+	@${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM}
 
 post-install:
 	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%DOCSDIR%%:${DOCSDIR}:g"
@@ -47,7 +68,7 @@ pre-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	This port requires perl 5.8.0 or later. Install lang/perl5.8 then try again
+IGNORE=	requires perl 5.8.0 or later. Install lang/perl5.8 then try again
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Text-NSP/distinfo b/textproc/p5-Text-NSP/distinfo
index a15e216760a4..e9ecad8d14e2 100644
--- a/textproc/p5-Text-NSP/distinfo
+++ b/textproc/p5-Text-NSP/distinfo
@@ -1,3 +1,3 @@
-MD5 (Text-NSP-0.73.tar.gz) = 72da4a92f53d82e4a0802e8f3210dc8c
-SHA256 (Text-NSP-0.73.tar.gz) = 5a129be7db646da8ea146310e4a1159d54f87817de64d73c8de27fa5f6d94a5c
-SIZE (Text-NSP-0.73.tar.gz) = 598666
+MD5 (Text-NSP-0.91.tar.gz) = 3f2fc956d5c92bdd135e5163a51eb630
+SHA256 (Text-NSP-0.91.tar.gz) = 9c1f69eec1fc324603c64f466d292da4c5aa5fb259bdd702cae2b3073da9c856
+SIZE (Text-NSP-0.91.tar.gz) = 625598
diff --git a/textproc/p5-Text-NSP/files/patch-Makefile.PL b/textproc/p5-Text-NSP/files/patch-Makefile.PL
deleted file mode 100644
index cfe01cde9e3c..000000000000
--- a/textproc/p5-Text-NSP/files/patch-Makefile.PL
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.PL.orig	Fri Jun 18 06:18:30 2004
-+++ Makefile.PL	Thu Sep 30 10:39:29 2004
-@@ -240,19 +240,6 @@
- 	@pod2html --outfile=$(SITEPREFIX)/doc/html/Todo.html --infile=Docs/Todo.pod --title="NSP Todo"
- 	@pod2html --outfile=$(SITEPREFIX)/doc/html/Usage.html --infile=Docs/Usage.pod --title="NSP Usage"
- 
--# general documentation to man/man3
--
--	@$(MKPATH) $(SITEPREFIX)/man/man3
--
--	@echo "Installing man page documentation in $(SITEPREFIX)/man/man3"
--
--	@pod2man Docs/FAQ.pod $(SITEPREFIX)/man/man3/FAQ.$(MAN3EXT) 
--	@pod2man Docs/NewStats.pod $(SITEPREFIX)/man/man3/NewStats.$(MAN3EXT) 
--	@pod2man Docs/Measures.pod $(SITEPREFIX)/man/man3/Measures.$(MAN3EXT) 
--	@pod2man Docs/README.pod $(SITEPREFIX)/man/man3/README.$(MAN3EXT) 
--	@pod2man Docs/Todo.pod $(SITEPREFIX)/man/man3/Todo.$(MAN3EXT) 
--	@pod2man Docs/Usage.pod $(SITEPREFIX)/man/man3/Usage.$(MAN3EXT) 
--
- # general documentation to doc/pod
- 
- 	@echo "Installing pod documentation in $(SITEPREFIX)/doc/pod"
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index 1e96f2b1b548..243d1988db77 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -10,36 +10,41 @@ bin/rank.pl
 bin/kocos-script.sh
 bin/combig.pl
 bin/sort-bigrams.pl
-%%SITE_PERL%%/auto/Text/NSP/autosplit.ix
-%%SITE_PERL%%/pmi.pm
-%%SITE_PERL%%/rightFisher.pm
-%%SITE_PERL%%/tmi3.pm
-%%SITE_PERL%%/measure3d.pm
-%%SITE_PERL%%/odds.pm
-%%SITE_PERL%%/ll3.pm
-%%SITE_PERL%%/ll.pm
-%%SITE_PERL%%/dice.pm
-%%SITE_PERL%%/x2.pm
-%%SITE_PERL%%/measure2d.pm
-%%SITE_PERL%%/leftFisher.pm
-%%SITE_PERL%%/phi.pm
-%%SITE_PERL%%/tmi.pm
-%%SITE_PERL%%/tscore.pm
 %%SITE_PERL%%/Text/NSP.pm
+%%SITE_PERL%%/Text/NSP/Measures.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/odds.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/dice.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2/left.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2/right.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2/twotailed.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/right.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/left.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/twotailed.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI/pmi.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI/ll.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI/tmi.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI/tscore.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI/phi.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI/x2.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D/MI.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D/MI/tmi.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D/MI/ll.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/html/dice.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ll.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ll3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/odds.html
 %%PORTDOCS%%%%DOCSDIR%%/html/phi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tmi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pmi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tscore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/x2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/leftFisher.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rightFisher.html
 %%PORTDOCS%%%%DOCSDIR%%/html/measure2d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/measure3d.html
 %%PORTDOCS%%%%DOCSDIR%%/html/count.html
 %%PORTDOCS%%%%DOCSDIR%%/html/statistic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rank.html
@@ -65,7 +70,14 @@ bin/sort-bigrams.pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP
-@dirrm %%SITE_PERL%%/auto/Text/NSP
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/3D/MI
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/3D
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/2D/MI
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/2D/Fisher
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/2D/CHI
+@dirrm %%SITE_PERL%%/Text/NSP/Measures/2D
+@dirrm %%SITE_PERL%%/Text/NSP/Measures
+@dirrm %%SITE_PERL%%/Text/NSP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrmtry %%SITE_PERL%%/auto/Text
 @dirrmtry %%SITE_PERL%%/Text