summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2021-08-01 01:31:01 -0700
committerXin LI <delphij@FreeBSD.org>2021-08-01 01:32:35 -0700
commit974e13b50148c5c8e7b33a1cb7e9dbaa9aedbc70 (patch)
treeb859452da4f6b6583b7d951258145569954d1c63 /databases
parentwww/pmwiki: Update to 2.2.141 (diff)
net/openldap24-server: Make SASL permanent for OpenLDAP port.
PR: ports/257374 Reviewed by: obrien Approved by: portmgr (exp-run by antoine) Differential Revision: https://reviews.freebsd.org/D31301
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql57-client/Makefile4
-rw-r--r--databases/mysql57-server/Makefile11
-rw-r--r--databases/percona57-client/Makefile4
3 files changed, 4 insertions, 15 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index fd339d57dd4b..384f8ed22f2c 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
PORTNAME= mysql
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
@@ -36,7 +36,7 @@ OPTIONS_GROUP_PLUGINS= SASLCLIENT
SASLCLIENT_DESC= SASL client plugin module
SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE= OPENLDAP=yes
OPTIONS_DEFAULT+= SASLCLIENT
# issue 166367: adding symlinks for back-compatibility with ${lib}_r
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index cce6845e0fb2..be12769af7d4 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -164,17 +164,6 @@ CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
CXXFLAGS+= -fpermissive
.endif
-# mysql57-server fails to compile with llvm11, which was imported to current in r364284
-# without a version increase (1300109 = r364274).
-# Until a proper fix is provided, simply use llvm from ports, which probably could be
-# a backport of amongst other tings:
-# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-.endif
-
.if ${ARCH} == powerpc
LLD_UNSAFE= yes
.endif
diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
index 46b8e1e7c2a4..36ad77a466ce 100644
--- a/databases/percona57-client/Makefile
+++ b/databases/percona57-client/Makefile
@@ -1,7 +1,7 @@
# Created by: Mark Felder <feld@FreeBSD.org>
PORTNAME= percona
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
@@ -36,7 +36,7 @@ OPTIONS_GROUP_PLUGINS= SASLCLIENT
SASLCLIENT_DESC= SASL client plugin module
SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE= OPENLDAP=yes
OPTIONS_DEFAULT+= SASLCLIENT
OPTIONS_SUB= yes