diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2024-04-06 23:32:10 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2024-04-07 09:36:13 +0000 |
| commit | 92a030dffd4fd7c3f5abdd7a85b16086da294fe1 (patch) | |
| tree | d83f5e611d5723c97792ba1aa7179471fd6c2e40 /deskutils | |
| parent | 04a6b84a1a7982cc3e6966d9a6be0b8e6f8648ee (diff) | |
databases/p5-DBD-mysql: Fix for MariaDB users
Add a new variable DBD_MYSQL, use that in *_DEPENDS and add mysql to USES
where required. DBD_MYSQL will automatically set the correct DBD dependency.
In cd16748194e2 databases/p5-DBD-mysql was updated to 5.x, in 5.x the
support for MariaDB was removed and only MySQL >= 8.0 is supported.
In the 4.x releases MariaDB is still supported, according to upstream 4.x
will still be supported for a while [1], so use that for now when we detect
that MYSQL_FLAVOUR is set to mariadb. databases/p5-DBD-mysql4 was added in
d95f49cb3b54.
DBD:MariaDB would be another alternative, but migrating to it might need
more analysis than just staying with the 4.x releases of p5-DBD-mysql. This
thread on the amavis-users mailing list has a very good summary [2] from
the author of DBD:MariaDB.
This includes ideas and suggestions from vvd and mat. Thanks!
[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277889#c17
[2] https://lists.amavis.org/pipermail/amavis-users/2024-March/006823.html
PR: 275100, 277889
Reviewed by: vvd, mat
Fixes: cd16748194e2
Differential Revision: https://reviews.freebsd.org/D44662
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/note/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deskutils/note/Makefile b/deskutils/note/Makefile index 9d7ec2bab443..8d0ade1192a5 100644 --- a/deskutils/note/Makefile +++ b/deskutils/note/Makefile @@ -1,5 +1,6 @@ PORTNAME= note DISTVERSION= 1.3.26 +PORTREVISION= 1 CATEGORIES= deskutils perl5 MASTER_SITES= http://www.daemon.de/idisk/Apps/note/ @@ -19,8 +20,9 @@ NO_ARCH= yes OPTIONS_DEFINE= EXAMPLES MYSQL PWSAFE3 OPTIONS_DEFAULT= BLOWFISH DES IDEA MYSQL PWSAFE3 -MYSQL_RUN_DEPENDS= p5-DBD-mysql>0:databases/p5-DBD-mysql \ +MYSQL_RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>0:databases/p5-DBI +MYSQL_USES= mysql PWSAFE3_DESC= Password Safe v3 backend PWSAFE3_RUN_DEPENDS= p5-Crypt-PWSafe3>0:security/p5-Crypt-PWSafe3 |