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 /x11-wm | |
| 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 'x11-wm')
| -rw-r--r-- | x11-wm/wmii-devel/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/wmii/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile index e195487d3f5e..8d07330c540c 100644 --- a/x11-wm/wmii-devel/Makefile +++ b/x11-wm/wmii-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp -CONFLICTS= wmii-[0-9]* +CONFLICTS= wmii USES= pkgconfig python:run shebangfix tar:tbz xorg SHEBANG_FILES= alternative_wmiircs/python/wmiirc diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index 5c7b8076ba00..f70a35526d10 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= dmenu:x11/dmenu USES= xorg USE_XORG= x11 xorgproto xt xext -CONFLICTS= wmii-devel-[0-9]* +CONFLICTS= wmii-devel MAKE_ARGS= PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \ INCLUDE="${LOCALBASE}/include" \ |