===> Applying extra patch /usr/ports/databases/mariadb55-server/files/extra-patch-include_my_compare.h ===> Applying FreeBSD patches for mariadb55-server-5.5.54 1 out of 2 hunks failed--saving rejects to scripts/mysqld_safe.sh.rej => Patch patch-scripts_mysqld_safe.sh failed to apply cleanly. => Patch(es) patch-client_CMakeLists.txt patch-cmake__jemalloc.cmake patch-CMakeLists.txt patch-extra_CMakeLists.txt patch-extra_yassl_taocrypt_src_integer.cpp patch-include_CMakeLists.txt patch-libmysql_CMakeLists.txt patch-libservices_CMakeLists.txt patch-man_CMakeLists.txt patch-mysys_default.c patch-regex_CMakeLists.txt patch-scripts_CMakeLists.txt patch-scripts_mysql_config.sh applied cleanly. *** Error code 1 Stop. make[1]: stopped in /usr/ports/databases/mariadb55-server *** Error code 1 cat /tmp/ports/usr/ports/databases/mariadb55-server/work/mariadb-5.5.54/scripts/mysqld_safe.sh.rej @@ -480,7 +480,7 @@ then log_error "WARNING: Found $DATADIR/my.cnf The data directory is a deprecated location for my.cnf, please move it to -$MY_BASEDIR_VERSION/my.cnf" +$MY_BASEDIR_VERSION/etc/my.cnf" MYSQL_HOME=$DATADIR else MYSQL_HOME=$MY_BASEDIR_VERSION
Created attachment 178375 [details] new working files/patch-scripts_mysqld_safe.sh Here is an updated files/patch-scripts_mysqld_safe.sh. This has been tested on a FreeBSD 10.3 amd64.
It work. Thanks!
Created attachment 178381 [details] Possible fix I suspect the attached replacement for the files/patch-scripts_mysqld_safe.sh file will fix the issue. It certainly applies cleanly when running "make clean patch"
sorry, hadn't refreshed bug web page before posting last comment
Can someone fix the port please? It's still broken
Port fixed in SVN revision 430977. Now builds for me
Fixed on Jan 9 by mat