pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/py-rpy Fix packaging with py33. Disable for py26.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d67da1b9148
branches:  trunk
changeset: 649815:8d67da1b9148
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Apr 10 08:36:30 2015 +0000

description:
Fix packaging with py33. Disable for py26.

diffstat:

 math/py-rpy/Makefile |  15 ++++++++++++++-
 math/py-rpy/PLIST    |   4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r fa6965da5191 -r 8d67da1b9148 math/py-rpy/Makefile
--- a/math/py-rpy/Makefile      Fri Apr 10 08:25:54 2015 +0000
+++ b/math/py-rpy/Makefile      Fri Apr 10 08:36:30 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/04/07 22:14:18 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2015/04/10 08:36:30 wiz Exp $
 
 DISTNAME=      rpy2-2.5.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
@@ -16,6 +16,19 @@
 
 LDFLAGS.SunOS+=                -mimpure-text
 
+PYTHON_VERSIONS_INCOMPATIBLE=  26 # doesn't find R
+
+.include "../../lang/python/pyversion.mk"
+
+PLIST_VARS=    sd
+.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33"
+PLIST.sd=      yes
+DEPENDS+=      ${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch
+.endif
+.if ${PYPKGPREFIX} == "py26"
+DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+.endif
+
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff -r fa6965da5191 -r 8d67da1b9148 math/py-rpy/PLIST
--- a/math/py-rpy/PLIST Fri Apr 10 08:25:54 2015 +0000
+++ b/math/py-rpy/PLIST Fri Apr 10 08:36:30 2015 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2015/04/10 06:17:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/10 08:36:30 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.sd}${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rpy2/__init__.py
 ${PYSITELIB}/rpy2/__init__.pyc



Home | Main Index | Thread Index | Old Index