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/cdrkit/Makefile | |
| 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/cdrkit/Makefile')
| -rw-r--r-- | sysutils/cdrkit/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 0b286ff2a681..c424c46c2b48 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -21,7 +21,7 @@ SHEBANG_FILES= 3rd-party/dirsplit/dirsplit # Fix build with clang11 CFLAGS+= -fcommon -CONFLICTS?= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]* +CONFLICTS?= cdrtools cjk-cdrtools cdrtools-devel PLIST_SUB?= CDRKIT="" GENISOIMAGE="@comment " |