git: dad24d6a5867 - main - www/caddy: Conflict with caddy-custom, not xcaddy
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Oct 2022 21:28:01 UTC
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=dad24d6a5867f02debf3522b5f9044e3573cb4d9 commit dad24d6a5867f02debf3522b5f9044e3573cb4d9 Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2022-10-06 21:23:42 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> 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"