Use subdirectories for the library files.

2 files changed, 97 insertions, 91 deletions

diff --git a/math/pygist/Makefile b/math/pygist/Makefile
index 34c9b6c92266..4dbb55f153b3 100644
--- a/math/pygist/Makefile
+++ b/math/pygist/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/09/01 07:05:05 tg Exp $
+# $Id: Makefile,v 1.7 1998/11/02 08:45:27 tg Exp $
 #
 
 DISTNAME=	LLNLPython6
@@ -16,11 +16,11 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${PREFIX}/lib/yorick/1.4/lib/libgist.a:${PORTSDIR}/lang/yorick \
-		${SITEPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
-		${SITEPYDIR}/Ranf.py:${PORTSDIR}/math/rng
+		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
+		${RNGDIR}/Ranf.py:${PORTSDIR}/math/rng
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${SITEPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
-		${SITEPYDIR}/Ranf.py:${PORTSDIR}/math/rng
+		${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy \
+		${RNGDIR}/Ranf.py:${PORTSDIR}/math/rng
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Graphics
 CONFIGURE_ENV=	PREFIX=${PREFIX}
@@ -28,15 +28,19 @@ ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-SITEPYDIR=	${PYTHONSCRIPTDIR}/site-packages
+GISTDIR=	${PYTHONSCRIPTDIR}/site-packages/PyGist
+NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/NumPy
+RNGDIR=		${PYTHONSCRIPTDIR}/site-packages/RNG
 EXAMPLEDIR=	${PREFIX}/share/examples/PyGist
 
 do-configure:
 	@(cd ${WRKSRC} && ${CONFIGURE_ENV} python makethis.py)
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/*/Lib/* ${SITEPYDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${SITEPYDIR}
+	@${MKDIR} ${GISTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*/Lib/* ${GISTDIR}
+	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${GISTDIR}
+	@${ECHO} "PyGist" > ${GISTDIR}/../PyGist.pth
 	${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/*/Demo/* ${EXAMPLEDIR}
 
diff --git a/math/pygist/pkg-plist b/math/pygist/pkg-plist
index 04c18e9f6cb3..a0e579fc45c3 100644
--- a/math/pygist/pkg-plist
+++ b/math/pygist/pkg-plist
@@ -1,88 +1,90 @@
-lib/python1.5/site-packages/GistPlotter.py
-lib/python1.5/site-packages/GistPlotter.pyc
-lib/python1.5/site-packages/GistPlotter.pyo
-lib/python1.5/site-packages/NarPlotter.py
-lib/python1.5/site-packages/NarPlotter.pyc
-lib/python1.5/site-packages/NarPlotter.pyo
-lib/python1.5/site-packages/animation2d.py
-lib/python1.5/site-packages/animation2d.pyc
-lib/python1.5/site-packages/animation2d.pyo
+lib/python1.5/site-packages/PyGist/GistPlotter.py
+lib/python1.5/site-packages/PyGist/GistPlotter.pyc
+lib/python1.5/site-packages/PyGist/GistPlotter.pyo
+lib/python1.5/site-packages/PyGist/NarPlotter.py
+lib/python1.5/site-packages/PyGist/NarPlotter.pyc
+lib/python1.5/site-packages/PyGist/NarPlotter.pyo
+lib/python1.5/site-packages/PyGist/animation2d.py
+lib/python1.5/site-packages/PyGist/animation2d.pyc
+lib/python1.5/site-packages/PyGist/animation2d.pyo
+lib/python1.5/site-packages/PyGist/cellarray.py
+lib/python1.5/site-packages/PyGist/cellarray.pyc
+lib/python1.5/site-packages/PyGist/cellarray.pyo
+lib/python1.5/site-packages/PyGist/colorbar.py
+lib/python1.5/site-packages/PyGist/colorbar.pyc
+lib/python1.5/site-packages/PyGist/colorbar.pyo
+lib/python1.5/site-packages/PyGist/curve.py
+lib/python1.5/site-packages/PyGist/curve.pyc
+lib/python1.5/site-packages/PyGist/curve.pyo
+lib/python1.5/site-packages/PyGist/ezplot.py
+lib/python1.5/site-packages/PyGist/ezplot.pyc
+lib/python1.5/site-packages/PyGist/ezplot.pyo
+lib/python1.5/site-packages/PyGist/gist.help
+lib/python1.5/site-packages/PyGist/gist.py
+lib/python1.5/site-packages/PyGist/gist.pyc
+lib/python1.5/site-packages/PyGist/gist.pyo
+lib/python1.5/site-packages/PyGist/gist3dhelp.py
+lib/python1.5/site-packages/PyGist/gist3dhelp.pyc
+lib/python1.5/site-packages/PyGist/gist3dhelp.pyo
+lib/python1.5/site-packages/PyGist/graftypes.py
+lib/python1.5/site-packages/PyGist/graftypes.pyc
+lib/python1.5/site-packages/PyGist/graftypes.pyo
+lib/python1.5/site-packages/PyGist/graph.py
+lib/python1.5/site-packages/PyGist/graph.pyc
+lib/python1.5/site-packages/PyGist/graph.pyo
+lib/python1.5/site-packages/PyGist/graph2d.py
+lib/python1.5/site-packages/PyGist/graph2d.pyc
+lib/python1.5/site-packages/PyGist/graph2d.pyo
+lib/python1.5/site-packages/PyGist/graph3d.py
+lib/python1.5/site-packages/PyGist/graph3d.pyc
+lib/python1.5/site-packages/PyGist/graph3d.pyo
+lib/python1.5/site-packages/PyGist/help.help
+lib/python1.5/site-packages/PyGist/help.py
+lib/python1.5/site-packages/PyGist/help.pyc
+lib/python1.5/site-packages/PyGist/help.pyo
+lib/python1.5/site-packages/PyGist/lines.py
+lib/python1.5/site-packages/PyGist/lines.pyc
+lib/python1.5/site-packages/PyGist/lines.pyo
+lib/python1.5/site-packages/PyGist/mesh3d.py
+lib/python1.5/site-packages/PyGist/mesh3d.pyc
+lib/python1.5/site-packages/PyGist/mesh3d.pyo
+lib/python1.5/site-packages/PyGist/movie.py
+lib/python1.5/site-packages/PyGist/movie.pyc
+lib/python1.5/site-packages/PyGist/movie.pyo
+lib/python1.5/site-packages/PyGist/pl3d.py
+lib/python1.5/site-packages/PyGist/pl3d.pyc
+lib/python1.5/site-packages/PyGist/pl3d.pyo
+lib/python1.5/site-packages/PyGist/plane.py
+lib/python1.5/site-packages/PyGist/plane.pyc
+lib/python1.5/site-packages/PyGist/plane.pyo
+lib/python1.5/site-packages/PyGist/plwf.py
+lib/python1.5/site-packages/PyGist/plwf.pyc
+lib/python1.5/site-packages/PyGist/plwf.pyo
+lib/python1.5/site-packages/PyGist/polymap.py
+lib/python1.5/site-packages/PyGist/polymap.pyc
+lib/python1.5/site-packages/PyGist/polymap.pyo
+lib/python1.5/site-packages/PyGist/quadmesh.py
+lib/python1.5/site-packages/PyGist/quadmesh.pyc
+lib/python1.5/site-packages/PyGist/quadmesh.pyo
+lib/python1.5/site-packages/PyGist/region.py
+lib/python1.5/site-packages/PyGist/region.pyc
+lib/python1.5/site-packages/PyGist/region.pyo
+lib/python1.5/site-packages/PyGist/shapetest.py
+lib/python1.5/site-packages/PyGist/shapetest.pyc
+lib/python1.5/site-packages/PyGist/shapetest.pyo
+lib/python1.5/site-packages/PyGist/slice3.py
+lib/python1.5/site-packages/PyGist/slice3.pyc
+lib/python1.5/site-packages/PyGist/slice3.pyo
+lib/python1.5/site-packages/PyGist/surface.py
+lib/python1.5/site-packages/PyGist/surface.pyc
+lib/python1.5/site-packages/PyGist/surface.pyo
+lib/python1.5/site-packages/PyGist/yorick.py
+lib/python1.5/site-packages/PyGist/yorick.pyc
+lib/python1.5/site-packages/PyGist/yorick.pyo
+@dirrm lib/python1.5/site-packages/PyGist
+lib/python1.5/site-packages/PyGist.pth
 lib/python1.5/site-packages/arrayfnsmodule.so
-lib/python1.5/site-packages/cellarray.py
-lib/python1.5/site-packages/cellarray.pyc
-lib/python1.5/site-packages/cellarray.pyo
-lib/python1.5/site-packages/colorbar.py
-lib/python1.5/site-packages/colorbar.pyc
-lib/python1.5/site-packages/colorbar.pyo
-lib/python1.5/site-packages/curve.py
-lib/python1.5/site-packages/curve.pyc
-lib/python1.5/site-packages/curve.pyo
-lib/python1.5/site-packages/ezplot.py
-lib/python1.5/site-packages/ezplot.pyc
-lib/python1.5/site-packages/ezplot.pyo
-lib/python1.5/site-packages/gist.help
-lib/python1.5/site-packages/gist.py
-lib/python1.5/site-packages/gist.pyc
-lib/python1.5/site-packages/gist.pyo
-lib/python1.5/site-packages/gist3dhelp.py
-lib/python1.5/site-packages/gist3dhelp.pyc
-lib/python1.5/site-packages/gist3dhelp.pyo
 lib/python1.5/site-packages/gistCmodule.so
-lib/python1.5/site-packages/graftypes.py
-lib/python1.5/site-packages/graftypes.pyc
-lib/python1.5/site-packages/graftypes.pyo
-lib/python1.5/site-packages/graph.py
-lib/python1.5/site-packages/graph.pyc
-lib/python1.5/site-packages/graph.pyo
-lib/python1.5/site-packages/graph2d.py
-lib/python1.5/site-packages/graph2d.pyc
-lib/python1.5/site-packages/graph2d.pyo
-lib/python1.5/site-packages/graph3d.py
-lib/python1.5/site-packages/graph3d.pyc
-lib/python1.5/site-packages/graph3d.pyo
-lib/python1.5/site-packages/help.help
-lib/python1.5/site-packages/help.py
-lib/python1.5/site-packages/help.pyc
-lib/python1.5/site-packages/help.pyo
-lib/python1.5/site-packages/lines.py
-lib/python1.5/site-packages/lines.pyc
-lib/python1.5/site-packages/lines.pyo
-lib/python1.5/site-packages/mesh3d.py
-lib/python1.5/site-packages/mesh3d.pyc
-lib/python1.5/site-packages/mesh3d.pyo
-lib/python1.5/site-packages/movie.py
-lib/python1.5/site-packages/movie.pyc
-lib/python1.5/site-packages/movie.pyo
-lib/python1.5/site-packages/pl3d.py
-lib/python1.5/site-packages/pl3d.pyc
-lib/python1.5/site-packages/pl3d.pyo
-lib/python1.5/site-packages/plane.py
-lib/python1.5/site-packages/plane.pyc
-lib/python1.5/site-packages/plane.pyo
-lib/python1.5/site-packages/plwf.py
-lib/python1.5/site-packages/plwf.pyc
-lib/python1.5/site-packages/plwf.pyo
-lib/python1.5/site-packages/polymap.py
-lib/python1.5/site-packages/polymap.pyc
-lib/python1.5/site-packages/polymap.pyo
-lib/python1.5/site-packages/quadmesh.py
-lib/python1.5/site-packages/quadmesh.pyc
-lib/python1.5/site-packages/quadmesh.pyo
-lib/python1.5/site-packages/region.py
-lib/python1.5/site-packages/region.pyc
-lib/python1.5/site-packages/region.pyo
-lib/python1.5/site-packages/shapetest.py
-lib/python1.5/site-packages/shapetest.pyc
-lib/python1.5/site-packages/shapetest.pyo
-lib/python1.5/site-packages/slice3.py
-lib/python1.5/site-packages/slice3.pyc
-lib/python1.5/site-packages/slice3.pyo
-lib/python1.5/site-packages/surface.py
-lib/python1.5/site-packages/surface.pyc
-lib/python1.5/site-packages/surface.pyo
-lib/python1.5/site-packages/yorick.py
-lib/python1.5/site-packages/yorick.pyc
-lib/python1.5/site-packages/yorick.pyo
 share/examples/PyGist/berts.py
 share/examples/PyGist/berts.pyc
 share/examples/PyGist/bills.py