upgrade to 2.39.235.1693

3 files changed, 23 insertions, 135 deletions

diff --git a/lang/f2py/Makefile b/lang/f2py/Makefile
index 18c0ef33d04..dab1312f2d5 100644
--- a/lang/f2py/Makefile
+++ b/lang/f2py/Makefile
@@ -7,17 +7,35 @@
 #
 
 PORTNAME=	f2py
-PORTVERSION=	2.37.233.1545
+PORTVERSION=	2.39.235.1693
 CATEGORIES=	lang python
 MASTER_SITES=	http://cens.ioc.ee/projects/f2py2e/2.x/
-DISTNAME=	${PORTNAME:U}-${PORTVERSION:R}-${PORTVERSION:E}
+DISTNAME=	${PORTNAME:U}-${PORTVERSION:R}_${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fortran to Python Interface Generator
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+RUN_DEPENDS=	${PYNUMERIC}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+PLIST_FILES=	bin/f2py
+MAN1=		f2py.1
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/f2py.1 ${MAN1PREFIX}/man/man1
+	@${FIND} ${PYTHON_SITELIBDIR}/f2py2e ! -type d | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${PYTHON_SITELIBDIR}/f2py2e -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/docs/ ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/lang/f2py/distinfo b/lang/f2py/distinfo
index 2b1b781d034..9525db1a375 100644
--- a/lang/f2py/distinfo
+++ b/lang/f2py/distinfo
@@ -1,2 +1,2 @@
-MD5 (F2PY-2.37.233-1545.tar.gz) = 823547c47f0194863da530102b6a5db4
-SIZE (F2PY-2.37.233-1545.tar.gz) = 159235
+MD5 (F2PY-2.39.235_1693.tar.gz) = 2dd9ba83e750ddc668453a94c5172e1e
+SIZE (F2PY-2.39.235_1693.tar.gz) = 122851
diff --git a/lang/f2py/pkg-plist b/lang/f2py/pkg-plist
deleted file mode 100644
index 2f7cfed4eb8..00000000000
--- a/lang/f2py/pkg-plist
+++ /dev/null
@@ -1,130 +0,0 @@
-bin/f2py
-%%PYTHON_SITELIBDIR%%/f2py2e/__cvs_version__.py
-%%PYTHON_SITELIBDIR%%/f2py2e/__cvs_version__.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/__cvs_version__.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/__init__.py
-%%PYTHON_SITELIBDIR%%/f2py2e/__init__.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/__init__.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/__version__.py
-%%PYTHON_SITELIBDIR%%/f2py2e/__version__.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/__version__.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/auxfuncs.py
-%%PYTHON_SITELIBDIR%%/f2py2e/auxfuncs.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/auxfuncs.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/capi_maps.py
-%%PYTHON_SITELIBDIR%%/f2py2e/capi_maps.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/capi_maps.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/cb_rules.py
-%%PYTHON_SITELIBDIR%%/f2py2e/cb_rules.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/cb_rules.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/cfuncs.py
-%%PYTHON_SITELIBDIR%%/f2py2e/cfuncs.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/cfuncs.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/common_rules.py
-%%PYTHON_SITELIBDIR%%/f2py2e/common_rules.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/common_rules.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/crackfortran.py
-%%PYTHON_SITELIBDIR%%/f2py2e/crackfortran.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/crackfortran.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/diagnose.py
-%%PYTHON_SITELIBDIR%%/f2py2e/diagnose.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/diagnose.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py2e.py
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py2e.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py2e.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py_testing.py
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py_testing.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/f2py_testing.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/f90mod_rules.py
-%%PYTHON_SITELIBDIR%%/f2py2e/f90mod_rules.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/f90mod_rules.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/func2subr.py
-%%PYTHON_SITELIBDIR%%/f2py2e/func2subr.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/func2subr.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/rules.py
-%%PYTHON_SITELIBDIR%%/f2py2e/rules.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/rules.pyo
-%%PYTHON_SITELIBDIR%%/f2py2e/src/fortranobject.c
-%%PYTHON_SITELIBDIR%%/f2py2e/src/fortranobject.h
-%%PYTHON_SITELIBDIR%%/f2py2e/use_rules.py
-%%PYTHON_SITELIBDIR%%/f2py2e/use_rules.pyc
-%%PYTHON_SITELIBDIR%%/f2py2e/use_rules.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__cvs_version__.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__cvs_version__.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__cvs_version__.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__init__.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/__init__.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/__init__.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/__init__.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_clib.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_clib.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_clib.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_ext.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_ext.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_ext.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_flib.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_flib.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_flib.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_py.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_py.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/build_py.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/cpuinfo.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/cpuinfo.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/cpuinfo.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_data.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_data.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_data.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_headers.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_headers.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/install_headers.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/run_f2py.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/run_f2py.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/run_f2py.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/sdist.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/sdist.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/command/sdist.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/core.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/core.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/core.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/dist.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/dist.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/dist.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/extension.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/extension.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/extension.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/lib2def.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/lib2def.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/lib2def.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/line_endings.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/line_endings.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/line_endings.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/mingw32_support.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/mingw32_support.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/mingw32_support.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/misc_util.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/misc_util.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/misc_util.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/scipy_distutils_version.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/scipy_distutils_version.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/scipy_distutils_version.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup_scipy_distutils.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup_scipy_distutils.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/setup_scipy_distutils.pyo
-%%PYTHON_SITELIBDIR%%/scipy_distutils/system_info.py
-%%PYTHON_SITELIBDIR%%/scipy_distutils/system_info.pyc
-%%PYTHON_SITELIBDIR%%/scipy_distutils/system_info.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/f2py2e/src
-@dirrm %%PYTHON_SITELIBDIR%%/f2py2e
-@dirrm %%PYTHON_SITELIBDIR%%/scipy_distutils/command
-@dirrm %%PYTHON_SITELIBDIR%%/scipy_distutils