Wed Jan 5 10:09:54 2022 UTC ()
py-django*: add dependency on py-setuptools

These use pkg_resources.

Noted by joerg.

Bump PKGREVISION.


(wiz)
diff -r1.115 -r1.116 pkgsrc/www/py-django/Makefile
diff -r1.20 -r1.21 pkgsrc/www/py-django14/Makefile
diff -r1.38 -r1.39 pkgsrc/www/py-django2/Makefile
diff -r1.23 -r1.24 pkgsrc/www/py-django3/Makefile

cvs diff -r1.115 -r1.116 pkgsrc/www/py-django/Makefile (switch to unified diff)

--- pkgsrc/www/py-django/Makefile 2022/01/04 20:55:17 1.115
+++ pkgsrc/www/py-django/Makefile 2022/01/05 10:09:53 1.116
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.115 2022/01/04 20:55:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.116 2022/01/05 10:09:53 wiz Exp $
2 2
3DISTNAME= Django-1.11.29 3DISTNAME= Django-1.11.29
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www python 6CATEGORIES= www python
7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= https://www.djangoproject.com/ 10HOMEPAGE= https://www.djangoproject.com/
11COMMENT= Django, a high-level Python Web framework 11COMMENT= Django, a high-level Python Web framework
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
 14DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
14DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 15DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
15 16
16USE_LANGUAGES= # none 17USE_LANGUAGES= # none
17 18
18REPLACE_PYTHON+= django/bin/django-admin.py 19REPLACE_PYTHON+= django/bin/django-admin.py
19REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl 20REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl
20 21
21post-install: 22post-install:
22 cd ${DESTDIR}${PREFIX}/bin && \ 23 cd ${DESTDIR}${PREFIX}/bin && \
23 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \ 24 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \
24 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE} 25 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE}
25 26
26.include "../../lang/python/application.mk" 27.include "../../lang/python/application.mk"
27.include "../../lang/python/egg.mk" 28.include "../../lang/python/egg.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"

cvs diff -r1.20 -r1.21 pkgsrc/www/py-django14/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/py-django14/Attic/Makefile 2020/05/22 20:27:13 1.20
+++ pkgsrc/www/py-django14/Attic/Makefile 2022/01/05 10:09:53 1.21
@@ -1,48 +1,50 @@ @@ -1,48 +1,50 @@
1# $NetBSD: Makefile,v 1.20 2020/05/22 20:27:13 rillig Exp $ 1# $NetBSD: Makefile,v 1.21 2022/01/05 10:09:53 wiz Exp $
2 2
3DISTNAME= Django-1.4.22 3DISTNAME= Django-1.4.22
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
 5PKGREVISION= 1
5CATEGORIES= www python 6CATEGORIES= www python
6MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
7 8
8MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= https://www.djangoproject.com/ 10HOMEPAGE= https://www.djangoproject.com/
10COMMENT= Django, a high-level Python Web framework (LTS version) 11COMMENT= Django, a high-level Python Web framework (LTS version)
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup 14DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
 15DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
