diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql80-client/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql80-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt | 10 |
3 files changed, 19 insertions, 2 deletions
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 9cfa8d717d8b..3ac1d1bcef1b 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 876d9757d1a3..1d5156b365ef 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -194,9 +194,16 @@ CXXFLAGS+= -malign-double USES+= compiler:c++17-lang .endif +.include <bsd.port.pre.mk> + post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h +# This can be removed after FreeBSD 12.4 and 13.1 EoL +.if defined(CLIENT_ONLY) && !exists(${OPENSSLBASE}/libdata/pkgconfig/openssl.pc) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_CMakeLists.txt +.endif + .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} @@ -206,4 +213,4 @@ post-install: ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..df891b025ccd --- /dev/null +++ b/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt @@ -0,0 +1,10 @@ +--- scripts/CMakeLists.txt.orig 2022-12-16 15:34:44 UTC ++++ scripts/CMakeLists.txt +@@ -362,7 +362,6 @@ IF (WITH_SSL STREQUAL "system") + # We have implemented "system" for other platforms as well, but those + # are non-native packages. + IF(LINUX OR SOLARIS OR FREEBSD) +- SET(CONFIG_REQUIRES_PRIVATE "openssl") + STRING(REPLACE "-lssl" "" CONFIG_LIBS_PRIVATE "${CONFIG_LIBS_PRIVATE}") + STRING(REPLACE "-lcrypto" "" CONFIG_LIBS_PRIVATE "${CONFIG_LIBS_PRIVATE}") + STRING(REGEX REPLACE "[ ]+" " " CONFIG_LIBS_PRIVATE |