Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_166176918667550"
MIME-Version: 1.0
Date: Mon, 29 Aug 2022 10:33:06 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/www/py-django14
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220829103306.145B8FA82@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_166176918667550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Aug 29 10:33:05 UTC 2022

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

Log Message:
py-django14: finish mysql option removal


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/py-django14/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/py-django14/PLIST
cvs rdiff -u -r1.12 -r1.13 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.


--_----------=_166176918667550
Content-Disposition: inline
Content-Length: 4481
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/py-django14/Makefile
diff -u pkgsrc/www/py-django14/Makefile:1.23 pkgsrc/www/py-django14/Makefile:1.24
--- pkgsrc/www/py-django14/Makefile:1.23	Mon Jan 10 09:03:53 2022
+++ pkgsrc/www/py-django14/Makefile	Mon Aug 29 10:33:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/10 09:03:53 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/08/29 10:33:05 wiz Exp $
 
 DISTNAME=	Django-1.4.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -25,9 +25,7 @@ USE_PKG_RESOURCES=	yes
 .include "options.mk"
 
 pre-configure:
-.if empty(PKG_OPTIONS:Mmysql)
 	rm -r ${WRKSRC}/django/db/backends/mysql
-.endif
 .if empty(PKG_OPTIONS:Moracle)
 	rm -r ${WRKSRC}/django/db/backends/oracle
 .endif
@@ -41,7 +39,6 @@ pre-configure:
 BACKEND_PATH=		${PYSITELIB}/django/db/backends
 BACKEND_PATH_PLIST=	$${PYSITELIB}/django/db/backends
 
-PRINT_PLIST_AWK+=	{ gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") }
 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/") }

Index: pkgsrc/www/py-django14/PLIST
diff -u pkgsrc/www/py-django14/PLIST:1.4 pkgsrc/www/py-django14/PLIST:1.5
--- pkgsrc/www/py-django14/PLIST:1.4	Fri Jan 14 17:52:06 2022
+++ pkgsrc/www/py-django14/PLIST	Mon Aug 29 10:33:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2022/01/14 17:52:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/08/29 10:33:05 wiz Exp $
 bin/django-admin.py
 ${PYSITELIB}/${EGG_INFODIR}
 ${PYSITELIB}/django/__init__.py
@@ -4849,27 +4849,6 @@ ${PYSITELIB}/django/db/backends/dummy/__
 ${PYSITELIB}/django/db/backends/dummy/base.py
 ${PYSITELIB}/django/db/backends/dummy/base.pyc
 ${PYSITELIB}/django/db/backends/dummy/base.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/compiler.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/compiler.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/compiler.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyo
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.py
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyc
-${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyo
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.py
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.pyc
 ${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.pyo

Index: pkgsrc/www/py-django14/options.mk
diff -u pkgsrc/www/py-django14/options.mk:1.12 pkgsrc/www/py-django14/options.mk:1.13
--- pkgsrc/www/py-django14/options.mk:1.12	Fri Aug 26 18:39:43 2022
+++ pkgsrc/www/py-django14/options.mk	Mon Aug 29 10:33:05 2022
@@ -1,19 +1,13 @@
-# $NetBSD: options.mk,v 1.12 2022/08/26 18:39:43 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2022/08/29 10:33:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.django
-PKG_SUPPORTED_OPTIONS=	oracle pgsql sqlite # mysql
+PKG_SUPPORTED_OPTIONS=	oracle pgsql sqlite
 PKG_SUGGESTED_OPTIONS=	pgsql
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	${PKG_SUPPORTED_OPTIONS}
 
-#.if !empty(PKG_OPTIONS:Mmysql)
-#DEPENDS+=	${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
-#PYTHON_VERSIONS_ACCEPTED= 27 # py-mysqldb
-#PLIST.mysql=	yes
-#.endif
-
 .if !empty(PKG_OPTIONS:Moracle)
 DEPENDS+=	${PYPKGPREFIX}-cx_Oracle-[0-9]*:../../databases/py-cx_Oracle
 PLIST.oracle=	yes


--_----------=_166176918667550--