Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Dec 2019 10:26:10 +0000 (UTC)
From:      Jochen Neumeister <joneum@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r519655 - in head/databases: mysql57-server mysql57-server/files mysql80-server mysql80-server/files
Message-ID:  <201912101026.xBAAQAER056975@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: joneum
Date: Tue Dec 10 10:26:10 2019
New Revision: 519655
URL: https://svnweb.freebsd.org/changeset/ports/519655

Log:
  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

Modified:
  head/databases/mysql57-server/Makefile
  head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
  head/databases/mysql57-server/pkg-plist
  head/databases/mysql80-server/Makefile
  head/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
  head/databases/mysql80-server/pkg-plist

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql57-server/Makefile	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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

Modified: head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
==============================================================================
--- head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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)

Modified: head/databases/mysql57-server/pkg-plist
==============================================================================
--- head/databases/mysql57-server/pkg-plist	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql57-server/pkg-plist	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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

Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql80-server/Makefile	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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

Modified: head/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-server/files/patch-scripts_CMakeLists.txt	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql80-server/files/patch-scripts_CMakeLists.txt	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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

Modified: head/databases/mysql80-server/pkg-plist
==============================================================================
--- head/databases/mysql80-server/pkg-plist	Tue Dec 10 10:06:09 2019	(r519654)
+++ head/databases/mysql80-server/pkg-plist	Tue Dec 10 10:26:10 2019	(r519655)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912101026.xBAAQAER056975>