4 files changed, 41 insertions, 18 deletions

diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 2b7f2caf4190..c3df302584cc 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -8,11 +8,16 @@
 PORTNAME=	psi3
 PORTVERSION=	3.2.0
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	maho/psi3
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://www.psicode.org/doc/:doc
 #		http://www.psicode.org/downloads.php
+MASTER_SITE_SUBDIR=	maho/psi3
 DISTNAME=	psi-${PORTVERSION}
 EXTRACT_SUFX=   .tar.bz2
+.if !defined(NOPORTDOCS)
+DISTFILES+=     ${DISTNAME}${EXTRACT_SUFX} installation.pdf:doc userman.pdf:doc progman.pdf:doc
+.endif
+DIST_SUBDIR=	psi3
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	An electronic structure programs for high-accuracy computations
@@ -73,6 +78,9 @@ do-install:
 	@${TAR} cf - -C ${WRKSRC}/tmpdoc/man .  | ${TAR} xf - -C ${PREFIX}/man
 	@${TAR} cf - -C ${WRKSRC}/tmpdoc/html . | ${TAR} xf - -C ${PREFIX}/share/doc/psi3
 	@${TAR} cf - -C ${WRKSRC}/tmpdoc/txt  . | ${TAR} xf - -C ${PREFIX}/share/doc/psi3
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/installation.pdf ${DOCSDIR}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/userman.pdf ${DOCSDIR}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/progman.pdf ${DOCSDIR}
 .endif
 	@${MKDIR} ${PREFIX}/share/examples/psi3
 	@${TAR} cf - -C ${WRKSRC}/tests .       | ${TAR} xf - -C ${PREFIX}/share/examples/psi3
diff --git a/science/psi3/distinfo b/science/psi3/distinfo
index 11e3804c695d..18cc797bdf7e 100644
--- a/science/psi3/distinfo
+++ b/science/psi3/distinfo
@@ -1,2 +1,8 @@
-MD5 (psi-3.2.0.tar.bz2) = 76a495bc8e7bb6b70cb80440800ddc6d
-SIZE (psi-3.2.0.tar.bz2) = 2052847
+MD5 (psi3/psi-3.2.0.tar.bz2) = 76a495bc8e7bb6b70cb80440800ddc6d
+SIZE (psi3/psi-3.2.0.tar.bz2) = 2052847
+MD5 (psi3/installation.pdf) = 8e2096909c6552db9469d99ede0fe3fd
+SIZE (psi3/installation.pdf) = 115048
+MD5 (psi3/userman.pdf) = c824b4108c861aaf62bb622e0d24aabd
+SIZE (psi3/userman.pdf) = 339661
+MD5 (psi3/progman.pdf) = d4cec41084fe3dd1161b8ce3215cc9f4
+SIZE (psi3/progman.pdf) = 397232
diff --git a/science/psi3/pkg-message b/science/psi3/pkg-message
new file mode 100644
index 000000000000..6964ca9df8fe
--- /dev/null
+++ b/science/psi3/pkg-message
@@ -0,0 +1,6 @@
+The following citation should be used in any publication
+utilizing the PSI3 program package:
+
+"T. Daniel Crawford, C. David Sherrill, Edward F. Valeev, Justin T. Fermann,
+Rollin A. King, Matthew L. Leininger, Shawn T. Brown, Curtis L. Janssen,
+Edward T. Seidl, Joseph P. Kenny, and Wesley D. Allen, PSI 3.2, 2003."
diff --git a/science/psi3/pkg-plist b/science/psi3/pkg-plist
index 19d2d058f0d0..774a515af3d9 100644
--- a/science/psi3/pkg-plist
+++ b/science/psi3/pkg-plist
@@ -99,21 +99,24 @@ lib/libPSI_r12.a
 @dirrm include/libbasis
 %%PORTDOCS%%share/psi3/pbasis.dat
 %%PORTDOCS%%share/psi3/psi.dat
-%%PORTDOCS%%share/doc/psi3/libpsio.html
-%%PORTDOCS%%share/doc/psi3/libdpd.html
-%%PORTDOCS%%share/doc/psi3/cints.html
-%%PORTDOCS%%share/doc/psi3/CINTS/commandline.html
-%%PORTDOCS%%share/doc/psi3/CINTS/compile.html
-%%PORTDOCS%%share/doc/psi3/CINTS/description.html
-%%PORTDOCS%%share/doc/psi3/CINTS/examples.html
-%%PORTDOCS%%share/doc/psi3/CINTS/home.html
-%%PORTDOCS%%share/doc/psi3/CINTS/keywords.html
-%%PORTDOCS%%share/doc/psi3/CINTS/references.html
-%%PORTDOCS%%share/doc/psi3/CINTS/toc.html
-%%PORTDOCS%%share/doc/psi3/libqt.txt
-%%PORTDOCS%%share/doc/psi3/libiwl.txt
+%%PORTDOCS%%%%DOCSDIR%%/libpsio.html
+%%PORTDOCS%%%%DOCSDIR%%/libdpd.html
+%%PORTDOCS%%%%DOCSDIR%%/cints.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/commandline.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/compile.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/description.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/home.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/keywords.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/references.html
+%%PORTDOCS%%%%DOCSDIR%%/CINTS/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/libqt.txt
+%%PORTDOCS%%%%DOCSDIR%%/libiwl.txt
+%%PORTDOCS%%%%DOCSDIR%%/installation.pdf
+%%PORTDOCS%%%%DOCSDIR%%/userman.pdf
+%%PORTDOCS%%%%DOCSDIR%%/progman.pdf
 %%PORTDOCS%%@dirrm share/doc/psi3/CINTS
-%%PORTDOCS%%@dirrm share/doc/psi3
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/MakeRules.in
 %%EXAMPLESDIR%%/INDEX
 %%EXAMPLESDIR%%/Basis_Tests/Benchmarks