sync with py-Scientific 2.4.5 update

3 files changed, 33 insertions, 19 deletions

diff --git a/math/py-Scientific-doc/Makefile b/math/py-Scientific-doc/Makefile
index 5f0b8bac32e..90a6e8d7829 100644
--- a/math/py-Scientific-doc/Makefile
+++ b/math/py-Scientific-doc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:48:03 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/18 23:58:36 recht Exp $
 
-DISTNAME=	ScientificPython-2.2
-PKGNAME=	py-Scientific-doc-2.2
+DISTNAME=	ScientificPython-2.4.5
+PKGNAME=	py-${DISTNAME:S/Python/-doc/}
 CATEGORIES=	math
-MASTER_SITES=	http://starship.python.net/crew/hinsen/ \
-		http://dirac.cnrs-orleans.fr/programs/
+MASTER_SITES=	http://starship.python.net/crew/hinsen/ScientificPython/ \
+		http://dirac.cnrs-orleans.fr/programs/ScientificPython/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/crew/hinsen/scientific.html
@@ -14,15 +14,17 @@ CONFLICTS+=	py-Scientific-*
 
 NO_BUILD=	yes
 
+EGDIR=		${PREFIX}/share/examples/py-Scientific
+DOCDIR=		${PREFIX}/share/doc/py-Scientific
+HTMLDIR=	${PREFIX}/share/doc/html/py-Scientific
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-Scientific
-	cd ${WRKSRC} && ${INSTALL_DATA} README COPYRIGHT 		\
-		Doc/PDF/manual.pdf ${PREFIX}/share/doc/py-Scientific/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/py-Scientific
-	${INSTALL_DATA} ${WRKSRC}/Doc/HTML/* 				\
-	${PREFIX}/share/doc/html/py-Scientific/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-Scientific
-	${INSTALL_DATA} ${WRKSRC}/Examples/* 				\
-	${PREFIX}/share/examples/py-Scientific/
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README LICENSE 			\
+		Doc/PDF/manual.pdf ${DOCDIR}
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	cd ${WRKSRC}/Doc/HTML && ${PAX} -rw -pp -pm . ${HTMLDIR}
+	${INSTALL_DATA_DIR} ${EGDIR}
+	cd ${WRKSRC}/Examples && ${PAX} -rw -pp -pm . ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific-doc/PLIST b/math/py-Scientific-doc/PLIST
index a0fc46b9698..5b015740967 100644
--- a/math/py-Scientific-doc/PLIST
+++ b/math/py-Scientific-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/17 12:00:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/18 23:58:36 recht Exp $
 share/doc/html/py-Scientific/Scientific.html
 share/doc/html/py-Scientific/Scientific_1.html
 share/doc/html/py-Scientific/Scientific_10.html
@@ -37,20 +37,32 @@ share/doc/html/py-Scientific/Scientific_4.html
 share/doc/html/py-Scientific/Scientific_40.html
 share/doc/html/py-Scientific/Scientific_41.html
 share/doc/html/py-Scientific/Scientific_42.html
+share/doc/html/py-Scientific/Scientific_43.html
+share/doc/html/py-Scientific/Scientific_44.html
+share/doc/html/py-Scientific/Scientific_45.html
+share/doc/html/py-Scientific/Scientific_46.html
+share/doc/html/py-Scientific/Scientific_47.html
+share/doc/html/py-Scientific/Scientific_48.html
 share/doc/html/py-Scientific/Scientific_5.html
 share/doc/html/py-Scientific/Scientific_6.html
 share/doc/html/py-Scientific/Scientific_7.html
 share/doc/html/py-Scientific/Scientific_8.html
 share/doc/html/py-Scientific/Scientific_9.html
-share/doc/py-Scientific/COPYRIGHT
+share/doc/py-Scientific/LICENSE
 share/doc/py-Scientific/README
 share/doc/py-Scientific/manual.pdf
+share/examples/py-Scientific/BSP/example1.py
+share/examples/py-Scientific/BSP/example1_array.py
+share/examples/py-Scientific/BSP/example2.py
+share/examples/py-Scientific/BSP/example3.py
+share/examples/py-Scientific/BSP/example4.py
 share/examples/py-Scientific/README
 share/examples/py-Scientific/Setup.template
 share/examples/py-Scientific/compile.py
 share/examples/py-Scientific/demomodule.c
 share/examples/py-Scientific/mpi.py
 share/examples/py-Scientific/netcdf_demo.py
+@dirrm share/examples/py-Scientific/BSP
 @dirrm share/examples/py-Scientific
 @dirrm share/doc/py-Scientific
 @dirrm share/doc/html/py-Scientific
diff --git a/math/py-Scientific-doc/distinfo b/math/py-Scientific-doc/distinfo
index 58682efc488..2928f84600a 100644
--- a/math/py-Scientific-doc/distinfo
+++ b/math/py-Scientific-doc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/17 12:00:11 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/01/18 23:58:36 recht Exp $
 
-SHA1 (ScientificPython-2.2.tar.gz) = f1fcf1ef1a54a1fd84b1e5df569dac13a1648225
-Size (ScientificPython-2.2.tar.gz) = 335561 bytes
+SHA1 (ScientificPython-2.4.5.tar.gz) = 452b04a20dd065fd9ea01092ae2e1e726406d2be
+Size (ScientificPython-2.4.5.tar.gz) = 487379 bytes