From 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 25 Jan 2014 10:29:56 +0000 Subject: Mark packages as not ready for python-3.x where applicable; either because they themselves are not ready or because a dependency isn't. This is annotated by PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z or PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar respectively, please use the same style for other packages, and check during updates. Use versioned_dependencies.mk where applicable. Use REPLACE_PYTHON instead of handcoded alternatives, where applicable. Reorder Makefile sections into standard order, where applicable. Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default with the next commit. Whitespace cleanups and other nits corrected, where necessary. --- www/py-django14/Makefile | 3 ++- www/py-django14/options.mk | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'www/py-django14') diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile index 64cc9cf1990..dfc3515e9b7 100644 --- a/www/py-django14/Makefile +++ b/www/py-django14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/18 19:07:57 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:28 wiz Exp $ DISTNAME= Django-1.4.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -20,6 +20,7 @@ REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py PYTHON_VERSIONED_DEPENDENCIES= flup +PYTHON_VERSIONS_INCOMPATIBLE= 33 # use py-django if you want python-3.x support .include "options.mk" diff --git a/www/py-django14/options.mk b/www/py-django14/options.mk index c61177b1336..8cc5e4e5086 100644 --- a/www/py-django14/options.mk +++ b/www/py-django14/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/11/14 21:27:01 joerg Exp $ +# $NetBSD: options.mk,v 1.2 2014/01/25 10:30:28 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.django PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite @@ -10,6 +10,7 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mysqldb PLIST.mysql= yes .endif @@ -25,5 +26,6 @@ PLIST.pgsql= yes .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-sqlite2 PLIST.sqlite= yes .endif -- cgit v1.2.3