CVS commit: pkgsrc/www/py-django14

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Tue Feb 14 18:09:43 UTC 2023

Modified Files:
        pkgsrc/www/py-django14: Makefile PLIST options.mk

Log Message:
py-django14: remove psycopg2 support (python 3.x only) and default to sqlite option.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/py-django14/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-django14/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-django14/options.mk

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-django14/Makefile
diff -u pkgsrc/www/py-django14/Makefile:1.25 pkgsrc/www/py-django14/Makefile:1.26
--- pkgsrc/www/py-django14/Makefile:1.25        Wed Nov  9 13:14:18 2022
+++ pkgsrc/www/py-django14/Makefile     Tue Feb 14 18:09:43 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2022/11/09 13:14:18 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2023/02/14 18:09:43 nikita Exp $
 
 DISTNAME=      Django-1.4.22
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www python
 MASTER_SITES=  https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
 
@@ -29,9 +29,8 @@ pre-configure:
 .if empty(PKG_OPTIONS:Moracle)
        rm -r ${WRKSRC}/django/db/backends/oracle
 .endif
-.if empty(PKG_OPTIONS:Mpgsql)
+       # broken, py-psycopg2 is python 3.x only
        rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
-.endif
 .if empty(PKG_OPTIONS:Msqlite)
        rm -r ${WRKSRC}/django/db/backends/sqlite3
 .endif
@@ -40,7 +39,6 @@ BACKEND_PATH=         ${PYSITELIB}/django/db/ba
 BACKEND_PATH_PLIST=    $${PYSITELIB}/django/db/backends
 
 PRINT_PLIST_AWK+=      { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") }
-PRINT_PLIST_AWK+=      { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") }
 PRINT_PLIST_AWK+=      { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
 
 .include "../../lang/python/application.mk"

Index: pkgsrc/www/py-django14/PLIST
diff -u pkgsrc/www/py-django14/PLIST:1.5 pkgsrc/www/py-django14/PLIST:1.6
--- pkgsrc/www/py-django14/PLIST:1.5    Mon Aug 29 10:33:05 2022
+++ pkgsrc/www/py-django14/PLIST        Tue Feb 14 18:09:43 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/08/29 10:33:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/02/14 18:09:43 nikita Exp $
 bin/django-admin.py
 ${PYSITELIB}/${EGG_INFODIR}
 ${PYSITELIB}/django/__init__.py
@@ -4867,27 +4867,6 @@ ${PLIST.oracle}${PYSITELIB}/django/db/ba
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.py
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyc
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/operations.pyo
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.py
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.pyc
-${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql_psycopg2/version.pyo
 ${PYSITELIB}/django/db/backends/signals.py
 ${PYSITELIB}/django/db/backends/signals.pyc
 ${PYSITELIB}/django/db/backends/signals.pyo

Index: pkgsrc/www/py-django14/options.mk
diff -u pkgsrc/www/py-django14/options.mk:1.13 pkgsrc/www/py-django14/options.mk:1.14
--- pkgsrc/www/py-django14/options.mk:1.13      Mon Aug 29 10:33:05 2022
+++ pkgsrc/www/py-django14/options.mk   Tue Feb 14 18:09:43 2023
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2022/08/29 10:33:05 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2023/02/14 18:09:43 nikita Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.django
-PKG_SUPPORTED_OPTIONS= oracle pgsql sqlite
-PKG_SUGGESTED_OPTIONS= pgsql
+PKG_SUPPORTED_OPTIONS= oracle sqlite
+PKG_SUGGESTED_OPTIONS= sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,11 +13,6 @@ DEPENDS+=    ${PYPKGPREFIX}-cx_Oracle-[0-9]
 PLIST.oracle=  yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+=      ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
-PLIST.pgsql=   yes
-.endif
-
 .if !empty(PKG_OPTIONS:Msqlite)
 DEPENDS+=      ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
 PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2