 @@ -1,38 +1,38 @@
-# $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/}
 PKGREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/rpy2/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rpy.sourceforge.net/
 COMMENT=	R interface for Python
 LICENSE=	mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 USE_LANGUAGES+=		c fortran77
 BUILDLINK_API_DEPENDS.R+= R>=2.11.0
 LDFLAGS.SunOS+=		-mimpure-text
 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
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../math/R/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -630,27 +630,27 @@ func (gd *GlobalData) InitVartypes() {
 	acl("PLIST_TYPE", lkNone, enum("dynamic static"), "")
 	acl("PREPEND_PATH", lkShell, BtPathname, "")
 	acl("PREFIX", lkNone, BtPathname, "*: use")
 	acl("PREV_PKGPATH", lkNone, BtPathname, "*: use") // doesn't exist any longer
 	acl("PRINT_PLIST_AWK", lkNone, BtAwkCommand, "*: append")
 	acl("PRIVILEGED_STAGES", lkShell, enum("install package clean"), "")
 	acl("PTHREAD_AUTO_VARS", lkNone, BtYesNo, "Makefile: set")
 	sys("PTHREAD_CFLAGS", lkShell, BtCFlag)
 	sys("PTHREAD_LDFLAGS", lkShell, BtLdFlag)
 	sys("PTHREAD_LIBS", lkShell, BtLdFlag)
 	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)
 	pkg("PYTHON_VERSIONS_INCOMPATIBLE", lkShell, BtVersion)
 	usr("PYTHON_VERSION_DEFAULT", lkNone, BtVersion)
 	usr("PYTHON_VERSION_REQD", lkNone, BtVersion)
 	pkglist("PYTHON_VERSIONED_DEPENDENCIES", lkShell, BtPythonDependency)
 	sys("RANLIB", lkNone, BtShellCommand)
 	pkglist("RCD_SCRIPTS", lkShell, BtFilename)
 	acl("RCD_SCRIPT_SRC.*", lkNone, BtPathname, "Makefile: set")
 	acl("RCD_SCRIPT_WRK.*", lkNone, BtPathname, "Makefile: set")
 	acl("REPLACE.*", lkNone, BtUnknown, "Makefile: set")
 	pkglist("REPLACE_AWK", lkShell, BtPathmask)

 @@ -1,14 +1,14 @@
-# $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
 # their current use in pkgsrc.
+#
 # The type YesNo is used for variables that are checked using
 #     .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss])
+#
 # The type Yes is used for variables that are checked using
 #     .if defined(VAR)
+#
 # The type List is used for lists of things. There are two types of lists,
 # InternalList and List, which are described in the pkgsrc guide, chapter
 @@ -648,27 +648,27 @@ PLIST_TYPE		{ dynamic static }
 PREPEND_PATH		List of Pathname
 PREFIX			Pathname [*:u]			# ???
 PREV_PKGPATH		Pathname [*:u]	# doesn't exist any longer
 PRINT_PLIST_AWK		AwkCommand [*:a]
 PRIVILEGED_STAGES	List of { install package clean }
 PTHREAD_AUTO_VARS	YesNo [m:s]
 PTHREAD_CFLAGS		List of CFlag [$system]
 PTHREAD_LDFLAGS		List of LdFlag [$system]
 PTHREAD_LIBS		List of LdFlag [$system]
 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]
 PYTHON_VERSIONS_INCOMPATIBLE List of Version [$package]
 PYTHON_VERSION_DEFAULT	Version [$user]
 PYTHON_VERSION_REQD	Version [$user]
 PYTHON_VERSIONED_DEPENDENCIES	List of PythonDependency [$package_list]
 RANLIB			ShellCommand [$system]
 RCD_SCRIPTS		List of Filename [$package_list]
 RCD_SCRIPT_SRC.*	List of Pathname [m:s]
 REPLACE.*		String [m:s]
 REPLACE_AWK		List of Pathmask [$package_list]
 REPLACE_BASH		List of Pathmask [$package_list]

 @@ -1,38 +1,36 @@
-# $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}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cryptography/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/cryptography/
 COMMENT=	Cryptographic recipes and primitives for Python
 LICENSE=	apache-2.0 OR modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-cffi>=1.8.2:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser>=2.10:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # actually, TEST_DEPENDS
 BUILD_DEPENDS+=	${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
 BUILD_DEPENDS+=	${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 BUILD_DEPENDS+=	${PYPKGPREFIX}-requests>=0.8:../../devel/py-requests
 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:
 	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/tornado/}
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://www.tornadoweb.org/
 COMMENT=	Fast and non-blocking web framework
 LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-curl>=7.18.2:../../www/py-curl
 DEPENDS+=	${PYPKGPREFIX}-backports_abc>=0.4:../../devel/py-backports_abc
 @@ -19,24 +19,20 @@ REPLACE_PYTHON+=	tornado/platform/*.py
 REPLACE_PYTHON+=	tornado/test/*.py
 do-test:
 	${RUN}cd ${WRKSRC}; ${PYTHONBIN} -m tornado.test.runtests
 .include "../../lang/python/pyversion.mk"
 PLIST_VARS+=	requires
 .if "${PYPKGPREFIX}" == "py27"
 DEPENDS+=	${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-backports.ssl_match_hostname
 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
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"