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 | |
| 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 'cad')
| -rw-r--r-- | cad/geda/Makefile | 6 | ||||
| -rw-r--r-- | cad/jspice3/Makefile | 2 | ||||
| -rw-r--r-- | cad/pcb/Makefile | 2 |
3 files changed, 5 insertions, 5 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 diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile index 3a7cd82dda1a..58ef5d291802 100644 --- a/cad/jspice3/Makefile +++ b/cad/jspice3/Makefile @@ -13,7 +13,7 @@ BROKEN_riscv64= fails to install: jspice3: No such file or directory BROKEN_FreeBSD_13= fails to install: jspice3: No such file or directory BROKEN_FreeBSD_14= fails to install: jspice3: No such file or directory -CONFLICTS= spice-[0-9]* +CONFLICTS= spice OPTIONS_DEFINE= X11 EXAMPLES OPTIONS_DEFAULT= X11 diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index b040cb13ce69..23c4806d7104 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -27,7 +27,7 @@ USE_GL= gl glu USE_GNOME= intltool cairo pangox-compat USE_XORG= x11 xrender xinerama -CONFLICTS= gts-[0-9]* +CONFLICTS= gts GNU_CONFIGURE= yes CONFIGURE_ENV+= INSTALL_DATA="${BSD_INSTALL_DATA}" LDFLAGS+= -lpthread |