Index: mysql57-server/Makefile =================================================================== --- mysql57-server/Makefile (revision 519155) +++ mysql57-server/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.28 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Index: mysql57-server/files/patch-scripts_CMakeLists.txt =================================================================== --- mysql57-server/files/patch-scripts_CMakeLists.txt (revision 519155) +++ mysql57-server/files/patch-scripts_CMakeLists.txt (working copy) @@ -25,6 +25,15 @@ mysqldumpslow mysqld_multi mysqld_safe +@@ -446,7 +447,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(FALSE) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} @@ -452,7 +453,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) Index: mysql57-server/pkg-plist =================================================================== --- mysql57-server/pkg-plist (revision 519155) +++ mysql57-server/pkg-plist (working copy) @@ -69,7 +69,6 @@ %%EXAMPLE%%lib/mysql/plugin/udf_example.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so -libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz Index: mysql80-server/Makefile =================================================================== --- mysql80-server/Makefile (revision 519155) +++ mysql80-server/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 8.0.17 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server Index: mysql80-server/files/patch-scripts_CMakeLists.txt =================================================================== --- mysql80-server/files/patch-scripts_CMakeLists.txt (revision 519156) +++ mysql80-server/files/patch-scripts_CMakeLists.txt (working copy) @@ -25,7 +25,16 @@ mysqldumpslow mysqld_multi mysqld_safe -@@ -471,7 +472,7 @@ ELSE() +@@ -485,7 +486,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(FALSE) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} +@@ -498,7 +499,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh Index: mysql80-server/pkg-plist =================================================================== --- mysql80-server/pkg-plist (revision 519155) +++ mysql80-server/pkg-plist (working copy) @@ -136,7 +136,6 @@ lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so -libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz