From nobody Thu Jan 20 14:55:38 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C8261195887B; Thu, 20 Jan 2022 14:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jfltf58rzz3k9C; Thu, 20 Jan 2022 14:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hy/nMEv7qzoKyzdbpuww0TiTCKmb99O3LnmVZLAmdQ4=; b=rfBAsTOG2Z7ZxRG/yOiMkjpiCn6LuZoyoT3Ik23ihFGlSLgltq+ddMSr52q9MjiA+v/aZf wv/qbcDqDMNGYCkfGOcKzmS95uPy49/h3oe28lEy8DyEEvF7VPs2W6/syeTnG1uwM5xEuH kX1jp6/hP1pShlm/NIqghYF3eAFKYsgra+j7895cBgOr051AGljVIpQgl1snZb85Pi1gfc wyXfV8MaY3hp5xSW3aF3FffjUWAIP2jegqrUb06KqmoQjhEe2gKXDrLaJ6th1lnfzHNfyC kaL0quSgRdA/a/xq3l3Y0bJNP7MNV6REiZqPIcemKBVXjEXlhFmQ+1jcFtYluw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9030521AE; Thu, 20 Jan 2022 14:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KEtcms078218; Thu, 20 Jan 2022 14:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEtchR078217; Thu, 20 Jan 2022 14:55:38 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:55:38 GMT Message-Id: <202201201455.20KEtchR078217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 2d48a02b9f50 - main - www/gitlab-ce: fix CONFLICTS_INSTALL List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d48a02b9f50f9c21f3a6ebbe42e160bccb55426 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hy/nMEv7qzoKyzdbpuww0TiTCKmb99O3LnmVZLAmdQ4=; b=dmPvkucdCbJdnbCic3wgnnn7gsnVGMqSEUb9kizHW0c92nv0hX/kWtv1JjKQfJ2NsRJx6m MpzbTTzKmQ0HsQdgaTrh3fd/40s1Llkl8WmnZKcfiACBuz/V33l5AYnWervgP9WI4cOGbw V3mJV404Xq6GFfHRaDF2rS/9+fx9gGUb9ozMOIPteX8/r0vr1KaHyuXH5s4UubnEKOh5jQ 2WJolqQgwdqZAXFh0W3ntgJxFJcZiVTak9EI4+uCHfTi/sccrhVbwe6WLbFkCkNracZmQv ayew8Wamg22YFzMNstKqvYxxm5FyaUzOcr/SJRbyyX8gtPqFRTpq5a2sXrJwyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642690538; a=rsa-sha256; cv=none; b=rGkgJX6m9Yks+AuVQWvCgFOCDH1EW79QQ36XEL22AV/yYKyuMYdPxQLvMufTdf2uowOnw/ PuoNtQQ3hA2hwy5v+EKnEpI5UdjBL5v/rdF4pIn8jPRGggg6bWZ21flDujTq358EtJRosC RCQuDlBIukgh5BLLMu0vHharpzxTYMC7KJbllfEzMAOebSxd+AqH0SEDxXxh3Vb/LbI40g V2fNutkaK0Ul713wQnIkFga3Hjrl0V3BF2/ioWgDSaHUVyS/zhzGoegAUZT4i/X3CURslv GRsOHOs+sz5PA3z5FQuFI+TxWEo6g0kw1QPDfniepWCGcKTfTICUavNVL5MLsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d48a02b9f50f9c21f3a6ebbe42e160bccb55426 commit 2d48a02b9f50f9c21f3a6ebbe42e160bccb55426 Author: Stefan Eßer AuthorDate: 2022-01-20 14:51:59 +0000 Commit: Stefan Eßer 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