git: 2d48a02b9f50 - main - www/gitlab-ce: fix CONFLICTS_INSTALL

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

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Thu, 20 Jan 2022 14:55:38 UTC

The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2d48a02b9f50f9c21f3a6ebbe42e160bccb55426

commit 2d48a02b9f50f9c21f3a6ebbe42e160bccb55426
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-01-20 14:51:59 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-01-20 14:55:27 +0000

    www/gitlab-ce: fix CONFLICTS_INSTALL
---
 www/gitlab-ce/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 45425303050f..dd296e7aba64 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -264,7 +264,7 @@ CONFLICTS_INSTALL=	gitolite \
 			gitolite2 \
 			gogs \
 			gitea \
-			${PYTHON_PKGNAMEPREFIX}-gitosis
+			gitosis
 
 USES=		go:modules shebangfix
 USE_RUBY=	yes