git: a5c2ca9eefbc - main - net-im/jabberd: fix build with MySQL 8.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Jun 2023 07:27:56 UTC
The branch main has been updated by eugen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a5c2ca9eefbc427074af49dd4b2630b0b58f6d80
commit a5c2ca9eefbc427074af49dd4b2630b0b58f6d80
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-06-18 07:22:19 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-06-18 07:22:19 +0000
net-im/jabberd: fix build with MySQL 8.0
PORTREVISION not bumped.
---
net-im/jabberd/Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 13f766d673de..419aec13cda0 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -75,7 +75,6 @@ SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
MYSQL_USES= mysql
MYSQL_CONFIGURE_ENABLE= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL=80
BDB_USES= bdb
BDB_CONFIGURE_ENABLE= db
@@ -129,11 +128,17 @@ SUB_LIST+= REQUIRE="LOGIN"
.endif
REQUIRES_DESC= Add backend requires to startup script
+.include <bsd.port.pre.mk>
+
post-patch:
.for FILE in c2s.xml jabberd.cfg router-filter.xml router-users.xml \
router.xml s2s.xml sm.xml templates/roster.xml
@${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in
.endfor
+.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER:U} == 80
+ cd ${WRKSRC}/storage && \
+ ${REINPLACE_CMD} 's/my_bool/_Bool/g' authreg_mysql.c storage_mysql.c
+.endif
post-install:
.for DIR in db logs pid