CVS commit: pkgsrc/databases/mysql80-server

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Wed Oct 15 04:02:19 UTC 2025

Modified Files:
        pkgsrc/databases/mysql80-server: Makefile

Log Message:
PR/59670 -- revert switch to included protobuf which didn't work


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/mysql80-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.38 pkgsrc/databases/mysql80-server/Makefile:1.39
--- pkgsrc/databases/mysql80-server/Makefile:1.38       Sun Oct  5 19:25:46 2025
+++ pkgsrc/databases/mysql80-server/Makefile    Wed Oct 15 04:02:19 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2025/10/05 19:25:46 js Exp $
+# $NetBSD: Makefile,v 1.39 2025/10/15 04:02:19 jnemeth Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   8
+PKGREVISION=   9
 COMMENT=       MySQL 8, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
@@ -9,9 +9,8 @@ CONFLICTS=      mysql3-server-[0-9]*
 .include "../../databases/mysql80-client/Makefile.common"
 
 CMAKE_CONFIGURE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
-CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="bundled"
+CMAKE_CONFIGURE_ARGS+= -DWITH_PROTOBUF="system"
 MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/library_output_directory
-MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/library_output_directory
 # This is a hack for ${WRKSRC}/cmake/protobuf.cmake
 CMAKE_CONFIGURE_ARGS+= -DHOMEBREW_HOME=${PREFIX}
 
@@ -87,7 +86,7 @@ post-extract:
        ${CP} ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/
        ${CHMOD} a-x ${WRKSRC}/mysql-test/std_data/datadir_tablespace_*
 
-#.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 BUILDLINK_AUTO_DIRS.mysql-client=      no
 .include "../../databases/mysql80-client/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"