diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 22:40:11 +0100 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 22:40:11 +0100 |
| commit | 04b9da414081a733478d3def4e1e3777908536c6 (patch) | |
| tree | f59ddc1be63ea2f6093a28c78fbd201d491ee49d /shells/ksh93-devel/Makefile | |
| parent | www/grafana7: Update to 7.5.11 (diff) | |
*/*: Remove redundant '-*' from CONFLICTS definitions
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Approved by: portmgr (blanket)
Diffstat (limited to 'shells/ksh93-devel/Makefile')
| -rw-r--r-- | shells/ksh93-devel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shells/ksh93-devel/Makefile b/shells/ksh93-devel/Makefile index 144c898055be..41495c285e2e 100644 --- a/shells/ksh93-devel/Makefile +++ b/shells/ksh93-devel/Makefile @@ -35,8 +35,8 @@ GH_TAGNAME= ${HASH} # IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in # arcane build failures due to already installed ksh/ksh93 in # $PATH. -KSH_CONFLICTS= pdksh-* -KSH93_CONFLICTS= ksh93-2* ast-ksh-* +KSH_CONFLICTS= pdksh +KSH93_CONFLICTS= ksh2020 ksh93 ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC |