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 /cad/geda/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 '')
| -rw-r--r-- | cad/geda/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 9d65f6e344c1..6cf616463ab8 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -41,9 +41,9 @@ DATADIR= ${PREFIX}/share/gEDA INFO= geda-scheme BINARY_WRAPPERS= gm4 -CONFLICTS= geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \ - geda-gschem-[0-9]* geda-netlist-[0-9]* geda-symbols-[0-9]* \ - geda-symcheck-[0-9]* geda-utils-[0-9]* libgeda-[0-9]* +CONFLICTS= geda-docs geda-examples geda-gattrib \ + geda-gschem geda-netlist geda-symbols \ + geda-symcheck geda-utils libgeda PORTSCOUT= limitw:1,even |