4 files changed, 92 insertions, 16 deletions

diff --git a/astro/pyephem/Makefile b/astro/pyephem/Makefile
index 664e3e125526..b09a7cca52e7 100644
--- a/astro/pyephem/Makefile
+++ b/astro/pyephem/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	pyephem
-PORTVERSION=	3.7b
+PORTVERSION=	3.7.3.1
+PORTEPOCH=	1
 CATEGORIES=	astro math hamradio
-MASTER_SITES=	http://rhodesmill.org/brandon/projects/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+MASTER_SITES=	${MASTER_SITE_CHEESESHOP:S"%SUBDIR%"source/p/pyephem"} \
+		${MASTER_SITE_LOCAL:S"%SUBDIR%"db"}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Scientific-grade astronomical computations for Python
@@ -18,10 +18,4 @@ COMMENT=	Scientific-grade astronomical computations for Python
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 
-post-install:
-.if     !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/pyephem-manual.html ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/astro/pyephem/distinfo b/astro/pyephem/distinfo
index 7424215f5f03..2173caf0c371 100644
--- a/astro/pyephem/distinfo
+++ b/astro/pyephem/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyephem-3.7b.tar.gz) = 08ddcadfef79b6020d593b7665b4c3fa
-SHA256 (pyephem-3.7b.tar.gz) = f310597a3da24cf6799f233cf88914ae5d4ddb2dc8ed6e47cbf95a39fa0e9634
-SIZE (pyephem-3.7b.tar.gz) = 299901
+MD5 (pyephem-3.7.3.1.tar.gz) = c49b5b0973d172526c70e196cf382565
+SHA256 (pyephem-3.7.3.1.tar.gz) = f506f4cf997dc3fbd26770ecebbaf522267b8e3d95468f960d6b4d382b446f04
+SIZE (pyephem-3.7.3.1.tar.gz) = 699817
diff --git a/astro/pyephem/files/patch-setup.py b/astro/pyephem/files/patch-setup.py
new file mode 100644
index 000000000000..0e2179073326
--- /dev/null
+++ b/astro/pyephem/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2008-07-04 17:26:06.000000000 -0400
++++ setup.py	2008-07-04 17:26:18.000000000 -0400
+@@ -1,7 +1,4 @@
+-try:
+-    from setuptools import setup, Extension
+-except:
+-    from distutils.core import setup, Extension
++from distutils.core import setup, Extension
+ 
+ import os
+ from glob import glob
diff --git a/astro/pyephem/pkg-plist b/astro/pyephem/pkg-plist
index 0137b936b11f..5b9918701012 100644
--- a/astro/pyephem/pkg-plist
+++ b/astro/pyephem/pkg-plist
@@ -1,3 +1,74 @@
-%%PYTHON_SITELIBDIR%%/ephem.so
-%%PORTDOCS%%%%DOCSDIR%%/pyephem-manual.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PYTHON_SITELIBDIR%%/ephem/__init__.py
+%%PYTHON_SITELIBDIR%%/ephem/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ephem/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ephem/_libastro.so
+%%PYTHON_SITELIBDIR%%/ephem/cities.py
+%%PYTHON_SITELIBDIR%%/ephem/cities.pyc
+%%PYTHON_SITELIBDIR%%/ephem/cities.pyo
+%%PYTHON_SITELIBDIR%%/ephem/stars.py
+%%PYTHON_SITELIBDIR%%/ephem/stars.pyc
+%%PYTHON_SITELIBDIR%%/ephem/stars.pyo
+%%PYTHON_SITELIBDIR%%/ephem/doc/CHANGELOG.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/angle.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/catalogs.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/coordinates.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/date.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/examples.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/faq.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/index.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/newton.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/quick.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/radec.rst
+%%PYTHON_SITELIBDIR%%/ephem/doc/tutorial.rst
+%%PYTHON_SITELIBDIR%%/ephem/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/ephem_test.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/ephem_test.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/ephem_test.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/launchpad_236872.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/launchpad_236872.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/launchpad_236872.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_angles.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_angles.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_angles.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_bodies.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_bodies.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_bodies.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_constants.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_constants.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_constants.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_dates.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_dates.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_dates.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_jpl.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_jpl.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_jpl.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_rst.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_rst.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_rst.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno_equinoxes.py
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno_equinoxes.pyc
+%%PYTHON_SITELIBDIR%%/ephem/tests/test_usno_equinoxes.pyo
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/appgeo_deneb.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/appgeo_jupiter.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/appgeo_moon.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/appgeo_sun.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/apptopo_deneb.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/apptopo_moon.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/apptopo_sun.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/astrom_antares.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/astrom_mercury.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/astrom_neptune.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/moon_phases.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/riset_moon.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/riset_sun.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/risettran_moon.txt
+%%PYTHON_SITELIBDIR%%/ephem/tests/usno/risettran_rigel.txt
+@dirrm %%PYTHON_SITELIBDIR%%/ephem/tests/usno/
+@dirrm %%PYTHON_SITELIBDIR%%/ephem/tests/
+@dirrm %%PYTHON_SITELIBDIR%%/ephem/doc/
+@dirrm %%PYTHON_SITELIBDIR%%/ephem/