summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/py-rpy/Makefile10
-rw-r--r--math/py-rpy/PLIST38
-rw-r--r--math/py-rpy/distinfo9
-rw-r--r--math/py-rpy/patches/patch-aa43
4 files changed, 42 insertions, 58 deletions
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index be2c20485e7..e1678f60bbd 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/09/11 23:04:32 asau Exp $
-#
+# $NetBSD: Makefile,v 1.31 2014/01/19 22:50:43 wiz Exp $
-DISTNAME= rpy2-2.1.3
-PKGNAME= ${PYPKGPREFIX}-rpy-2.1.3
+DISTNAME= rpy2-2.3.0
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rpy/}
@@ -11,14 +10,13 @@ HOMEPAGE= http://rpy.sourceforge.net/
COMMENT= R interface for Python
LICENSE= mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1
-PYDISTUTILSPKG= YES
USE_LANGUAGES+= c fortran77
BUILDLINK_API_DEPENDS.R+= R>=2.11.0
LDFLAGS.SunOS+= -mimpure-text
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../math/R/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/py-rpy/PLIST b/math/py-rpy/PLIST
index 91eb097450f..6cd41751bc6 100644
--- a/math/py-rpy/PLIST
+++ b/math/py-rpy/PLIST
@@ -1,13 +1,22 @@
-@comment $NetBSD: PLIST,v 1.12 2010/06/09 21:04:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/01/19 22:50:43 wiz Exp $
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/rpy2/__init__.py
${PYSITELIB}/rpy2/__init__.pyc
${PYSITELIB}/rpy2/__init__.pyo
-${PYSITELIB}/rpy2/images/rpy2_logo.png
+${PYSITELIB}/rpy2/interactive/__init__.py
+${PYSITELIB}/rpy2/interactive/__init__.pyc
+${PYSITELIB}/rpy2/interactive/__init__.pyo
+${PYSITELIB}/rpy2/interactive/process_revents.py
+${PYSITELIB}/rpy2/interactive/process_revents.pyc
+${PYSITELIB}/rpy2/interactive/process_revents.pyo
+${PYSITELIB}/rpy2/interactive/tests/__init__.py
+${PYSITELIB}/rpy2/interactive/tests/__init__.pyc
+${PYSITELIB}/rpy2/interactive/tests/__init__.pyo
${PYSITELIB}/rpy2/rinterface/__init__.py
${PYSITELIB}/rpy2/rinterface/__init__.pyc
${PYSITELIB}/rpy2/rinterface/__init__.pyo
-${PYSITELIB}/rpy2/rinterface/rinterface.so
-${PYSITELIB}/rpy2/rinterface/rpy_device.so
+${PYSITELIB}/rpy2/rinterface/_rinterface.so
+${PYSITELIB}/rpy2/rinterface/_rpy_device.so
${PYSITELIB}/rpy2/rinterface/tests/__init__.py
${PYSITELIB}/rpy2/rinterface/tests/__init__.pyc
${PYSITELIB}/rpy2/rinterface/tests/__init__.pyo
@@ -26,6 +35,9 @@ ${PYSITELIB}/rpy2/rinterface/tests/test_SexpClosure.pyo
${PYSITELIB}/rpy2/rinterface/tests/test_SexpEnvironment.py
${PYSITELIB}/rpy2/rinterface/tests/test_SexpEnvironment.pyc
${PYSITELIB}/rpy2/rinterface/tests/test_SexpEnvironment.pyo
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.py
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.pyc
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.pyo
${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.py
${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.pyc
${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.pyo
@@ -59,12 +71,24 @@ ${PYSITELIB}/rpy2/rlike/tests/test_indexing.pyo
${PYSITELIB}/rpy2/robjects/__init__.py
${PYSITELIB}/rpy2/robjects/__init__.pyc
${PYSITELIB}/rpy2/robjects/__init__.pyo
+${PYSITELIB}/rpy2/robjects/constants.py
+${PYSITELIB}/rpy2/robjects/constants.pyc
+${PYSITELIB}/rpy2/robjects/constants.pyo
${PYSITELIB}/rpy2/robjects/conversion.py
${PYSITELIB}/rpy2/robjects/conversion.pyc
${PYSITELIB}/rpy2/robjects/conversion.pyo
+${PYSITELIB}/rpy2/robjects/environments.py
+${PYSITELIB}/rpy2/robjects/environments.pyc
+${PYSITELIB}/rpy2/robjects/environments.pyo
${PYSITELIB}/rpy2/robjects/functions.py
${PYSITELIB}/rpy2/robjects/functions.pyc
${PYSITELIB}/rpy2/robjects/functions.pyo
+${PYSITELIB}/rpy2/robjects/help.py
+${PYSITELIB}/rpy2/robjects/help.pyc
+${PYSITELIB}/rpy2/robjects/help.pyo
+${PYSITELIB}/rpy2/robjects/language.py
+${PYSITELIB}/rpy2/robjects/language.pyc
+${PYSITELIB}/rpy2/robjects/language.pyo
${PYSITELIB}/rpy2/robjects/lib/__init__.py
${PYSITELIB}/rpy2/robjects/lib/__init__.pyc
${PYSITELIB}/rpy2/robjects/lib/__init__.pyo
@@ -104,6 +128,12 @@ ${PYSITELIB}/rpy2/robjects/tests/testFormula.pyo
${PYSITELIB}/rpy2/robjects/tests/testFunction.py
${PYSITELIB}/rpy2/robjects/tests/testFunction.pyc
${PYSITELIB}/rpy2/robjects/tests/testFunction.pyo
+${PYSITELIB}/rpy2/robjects/tests/testHelp.py
+${PYSITELIB}/rpy2/robjects/tests/testHelp.pyc
+${PYSITELIB}/rpy2/robjects/tests/testHelp.pyo
+${PYSITELIB}/rpy2/robjects/tests/testLanguage.py
+${PYSITELIB}/rpy2/robjects/tests/testLanguage.pyc
+${PYSITELIB}/rpy2/robjects/tests/testLanguage.pyo
${PYSITELIB}/rpy2/robjects/tests/testMethods.py
${PYSITELIB}/rpy2/robjects/tests/testMethods.pyc
${PYSITELIB}/rpy2/robjects/tests/testMethods.pyo
diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo
index e05bea878d8..53bb6fd4fef 100644
--- a/math/py-rpy/distinfo
+++ b/math/py-rpy/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2011/12/18 21:32:08 dholland Exp $
+$NetBSD: distinfo,v 1.11 2014/01/19 22:50:43 wiz Exp $
-SHA1 (rpy2-2.1.3.tar.gz) = cf067b0fbcc9589b442538ee89273e61973c6207
-RMD160 (rpy2-2.1.3.tar.gz) = fb9354770fbbda39e07603f616bd9852f9573bc8
-Size (rpy2-2.1.3.tar.gz) = 127887 bytes
-SHA1 (patch-aa) = 5ea826e4ec3d09feb4249e94f17e9e3115f70abf
+SHA1 (rpy2-2.3.0.tar.gz) = 57756415b343bfb960f319b53e6387ddbd0e0d08
+RMD160 (rpy2-2.3.0.tar.gz) = f2c70f8f7b242686e04d19c055090d3eb08005a9
+Size (rpy2-2.3.0.tar.gz) = 178022 bytes
diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa
deleted file mode 100644
index dc17299deb8..00000000000
--- a/math/py-rpy/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2011/12/18 21:32:08 dholland Exp $
-
-- configure compiler for pkgsrc
-- allow BLAS_LIBS to be empty
-- handle extra_link_args correctly
-- accept pkgsrc-reported link args
-
---- setup.py.orig 2010-05-16 12:23:30.000000000 +0000
-+++ setup.py
-@@ -1,5 +1,12 @@
-
- import os, os.path, sys, shutil, re, itertools
-+import distutils.sysconfig
-+old_customize_compiler = distutils.sysconfig.customize_compiler
-+def customize_compiler(compiler):
-+ old_customize_compiler(compiler)
-+ compiler.set_executables(linker_so=os.environ['FC'] + ' -shared')
-+distutils.sysconfig.customize_compiler = customize_compiler
-+
- from distutils.command.build_ext import build_ext as _build_ext
- from distutils.command.build import build as _build
-
-@@ -130,10 +137,10 @@ class build_ext(_build_ext):
- extra_link_args = get_rconfig(r_home, '--ldflags') +\
- get_rconfig(r_home, 'LAPACK_LIBS',
- allow_empty=True) +\
-- get_rconfig(r_home, 'BLAS_LIBS')
-+ get_rconfig(r_home, 'BLAS_LIBS', allow_empty=True)
-
- for e in self.extensions:
-- e.extra_compile_args.extend(extra_link_args)
-+ e.extra_link_args.extend(extra_link_args)
-
- def run(self):
- _build_ext.run(self)
-@@ -180,6 +187,7 @@ def get_rconfig(r_home, about, allow_emp
- #sanity check of what is returned into rconfig
- rconfig_m = None
- possible_patterns = ('^(-L.+) (-l.+)$',
-+ '^(-Wl,-R.+) (-L.+) (-l.+)$',
- '^(-l.+)$', # fix for the case -lblas is returned
- '^(-F.+? -framework .+)$', # fix for MacOS X
- '^(-framework .+)$',
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 00:25:18 +0000