git: 4cb564bb2701 - main - databases/mroonga: Update version 15.23=>15.25
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 May 2026 11:46:35 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4cb564bb2701dce07426f737c93d8ae8640b95ae
commit 4cb564bb2701dce07426f737c93d8ae8640b95ae
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-05-16 02:08:49 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-05-16 11:46:14 +0000
databases/mroonga: Update version 15.23=>15.25
Changelog: https://mroonga.org/docs/news/15.html#release-15-25
---
databases/mroonga/Makefile | 26 +++++++++----------
databases/mroonga/distinfo | 6 ++---
databases/mroonga/files/patch-CMakeLists.txt | 17 +++++++++++++
databases/mroonga/files/patch-configure | 37 ----------------------------
databases/mroonga/pkg-plist | 6 ++---
5 files changed, 34 insertions(+), 58 deletions(-)
diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
index 88d806b43b45..5654ddf5df85 100644
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mroonga
-DISTVERSION= 15.23
+DISTVERSION= 15.25
CATEGORIES= databases textproc
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -10,18 +10,18 @@ WWW= https://mroonga.org/
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:configure
+BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:build \
+ ${LOCALBASE}/lib/groonga/plugins/normalizers/mysql.so:databases/groonga-normalizer-mysql
LIB_DEPENDS= libgroonga.so:textproc/groonga
-USES= compiler:c11 libtool mysql pkgconfig shebangfix
-IGNORE_WITH_MYSQL= 105m 106m 1011m 81 84
+USES= cmake compiler:c11 libtool mysql pkgconfig shebangfix
+IGNORE_WITH_MYSQL= 105m 106m 1011m 81
SHEBANG_FILES= data/rpm/post.sh data/rpm/preun.sh
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
- --with-mysql-config=${PREFIX}/bin/mysql_config \
- --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
+CMAKE_ARGS= -DMYSQL_BUILD_DIR="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
+ -DMYSQL_CONFIG=${PREFIX}/bin/mysql_config \
+ -DMYSQL_SOURCE_DIR="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
SUB_FILES= pkg-message
@@ -29,14 +29,12 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
+DOCS_CMAKE_BOOL= MRN_WITH_DOC
+
post-patch:
- @${REINPLACE_CMD} -i .c++20 's,srcdir)/version[[:>:]],&.txt,' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/deb/d' \
- -e '/rpm/d' \
- ${WRKSRC}/data/Makefile.in
+ @${REINPLACE_CMD} -e 's| ja||g' ${WRKSRC}/doc/CMakeLists.txt
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/ha_mroonga.so.0.0.0
+ ${INSTALL_MAN} ${WRKSRC}/doc/locale/en/man/mroonga.1 ${STAGEDIR}${PREFIX}/share/man/man1
.include <bsd.port.mk>
diff --git a/databases/mroonga/distinfo b/databases/mroonga/distinfo
index 53e2b95918f6..4ca5c91c59ff 100644
--- a/databases/mroonga/distinfo
+++ b/databases/mroonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774010217
-SHA256 (mroonga-15.23.tar.gz) = 565b0fe834847e2ca35cf21c63ced96633412f9252bba78516489d078fa460fb
-SIZE (mroonga-15.23.tar.gz) = 7327467
+TIMESTAMP = 1778890545
+SHA256 (mroonga-15.25.tar.gz) = cc906fa55387a8e431cd87fd3bf0018ee23f3b6b3108b655039cbebd19481b1d
+SIZE (mroonga-15.25.tar.gz) = 7328468
diff --git a/databases/mroonga/files/patch-CMakeLists.txt b/databases/mroonga/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4420557abcc9
--- /dev/null
+++ b/databases/mroonga/files/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+--- CMakeLists.txt.orig 2026-05-16 01:30:24 UTC
++++ CMakeLists.txt
+@@ -563,14 +563,6 @@ install(FILES
+ "${PROJECT_SOURCE_DIR}/data/uninstall.sql"
+ "${PROJECT_BINARY_DIR}/data/update.sql"
+ DESTINATION "${MRN_DATA_DIR}/")
+-install(PROGRAMS
+- "${PROJECT_SOURCE_DIR}/data/deb/postinst.sh"
+- "${PROJECT_SOURCE_DIR}/data/deb/prerm.sh"
+- DESTINATION "${MRN_DATA_DIR}/deb/")
+-install(PROGRAMS
+- "${PROJECT_SOURCE_DIR}/data/rpm/post.sh"
+- "${PROJECT_SOURCE_DIR}/data/rpm/preun.sh"
+- DESTINATION "${MRN_DATA_DIR}/rpm/")
+ if(MSVC)
+ install(FILES $<TARGET_PDB_FILE:mroonga>
+ DESTINATION "${MYSQL_PLUGIN_DIR}"
diff --git a/databases/mroonga/files/patch-configure b/databases/mroonga/files/patch-configure
deleted file mode 100644
index e95aec3ad8f6..000000000000
--- a/databases/mroonga/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig 2025-05-14 02:45:47 UTC
-+++ configure
-@@ -20724,28 +20724,6 @@ printf "%s\n" "$check_cxxflag" >&6; }
- ;;
- esac
-
-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmysqlservices.a directory" >&5
--printf %s "checking for libmysqlservices.a directory... " >&6; }
-- pkglibdir="$($ac_mysql_config --variable=pkglibdir)"
-- mysql_build_archive_output_dir="${MYSQL_BUILD_DIR}/archive_output_directory"
-- mysql_build_libservices_dir="${MYSQL_BUILD_DIR}/libservices"
-- if test -f "${mysql_build_archive_output_dir}/libmysqlservices.a"; then
-- mysql_services_lib_dir="${mysql_build_archive_output_dir}"
-- elif test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then
-- mysql_services_lib_dir="${mysql_build_libservices_dir}"
-- else
-- if test -f "${pkglibdir}/libmysqlservices.a"; then
-- mysql_services_lib_dir="${pkglibdir}"
-- elif test -f "${pkglibdir}/mysql/libmysqlservices.a"; then
-- mysql_services_lib_dir="${pkglibdir}/mysql"
-- else
-- as_fn_error $? "libmysqlservices.a is not found in <${pkglibdir}/> and <${pkglibdir}/mysql/>" "$LINENO" 5
-- fi
-- fi
-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mysql_services_lib_dir" >&5
--printf "%s\n" "$mysql_services_lib_dir" >&6; }
-- MYSQL_LIBS="$MYSQL_LIBS \"$mysql_services_lib_dir/libmysqlservices.a\""
--
- case "$MYSQL_MAJOR_MINOR_VERSION" in
- 10.4)
- :
-@@ -23991,5 +23969,3 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
--
--
diff --git a/databases/mroonga/pkg-plist b/databases/mroonga/pkg-plist
index b5d974c5cf4b..01ea4ea3a039 100644
--- a/databases/mroonga/pkg-plist
+++ b/databases/mroonga/pkg-plist
@@ -1,9 +1,7 @@
-lib/mysql/plugin/ha_mroonga.a
lib/mysql/plugin/ha_mroonga.so
-lib/mysql/plugin/ha_mroonga.so.0
-lib/mysql/plugin/ha_mroonga.so.0.0.0
-share/man/ja/man1/mroonga.1.gz
share/man/man1/mroonga.1.gz
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
%%DATADIR%%/install.sql
%%DATADIR%%/uninstall.sql
%%DATADIR%%/update.sql