diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
| commit | 04b9da414081a733478d3def4e1e3777908536c6 (patch) | |
| tree | f59ddc1be63ea2f6093a28c78fbd201d491ee49d /databases/mariadb103-server | |
| parent | 09c1162b8dd0e293c93ff2a2a81b2d54b57729e3 (diff) | |
| download | ports-04b9da414081a733478d3def4e1e3777908536c6.tar.gz ports-04b9da414081a733478d3def4e1e3777908536c6.zip | |
*/*: Remove redundant '-*' from CONFLICTS definitions
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 'databases/mariadb103-server')
| -rw-r--r-- | databases/mariadb103-server/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 661ef7f620fa..8ae086ab6851 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -92,10 +92,10 @@ DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ DATADIR= ${PREFIX}/share/mysql -CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* +CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ + mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ + mysqlwsrep*-server \ + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi |