CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan  5 15:51:59 UTC 2022

Modified Files:
        pkgsrc/www/py-django: Makefile
        pkgsrc/www/py-django14: Makefile
        pkgsrc/www/py-django2: Makefile
        pkgsrc/www/py-django3: Makefile

Log Message:
py-django*: switch to USE_PKG_RESOURCES


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/www/py-django/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-django14/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/py-django2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/py-django3/Makefile

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

Modified files:

Index: pkgsrc/www/py-django/Makefile
diff -u pkgsrc/www/py-django/Makefile:1.117 pkgsrc/www/py-django/Makefile:1.118
--- pkgsrc/www/py-django/Makefile:1.117 Wed Jan  5 15:41:29 2022
+++ pkgsrc/www/py-django/Makefile       Wed Jan  5 15:51:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2022/01/05 15:41:29 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2022/01/05 15:51:59 wiz Exp $
 
 DISTNAME=      Django-1.11.29
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,6 @@ HOMEPAGE=     https://www.djangoproject.com/
 COMMENT=       Django, a high-level Python Web framework
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 
 USE_LANGUAGES= # none

Index: pkgsrc/www/py-django14/Makefile
diff -u pkgsrc/www/py-django14/Makefile:1.21 pkgsrc/www/py-django14/Makefile:1.22
--- pkgsrc/www/py-django14/Makefile:1.21        Wed Jan  5 10:09:53 2022
+++ pkgsrc/www/py-django14/Makefile     Wed Jan  5 15:51:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/01/05 10:09:53 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:51:59 wiz Exp $
 
 DISTNAME=      Django-1.4.22
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,7 +12,6 @@ COMMENT=      Django, a high-level Python Web
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
-DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 USE_LANGUAGES=         # none
 REPLACE_PYTHON=                django/bin/*.py
@@ -21,6 +20,8 @@ REPLACE_PYTHON+=      django/conf/project_tem
 
 PYTHON_VERSIONS_ACCEPTED=      27 # use py-django if you want python-3.x support
 
+USE_PKG_RESOURCES=     yes
+
 .include "options.mk"
 
 pre-configure:

Index: pkgsrc/www/py-django2/Makefile
diff -u pkgsrc/www/py-django2/Makefile:1.39 pkgsrc/www/py-django2/Makefile:1.40
--- pkgsrc/www/py-django2/Makefile:1.39 Wed Jan  5 10:09:53 2022
+++ pkgsrc/www/py-django2/Makefile      Wed Jan  5 15:51:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/01/05 10:09:53 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/01/05 15:51:59 wiz Exp $
 
 DISTNAME=      Django-2.2.25
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -13,12 +13,13 @@ COMMENT=    Django, a high-level Python Web
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       django/bin/django-admin.py
 REPLACE_PYTHON+=       django/conf/project_template/manage.py-tpl
 

Index: pkgsrc/www/py-django3/Makefile
diff -u pkgsrc/www/py-django3/Makefile:1.24 pkgsrc/www/py-django3/Makefile:1.25
--- pkgsrc/www/py-django3/Makefile:1.24 Wed Jan  5 10:09:53 2022
+++ pkgsrc/www/py-django3/Makefile      Wed Jan  5 15:51:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/01/05 10:09:53 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/01/05 15:51:59 wiz Exp $
 
 DISTNAME=      Django-3.2.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,13 +14,14 @@ LICENSE=    modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-asgiref>=3.3.2:../../www/py-asgiref
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-sqlparse>=0.2.2:../../databases/py-sqlparse
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+USE_PKG_RESOURCES=     yes
+
 REPLACE_PYTHON+=       django/bin/django-admin.py
 REPLACE_PYTHON+=       django/conf/project_template/manage.py-tpl