diff options
| -rw-r--r-- | math/py-rpy/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/vardefs.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint4/files/makevars.map | 4 | ||||
| -rw-r--r-- | security/py-cryptography/Makefile | 6 | ||||
| -rw-r--r-- | www/py-tornado/Makefile | 6 |
5 files changed, 8 insertions, 14 deletions
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile index becb15912c9..6cf0050140f 100644 --- a/math/py-rpy/Makefile +++ b/math/py-rpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2016/06/08 17:43:35 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2016/10/03 12:25:36 wiz Exp $ DISTNAME= rpy2-2.5.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/} @@ -24,7 +24,7 @@ REPLACE_PYTHON= rpy/tests.py .include "../../lang/python/pyversion.mk" PLIST_VARS= sd -.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33" +.if ${PYPKGPREFIX} == "py27" PLIST.sd= yes DEPENDS+= ${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch .endif diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index da1c8f36c20..2bf228b6dad 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -640,7 +640,7 @@ func (gd *GlobalData) InitVartypes() { acl("PTHREAD_OPTS", lkShell, enum("native optional require"), "Makefile: set, append; Makefile.common, buildlink3.mk: append") sys("PTHREAD_TYPE", lkNone, BtIdentifier) // Or "native" or "none". pkg("PY_PATCHPLIST", lkNone, BtYes) - acl("PYPKGPREFIX", lkNone, enum("py27 py33 py34 py35"), "pyversion.mk: set; *: use-loadtime, use") + acl("PYPKGPREFIX", lkNone, enum("py27 py34 py35"), "pyversion.mk: set; *: use-loadtime, use") pkg("PYTHON_FOR_BUILD_ONLY", lkNone, BtYes) pkglist("REPLACE_PYTHON", lkShell, BtPathmask) pkg("PYTHON_VERSIONS_ACCEPTED", lkShell, BtVersion) diff --git a/pkgtools/pkglint4/files/makevars.map b/pkgtools/pkglint4/files/makevars.map index df0910bb53d..76f61e435bb 100644 --- a/pkgtools/pkglint4/files/makevars.map +++ b/pkgtools/pkglint4/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.2 2016/06/19 18:03:05 wiz Exp $ +# $NetBSD: makevars.map,v 1.3 2016/10/03 12:25:37 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -658,7 +658,7 @@ PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a] PTHREAD_TYPE Identifier [$system] # ^^ or "native" or "none". PY_PATCHPLIST Yes [$package] -PYPKGPREFIX { py27 py33 py34 } [*:pu, pyversion.mk:s, *:] +PYPKGPREFIX { py27 py34 py35 } [*:pu, pyversion.mk:s, *:] PYTHON_FOR_BUILD_ONLY Yes [$package] REPLACE_PYTHON List of Pathmask [$package_list] PYTHON_VERSIONS_ACCEPTED List of Version [$package] diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile index df9edef9867..6097be16368 100644 --- a/security/py-cryptography/Makefile +++ b/security/py-cryptography/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/10/03 12:21:16 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2016/10/03 12:25:37 wiz Exp $ DISTNAME= cryptography-1.5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,10 +24,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=0.8:../../devel/py-test .include "../../lang/python/pyversion.mk" .if ${PYPKGPREFIX} == "py27" -DEPENDS+= ${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress -.endif -.if ${PYPKGPREFIX} == "py27" || ${PYPKGPREFIX} == "py33" DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 +DEPENDS+= ${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress .endif do-test: diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile index aabec56291f..a5be2fac998 100644 --- a/www/py-tornado/Makefile +++ b/www/py-tornado/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/06/08 17:43:46 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2016/10/03 12:25:37 wiz Exp $ DISTNAME= tornado-4.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -29,10 +29,6 @@ DEPENDS+= ${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-b DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi DEPENDS+= ${PYPKGPREFIX}-singledispatch>0:../../devel/py-singledispatch .endif -.if "${PYPKGPREFIX}" == "py33" -DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi -DEPENDS+= ${PYPKGPREFIX}-singledispatch>0:../../devel/py-singledispatch -.endif .if "${PYPKGPREFIX}" != "py35" PLIST.requires= yes .endif |