git: 4ca72e1c3a29 - main - www/py-django32: Simplify CONFLICTS_INSTALL

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 30 Jan 2023 13:19:12 UTC

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ca72e1c3a299dba0650ce05ab75722fee283bf7

commit 4ca72e1c3a299dba0650ce05ab75722fee283bf7
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-01-30 12:44:56 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-01-30 13:02:19 +0000

    www/py-django32: Simplify CONFLICTS_INSTALL
---
 www/py-django32/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile
index ecda0425e775..23dd135ef93f 100644
--- a/www/py-django32/Makefile
+++ b/www/py-django32/Makefile
@@ -32,8 +32,7 @@ PORTDOCS=	*
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py-tpl
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django40 \
-			${PYTHON_PKGNAMEPREFIX}django41
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django[0-9][0-9]
 
 CPE_VENDOR=	djangoproject