summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/py-beets/Makefile7
-rw-r--r--devel/Makefile3
-rw-r--r--devel/py-ordereddict/DESCR3
-rw-r--r--devel/py-ordereddict/Makefile17
-rw-r--r--devel/py-ordereddict/PLIST5
-rw-r--r--devel/py-ordereddict/distinfo5
-rw-r--r--graphics/py-blockdiag/Makefile5
-rw-r--r--textproc/csvkit/Makefile5
-rw-r--r--www/py-wtforms-alchemy/Makefile6
9 files changed, 5 insertions, 51 deletions
diff --git a/audio/py-beets/Makefile b/audio/py-beets/Makefile
index 917b4f1be1b..72cf7c5951c 100644
--- a/audio/py-beets/Makefile
+++ b/audio/py-beets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/01/06 19:50:43 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/14 11:25:37 wiz Exp $
DISTNAME= v1.3.10
PKGNAME= beets-${DISTNAME:S/v//}
@@ -23,11 +23,6 @@ DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.3.8
-.include "../../lang/python/pyversion.mk"
-.if !empty(PYPKGPREFIX:Mpy26)
-DEPENDS+= ${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict
-.endif
-
DIST_SUBDIR= py-beets
WRKSRC= ${WRKDIR}/beets-${DISTNAME:S/v//}
USE_LANGUAGES= # none
diff --git a/devel/Makefile b/devel/Makefile
index 2aa65e7ea18..f98e4d43165 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2078 2015/04/10 08:25:45 wiz Exp $
+# $NetBSD: Makefile,v 1.2079 2015/04/14 11:25:38 wiz Exp $
#
COMMENT= Development utilities
@@ -1646,7 +1646,6 @@ SUBDIR+= py-multiprocessing
SUBDIR+= py-newt
SUBDIR+= py-nose
SUBDIR+= py-open-vcdiff
-SUBDIR+= py-ordereddict
SUBDIR+= py-pbr
SUBDIR+= py-pep8
SUBDIR+= py-pexpect
diff --git a/devel/py-ordereddict/DESCR b/devel/py-ordereddict/DESCR
deleted file mode 100644
index 352a5428ba2..00000000000
--- a/devel/py-ordereddict/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Drop-in substitute for Py2.7's new collections.OrderedDict. The recipe has
-big-oh performance that matches regular dictionaries (amortized O(1)
-insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing).
diff --git a/devel/py-ordereddict/Makefile b/devel/py-ordereddict/Makefile
deleted file mode 100644
index 9442bf3d4a6..00000000000
--- a/devel/py-ordereddict/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2015/04/13 23:12:41 rodent Exp $
-#
-
-DISTNAME= ordereddict-1.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= devel
-MASTER_SITES= http://pypi.python.org/packages/source/o/ordereddict/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pypi.python.org/pypi/ordereddict/
-COMMENT= Drop-in substitute for Py2.7's new collections.OrderedDict
-LICENSE= mit
-
-USE_LANGUAGES= # none
-
-.include "../../lang/python/distutils.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-ordereddict/PLIST b/devel/py-ordereddict/PLIST
deleted file mode 100644
index d18a6bbf1f0..00000000000
--- a/devel/py-ordereddict/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:46 wiz Exp $
-${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/ordereddict.py
-${PYSITELIB}/ordereddict.pyc
-${PYSITELIB}/ordereddict.pyo
diff --git a/devel/py-ordereddict/distinfo b/devel/py-ordereddict/distinfo
deleted file mode 100644
index d1d1385b23e..00000000000
--- a/devel/py-ordereddict/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/07 12:54:24 obache Exp $
-
-SHA1 (ordereddict-1.1.tar.gz) = ab90b67dceab55a11b609d253846fa486eb980c4
-RMD160 (ordereddict-1.1.tar.gz) = a181547c43bb0ce4e106188ae5ad13648c1938cc
-Size (ordereddict-1.1.tar.gz) = 2114 bytes
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index ba71ab30e3c..04611af5ae0 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/03/15 17:56:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.21 2015/04/14 11:25:37 wiz Exp $
DISTNAME= blockdiag-1.5.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -26,8 +26,5 @@ post-install:
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/python/egg.mk"
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+= ${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict
-.endif
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/csvkit/Makefile b/textproc/csvkit/Makefile
index 6de5cf2fab6..102c01bc3ac 100644
--- a/textproc/csvkit/Makefile
+++ b/textproc/csvkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/13 23:12:43 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/14 11:25:37 wiz Exp $
DISTNAME= 0.9.0
PKGNAME= csvkit-${DISTNAME}
@@ -32,7 +32,4 @@ EGG_NAME= ${PKGNAME}
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+= ${PYPKGPREFIX}-ordereddict>=1.1:../../devel/py-ordereddict
-.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-wtforms-alchemy/Makefile b/www/py-wtforms-alchemy/Makefile
index d7c8a99cf61..041df606a2e 100644
--- a/www/py-wtforms-alchemy/Makefile
+++ b/www/py-wtforms-alchemy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/12/31 13:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/14 11:25:37 wiz Exp $
DISTNAME= WTForms-Alchemy-0.13.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,10 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-wtforms>=1.0.4:../../www/py-wtforms
DEPENDS+= ${PYPKGPREFIX}-wtforms-components>=0.9.2:../../www/py-wtforms-components
DEPENDS+= ${PYPKGPREFIX}-sqlalchemy-utils>=0.23.1:../../databases/py-sqlalchemy-utils
DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+= ${PYPKGPREFIX}-ordereddict>=1.1:../../devel/py-ordereddict
-.endif
USE_LANGUAGES= # none