CVS commit: pkgsrc/databases/mysql57-client

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Nov 13 11:24:38 UTC 2018

Modified Files:
        pkgsrc/databases/mysql57-client: distinfo
        pkgsrc/databases/mysql57-client/patches:
            patch-rapid_plugin_group__replication_rpcgen.cmake

Log Message:
mysql57-client: tweak patch to work on modern linux
copy tirpc handling from the else clause for linux systems that no longer
have sun rpc in glibc.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.23 pkgsrc/databases/mysql57-client/distinfo:1.24
--- pkgsrc/databases/mysql57-client/distinfo:1.23       Mon Oct  1 00:11:29 2018
+++ pkgsrc/databases/mysql57-client/distinfo    Tue Nov 13 11:24:38 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2018/10/01 00:11:29 sevan Exp $
+$NetBSD: distinfo,v 1.24 2018/11/13 11:24:38 markd Exp $
 
 SHA1 (mysql-5.7.23.tar.gz) = 0c07dd1670f3749c482180227717738c031bb5b4
 RMD160 (mysql-5.7.23.tar.gz) = 20021aa73537f4630b72931925bec78c251b06e6
@@ -28,7 +28,7 @@ SHA1 (patch-mysys_stacktrace.c) = 3e0794
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924
-SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = 5c14be97bd1fd04b2b845f1a2422452445733474
+SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = ff0679ed644d79abe52b208f6b60b5a4e480ed3f
 SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8
 SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1

Index: pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake:1.1 pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake:1.2
--- pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake:1.1      Thu Jan 12 09:39:47 2017
+++ pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake  Tue Nov 13 11:24:38 2018
@@ -1,15 +1,20 @@
-$NetBSD: patch-rapid_plugin_group__replication_rpcgen.cmake,v 1.1 2017/01/12 09:39:47 jperkin Exp $
+$NetBSD: patch-rapid_plugin_group__replication_rpcgen.cmake,v 1.2 2018/11/13 11:24:38 markd Exp $
 
 Don't depend on rpcgen, just use the pre-generated headers.
 
---- rapid/plugin/group_replication/rpcgen.cmake.orig   2016-11-28 13:32:52.000000000 +0000
+--- rapid/plugin/group_replication/rpcgen.cmake.orig   2018-06-08 09:56:29.000000000 +0000
 +++ rapid/plugin/group_replication/rpcgen.cmake
-@@ -64,7 +64,7 @@ FOREACH(X xcom_vp)
+@@ -64,7 +64,12 @@ FOREACH(X xcom_vp)
    SET (x_vanilla_h      ${XCOM_BASEDIR}/${X}.h.gen)
    SET (x_vanilla_c      ${XCOM_BASEDIR}/${X}_xdr.c.gen)
  
 -  IF(WIN32)
 +  IF(1)
++    IF(RPC_INCLUDE_DIR STREQUAL "/usr/include/tirpc")
++      INCLUDE_DIRECTORIES(SYSTEM /usr/include/tirpc)
++      ADD_DEFINITIONS(-DHAVE_TIRPC)
++      SET(TIRPC_LIBRARY tirpc)
++    ENDIF()
      # on windows system's there is no rpcgen, thence copy
      # the files in the source directory
      ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c} ${x_tmp_plat_h}