- Upgrade to 1.2.5;

- Use DOCSDIR;

- Don't extract the doc tarball on the spot to avoid conflict if doxygen
  is installed.

Notified by:	Pedro F. Giffuni <giffunip (at) yahoo.com>

3 files changed, 42 insertions, 42 deletions

diff --git a/math/jama/Makefile b/math/jama/Makefile
index 99511ebd88ca..7c651e0a9708 100644
--- a/math/jama/Makefile
+++ b/math/jama/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jama
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	math devel
 MASTER_SITES=	http://math.nist.gov/tnt/
-DISTNAME=	${PORTNAME}124src
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 .ifndef NOPORTDOCS
 DISTFILES=${DISTNAME}${EXTRACT_SUFX} jama102doc.zip
 .endif
@@ -31,10 +31,10 @@ do-install:
 	${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
 		-d ${PREFIX}/include/tnt
 .ifndef NOPORTDOCS
-	${MKDIR} ${PREFIX}/share/doc
-	${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/jama102doc \
-		-d ${PREFIX}/share/doc
-	${MV} ${PREFIX}/share/doc/doxygen ${DOCSDIR}
+	${MKDIR} ${WRKDIR}/doc ${DOCSDIR}
+	${EXTRACT_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/jama102doc \
+		-d ${WRKDIR}/doc
+	(cd ${WRKDIR}/doc/doxygen && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/jama/distinfo b/math/jama/distinfo
index fd51cd946a9b..f89931028ff9 100644
--- a/math/jama/distinfo
+++ b/math/jama/distinfo
@@ -1,6 +1,6 @@
-MD5 (tnt/jama124src.zip) = b752ba3cc513a09e30d9e2a3686dc4c2
-SHA256 (tnt/jama124src.zip) = 1a43760d08957ca356e7505a031b841a8b48d7327a4f92c567e44869eb73a86c
-SIZE (tnt/jama124src.zip) = 16272
+MD5 (tnt/jama125.zip) = 7a5acf6031cf35a6bb15a0fe1f70ed34
+SHA256 (tnt/jama125.zip) = 7432bf51d7101f63d5880421f940f64cea124f1460ff2fcfb6226e6744d1360c
+SIZE (tnt/jama125.zip) = 16277
 MD5 (tnt/jama102doc.zip) = ddb94fdb217fbda0275c60872c08b545
 SHA256 (tnt/jama102doc.zip) = 0175a981cba82b316f17e1066e605a1bc6aa2840edf70b5e1a06305f16e5f7e3
 SIZE (tnt/jama102doc.zip) = 61085
diff --git a/math/jama/pkg-plist b/math/jama/pkg-plist
index 53d4220a104b..f967b05c7e3c 100644
--- a/math/jama/pkg-plist
+++ b/math/jama/pkg-plist
@@ -3,36 +3,36 @@ include/tnt/jama_eig.h
 include/tnt/jama_lu.h
 include/tnt/jama_qr.h
 include/tnt/jama_svd.h
-%%PORTDOCS%%share/doc/jama/html/annotated.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__Cholesky-members.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__Cholesky.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__Eigenvalue-members.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__Eigenvalue.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__LU-members.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__LU.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__QR-members.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__QR.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__SVD-members.html
-%%PORTDOCS%%share/doc/jama/html/class_JAMA__SVD.html
-%%PORTDOCS%%share/doc/jama/html/doxygen.css
-%%PORTDOCS%%share/doc/jama/html/doxygen.gif
-%%PORTDOCS%%share/doc/jama/html/files.html
-%%PORTDOCS%%share/doc/jama/html/functions.html
-%%PORTDOCS%%share/doc/jama/html/index.html
-%%PORTDOCS%%share/doc/jama/html/jama_cholesky_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_cholesky_h.html
-%%PORTDOCS%%share/doc/jama/html/jama_cholesky_old_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_cholesky_old_h.html
-%%PORTDOCS%%share/doc/jama/html/jama_eig_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_eig_h.html
-%%PORTDOCS%%share/doc/jama/html/jama_lu_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_lu_h.html
-%%PORTDOCS%%share/doc/jama/html/jama_qr_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_qr_h.html
-%%PORTDOCS%%share/doc/jama/html/jama_svd_h-source.html
-%%PORTDOCS%%share/doc/jama/html/jama_svd_h.html
-%%PORTDOCS%%share/doc/jama/html/namespace_JAMA.html
-%%PORTDOCS%%share/doc/jama/html/namespace_TNT.html
-%%PORTDOCS%%share/doc/jama/html/namespaces.html
-%%PORTDOCS%%@dirrm share/doc/jama/html/
-%%PORTDOCS%%@dirrm share/doc/jama/
+%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__Cholesky-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__Cholesky.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__Eigenvalue-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__Eigenvalue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__LU-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__LU.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__QR-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__QR.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__SVD-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/class_JAMA__SVD.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_cholesky_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_cholesky_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_cholesky_old_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_cholesky_old_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_eig_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_eig_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_lu_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_lu_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_qr_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_qr_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_svd_h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jama_svd_h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespace_JAMA.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespace_TNT.html
+%%PORTDOCS%%%%DOCSDIR%%/html/namespaces.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/