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 /chinese | |
| parent | f2b9a177fa65d8010c60d9dd2803a4b4bb9bcec8 (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 'chinese')
| -rw-r--r-- | chinese/opendesktop-fonts/Makefile | 2 | ||||
| -rw-r--r-- | chinese/phpbb-tw/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index cb33df9f6b30..3ff62cabe2a2 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -9,7 +9,7 @@ MASTER_SITES?= LOCAL/chinsan/fonts MAINTAINER= ports@FreeBSD.org COMMENT= Ming and Kai face of OpenDesktop fonts -CONFLICTS= zh-fireflyttf-[0-9]* +CONFLICTS= zh-fireflyttf DIST_SUBDIR= OpenFonts NO_BUILD= yes NO_ARCH= yes diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile index 571a22003e44..7e72d5f799d3 100644 --- a/chinese/phpbb-tw/Makefile +++ b/chinese/phpbb-tw/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} -CONFLICTS= phpbb-[0-9]* +CONFLICTS= phpbb USES= dos2unix php # Get HOSTNAME |