Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jan 2023 13:19:12 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4ca72e1c3a29 - main - www/py-django32: Simplify CONFLICTS_INSTALL
Message-ID:  <202301301319.30UDJCVa084302@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301301319.30UDJCVa084302>