diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile index ee1a355c4f50..9bb1530d8864 100644 --- a/databases/mroonga/Makefile +++ b/databases/mroonga/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mroonga -PORTVERSION= 9.07 +PORTVERSION= 9.08 CATEGORIES= databases textproc MASTER_SITES= http://packages.groonga.org/source/mroonga/ @@ -20,7 +20,7 @@ IGNORE_WITH_MYSQL= 101m 102m 103m 57p 57w GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \ --with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \ - --with-mysql-config=${PREFIX}/bin/mysql_config --with-libmysqlservices-compat + --with-mysql-config=${PREFIX}/bin/mysql_config SUB_FILES= pkg-message diff --git a/databases/mroonga/distinfo b/databases/mroonga/distinfo index ebf8615a3ba4..3d7673da98d2 100644 --- a/databases/mroonga/distinfo +++ b/databases/mroonga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567681564 -SHA256 (mroonga-9.07.tar.gz) = 2e5ba33f042de13923cb307c0be44b14052c30103aa27b0a1f955adbf283bdd3 -SIZE (mroonga-9.07.tar.gz) = 2688119 +TIMESTAMP = 1570473765 +SHA256 (mroonga-9.08.tar.gz) = 7cc64db5185af88a370716780cfede5468b78e91b8c35c6300ee1bdd72d029d3 +SIZE (mroonga-9.08.tar.gz) = 2713599 diff --git a/databases/mroonga/files/patch-configure b/databases/mroonga/files/patch-configure new file mode 100644 index 000000000000..1e4d94388d33 --- /dev/null +++ b/databases/mroonga/files/patch-configure @@ -0,0 +1,39 @@ +--- configure.orig 2019-10-07 19:19:28 UTC ++++ configure +@@ -20048,36 +20048,6 @@ $as_echo "#define HAVE_CXX11 1" >>confdefs.h + ;; + esac + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysqlservices.a directory" >&5 +-$as_echo_n "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 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mysql_services_lib_dir" >&5 +-$as_echo "$mysql_services_lib_dir" >&6; } +- MYSQL_LIBS="$MYSQL_LIBS \"$mysql_services_lib_dir/libmysqlservices.a\"" +- +- +- +- +- +- +- +- +- + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. diff --git a/databases/mroonga/pkg-plist b/databases/mroonga/pkg-plist index 412c3879c0e3..65acb408b443 100644 --- a/databases/mroonga/pkg-plist +++ b/databases/mroonga/pkg-plist @@ -11,7 +11,7 @@ man/man1/mroonga.1.gz %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/documentation_options.js %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/favicon.ico %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/jquery-3.2.1.js +%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/jquery-3.4.1.js %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/jquery.js %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/language_data.js %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/logo.png @@ -86,7 +86,7 @@ man/man1/mroonga.1.gz %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/documentation_options.js %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/favicon.ico %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/jquery-3.2.1.js +%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/jquery-3.4.1.js %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/jquery.js %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/language_data.js %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/logo.png