diff options
author | Stefan Eßer <se@FreeBSD.org> | 2021-10-28 14:28:24 +0200 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2021-10-29 11:50:18 +0200 |
commit | 819f25b36d45b8ac5593ec8e6f470d9ad454b08a (patch) | |
tree | a9ad0caa2a052fc695c1cdede2866080f5660431 /sysutils/conky | |
parent | www/firefox: update to 94.0 (rc3) (diff) |
*/*: Remove redundant '-[0-9]*' from CONFLICTS
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").
Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".
Approved by: portmgr (blanket)
Diffstat (limited to 'sysutils/conky')
-rw-r--r-- | sysutils/conky/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index fb1132843560..42f3e8178d55 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -24,7 +24,7 @@ CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_AUDACIOUS:BOOL=false \ -DBUILD_DOCS:BOOL=true \ -DAPP_SED=${LOCALBASE}/bin/gsed -CONFLICTS?= conky-awesome-[0-9]* +CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky man/man1/conky.1.gz |