diff options
| author | Vladimir Druzenko <vvd@FreeBSD.org> | 2024-06-09 21:55:42 +0000 |
|---|---|---|
| committer | Vladimir Druzenko <vvd@FreeBSD.org> | 2024-06-09 21:55:42 +0000 |
| commit | 1acc62c56236fee8b9d5c10350a78f3c36489933 (patch) | |
| tree | 8912c008797833e711c7ec7511b6ed04bc8c0564 | |
| parent | 7e77b02e89501f0f1db348d137b2babf69d5d655 (diff) | |
| download | ports-1acc62c56236fee8b9d5c10350a78f3c36489933.tar.gz ports-1acc62c56236fee8b9d5c10350a78f3c36489933.zip | |
security/{open,}doas: add CONFLICTS to each other
They install files with the same names.
PR: 279598
Reported by: fluffy (via email)
Fixes: 2820df617d13 (new port: portable version of OpenBSD's doas)
| -rw-r--r-- | security/doas/Makefile | 2 | ||||
| -rw-r--r-- | security/opendoas/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/security/doas/Makefile b/security/doas/Makefile index 7180fd0237fc..58c1aa4b15fe 100644 --- a/security/doas/Makefile +++ b/security/doas/Makefile @@ -20,6 +20,8 @@ GH_ACCOUNT= slicer69 MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"' +CONFLICTS= opendoas + BINMODE= 4755 SUB_FILES= pkg-message diff --git a/security/opendoas/Makefile b/security/opendoas/Makefile index 6e30ec1a2734..7b821302a87b 100644 --- a/security/opendoas/Makefile +++ b/security/opendoas/Makefile @@ -32,6 +32,8 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc \ MAKEFILE= GNUmakefile +CONFLICTS= doas + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/doas |