From nobody Thu Oct 06 21:28:01 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 4Mk4Kt1kspz4V6rC; Thu, 6 Oct 2022 21:28:02 +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 4Mk4Kt1BLGz3rWX; Thu, 6 Oct 2022 21:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665091682; 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=kjvCi7ElU2kkgwtr1sgPH5zAUf4xN0KrcNhUjCwpRNY=; b=hzjRJ1nnGaQWAVjq0CBHh5ffrpLPpW72vpEUS9TLFRiIcgSfMjqtLb7iaJeFhs6zCXJaYS o38pIUa6dunWMDcoX7xvKwh4Cv/avPzvDrIteORfTS7Ch6wVR8cQQpvIB+uAG8i2jCly8f f5zwbRTfo9zKmZokwgNswE2oExG1fP0zO27dh7iicYJL4xqSrmzTO1/vu1d+em0JbCKtwm kMhPJ6GLkAkbKbLJM9U6ex+Il3fUmGLXRioMaqIsEf2g4Wq7tXw3zAh//fAgpVBxBx57MO Uy5ng5+Us4+rgjv2OHyOe3bW00MiMNxpgoLWQzNs3ICBYLeYdtxXAD7olRBXMw== 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 4Mk4Kt05f3zNW3; Thu, 6 Oct 2022 21:28:02 +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 296LS1oW005970; Thu, 6 Oct 2022 21:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296LS1Hq005969; Thu, 6 Oct 2022 21:28:01 GMT (envelope-from git) Date: Thu, 6 Oct 2022 21:28:01 GMT Message-Id: <202210062128.296LS1Hq005969@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: dad24d6a5867 - main - www/caddy: Conflict with caddy-custom, not xcaddy 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: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dad24d6a5867f02debf3522b5f9044e3573cb4d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665091682; 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=kjvCi7ElU2kkgwtr1sgPH5zAUf4xN0KrcNhUjCwpRNY=; b=gfFb+WKEMzRPvrtAH6VkL3bxbRWsVHPfYs01rnM9IFQF7Rkf+zsNS9GlW5eLE90mozT9oT 4VX+fw5VE/2TqmUtSN8osI6wEJTCmmYyHc9LaGDY5DM/ofN2Fimjpb2unG9JHI83lAz5rK Jw6Yp1YXA+vckKQFwnPQJterj05Wr85EmIVs0i6gcuAtk4RrVcV8YKq/kxiQutIq5WJ9fK VKtwjPvpqzUJ3sufl0XxMPPQC3Bw3ltOghj5sn75mDBNfzAbM3TppRWaWOt1B9EsRgnd2w 6UCE5quYbxnCi2/yDil6tJ9jJgDEEbDJfJDvQ/OxAjNl3ZSXlh+PeMGy3ycGOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665091682; a=rsa-sha256; cv=none; b=Lv+AVclqppEgIA9CfaKnwAWxCJfebkk0sB3GPQtzxtdLQm1pY87YLCT4rVdBDnglIPUQeE e1mcmRzsmqUB1IRYBGVXsG6faINaTBLerkwvyW1ej8uM+g+mUk2F8eZjvRmm8j5FopTcxf fk3JMdYu7WNJVq19pYIYGuKBvLR7w+SDfQtz1vyR+ruTtWvyV+w1w5EeeMiz8S+dyNO6yu 6/PUdocq7/0fi8IsTJcaoDteAtOfWUe+vxT5NGWEQAbVm0T5yTJUlkfG70a/wQ1gy1FRa1 TFubOCqqJLIdhkZCU14M7EWC8yC3ssy0pVpUS8eUU4VdCoGHe6jyLerABHO0/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=dad24d6a5867f02debf3522b5f9044e3573cb4d9 commit dad24d6a5867f02debf3522b5f9044e3573cb4d9 Author: Adam Weinberger AuthorDate: 2022-10-06 21:23:42 +0000 Commit: Adam Weinberger CommitDate: 2022-10-06 21:27:33 +0000 www/caddy: Conflict with caddy-custom, not xcaddy --- www/caddy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/caddy/Makefile b/www/caddy/Makefile index d11e5fcc36ea..6fef82b70afb 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -18,7 +18,7 @@ CPE_VENDOR= caddyserver USE_RC_SUBR= caddy SUB_FILES= Caddyfile.sample caddy pkg-message -CONFLICTS_INSTALL= xcaddy +CONFLICTS_INSTALL= caddy-custom PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR_REL}/Caddyfile.sample"