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 /net-p2p | |
| 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 'net-p2p')
| -rw-r--r-- | net-p2p/amule-devel/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/amule/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/microdc2/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/mldonkey/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 1942ce8037e5..ff20ab0f6f3a 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -CONFLICTS= amule-[0-9]* +CONFLICTS= amule USES= bison compiler:c++11-lang cpe desktop-file-utils desktop-file-utils \ gmake localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2 diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 88d7edfdc65b..040135241b8d 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -CONFLICTS= amule-devel-[0-9]* +CONFLICTS= amule-devel USES= bison compiler:c++11-lang cpe desktop-file-utils gmake \ localbase:ldflags perl5 pkgconfig shebangfix tar:xz diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index a702e08193c9..a20118ec3012 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -11,7 +11,7 @@ COMMENT= Command-line based Direct Connect client LICENSE= GPLv2 -CONFLICTS= tthsum-[0-9]* +CONFLICTS= tthsum USES= gnome iconv readline GNU_CONFIGURE= yes diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 8a441632c911..c34bea2599d6 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -14,7 +14,7 @@ COMMENT?= Multi-protocol peer-to-peer client written in OCaml LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/Copying.txt -CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* +CONFLICTS= mldonkey{-{core,gui},}-devel USES= compiler:c++11-lang cpe gmake iconv pkgconfig tar:bzip2 USE_OCAML= yes |