aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorjoneum <joneum@FreeBSD.org>2019-12-10 18:26:10 +0800
committerjoneum <joneum@FreeBSD.org>2019-12-10 18:26:10 +0800
commitcf2a47ea58dcec62536b5e35d8b632783ca86a82 (patch)
tree453515fc387e2d8160cb9028b3002cd29a3aaac6 /databases
parent3075b9f34a563d3353173342e586842e7e2527a1 (diff)
downloadfreebsd-ports-gnome-cf2a47ea58dcec62536b5e35d8b632783ca86a82.tar.gz
freebsd-ports-gnome-cf2a47ea58dcec62536b5e35d8b632783ca86a82.tar.zst
freebsd-ports-gnome-cf2a47ea58dcec62536b5e35d8b632783ca86a82.zip
Get rid of useless and unfilled libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
for server bundle, right .pc file is already installed by client package PR: 242488 Reported by: fluffy Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql57-server/Makefile2
-rw-r--r--databases/mysql57-server/files/patch-scripts_CMakeLists.txt9
-rw-r--r--databases/mysql57-server/pkg-plist1
-rw-r--r--databases/mysql80-server/Makefile2
-rw-r--r--databases/mysql80-server/files/patch-scripts_CMakeLists.txt11
-rw-r--r--databases/mysql80-server/pkg-plist1
6 files changed, 21 insertions, 5 deletions
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index fa424d89ce99..d0d0fb4bb50b 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.7.28
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
diff --git a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
index 738ed8b4a596..6766227250a1 100644
--- a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
@@ -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)
diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist
index 6f5420f6c4df..5964d7cd621b 100644
--- a/databases/mysql57-server/pkg-plist
+++ b/databases/mysql57-server/pkg-plist
@@ -69,7 +69,6 @@ lib/mysql/plugin/test_udf_services.so
%%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
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 48eefc716f48..ca7b0967ca50 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -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
diff --git a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
index 1903d7724828..9334ba74754b 100644
--- a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
@@ -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
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 6f627d3bc85d..7d9384f48656 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -136,7 +136,6 @@ lib/mysql/plugin/keyring_udf.so
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