diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-10-28 12:28:24 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-10-29 09:50:18 +0000 |
| commit | 819f25b36d45b8ac5593ec8e6f470d9ad454b08a (patch) | |
| tree | a9ad0caa2a052fc695c1cdede2866080f5660431 /news | |
| parent | f2b9a177fa65d8010c60d9dd2803a4b4bb9bcec8 (diff) | |
| download | ports-819f25b36d45b8ac5593ec8e6f470d9ad454b08a.tar.gz ports-819f25b36d45b8ac5593ec8e6f470d9ad454b08a.zip | |
*/*: 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 'news')
| -rw-r--r-- | news/inn/Makefile | 2 | ||||
| -rw-r--r-- | news/s-news/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index fe00a82bd544..ae786f1eeb46 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -21,7 +21,7 @@ SUB_FILES= pkg-install USES= cpe gmake libtool perl5 uidfix CPE_VENDOR= isc -CONFLICTS?= inn-current-[0-9]* +CONFLICTS?= inn-current OPTIONS_DEFINE= BERKELEYDB GNUPG KERBEROS PYTHON SASL KEYWORDS \ LARGE_FILES OPENSSL SETGID_INEWS TAGGED_HASH \ diff --git a/news/s-news/Makefile b/news/s-news/Makefile index ed27727b705c..29489a5834e8 100644 --- a/news/s-news/Makefile +++ b/news/s-news/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple news server for hosts with one or two users LIB_DEPENDS= libgdbm.so:databases/gdbm -CONFLICTS= leafnode-[1-9]* nntp-[0-9]* +CONFLICTS= leafnode-[1-9]* nntp CONFIGURE_ARGS+= \ --with-confdir=${PREFIX}/etc/s-news \ |