Tue Feb 14 18:09:43 2023 UTC ()
py-django14: remove psycopg2 support (python 3.x only) and default to sqlite option.


(nikita)
diff -r1.25 -r1.26 pkgsrc/www/py-django14/Makefile
diff -r1.5 -r1.6 pkgsrc/www/py-django14/PLIST
diff -r1.13 -r1.14 pkgsrc/www/py-django14/options.mk
cvs diff -r1.25 -r1.26 pkgsrc/www/py-django14/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-django14/Attic/Makefile 2022/11/09 13:14:18 1.25
+++ pkgsrc/www/py-django14/Attic/Makefile 2023/02/14 18:09:43 1.26
@@ -1,48 +1,46 @@ @@ -1,48 +1,46 @@
1# $NetBSD: Makefile,v 1.25 2022/11/09 13:14:18 joerg Exp $ 1# $NetBSD: Makefile,v 1.26 2023/02/14 18:09:43 nikita Exp $
2 2
3DISTNAME= Django-1.4.22 3DISTNAME= Django-1.4.22
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 2 5PKGREVISION= 3
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= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.djangoproject.com/ 10HOMEPAGE= https://www.djangoproject.com/
11COMMENT= Django, a high-level Python Web framework (LTS version) 11COMMENT= Django, a high-level Python Web framework (LTS version)
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup 14DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
15 15
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none
17REPLACE_PYTHON= django/bin/*.py 17REPLACE_PYTHON= django/bin/*.py
18REPLACE_PYTHON+= django/bin/profiling/*.py 18REPLACE_PYTHON+= django/bin/profiling/*.py
19REPLACE_PYTHON+= django/conf/project_template/*.py 19REPLACE_PYTHON+= django/conf/project_template/*.py
20 20
21PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support 21PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support
22 22
23USE_PKG_RESOURCES= yes 23USE_PKG_RESOURCES= yes
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27pre-configure: 27pre-configure:
28 rm -r ${WRKSRC}/django/db/backends/mysql 28 rm -r ${WRKSRC}/django/db/backends/mysql
29.if empty(PKG_OPTIONS:Moracle) 29.if empty(PKG_OPTIONS:Moracle)
30 rm -r ${WRKSRC}/django/db/backends/oracle 30 rm -r ${WRKSRC}/django/db/backends/oracle
31.endif 31.endif
32.if empty(PKG_OPTIONS:Mpgsql) 32 # broken, py-psycopg2 is python 3.x only
33 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2 33 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
34.endif 
35.if empty(PKG_OPTIONS:Msqlite) 34.if empty(PKG_OPTIONS:Msqlite)
36 rm -r ${WRKSRC}/django/db/backends/sqlite3 35 rm -r ${WRKSRC}/django/db/backends/sqlite3
37.endif 36.endif
38 37
39BACKEND_PATH= ${PYSITELIB}/django/db/backends 38BACKEND_PATH= ${PYSITELIB}/django/db/backends
40BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends 39BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends
41 40
42PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") } 41PRINT_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/") } 
44PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") } 42PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
45 43
46.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
47.include "../../lang/python/egg.mk" 45.include "../../lang/python/egg.mk"
48.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/www/py-django14/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/py-django14/Attic/PLIST 2022/08/29 10:33:05 1.5
+++ pkgsrc/www/py-django14/Attic/PLIST 2023/02/14 18:09:43 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2022/08/29 10:33:05 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/02/14 18:09:43 nikita Exp $
2bin/django-admin.py 2bin/django-admin.py
3${PYSITELIB}/${EGG_INFODIR} 3${PYSITELIB}/${EGG_INFODIR}
4${PYSITELIB}/django/__init__.py 4${PYSITELIB}/django/__init__.py
5${PYSITELIB}/django/__init__.pyc 5${PYSITELIB}/django/__init__.pyc
6${PYSITELIB}/django/__init__.pyo 6${PYSITELIB}/django/__init__.pyo
7${PYSITELIB}/django/bin/__init__.py 7${PYSITELIB}/django/bin/__init__.py
8${PYSITELIB}/django/bin/__init__.pyc 8${PYSITELIB}/django/bin/__init__.pyc
9${PYSITELIB}/django/bin/__init__.pyo 9${PYSITELIB}/django/bin/__init__.pyo
10${PYSITELIB}/django/bin/daily_cleanup.py 10${PYSITELIB}/django/bin/daily_cleanup.py
11${PYSITELIB}/django/bin/daily_cleanup.pyc 11${PYSITELIB}/django/bin/daily_cleanup.pyc
12${PYSITELIB}/django/bin/daily_cleanup.pyo 12${PYSITELIB}/django/bin/daily_cleanup.pyo
13${PYSITELIB}/django/bin/django-admin.py 13${PYSITELIB}/django/bin/django-admin.py
14${PYSITELIB}/django/bin/django-admin.pyc 14${PYSITELIB}/django/bin/django-admin.pyc
@@ -4857,47 +4857,26 @@ ${PLIST.oracle}${PYSITELIB}/django/db/ba @@ -4857,47 +4857,26 @@ ${PLIST.oracle}${PYSITELIB}/django/db/ba
4857${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/base.pyo 4857${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/base.pyo
4858${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.py 4858${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.py
4859${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyc 4859${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyc
4860${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyo 4860${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyo
4861${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.py 4861${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.py
4862${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.pyc 4862${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.pyc
4863${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.pyo 4863${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/compiler.pyo
4864${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.py 4864${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.py
4865${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyc 4865${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyc
4866${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyo 4866${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyo
4867${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.py 4867${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.py
4868${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyc 4868${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyc
4869${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyo 4869${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyo
4870${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py 
4871${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc 
4872${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo 
4873${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py 
4874${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc 
4875${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo 
4876${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py 
4877${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc 
4878${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo 
4879${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py 
4880${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc 
4881${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo 
4882${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py 
4883${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc 
4884${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo 
4885${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.py 
4886${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.pyc 
4887${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.pyo 
4888${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.py 
4889${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.pyc 
4890${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.pyo 
4891${PYSITELIB}/django/db/backends/signals.py 4870${PYSITELIB}/django/db/backends/signals.py
4892${PYSITELIB}/django/db/backends/signals.pyc 4871${PYSITELIB}/django/db/backends/signals.pyc
4893${PYSITELIB}/django/db/backends/signals.pyo 4872${PYSITELIB}/django/db/backends/signals.pyo
4894${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.py 4873${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.py
4895${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc 4874${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc
4896${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo 4875${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo
4897${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.py 4876${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.py
4898${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyc 4877${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyc
4899${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyo 4878${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyo
4900${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.py 4879${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.py
4901${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyc 4880${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyc
4902${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyo 4881${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyo
4903${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.py 4882${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.py
cvs diff -r1.13 -r1.14 pkgsrc/www/py-django14/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/py-django14/Attic/options.mk 2022/08/29 10:33:05 1.13
+++ pkgsrc/www/py-django14/Attic/options.mk 2023/02/14 18:09:43 1.14
@@ -1,25 +1,20 @@ @@ -1,25 +1,20 @@
1# $NetBSD: options.mk,v 1.13 2022/08/29 10:33:05 wiz Exp $ 1# $NetBSD: options.mk,v 1.14 2023/02/14 18:09:43 nikita Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.django 3PKG_OPTIONS_VAR= PKG_OPTIONS.django
4PKG_SUPPORTED_OPTIONS= oracle pgsql sqlite 4PKG_SUPPORTED_OPTIONS= oracle sqlite
5PKG_SUGGESTED_OPTIONS= pgsql 5PKG_SUGGESTED_OPTIONS= sqlite
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
10 10
11.if !empty(PKG_OPTIONS:Moracle) 11.if !empty(PKG_OPTIONS:Moracle)
12DEPENDS+= ${PYPKGPREFIX}-cx_Oracle-[0-9]*:../../databases/py-cx_Oracle 12DEPENDS+= ${PYPKGPREFIX}-cx_Oracle-[0-9]*:../../databases/py-cx_Oracle
13PLIST.oracle= yes 13PLIST.oracle= yes
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Mpgsql) 
17DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 
18PLIST.pgsql= yes 
19.endif 
20 
21.if !empty(PKG_OPTIONS:Msqlite) 16.if !empty(PKG_OPTIONS:Msqlite)
22DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 17DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
23PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2 18PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2
24PLIST.sqlite= yes 19PLIST.sqlite= yes
25.endif 20.endif