Moved documentation from share/doc/html to share/doc/py-Scientific.

Bumped PKGREVISION.

2 files changed, 54 insertions, 56 deletions

diff --git a/math/py-Scientific-doc/Makefile b/math/py-Scientific-doc/Makefile
index 934aed65f92..fd58f1f840f 100644
--- a/math/py-Scientific-doc/Makefile
+++ b/math/py-Scientific-doc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/09/11 23:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.10 2016/07/24 20:44:51 rillig Exp $
 
 DISTNAME=	ScientificPython-2.4.5
 PKGNAME=	py-${DISTNAME:S/Python/-doc/}
+PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/ScientificPython/ \
 		http://dirac.cnrs-orleans.fr/programs/ScientificPython/
@@ -13,20 +14,17 @@ COMMENT=	Python modules for scientific computing
 CONFLICTS+=	py-Scientific-*
 
 NO_BUILD=	yes
-
 USE_TOOLS+=	pax
+AUTO_MKDIRS=	yes
 
 EGDIR=		${PREFIX}/share/examples/py-Scientific
 DOCDIR=		${PREFIX}/share/doc/py-Scientific
-HTMLDIR=	${PREFIX}/share/doc/html/py-Scientific
+HTMLDIR=	${PREFIX}/share/doc/py-Scientific/HTML
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README LICENSE 			\
 		Doc/PDF/manual.pdf ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
 	cd ${WRKSRC}/Doc/HTML && pax -rw -pp -pm . ${DESTDIR}${HTMLDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	cd ${WRKSRC}/Examples && pax -rw -pp -pm . ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific-doc/PLIST b/math/py-Scientific-doc/PLIST
index 0cbaaac7b0c..1b91b8cf6b5 100644
--- a/math/py-Scientific-doc/PLIST
+++ b/math/py-Scientific-doc/PLIST
@@ -1,53 +1,53 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:05:47 joerg Exp $
-share/doc/html/py-Scientific/Scientific.html
-share/doc/html/py-Scientific/Scientific_1.html
-share/doc/html/py-Scientific/Scientific_10.html
-share/doc/html/py-Scientific/Scientific_11.html
-share/doc/html/py-Scientific/Scientific_12.html
-share/doc/html/py-Scientific/Scientific_13.html
-share/doc/html/py-Scientific/Scientific_14.html
-share/doc/html/py-Scientific/Scientific_15.html
-share/doc/html/py-Scientific/Scientific_16.html
-share/doc/html/py-Scientific/Scientific_17.html
-share/doc/html/py-Scientific/Scientific_18.html
-share/doc/html/py-Scientific/Scientific_19.html
-share/doc/html/py-Scientific/Scientific_2.html
-share/doc/html/py-Scientific/Scientific_20.html
-share/doc/html/py-Scientific/Scientific_21.html
-share/doc/html/py-Scientific/Scientific_22.html
-share/doc/html/py-Scientific/Scientific_23.html
-share/doc/html/py-Scientific/Scientific_24.html
-share/doc/html/py-Scientific/Scientific_25.html
-share/doc/html/py-Scientific/Scientific_26.html
-share/doc/html/py-Scientific/Scientific_27.html
-share/doc/html/py-Scientific/Scientific_28.html
-share/doc/html/py-Scientific/Scientific_29.html
-share/doc/html/py-Scientific/Scientific_3.html
-share/doc/html/py-Scientific/Scientific_30.html
-share/doc/html/py-Scientific/Scientific_31.html
-share/doc/html/py-Scientific/Scientific_32.html
-share/doc/html/py-Scientific/Scientific_33.html
-share/doc/html/py-Scientific/Scientific_34.html
-share/doc/html/py-Scientific/Scientific_35.html
-share/doc/html/py-Scientific/Scientific_36.html
-share/doc/html/py-Scientific/Scientific_37.html
-share/doc/html/py-Scientific/Scientific_38.html
-share/doc/html/py-Scientific/Scientific_39.html
-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
+@comment $NetBSD: PLIST,v 1.4 2016/07/24 20:44:51 rillig Exp $
+share/doc/py-Scientific/HTML/Scientific.html
+share/doc/py-Scientific/HTML/Scientific_1.html
+share/doc/py-Scientific/HTML/Scientific_10.html
+share/doc/py-Scientific/HTML/Scientific_11.html
+share/doc/py-Scientific/HTML/Scientific_12.html
+share/doc/py-Scientific/HTML/Scientific_13.html
+share/doc/py-Scientific/HTML/Scientific_14.html
+share/doc/py-Scientific/HTML/Scientific_15.html
+share/doc/py-Scientific/HTML/Scientific_16.html
+share/doc/py-Scientific/HTML/Scientific_17.html
+share/doc/py-Scientific/HTML/Scientific_18.html
+share/doc/py-Scientific/HTML/Scientific_19.html
+share/doc/py-Scientific/HTML/Scientific_2.html
+share/doc/py-Scientific/HTML/Scientific_20.html
+share/doc/py-Scientific/HTML/Scientific_21.html
+share/doc/py-Scientific/HTML/Scientific_22.html
+share/doc/py-Scientific/HTML/Scientific_23.html
+share/doc/py-Scientific/HTML/Scientific_24.html
+share/doc/py-Scientific/HTML/Scientific_25.html
+share/doc/py-Scientific/HTML/Scientific_26.html
+share/doc/py-Scientific/HTML/Scientific_27.html
+share/doc/py-Scientific/HTML/Scientific_28.html
+share/doc/py-Scientific/HTML/Scientific_29.html
+share/doc/py-Scientific/HTML/Scientific_3.html
+share/doc/py-Scientific/HTML/Scientific_30.html
+share/doc/py-Scientific/HTML/Scientific_31.html
+share/doc/py-Scientific/HTML/Scientific_32.html
+share/doc/py-Scientific/HTML/Scientific_33.html
+share/doc/py-Scientific/HTML/Scientific_34.html
+share/doc/py-Scientific/HTML/Scientific_35.html
+share/doc/py-Scientific/HTML/Scientific_36.html
+share/doc/py-Scientific/HTML/Scientific_37.html
+share/doc/py-Scientific/HTML/Scientific_38.html
+share/doc/py-Scientific/HTML/Scientific_39.html
+share/doc/py-Scientific/HTML/Scientific_4.html
+share/doc/py-Scientific/HTML/Scientific_40.html
+share/doc/py-Scientific/HTML/Scientific_41.html
+share/doc/py-Scientific/HTML/Scientific_42.html
+share/doc/py-Scientific/HTML/Scientific_43.html
+share/doc/py-Scientific/HTML/Scientific_44.html
+share/doc/py-Scientific/HTML/Scientific_45.html
+share/doc/py-Scientific/HTML/Scientific_46.html
+share/doc/py-Scientific/HTML/Scientific_47.html
+share/doc/py-Scientific/HTML/Scientific_48.html
+share/doc/py-Scientific/HTML/Scientific_5.html
+share/doc/py-Scientific/HTML/Scientific_6.html
+share/doc/py-Scientific/HTML/Scientific_7.html
+share/doc/py-Scientific/HTML/Scientific_8.html
+share/doc/py-Scientific/HTML/Scientific_9.html
 share/doc/py-Scientific/LICENSE
 share/doc/py-Scientific/README
 share/doc/py-Scientific/manual.pdf