14 16
15USE_LANGUAGES= # none 17USE_LANGUAGES= # none
16REPLACE_PYTHON= django/bin/*.py 18REPLACE_PYTHON= django/bin/*.py
17REPLACE_PYTHON+= django/bin/profiling/*.py 19REPLACE_PYTHON+= django/bin/profiling/*.py
18REPLACE_PYTHON+= django/conf/project_template/*.py 20REPLACE_PYTHON+= django/conf/project_template/*.py
19 21
20PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support 22PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support
21 23
22.include "options.mk" 24.include "options.mk"
23 25
24pre-configure: 26pre-configure:
25.if empty(PKG_OPTIONS:Mmysql) 27.if empty(PKG_OPTIONS:Mmysql)
26 rm -r ${WRKSRC}/django/db/backends/mysql 28 rm -r ${WRKSRC}/django/db/backends/mysql
27.endif 29.endif
28.if empty(PKG_OPTIONS:Moracle) 30.if empty(PKG_OPTIONS:Moracle)
29 rm -r ${WRKSRC}/django/db/backends/oracle 31 rm -r ${WRKSRC}/django/db/backends/oracle
30.endif 32.endif
31.if empty(PKG_OPTIONS:Mpgsql) 33.if empty(PKG_OPTIONS:Mpgsql)
32 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2 34 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
33.endif 35.endif
34.if empty(PKG_OPTIONS:Msqlite) 36.if empty(PKG_OPTIONS:Msqlite)
35 rm -r ${WRKSRC}/django/db/backends/sqlite3 37 rm -r ${WRKSRC}/django/db/backends/sqlite3
36.endif 38.endif
37 39
38BACKEND_PATH= ${PYSITELIB}/django/db/backends 40BACKEND_PATH= ${PYSITELIB}/django/db/backends
39BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends 41BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends
40 42
41PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") } 43PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") }
42PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") } 44PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") }
43PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") } 45PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") }
44PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") } 46PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
45 47
46.include "../../lang/python/application.mk" 48.include "../../lang/python/application.mk"
47.include "../../lang/python/distutils.mk" 49.include "../../lang/python/distutils.mk"
48.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"

cvs diff -r1.38 -r1.39 pkgsrc/www/py-django2/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/py-django2/Attic/Makefile 2022/01/04 20:55:22 1.38
+++ pkgsrc/www/py-django2/Attic/Makefile 2022/01/05 10:09:53 1.39
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.38 2022/01/04 20:55:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2022/01/05 10:09:53 wiz Exp $
2 2
3DISTNAME= Django-2.2.25 3DISTNAME= Django-2.2.25
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www python 6CATEGORIES= www python
7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
8MASTER_SITES+= ${MASTER_SITE_PYPI:=D/Django/} 8MASTER_SITES+= ${MASTER_SITE_PYPI:=D/Django/}
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= https://www.djangoproject.com/ 11HOMEPAGE= https://www.djangoproject.com/
12COMMENT= Django, a high-level Python Web framework 12COMMENT= Django, a high-level Python Web framework
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 15DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 16DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
16 17
17USE_LANGUAGES= # none 18USE_LANGUAGES= # none
18 19
19PYTHON_VERSIONS_INCOMPATIBLE= 27 20PYTHON_VERSIONS_INCOMPATIBLE= 27
20 21
21REPLACE_PYTHON+= django/bin/django-admin.py 22REPLACE_PYTHON+= django/bin/django-admin.py
22REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl 23REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl
23 24
24post-install: 25post-install:
25 cd ${DESTDIR}${PREFIX}/bin && \ 26 cd ${DESTDIR}${PREFIX}/bin && \
26 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \ 27 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \
27 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE} 28 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE}
28 29
29.include "../../lang/python/application.mk" 30.include "../../lang/python/application.mk"
30.include "../../lang/python/egg.mk" 31.include "../../lang/python/egg.mk"
31.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"

cvs diff -r1.23 -r1.24 pkgsrc/www/py-django3/Makefile (switch to unified diff)

--- pkgsrc/www/py-django3/Makefile 2022/01/04 20:55:22 1.23
+++ pkgsrc/www/py-django3/Makefile 2022/01/05 10:09:53 1.24
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.23 2022/01/04 20:55:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2022/01/05 10:09:53 wiz Exp $
2 2
3DISTNAME= Django-3.2.10 3DISTNAME= Django-3.2.10
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www python 6CATEGORIES= www python
7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
8MASTER_SITES+= ${MASTER_SITE_PYPI:=D/Django/} 8MASTER_SITES+= ${MASTER_SITE_PYPI:=D/Django/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.djangoproject.com/ 11HOMEPAGE= https://www.djangoproject.com/
12COMMENT= Django, a high-level Python Web framework 12COMMENT= Django, a high-level Python Web framework
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15DEPENDS+= ${PYPKGPREFIX}-asgiref>=3.3.2:../../www/py-asgiref 15DEPENDS+= ${PYPKGPREFIX}-asgiref>=3.3.2:../../www/py-asgiref
16DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 16DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 17DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
17DEPENDS+= ${PYPKGPREFIX}-sqlparse>=0.2.2:../../databases/py-sqlparse 18DEPENDS+= ${PYPKGPREFIX}-sqlparse>=0.2.2:../../databases/py-sqlparse
18 19
19USE_LANGUAGES= # none 20USE_LANGUAGES= # none
20 21
21PYTHON_VERSIONS_INCOMPATIBLE= 27 22PYTHON_VERSIONS_INCOMPATIBLE= 27
22 23
23REPLACE_PYTHON+= django/bin/django-admin.py 24REPLACE_PYTHON+= django/bin/django-admin.py
24REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl 25REPLACE_PYTHON+= django/conf/project_template/manage.py-tpl
25 26
26post-install: 27post-install:
27 cd ${DESTDIR}${PREFIX}/bin && \ 28 cd ${DESTDIR}${PREFIX}/bin && \
28 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \ 29 ${MV} django-admin django-admin-${PYVERSSUFFIX} && \
29 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE} 30 ${MV} django-admin.py django-admin-${PYVERSSUFFIX}.py || ${TRUE}
30 31
31.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
32.include "../../lang/python/egg.mk" 33.include "../../lang/python/egg.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"