aboutsummaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2021-11-23 22:11:40 +0000
committerStefan Eßer <se@FreeBSD.org>2021-11-23 22:11:40 +0000
commit5933ac0b099d61d98eb531d373cf57a8927bc7af (patch)
treefc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 /news
parente2521329169c2867009b66984bc2988c9631f00f (diff)
downloadports-5933ac0b099d61d98eb531d373cf57a8927bc7af.tar.gz
ports-5933ac0b099d61d98eb531d373cf57a8927bc7af.zip
*/*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL
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"). Approved by: portmgr (blanket)
Diffstat (limited to 'news')
-rw-r--r--news/slrn/Makefile2
-rw-r--r--news/trn4/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 252c7321cac9..90477d8e9713 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2+
LIB_DEPENDS= libslang.so:devel/libslang2
-CONFLICTS_INSTALL= ja-slrn-[0-9]*
+CONFLICTS_INSTALL= ja-slrn
USES= gmake iconv tar:bz2
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index 6a18a74af703..d6e0e2384328 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-test/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Version 4.0 of the threaded readnews newsreader
-CONFLICTS_INSTALL=trn-3.[0-9]* cnews-* s-news-[0-9]*
+CONFLICTS_INSTALL=trn-3.[0-9]* cnews s-news
USES= ncurses