3 files changed, 68 insertions, 54 deletions

diff --git a/textproc/p5-Text-NSP/Makefile b/textproc/p5-Text-NSP/Makefile
index f198130bb8e6..932acc3b5d93 100644
--- a/textproc/p5-Text-NSP/Makefile
+++ b/textproc/p5-Text-NSP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Text-NSP
-PORTVERSION=	0.91
+PORTVERSION=	0.95
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Text
@@ -22,29 +22,36 @@ 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=	Text::NSP.3 Text::NSP::Measures.3 \
+
+MAN3=	Text::NSP.3 \
+	Text::NSP::Measures.3 \
 	Text::NSP::Measures::2D.3 \
+	Text::NSP::Measures::2D::CHI.3 \
+	Text::NSP::Measures::2D::CHI::phi.3 \
 	Text::NSP::Measures::2D::CHI::tscore.3 \
+	Text::NSP::Measures::2D::CHI::x2.3 \
+	Text::NSP::Measures::2D::Dice.3 \
+	Text::NSP::Measures::2D::Dice::dice.3 \
+	Text::NSP::Measures::2D::Dice::jaccard.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::right.3 \
 	Text::NSP::Measures::2D::Fisher::twotailed.3 \
 	Text::NSP::Measures::2D::MI.3 \
-	Text::NSP::Measures::2D::CHI::x2.3 \
+	Text::NSP::Measures::2D::MI::ll.3 \
+	Text::NSP::Measures::2D::MI::pmi.3 \
+	Text::NSP::Measures::2D::MI::ps.3 \
+	Text::NSP::Measures::2D::MI::tmi.3 \
+	Text::NSP::Measures::2D::odds.3 \
 	Text::NSP::Measures::3D.3 \
 	Text::NSP::Measures::3D::MI.3 \
 	Text::NSP::Measures::3D::MI::ll.3 \
+	Text::NSP::Measures::3D::MI::pmi.3 \
+	Text::NSP::Measures::3D::MI::ps.3 \
 	Text::NSP::Measures::3D::MI::tmi.3
 
 post-patch:
diff --git a/textproc/p5-Text-NSP/distinfo b/textproc/p5-Text-NSP/distinfo
index e9ecad8d14e2..0662ea28bd27 100644
--- a/textproc/p5-Text-NSP/distinfo
+++ b/textproc/p5-Text-NSP/distinfo
@@ -1,3 +1,3 @@
-MD5 (Text-NSP-0.91.tar.gz) = 3f2fc956d5c92bdd135e5163a51eb630
-SHA256 (Text-NSP-0.91.tar.gz) = 9c1f69eec1fc324603c64f466d292da4c5aa5fb259bdd702cae2b3073da9c856
-SIZE (Text-NSP-0.91.tar.gz) = 625598
+MD5 (Text-NSP-0.95.tar.gz) = cf8ca2db024e6b58f8f90e49ddb25ed8
+SHA256 (Text-NSP-0.95.tar.gz) = 63e812e01a40078dfee9119b8c63c8dc9fcf0cc35577f35caf195212a985f70f
+SIZE (Text-NSP-0.95.tar.gz) = 965073
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index 243d1988db77..d6334fdd26bc 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -1,83 +1,90 @@
-bin/statistic.pl
-bin/split-data.pl
 bin/combig-script.sh
+bin/combig.pl
+bin/count.pl
+bin/huge-combine.pl
 bin/huge-count.pl
-bin/rank-script.sh
+bin/kocos-script.sh
 bin/kocos.pl
-bin/huge-combine.pl
-bin/count.pl
+bin/rank-script.sh
 bin/rank.pl
-bin/kocos-script.sh
-bin/combig.pl
 bin/sort-bigrams.pl
+bin/split-data.pl
+bin/statistic.pl
 %%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/CHI/phi.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI/tscore.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/CHI/x2.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Dice.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Dice/dice.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Dice/jaccard.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/left.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/right.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher/twotailed.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/Fisher2.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.pm
 %%SITE_PERL%%/Text/NSP/Measures/2D/MI/ll.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI/pmi.pm
+%%SITE_PERL%%/Text/NSP/Measures/2D/MI/ps.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/2D/odds.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D.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%%/Text/NSP/Measures/3D/MI/pmi.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D/MI/ps.pm
+%%SITE_PERL%%/Text/NSP/Measures/3D/MI/tmi.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP/.packlist
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Measures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/NewStats.html
+%%PORTDOCS%%%%DOCSDIR%%/html/README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Todo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/combig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/count.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dice.html
+%%PORTDOCS%%%%DOCSDIR%%/html/huge-combine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/huge-count.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jaccard.html
+%%PORTDOCS%%%%DOCSDIR%%/html/kocos.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ll.html
+%%PORTDOCS%%%%DOCSDIR%%/html/measure2d.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/measure2d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/count.html
-%%PORTDOCS%%%%DOCSDIR%%/html/statistic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/kocos.html
-%%PORTDOCS%%%%DOCSDIR%%/html/combig.html
-%%PORTDOCS%%%%DOCSDIR%%/html/huge-count.html
-%%PORTDOCS%%%%DOCSDIR%%/html/huge-combine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sort-bigrams.html
 %%PORTDOCS%%%%DOCSDIR%%/html/split-data.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/html/NewStats.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Measures.html
-%%PORTDOCS%%%%DOCSDIR%%/html/README.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Todo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/statistic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tmi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tscore.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2.html
 %%PORTDOCS%%%%DOCSDIR%%/pod/FAQ.pod
-%%PORTDOCS%%%%DOCSDIR%%/pod/NewStats.pod
 %%PORTDOCS%%%%DOCSDIR%%/pod/Measures.pod
+%%PORTDOCS%%%%DOCSDIR%%/pod/NewStats.pod
 %%PORTDOCS%%%%DOCSDIR%%/pod/README.pod
 %%PORTDOCS%%%%DOCSDIR%%/pod/Todo.pod
 %%PORTDOCS%%%%DOCSDIR%%/pod/Usage.pod
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pod
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @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/Dice
 @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%%/Text