5 files changed, 86 insertions, 30 deletions

diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index 99a049c4120c..95e8d0539d8e 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	ncbi-toolkit
-PORTVERSION=	2000.10.31
-PORTREVISION=	1
+PORTVERSION=	2001.04.03
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
 DISTNAME=	ncbi
-DIST_SUBDIR=	ncbi
 
 MAINTAINER=	tony.maher@ebioinformatics.com
 
@@ -30,6 +28,9 @@ DUMMYMAKE=	Makefile
 PLATFORMDIR=	${WRKSRC}/platform
 BUILDSCRIPT=	${WRKSRC}/make/makedis.csh
 
+DOCDIR=		${PREFIX}/share/doc/${PORTNAME}
+CPIO=		cpio --quiet -pdum -R
+
 #
 # Thus ends the definitions
 #
@@ -44,4 +45,11 @@ pre-configure:
 	@${CP} ${FILESDIR}/freebsd.ncbi.mk ${PLATFORMDIR}
 	@${PERL} -pi.orig -e 's#NetBSD#FreeBSD#;'  -e 's#netbsd#freebsd#' ${BUILDSCRIPT}
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCDIR}
+	@ cd ${WRKSRC}/doc && find * | \
+	  ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/biology/ncbi-toolkit/distinfo b/biology/ncbi-toolkit/distinfo
index 75778c5e607c..fe1891b3fa06 100644
--- a/biology/ncbi-toolkit/distinfo
+++ b/biology/ncbi-toolkit/distinfo
@@ -1 +1 @@
-MD5 (ncbi/ncbi.tar.gz) = 7eed2d92ddd1cddd07dac5d881c21e4f
+MD5 (ncbi.tar.gz) = 7bbfecf047f4e43c4e7bc292865c3485
diff --git a/biology/ncbi-toolkit/pkg-comment b/biology/ncbi-toolkit/pkg-comment
index dd198645b6bc..f8b58e837a91 100644
--- a/biology/ncbi-toolkit/pkg-comment
+++ b/biology/ncbi-toolkit/pkg-comment
@@ -1 +1 @@
-National Center for Biotechnology Information (NCBI) Development Toolkit
+NCBI development toolkit, including BLAST 2.0 and GenBank/Entrez support
diff --git a/biology/ncbi-toolkit/pkg-descr b/biology/ncbi-toolkit/pkg-descr
index 5a683434f4cb..515d58ba056b 100644
--- a/biology/ncbi-toolkit/pkg-descr
+++ b/biology/ncbi-toolkit/pkg-descr
@@ -1,16 +1,20 @@
-"The NCBI Software Development Toolkit was developed for the production and
-distribution of GenBank, Entrez, BLAST, and related services by NCBI. We
-make it freely available to the public without restriction to facilitate the
-use of NCBI by the scientific community. However, please understand that
-while we feel we have done a high quality job, this is not commercial
-software.
-The documentation lags considerably behind the software and we must make any
-changes required by our data production needs. Nontheless, many people have
-found it a useful and stable basis for a number of tools and applications.
+The NCBI (National Center for Biotechnology Information) development toolkit,
+containing various libraries needed by NCBI applications, as well as a
+software suite containing, amongst other things, NCBI BLAST 2.0.
 
-The toolkit is available by anonymous ftp from ncbi.nlm.nih.gov"
+From the README:
 
-excerpt from NCBI toolkit README file.
+  The NCBI Software Development Toolkit was developed for the production and
+  distribution of GenBank, Entrez, BLAST, and related services by NCBI. We
+  make it freely available to the public without restriction to facilitate
+  the use of NCBI by the scientific community. However, please understand
+  that while we feel we have done a high quality job, this is not commercial
+  software.
+
+  The documentation lags considerably behind the software and we must make
+  any changes required by our data production needs. Nontheless, many people
+  have found it a useful and stable basis for a number of tools and
+  applications.
 
 -- Tony Maher <tony.maher@ebioinformatics.com>
    FreeBSD bio-porters <bio@freebsd.net>
diff --git a/biology/ncbi-toolkit/pkg-plist b/biology/ncbi-toolkit/pkg-plist
index b03c4c7f0261..0ad0ea5b0419 100644
--- a/biology/ncbi-toolkit/pkg-plist
+++ b/biology/ncbi-toolkit/pkg-plist
@@ -1,3 +1,45 @@
+%%PORTDOCS%%share/doc/ncbi-toolkit/FAQ.txt
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.asn2xml
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.bcl
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.bls
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.formatdb
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.imp
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.mbl
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.nbl
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.pbl
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.rps
+%%PORTDOCS%%share/doc/ncbi-toolkit/README.sdk
+%%PORTDOCS%%share/doc/ncbi-toolkit/fa2htgs/README
+%%PORTDOCS%%share/doc/ncbi-toolkit/fa2htgs/updateHtgsDoc
+%%PORTDOCS%%share/doc/ncbi-toolkit/firedialog.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/firewall.html
+%%PORTDOCS%%share/doc/ncbi-toolkit/firewall.txt
+%%PORTDOCS%%share/doc/ncbi-toolkit/fwd_check.sh
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/ncbi_sequin.css
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn01.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn02.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn03.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn04.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn05.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn06.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn07.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn08.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn09.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn10.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn11.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn12.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn13.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn14.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn15.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn16.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn17.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn18.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn19.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn20.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/images/seqn21.gif
+%%PORTDOCS%%share/doc/ncbi-toolkit/ncbixml.txt
+%%PORTDOCS%%share/doc/ncbi-toolkit/sdk.doc
+%%PORTDOCS%%share/doc/ncbi-toolkit/sequin.htm
 bin/Nentrez
 bin/Psequin
 bin/asn2fast
@@ -45,24 +87,26 @@ bin/testval
 bin/udv
 bin/vecscreen
 lib/ncbi/libncbi.a
-lib/ncbi/libncbicdr.a
-lib/ncbi/libncbimla.a
-lib/ncbi/libncbitxc2.a
-lib/ncbi/libnetentr.a
 lib/ncbi/libncbiCacc.a
-lib/ncbi/libncbicn3d.a
-lib/ncbi/libncbimmdb.a
-lib/ncbi/libnetblast.a
-lib/ncbi/libvibgif.a
 lib/ncbi/libncbiNacc.a
-lib/ncbi/libncbidesk.a
-lib/ncbi/libncbiobj.a
-lib/ncbi/libnetcli.a
-lib/ncbi/libvibnet.a
 lib/ncbi/libncbiacc.a
+lib/ncbi/libncbicdr.a
+lib/ncbi/libncbicn3d.a
+lib/ncbi/libncbidesk.a
 lib/ncbi/libncbiid1.a
+lib/ncbi/libncbimla.a
+lib/ncbi/libncbimmdb.a
+lib/ncbi/libncbiobj.a
 lib/ncbi/libncbitool.a
+lib/ncbi/libncbitxc2.a
+lib/ncbi/libnetblast.a
+lib/ncbi/libnetcli.a
 lib/ncbi/libnetcli_.a
+lib/ncbi/libnetentr.a
+lib/ncbi/libvibgif.a
+lib/ncbi/libvibnet.a
 lib/ncbi/libvibrant.a
-@unexec rmdir %D/lib/ncbi
-@unexec rm -rf %D/include/ncbi
+@dirrm lib/ncbi
+%%PORTDOCS%%@dirrm share/doc/ncbi-toolkit/images
+%%PORTDOCS%%@dirrm share/doc/ncbi-toolkit/fa2htgs
+%%PORTDOCS%%@dirrm share/doc/ncbi-toolkit