- Update to 1.01

- Overhaul of Makefile and pkg-plist as Vendor has now left it up to the
  user to install the documentation

PR:		ports/99497
Submitted by:	aaron

4 files changed, 24 insertions, 61 deletions

diff --git a/textproc/p5-Text-NSP/Makefile b/textproc/p5-Text-NSP/Makefile
index 932acc3b5d93..8450d752947a 100644
--- a/textproc/p5-Text-NSP/Makefile
+++ b/textproc/p5-Text-NSP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Text-NSP
-PORTVERSION=	0.95
+PORTVERSION=	1.01
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Text
@@ -16,13 +16,11 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Perl5 modules for Ngram Statistics Package
 
 PERL_CONFIGURE=	yes
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 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 \
 	Text::NSP::Measures::2D.3 \
@@ -54,24 +52,19 @@ MAN3=	Text::NSP.3 \
 	Text::NSP::Measures::3D::MI::ps.3 \
 	Text::NSP::Measures::3D::MI::tmi.3
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-	's,$(SITEPREFIX)/doc,$(SITEPREFIX)/share/doc/${PKGNAMEPREFIX}${PORTNAME},' \
-	${WRKSRC}/Makefile.PL
-	@${FIND} ${WRKSRC} -name "*.pl" |${XARGS} \
-	${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}
+DOCS=	CHANGES README Docs/FAQ.pod Docs/NSP-Class-diagram.pdf \
+	Docs/NSP-Class-diagram.png Docs/README.pod Docs/Todo.pod \
+	Docs/Usage.pod Docs/cicling2003.pdf Docs/cicling2003.ps
 
+.ifndef (NOPORTDOCS)
 post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%DOCSDIR%%:${DOCSDIR}:g"
-
-.if defined(NOPORTDOCS)
-pre-patch:
-	@${REINPLACE_CMD} -e \
-	"s,'html',''," ${WRKSRC}/Makefile.PL
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+	@${ECHO_MSG} "===>   Installing documentation in ${DOCSDIR}"
 .endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
diff --git a/textproc/p5-Text-NSP/distinfo b/textproc/p5-Text-NSP/distinfo
index 0662ea28bd27..8ba732a4ee1e 100644
--- a/textproc/p5-Text-NSP/distinfo
+++ b/textproc/p5-Text-NSP/distinfo
@@ -1,3 +1,3 @@
-MD5 (Text-NSP-0.95.tar.gz) = cf8ca2db024e6b58f8f90e49ddb25ed8
-SHA256 (Text-NSP-0.95.tar.gz) = 63e812e01a40078dfee9119b8c63c8dc9fcf0cc35577f35caf195212a985f70f
-SIZE (Text-NSP-0.95.tar.gz) = 965073
+MD5 (Text-NSP-1.01.tar.gz) = 4772f7e2c6edaf1430bceceed441b35e
+SHA256 (Text-NSP-1.01.tar.gz) = 31dd562694f3f7c555102b3c34ad8f31f8ea9156af8ba6167df4282acecad64d
+SIZE (Text-NSP-1.01.tar.gz) = 959147
diff --git a/textproc/p5-Text-NSP/pkg-message b/textproc/p5-Text-NSP/pkg-message
deleted file mode 100644
index 2274df50edb7..000000000000
--- a/textproc/p5-Text-NSP/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-************************************************************
-All scripts have extensive command help and documentation 
-in %%DOCSDIR%%/.
-
-See %%DOCSDIR%%/pod/README.pod for an extensive description.
-
-************************************************************
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index d6334fdd26bc..77ee47ba046c 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -41,39 +41,16 @@ bin/statistic.pl
 %%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/pmi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/sort-bigrams.html
-%%PORTDOCS%%%%DOCSDIR%%/html/split-data.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/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%%/pod
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.pod
+%%PORTDOCS%%%%DOCSDIR%%/NSP-Class-diagram.pdf
+%%PORTDOCS%%%%DOCSDIR%%/NSP-Class-diagram.png
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.pod
+%%PORTDOCS%%%%DOCSDIR%%/Todo.pod
+%%PORTDOCS%%%%DOCSDIR%%/Usage.pod
+%%PORTDOCS%%%%DOCSDIR%%/cicling2003.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cicling2003.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text