CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  3 12:25:37 UTC 2016

Modified Files:
        pkgsrc/math/py-rpy: Makefile
        pkgsrc/pkgtools/pkglint/files: vardefs.go
        pkgsrc/pkgtools/pkglint4/files: makevars.map
        pkgsrc/security/py-cryptography: Makefile
        pkgsrc/www/py-tornado: Makefile

Log Message:
Remove some dead code, python-3.3 is no more.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/math/py-rpy/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/py-cryptography/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/py-tornado/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-rpy/Makefile
diff -u pkgsrc/math/py-rpy/Makefile:1.40 pkgsrc/math/py-rpy/Makefile:1.41
--- pkgsrc/math/py-rpy/Makefile:1.40    Wed Jun  8 17:43:35 2016
+++ pkgsrc/math/py-rpy/Makefile Mon Oct  3 12:25:36 2016
@@ -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

Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.16 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.17
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.16       Tue Sep  6 20:54:21 2016
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go    Mon Oct  3 12:25:36 2016
@@ -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)

Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.2 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.3
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.2     Sun Jun 19 18:03:05 2016
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Mon Oct  3 12:25:37 2016
@@ -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 
 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]

Index: pkgsrc/security/py-cryptography/Makefile
diff -u pkgsrc/security/py-cryptography/Makefile:1.45 pkgsrc/security/py-cryptography/Makefile:1.46
--- pkgsrc/security/py-cryptography/Makefile:1.45       Mon Oct  3 12:21:16 2016
+++ pkgsrc/security/py-cryptography/Makefile    Mon Oct  3 12:25:37 2016
@@ -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
 .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:

Index: pkgsrc/www/py-tornado/Makefile
diff -u pkgsrc/www/py-tornado/Makefile:1.18 pkgsrc/www/py-tornado/Makefile:1.19
--- pkgsrc/www/py-tornado/Makefile:1.18 Wed Jun  8 17:43:46 2016
+++ pkgsrc/www/py-tornado/Makefile      Mon Oct  3 12:25:37 2016
@@ -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_m
 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