--- Mk/Uses/python.mk (revision 478329) +++ Mk/Uses/python.mk (working copy) @@ -82,6 +82,27 @@ # # cython_run - Depend on lang/cython at run-time. # +# django - Depend on the Django framework +# +# Valid ARGS: , build, run, test +# +# usage: +# +# django # Use the set default Django +# django:1.11 # Only use Django 1.11 +# django:1.11+ # Use Django 1.11 or newer +# django:1.11-2.0 # Use Django 1.11 or 2.0 +# django:-2.0 # Use any Django up to 2.0 +# +# build Indicates, that Django is needed at +# build time and adds it to BUILD_DEPENDS +# +# run Indicates, that Django is needed at +# run time and adds it to RUN_DEPENDS +# +# test Indicates, that Django is needed at +# test time and adds it to TEST_DEPENDS +# # flavors - Force creation of flavors for Python 2 and 3 default # versions, where applicable. # @@ -249,9 +270,19 @@ _PYTHON_BASECMD= ${LOCALBASE}/bin/python _PYTHON_RELPORTDIR= lang/python +# What Django versions are currently supported? +# When adding a version, please keep the comment in +# Mk/bsd.default-versions.mk in sync. +_DJANGO_VERSIONS= 1.11 2.0 2.1 + # Make each individual feature available as _PYTHON_FEATURE_ .for var in ${USE_PYTHON} -_PYTHON_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g} +_PYTHON_FEATURE_${var:C/\:.*//:tu}= ${var:C/\:.*//:S/,/ /g} +# Were arguments supplied? If so, assign them to another variable +# At the moment this is only used for the django feature +.if !defined(_PYTHON_FEATURE_${var:C/\:.*//:tu}_ARGS) +_PYTHON_FEATURE_${var:C/\:.*//:tu}_ARGS= ${var:C/^[^\:]*(\:|\$)//:S/,/ /g} +.endif .endfor # distutils automatically generates flavors depending on the supported @@ -559,6 +590,244 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} .endif +# Django framework support +# WIP: Packaging / flavors for Django ports? +# +# Process-Flow: +# - Parse for build, run and test arguments +# - Check for set Django version from user/framework +# - Get minimum/maximum Django version from Makefile of port +# - Split Django versions into major/minor numbers, e.g. 1.11 will be +# splitted into major 1 and minor 11 . +# - Compare splitted user/ports framework Django version against splitted +# minimum/maximum Django versions of ports +# - Handle unsupported versions of Django +# - Set the Django dependencies +.if defined(_PYTHON_FEATURE_DJANGO) +######### +### Parse for build, run and test arguments +### +# Reset the variables just to be sure +.undef _PYTHON_DJANGO_BUILD_DEP +.undef _PYTHON_DJANGO_RUN_DEP +.undef _PYTHON_DJANGO_TEST_DEP +# Parse for build ,run and test arguments and if found, remove them afterwards +.if ${_PYTHON_FEATURE_DJANGO_ARGS:Mbuild} +_PYTHON_DJANGO_BUILD_DEP= yes +_PYTHON_FEATURE_DJANGO_ARGS:= ${_PYTHON_FEATURE_DJANGO_ARGS:Nbuild} +.endif +.if ${_PYTHON_FEATURE_DJANGO_ARGS:Mrun} +_PYTHON_DJANGO_RUN_DEP= yes +_PYTHON_FEATURE_DJANGO_ARGS:= ${_PYTHON_FEATURE_DJANGO_ARGS:Nrun} +.endif +.if ${_PYTHON_FEATURE_DJANGO_ARGS:Mtest} +_PYTHON_DJANGO_TEST_DEP= yes +_PYTHON_FEATURE_DJANGO_ARGS:= ${_PYTHON_FEATURE_DJANGO_ARGS:Ntest} +.endif +# The port does not specify a build, run or test dependency, assume all are required. +.if !defined(_PYTHON_DJANGO_BUILD_DEP) && !defined(_PYTHON_DJANGO_RUN_DEP) && \ + !defined(_PYTHON_DJANGO_TEST_DEP) +_PYTHON_DJANGO_BUILD_DEP= yes +_PYTHON_DJANGO_RUN_DEP= yes +_PYTHON_DJANGO_TEST_DEP= yes +.endif + +######### +### Check for set Django version from user/framework +### +# Check if the user has given the desired Django version +.if defined(DJANGO_VERSION) +# A port/user requests a specific django version for its dependencies via +# DEPENDS_ARGS, since it requires the specific django version itself. +# Several things can happen now: +# a) the dependency supports the requested version -> everything's fine +# b) the dependency does not support the requested version +# 1) the dependency works in a way that the different django +# versions do not matter -> everything's fine +# 2) the dependency is likely to break due to the conflict +# nothing's fine +# +# b.2) needs to be resolved. Due to the complexity of how different pieces of +# software are built, we can't solve this automatically. Instead, let's assume +# that maintainers know what they are doing and assume DJANGO_VERSION to be a +# hint. Just warn maintainers, if the versions do not match +# (_DJANGO_VERSION_NONSUPPORTED). +_DJANGO_VERSION:= ${DJANGO_VERSION:S/^django//} +.else +_DJANGO_VERSION:= ${DJANGO_DEFAULT} +.endif # if defined(DJANGO_VERSION) + +######### +### Get the minimum/maximum Django version from the Makefile of the port +### +# Get and prepare the Django version(s) given in the Makefile +_DJANGO_VERSION_CHECK= ${_PYTHON_FEATURE_DJANGO_ARGS:C/^([1-9]\.[0-9]+)$/\1-\1/} + +# Get the minimum supported version +_DJANGO_VERSION_MINIMUM_TMP:= ${_DJANGO_VERSION_CHECK:C/([1-9]\.[0-9]+)[-+].*/\1/} +_DJANGO_VERSION_MINIMUM:= ${_DJANGO_VERSION_MINIMUM_TMP:M[1-9].[0-9][0-9]} +# Fallback for versions with 1.X versioning scheme +.if empty(_DJANGO_VERSION_MINIMUM) +_DJANGO_VERSION_MINIMUM:= ${_DJANGO_VERSION_MINIMUM_TMP:M[1-9].[0-9]} +.endif +# Get the maximum supported version +_DJANGO_VERSION_MAXIMUM_TMP:= ${_DJANGO_VERSION_CHECK:C/.*-([1-9]\.[0-9]+)/\1/} +_DJANGO_VERSION_MAXIMUM:= ${_DJANGO_VERSION_MAXIMUM_TMP:M[1-9].[0-9][0-9]} +# Fallback for versions with 1.X versioning scheme +.if empty(_DJANGO_VERSION_MAXIMUM) +_DJANGO_VERSION_MAXIMUM:= ${_DJANGO_VERSION_MAXIMUM_TMP:M[1-9].[0-9]} +.endif + +# Reset _DJANGO_VERSION_NONSUPPORTED just to be sure +.undef _DJANGO_VERSION_NONSUPPORTED + +######### +### Split Django versions into major/minor numbers +### +# Split the given Django version (framework/user) into major and minor versions +# Get the major version number +_DJANGO_VERSION_MAJOR_TMP:= ${_DJANGO_VERSION:C/^([1-9]).*/\1/} +_DJANGO_VERSION_MAJOR:= ${_DJANGO_VERSION_MAJOR_TMP:M[1-9]} +# Get the minor version number +_DJANGO_VERSION_MINOR_TMP:= ${_DJANGO_VERSION:C/.*\.([0-9]+)$/\1/} +_DJANGO_VERSION_MINOR:= ${_DJANGO_VERSION_MINOR_TMP:M[0-9][0-9]} +# Fallback for versions with 1.X versioning scheme +.if empty(_DJANGO_VERSION_MINOR) +_DJANGO_VERSION_MINOR:= ${_DJANGO_VERSION_MINOR_TMP:M[0-9]} +.endif + +# If set, split up the minimum version (from makefile) into major and minor versions +.if !empty(_DJANGO_VERSION_MINIMUM) +# Get the major version number +_DJANGO_VERSION_MINIMUM_MAJOR_TMP:= ${_DJANGO_VERSION_MINIMUM:C/^([1-9]).*/\1/} +_DJANGO_VERSION_MINIMUM_MAJOR:= ${_DJANGO_VERSION_MINIMUM_MAJOR_TMP:M[1-9]} +# Get the minor version number +_DJANGO_VERSION_MINIMUM_MINOR_TMP:= ${_DJANGO_VERSION_MINIMUM:C/.*\.([0-9]+)$/\1/} +_DJANGO_VERSION_MINIMUM_MINOR:= ${_DJANGO_VERSION_MINIMUM_MINOR_TMP:M[0-9][0-9]} +# Fallback for versions with 1.X versioning scheme +.if empty(_DJANGO_VERSION_MINIMUM_MINOR) +_DJANGO_VERSION_MINIMUM_MINOR:= ${_DJANGO_VERSION_MINIMUM_MINOR_TMP:M[0-9]} +.endif +.endif # !empty(_DJANGO_VERSION_MINIMUM) + +# If set, split up the maximum version (from makefile) into major and minor versions +.if !empty(_DJANGO_VERSION_MAXIMUM) +# Get the major version number +_DJANGO_VERSION_MAXIMUM_MAJOR_TMP:= ${_DJANGO_VERSION_MAXIMUM:C/^([1-9]).*/\1/} +_DJANGO_VERSION_MAXIMUM_MAJOR:= ${_DJANGO_VERSION_MAXIMUM_MAJOR_TMP:M[1-9]} +# Get the minor version number +_DJANGO_VERSION_MAXIMUM_MINOR_TMP:= ${_DJANGO_VERSION_MAXIMUM:C/.*\.([0-9]+)$/\1/} +_DJANGO_VERSION_MAXIMUM_MINOR:= ${_DJANGO_VERSION_MAXIMUM_MINOR_TMP:M[0-9][0-9]} +# Fallback for versions with 1.X versioning scheme +.if empty(_DJANGO_VERSION_MAXIMUM_MINOR) +_DJANGO_VERSION_MAXIMUM_MINOR:= ${_DJANGO_VERSION_MAXIMUM_MINOR_TMP:M[0-9]} +.endif +.endif # !empty(_DJANGO_VERSION_MAXIMUM) + +# Check the given Django version (ports framework/user) against the minimum +# version from the makefile +.if !empty(_DJANGO_VERSION_MINIMUM) +.if (${_DJANGO_VERSION_MAJOR} <= ${_DJANGO_VERSION_MINIMUM_MAJOR}) && \ + (${_DJANGO_VERSION_MINOR} < ${_DJANGO_VERSION_MINIMUM_MINOR}) +_DJANGO_VERSION_NONSUPPORTED= ${_DJANGO_VERSION_MINIMUM} at least +.endif +.endif # !empty(_DJANGO_VERSION_MINIMUM) + +# Check the given Django version (ports framework/user) against the maximum +# version from the makefile +.if !empty(_DJANGO_VERSION_MAXIMUM) +.if (${_DJANGO_VERSION_MAJOR} >= ${_DJANGO_VERSION_MAXIMUM_MAJOR}) && \ + (${_DJANGO_VERSION_MINOR} > ${_DJANGO_VERSION_MAXIMUM_MINOR}) +_DJANGO_VERSION_NONSUPPORTED= ${_DJANGO_VERSION_MAXIMUM} at most +.endif +.endif # !empty(_DJANGO_VERSION_MAXIMUM) + +######### +# Handle unsupported versions of Django +### +.if defined(_DJANGO_VERSION_NONSUPPORTED) +# If user has specified a Django version +#.if defined(DJANGO_VERSION) +_DV:= ${_DJANGO_VERSION} # preserve the specified django version +IGNORE= needs Django ${_DJANGO_VERSION_NONSUPPORTED}, but ${_DV} was specified +#.endif # defined(DJANGO_VERSION) + +# Reset _DJANGO_VERSION +.undef _DJANGO_VERSION + +#.for dver in ${DJANGO_DEFAULT} ${_DJANGO_VERSIONS} +#__DVER= ${dver} +# Split up the Django version into major and minor versions +# Get the major version number +#__DVER_MAJOR_TMP= ${__DVER:C/^([1-9]).*/\1/} +#__DVER_MAJOR= ${__DVER_MAJOR_TMP:M[1-9]} +# Get the minor version number +#__DVER_MINOR_TMP= ${__DVER:C/.*\.([0-9]+)$/\1/} +#__DVER_MINOR= ${__DVER_MINOR_TMP:M[0-9][0-9]} +# Fall back for versions with 1.X versioning scheme +#.if empty(__DVER_MINOR) +#__DVER_MINOR= ${__DVER_MINOR_TMP:M[0-9]} +#.endif + +# Compare the Django version with the available Django versions in the ports +# framework +#.if !defined(_DJANGO_VERSION) +#.if !(!empty(_DJANGO_VERSION_MINIMUM) && ( \ + (${__DVER_MAJOR} < ${_DJANGO_VERSION_MINIMUM_MAJOR}) && \ + (${__DVER_MINOR} < ${_DJANGO_VERSION_MINIMUM_MINOR})) \ + ) && \ + !(!empty(_DJANGO_VERSION_MAXIMUM) && ( \ + (${__DVER_MAJOR} > ${_DJANGO_VERSION_MAXIMUM_MAJOR}) && \ + (${__DVER_MINOR} > ${_DJANGO_VERSION_MAXIMUM_MINOR})) \ + ) +#_DJANGO_VERSION= ${dver} +#.endif # !empty(_DJANGO_VERSION_MINIMUM [...] +#.endif # !defined(_DJANGO_VERSION +#.endfor # dver in ${DJANGO_DEFAULT} ${_DJANGO_VERSIONS} + +#.if !defined(_DJANGO_VERSION) +#IGNORE= needs an unsupported version of Django +#.endif +.endif # defined(_DJANGO_VERSION_NONSUPPORTED) + +# Pass DJANGO_VERSION down the dependency chain. This ensures that +# port A -> B -> C all will use the same django version and do not +# try to find a different one, if the passed version fits into +# the supported version range. +DJANGO_VERSION?= django${_DJANGO_VERSION} +.if ${DJANGO_VERSION} != django${DJANGO_DEFAULT} +DEPENDS_ARGS+= DJANGO_VERSION=${DJANGO_VERSION} +.endif + +######### +### Set the Django dependencies +### +.if defined(_DJANGO_VERSION) +_DJANGO_PACKAGE= ${PYTHON_PKGNAMEPREFIX}django${_DJANGO_VERSION:S/.//}>=${_DJANGO_VERSION}:www/py-django${_DJANGO_VERSION:S/.//}@${PY_FLAVOR} +.if defined(_PYTHON_DJANGO_BUILD_DEP) +BUILD_DEPENDS+= ${_DJANGO_PACKAGE} +.if !defined(_PYTHON_BUILD_DEP) +WARNING+= "django,build was set but not for Python!" +.endif +.endif + +.if defined(_PYTHON_DJANGO_RUN_DEP) +RUN_DEPENDS+= ${_DJANGO_PACKAGE} +.if !defined(_PYTHON_RUN_DEP) +WARNING+= "django,run was set but not for Python!" +.endif +.endif + +.if defined(_PYTHON_DJANGO_TEST_DEP) +TEST_DEPENDS+= ${_DJANGO_PACKAGE} +.if !defined(_PYTHON_TEST_DEP) +WARNING+= "django,test was set but not for Python!" +.endif +.endif + +.endif # if defined(_DJANGO_VERSION) +.endif # defined(_PYTHON_FEATURE_DJANGO) + # distutils support PYSETUP?= setup.py PYDISTUTILS_SETUP?= -c \ --- Mk/bsd.default-versions.mk (revision 478329) +++ Mk/bsd.default-versions.mk (working copy) @@ -15,7 +15,7 @@ LOCALBASE?= /usr/local -.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \ +.for lang in APACHE BDB COROSYNC DJANGO EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \ LINUX LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK .if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" @@ -34,6 +34,8 @@ BDB_DEFAULT?= 5 # Possible values: 2, 3 COROSYNC_DEFAULT?= 2 +# Possible values: 1.11, 2.0, 2.1 +DJANGO_DEFAULT?= 1.11 # Possible_values: full canna nox devel_full devel_nox #EMACS_DEFAULT?= let the flavor be the default if not explicitly set # Possible values: 2.5 --- databases/py-django-transaction-hooks/Makefile (revision 478329) +++ databases/py-django-transaction-hooks/Makefile (working copy) @@ -13,11 +13,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- devel/py-django-rq/Makefile (revision 478329) +++ devel/py-django-rq/Makefile (working copy) @@ -17,13 +17,12 @@ ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}rq>=0.12.0:devel/py-rq@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rq>=0.12.0:devel/py-rq@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django USE_GITHUB= yes GH_ACCOUNT= rq --- devel/py-django-tastypie-mongoengine/Makefile (revision 478329) +++ devel/py-django-tastypie-mongoengine/Makefile (working copy) @@ -15,13 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= wlanslovenija USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- devel/py-eventlib/Makefile (revision 478329) +++ devel/py-eventlib/Makefile (working copy) @@ -14,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}celery>=3.0.0:devel/py-celery@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ejson>=0:devel/py-ejson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}logan>=0.5.0:devel/py-logan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=2.7.1:databases/py-redis@${PY_FLAVOR} NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django USES= python .include --- devel/py-logan/Makefile (revision 478329) +++ devel/py-logan/Makefile (working copy) @@ -13,13 +13,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:devel/py-mock@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django,test NO_ARCH= yes OPTIONS_DEFINE= DOCS --- devel/py-semantic_version/Makefile (revision 478329) +++ devel/py-semantic_version/Makefile (working copy) @@ -14,8 +14,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USE_GITHUB= yes GH_ACCOUNT= rbarrois GH_PROJECT= python-semanticversion @@ -23,7 +21,7 @@ NO_ARCH= yes USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django,test do-test: @(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) --- graphics/py-django-easy-thumbnails/Makefile (revision 478329) +++ graphics/py-django-easy-thumbnails/Makefile (working copy) @@ -13,20 +13,18 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:-2.0 NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" +DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" \ post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|^\(release = \)\(easy_thumbnails.get_version()\)|\1version|' ${WRKSRC}/docs/conf.py --- graphics/py-sorl-thumbnail/Makefile (revision 478329) +++ graphics/py-sorl-thumbnail/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 NO_ARCH= yes PORTDOCS= * --- net-mgmt/netbox/Makefile (revision 478329) +++ net-mgmt/netbox/Makefile (working copy) @@ -11,8 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=2.1.0:www/py-django-cors-headers@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=2.1.0:www/py-django-cors-headers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=1.9.0:www/py-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-filter>=1.1.0:www/py-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.9.0:www/py-django-mptt@${PY_FLAVOR} \ @@ -33,6 +32,7 @@ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} USES= pgsql:9.4+ python:3.5+ +USE_PYTHON= django:1.11-2.0 WANT_PGSQL= server USE_GITHUB= yes GH_ACCOUNT= digitalocean --- security/py-first-server/Makefile (revision 478329) +++ security/py-first-server/Makefile (working copy) @@ -13,7 +13,6 @@ LICENSE= GPLv2 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client@${PY_FLAVOR} @@ -25,7 +24,7 @@ GH_PROJECT= FIRST-server USES= python -USE_PYTHON= flavors +USE_PYTHON= flavors django NO_BUILD= yes --- textproc/pootle/Makefile (revision 478329) +++ textproc/pootle/Makefile (working copy) @@ -32,7 +32,7 @@ NO_ARCH= yes USES= gettext python:2.7 tar:bzip2 shebangfix -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django SHEBANG_FILES= pootle/assets/admin/js/compress.py USERS= pootle --- www/feedjack/Makefile (revision 478329) +++ www/feedjack/Makefile (working copy) @@ -12,11 +12,10 @@ DEPRECATED= Upstream gone -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${PY_FLAVOR} DIST_SUBDIR= python USES= python:2.7 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-allauth/Makefile (revision 478329) +++ www/py-django-allauth/Makefile (working copy) @@ -12,13 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-annoying/Makefile (revision 478329) +++ www/py-django-annoying/Makefile (working copy) @@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 .include --- www/py-django-appmedia/Makefile (revision 478329) +++ www/py-django-appmedia/Makefile (working copy) @@ -11,9 +11,7 @@ MAINTAINER= kurt.lidl@cello.com COMMENT= Serve static content from within django app directories -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR} - USES= python:2.7 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 .include --- www/py-django-assets/Makefile (revision 478329) +++ www/py-django-assets/Makefile (working copy) @@ -12,11 +12,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes --- www/py-django-auth-ldap/Makefile (revision 478329) +++ www/py-django-auth-ldap/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django NO_ARCH= yes PORTDOCS= * --- www/py-django-babel/Makefile (revision 478329) +++ www/py-django-babel/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django NO_ARCH= yes PORTDOCS= * --- www/py-django-bitfield/Makefile (revision 478329) +++ www/py-django-bitfield/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-bootstrap-form/Makefile (revision 478329) +++ www/py-django-bootstrap-form/Makefile (working copy) @@ -13,8 +13,6 @@ LICENSE= MIT USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.5:www/py-django@${PY_FLAVOR} - .include --- www/py-django-braces/Makefile (revision 478329) +++ www/py-django-braces/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:-2.0 USES= python .include --- www/py-django-bulk-update/Makefile (revision 478329) +++ www/py-django-bulk-update/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} - NO_ARCH= yes USES= python:-3.4 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-caching-app-plugins/Makefile (revision 478329) +++ www/py-django-caching-app-plugins/Makefile (working copy) @@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-classy-tags/Makefile (revision 478329) +++ www/py-django-classy-tags/Makefile (working copy) @@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 .include --- www/py-django-cms/Makefile (revision 478329) +++ www/py-django-cms/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangocms-admin-style>=1.0:www/py-djangocms-admin-style@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}djangocms-admin-style>=1.0:www/py-djangocms-admin-style@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.7.2:www/py-django-classy-tags@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-formtools>=1.0:www/py-django-formtools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.7:www/py-django-sekizai@${PY_FLAVOR} \ @@ -21,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}django-treebeard>=4.0.1:www/py-django-treebeard@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes OPTIONS_MULTI= DATABASE --- www/py-django-configurations/Makefile (revision 478329) +++ www/py-django-configurations/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils concurrent autoplist +USE_PYTHON= distutils concurrent autoplist django NO_ARCH= yes PORTDOCS= * --- www/py-django-constance/Makefile (revision 478329) +++ www/py-django-constance/Makefile (working copy) @@ -16,11 +16,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes USE_GITHUB= yes GH_ACCOUNT= jazzband --- www/py-django-contact-form/Makefile (revision 478329) +++ www/py-django-contact-form/Makefile (working copy) @@ -13,13 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}akismet>=0:devel/py-akismet@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test --- www/py-django-contrib-comments/Makefile (revision 478329) +++ www/py-django-contrib-comments/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes --- www/py-django-cors-headers/Makefile (revision 478329) +++ www/py-django-cors-headers/Makefile (working copy) @@ -11,9 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 .include --- www/py-django-crispy-forms/Makefile (revision 478329) +++ www/py-django-crispy-forms/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django .include --- www/py-django-datetime-widget/Makefile (revision 478329) +++ www/py-django-datetime-widget/Makefile (working copy) @@ -14,11 +14,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:1.11 NO_ARCH= yes .include --- www/py-django-debug-toolbar/Makefile (revision 478329) +++ www/py-django-debug-toolbar/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:-2.0 NO_ARCH= yes .include --- www/py-django-dpaste/Makefile (revision 478329) +++ www/py-django-dpaste/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} OPTIONS_DEFINE= MIGRATIONS @@ -23,7 +22,7 @@ MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes --- www/py-django-evolution/Makefile (revision 478329) +++ www/py-django-evolution/Makefile (working copy) @@ -13,13 +13,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR} - USE_GITHUB= yes GH_ACCOUNT= beanbaginc USES= python:2.7 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 post-extract: ${RM} -r ${WRKSRC}/tests --- www/py-django-extensions/Makefile (revision 478329) +++ www/py-django-extensions/Makefile (working copy) @@ -13,12 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-filer/Makefile (revision 478329) +++ www/py-django-filer/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6:www/py-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_polymorphic>=0.7:www/py-django_polymorphic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \ @@ -21,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes .include --- www/py-django-filter/Makefile (revision 478329) +++ www/py-django-filter/Makefile (working copy) @@ -12,13 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>0:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}djangorestframework>0:www/py-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>0:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>0:devel/py-coreschema@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes .include --- www/py-django-happenings/Makefile (revision 478329) +++ www/py-django-happenings/Makefile (working copy) @@ -14,12 +14,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} CONFLICTS_INSTALL= py*-django-mptt USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django .include --- www/py-django-haystack/Makefile (revision 478329) +++ www/py-django-haystack/Makefile (working copy) @@ -14,10 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} USES= python -USE_PYTHON= distutils concurrent autoplist +USE_PYTHON= distutils concurrent autoplist django:-2.0 NO_ARCH= yes PORTDOCS= * --- www/py-django-hijack/Makefile (revision 478329) +++ www/py-django-hijack/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django .include --- www/py-django-js-asset/Makefile (revision 478329) +++ www/py-django-js-asset/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes .include --- www/py-django-json-rpc/Makefile (revision 478329) +++ www/py-django-json-rpc/Makefile (working copy) @@ -11,11 +11,9 @@ MAINTAINER= jhixson@FreeBSD.org COMMENT= Simple JSON-RPC implementation for Django -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR} - LICENSE= MIT USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-jsonfield/Makefile (revision 478329) +++ www/py-django-jsonfield/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes USE_GITHUB= yes GH_ACCOUNT= bradjasper --- www/py-django-jsonfield2/Makefile (revision 478329) +++ www/py-django-jsonfield2/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django USES= python:3.4+ GH_ACCOUNT= rpkilby --- www/py-django-ldapdb/Makefile (revision 478329) +++ www/py-django-ldapdb/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.25:net/py-ldap@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.25:net/py-ldap@${PY_FLAVOR} USES= python -USE_PYTHON= distutils concurrent autoplist +USE_PYTHON= distutils concurrent autoplist django:-2.0 NO_ARCH= yes PORTDOCS= README.rst --- www/py-django-livesettings/Makefile (revision 478329) +++ www/py-django-livesettings/Makefile (working copy) @@ -17,9 +17,8 @@ EXPIRATION_DATE=2018-09-11 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} USES= python:2.7 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-markdownx/Makefile (revision 478329) +++ www/py-django-markdownx/Makefile (working copy) @@ -14,12 +14,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 NO_ARCH= yes .include --- www/py-django-mezzanine/Makefile (revision 478329) +++ www/py-django-mezzanine/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \ @@ -29,7 +28,7 @@ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR} USES= gettext python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:1.11 USE_GITHUB= yes GH_ACCOUNT= stephenmcd GH_PROJECT= mezzanine --- www/py-django-model-utils/Makefile (revision 478329) +++ www/py-django-model-utils/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:-2.0 USES= python .include --- www/py-django-mptt/Makefile (revision 478329) +++ www/py-django-mptt/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR} CONFLICTS_INSTALL=py*-django-happenings @@ -21,7 +20,7 @@ USE_GITHUB= yes USES= gettext python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 NO_ARCH= yes --- www/py-django-netfields/Makefile (revision 478329) +++ www/py-django-netfields/Makefile (working copy) @@ -13,12 +13,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \ ${PY_IPADDRESS} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes --- www/py-django-openid-auth/Makefile (revision 478329) +++ www/py-django-openid-auth/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.6:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes PORTDOCS= README.txt TODO.txt --- www/py-django-overextends/Makefile (revision 478329) +++ www/py-django-overextends/Makefile (working copy) @@ -13,12 +13,11 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-paging/Makefile (revision 478329) +++ www/py-django-paging/Makefile (working copy) @@ -12,11 +12,9 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Paging module for Django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - # FIXME syntax error in __init__.py on Python 3.6 USES= python:2.7 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes .include --- www/py-django-photologue/Makefile (revision 478329) +++ www/py-django-photologue/Makefile (working copy) @@ -13,13 +13,12 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-picklefield/Makefile (revision 478329) +++ www/py-django-picklefield/Makefile (working copy) @@ -14,10 +14,9 @@ LICENSE= MIT # Reminder: www/seahub depends on django, changing django version may break seahub -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes PORTDOCS= README.rst --- www/py-django-post_office/Makefile (revision 478329) +++ www/py-django-post_office/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django USE_GITHUB= yes GH_ACCOUNT= ui --- www/py-django-profiles/Makefile (revision 478329) +++ www/py-django-profiles/Makefile (working copy) @@ -15,11 +15,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR} - WRKSRC= ${WRKDIR}/${PORTNAME} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS --- www/py-django-pyscss/Makefile (revision 478329) +++ www/py-django-pyscss/Makefile (working copy) @@ -14,11 +14,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.4:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django NO_ARCH= yes .include --- www/py-django-ranged-response/Makefile (revision 478329) +++ www/py-django-ranged-response/Makefile (working copy) @@ -11,10 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes .include --- www/py-django-recaptcha/Makefile (revision 478329) +++ www/py-django-recaptcha/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes .include --- www/py-django-redis/Makefile (revision 478329) +++ www/py-django-redis/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ @@ -21,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes do-test: build --- www/py-django-registration/Makefile (revision 478329) +++ www/py-django-registration/Makefile (working copy) @@ -13,12 +13,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confusable_homoglyphs>=0:devel/py-confusable_homoglyphs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confusable_homoglyphs>=0:devel/py-confusable_homoglyphs@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 CONFLICTS_INSTALL= pootle ${PYTHON_PKGNAMEPREFIX}django-registration-redux --- www/py-django-registration-redux/Makefile (revision 478329) +++ www/py-django-registration-redux/Makefile (working copy) @@ -13,11 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 USE_GITHUB= yes GH_ACCOUNT= macropin --- www/py-django-reversion/Makefile (revision 478329) +++ www/py-django-reversion/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes PORTDOCS= * --- www/py-django-sekizai/Makefile (revision 478329) +++ www/py-django-sekizai/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${PY_FLAVOR} USES= python -USE_PYTHON= distutils concurrent autoplist +USE_PYTHON= distutils concurrent autoplist django NO_ARCH= yes PORTDOCS= * --- www/py-django-simple-captcha/Makefile (revision 478329) +++ www/py-django-simple-captcha/Makefile (working copy) @@ -13,13 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.7.0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} USES= python zip -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes PORTDOCS= * --- www/py-django-simple-history/Makefile (revision 478329) +++ www/py-django-simple-history/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:-2.0 NO_ARCH= yes PORTDOCS= *.rst --- www/py-django-solo/Makefile (revision 478329) +++ www/py-django-solo/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= CC-BY-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.6:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django-sortedm2m/Makefile (revision 478329) +++ www/py-django-sortedm2m/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-star-ratings/Makefile (revision 478329) +++ www/py-django-star-ratings/Makefile (working copy) @@ -12,13 +12,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-braces>=0:www/py-django-braces@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-braces>=0:www/py-django-braces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-model-utils>=0:www/py-django-model-utils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}swapper>=0:www/py-swapper@${PY_FLAVOR} NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django .include --- www/py-django-statici18n/Makefile (revision 478329) +++ www/py-django-statici18n/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:-2.0 NO_ARCH= yes .include --- www/py-django-subdomains/Makefile (revision 478329) +++ www/py-django-subdomains/Makefile (working copy) @@ -13,9 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-sudo/Makefile (revision 478329) +++ www/py-django-sudo/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes .include --- www/py-django-tables2/Makefile (revision 478329) +++ www/py-django-tables2/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes .include --- www/py-django-tagging/Makefile (revision 478329) +++ www/py-django-tagging/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-django-taggit/Makefile (revision 478329) +++ www/py-django-taggit/Makefile (working copy) @@ -12,10 +12,9 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django NO_ARCH= yes --- www/py-django-tastypie/Makefile (revision 478329) +++ www/py-django-tastypie/Makefile (working copy) @@ -14,10 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes --- www/py-django-templatetag-sugar/Makefile (revision 478329) +++ www/py-django-templatetag-sugar/Makefile (working copy) @@ -12,10 +12,8 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Library to make writing templatetags in Django sweet -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes .include --- www/py-django-timezone-field/Makefile (revision 478329) +++ www/py-django-timezone-field/Makefile (working copy) @@ -12,11 +12,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes .include --- www/py-django-tinymce/Makefile (revision 478329) +++ www/py-django-tinymce/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django NO_ARCH= yes PORTDOCS= *.rst --- www/py-django-treebeard/Makefile (revision 478329) +++ www/py-django-treebeard/Makefile (working copy) @@ -12,16 +12,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" --- www/py-django-widget-tweaks/Makefile (revision 478329) +++ www/py-django-widget-tweaks/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.2:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django .include --- www/py-django_openstack_auth/Makefile (revision 478329) +++ www/py-django_openstack_auth/Makefile (working copy) @@ -15,7 +15,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=4.0.0:devel/py-oslo.config@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.23.0:devel/py-oslo.policy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \ @@ -23,7 +22,7 @@ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes --- www/py-django_polymorphic/Makefile (revision 478329) +++ www/py-django_polymorphic/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:-2.0 NO_ARCH= yes .include --- www/py-djangocms-admin-style/Makefile (revision 478329) +++ www/py-djangocms-admin-style/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes .include --- www/py-djangorestframework/Makefile (revision 478329) +++ www/py-djangorestframework/Makefile (working copy) @@ -13,11 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework36 NO_ARCH= yes --- www/py-djangotoolbox/Makefile (revision 478329) +++ www/py-djangotoolbox/Makefile (working copy) @@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 .include --- www/py-dojango/Makefile (revision 478329) +++ www/py-dojango/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.6:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 USE_GITHUB= yes GH_ACCOUNT= william-gr --- www/py-drf-yasg/Makefile (revision 478329) +++ www/py-drf-yasg/Makefile (working copy) @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.6:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.7.7:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.7.7:www/py-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flex>=6.11.1:devel/py-flex@${PY_FLAVOR} \ @@ -27,7 +26,7 @@ ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django NO_ARCH= yes --- www/py-graphite-web/Makefile (revision 478329) +++ www/py-graphite-web/Makefile (working copy) @@ -14,7 +14,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \ @@ -26,7 +25,7 @@ GH_ACCOUNT= graphite-project CPE_VENDOR= graphite_project CPE_PRODUCT= graphite -USE_PYTHON= distutils +USE_PYTHON= distutils django:1.11 SHEBANG_FILES= bin/build-index.sh SUB_FILES= pkg-message SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \ --- www/py-horizon/Makefile (revision 478329) +++ www/py-horizon/Makefile (working copy) @@ -16,7 +16,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${PY_FLAVOR} \ @@ -74,7 +73,7 @@ ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils django:1.11 NO_ARCH= yes USERS= horizon --- www/py-jsonfield/Makefile (revision 478329) +++ www/py-jsonfield/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist django:1.11 NO_ARCH= yes .include --- www/py-swapper/Makefile (revision 478329) +++ www/py-swapper/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.6:www/py-django111@${PY_FLAVOR} - NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils django:1.11 USES= python .include --- www/seahub/Makefile (revision 478329) +++ www/seahub/Makefile (working copy) @@ -13,11 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} - RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \ - ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-simple-captcha>=0:www/py-django-simple-captcha@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \ @@ -39,6 +36,7 @@ ${PY_FUTURES} USES= gettext-tools:build python:-2.7 shebangfix +USE_PYTHON= django:1.11 USE_GITHUB= yes GH_ACCOUNT= haiwen SHEBANG_FILES= *.sh tests/*.sh *.template *.py tools/*.py seahub/*.py