Fri Sep 30 11:54:49 2016 UTC ()
Change the way readline/editline support is patched, based on what
mysql57-client has. This fixes at least SmartOS builds, no changes for
NetBSD (and presumably elsewhere).


(fhajny)
diff -r1.35 -r1.36 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.37 -r1.38 pkgsrc/databases/mysql56-client/distinfo
diff -r1.1 -r0 pkgsrc/databases/mysql56-client/patches/patch-client_mysql.cc
diff -r1.3 -r1.4 pkgsrc/databases/mysql56-client/patches/patch-cmake_readline.cmake
cvs diff -r1.35 -r1.36 pkgsrc/databases/mysql56-client/Makefile.common (switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2016/09/07 12:58:25 1.35
+++ pkgsrc/databases/mysql56-client/Makefile.common 2016/09/30 11:54:49 1.36
@@ -1,131 +1,133 @@ @@ -1,131 +1,133 @@
1# $NetBSD: Makefile.common,v 1.35 2016/09/07 12:58:25 adam Exp $ 1# $NetBSD: Makefile.common,v 1.36 2016/09/30 11:54:49 fhajny Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.33 6DISTNAME= mysql-5.6.33
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25# MYSQL_USER username of the database administrator 25# MYSQL_USER username of the database administrator
26# MYSQL_GROUP group of the database administrator 26# MYSQL_GROUP group of the database administrator
27# MYSQL_DATADIR home directory (location of the databases) 27# MYSQL_DATADIR home directory (location of the databases)
28# MYSQL_PIDFILE process ID file 28# MYSQL_PIDFILE process ID file
29# MYSQL_CHARSET default character set 29# MYSQL_CHARSET default character set
30# MYSQL_EXTRA_CHARSET additional character set to be compiled in 30# MYSQL_EXTRA_CHARSET additional character set to be compiled in
31MYSQL_USER?= mysql 31MYSQL_USER?= mysql
32MYSQL_GROUP?= mysql 32MYSQL_GROUP?= mysql
33MYSQL_DATADIR?= ${VARBASE}/mysql 33MYSQL_DATADIR?= ${VARBASE}/mysql
34MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid 34MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
35MYSQL_CHARSET?= latin1 35MYSQL_CHARSET?= latin1
36MYSQL_COLLATION?= latin1_swedish_ci 36MYSQL_COLLATION?= latin1_swedish_ci
37MYSQL_EXTRA_CHARSET?= all 37MYSQL_EXTRA_CHARSET?= all
38 38
39PKG_USERS_VARS+= MYSQL_USER 39PKG_USERS_VARS+= MYSQL_USER
40PKG_GROUPS_VARS+= MYSQL_GROUP 40PKG_GROUPS_VARS+= MYSQL_GROUP
41 41
42CONFIG_SHELL= ${TOOLS_PATH.bash} 42CONFIG_SHELL= ${TOOLS_PATH.bash}
43 43
44CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H 44CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H
45 45
46BUILD_DEFS+= VARBASE 46BUILD_DEFS+= VARBASE
47 47
48# paths 48# paths
49CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" 49CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
50CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" 50CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
51CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" 51CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
52CMAKE_ARGS+= -DINSTALL_INFODIR="info" 52CMAKE_ARGS+= -DINSTALL_INFODIR="info"
53CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" 53CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
54CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" 54CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
55CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" 55CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
56CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" 56CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
57CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" 57CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
58CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" 58CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
59CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" 59CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
60CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" 60CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
61CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} 61CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
62 62
63CMAKE_ARGS+= -DWITH_ZLIB="system" 63CMAKE_ARGS+= -DWITH_ZLIB="system"
64CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 64CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
65CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 65CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
66CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 66CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
67 67
68# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 68# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
69.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 69.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
70GNU_ARCH.i386= i486 70GNU_ARCH.i386= i486
71CFLAGS+= -march=i486 71CFLAGS+= -march=i486
72.endif 72.endif
73 73
74# Ensure the correct DTrace ABI is used. 74# Ensure the correct DTrace ABI is used.
75.if !empty(ABI) 75.if !empty(ABI)
76CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 76CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
77.endif 77.endif
78 78
79CPPFLAGS+= -Dunix 79CPPFLAGS+= -Dunix
80CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 80CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
81CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 81CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
82 82
83.if ${OPSYS} != "Interix" 83.if ${OPSYS} != "Interix"
84CFLAGS+= -fPIC -DPIC 84CFLAGS+= -fPIC -DPIC
85CXXFLAGS+= -fPIC -DPIC 85CXXFLAGS+= -fPIC -DPIC
86.endif 86.endif
87 87
88# Force HAVE_CURSES_H on Solaris since the configure script is broken 88# Force HAVE_CURSES_H on Solaris since the configure script is broken
89# and does not properly detect this, breaking the build later on. Also 89# and does not properly detect this, breaking the build later on. Also
90# explicitly disable epoll support as it is Linux-specific. 90# explicitly disable epoll support as it is Linux-specific.
91CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO 91CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO
92CFLAGS.SunOS+= -DHAVE_CURSES_H 92CFLAGS.SunOS+= -DHAVE_CURSES_H
93CXXFLAGS.SunOS+= -DHAVE_CURSES_H 93CXXFLAGS.SunOS+= -DHAVE_CURSES_H
94 94
95.include "../../mk/pthread.buildlink3.mk" 95.include "../../mk/pthread.buildlink3.mk"
96 96
97.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 97.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
98CFLAGS+= -DSIGNALS_DONT_BREAK_READ 98CFLAGS+= -DSIGNALS_DONT_BREAK_READ
99CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 99CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
100.endif 100.endif
101 101
102LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 102LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
103 103
104SUBST_CLASSES+= scr 104SUBST_CLASSES+= scr
105SUBST_STAGE.scr= pre-configure 105SUBST_STAGE.scr= pre-configure
106SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 106SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
107 scripts/mysql_secure_installation.sh \ 107 scripts/mysql_secure_installation.sh \
108 support-files/mysql.server.sh 108 support-files/mysql.server.sh
109SUBST_SED.scr= -e "s,chown,${CHOWN},g" 109SUBST_SED.scr= -e "s,chown,${CHOWN},g"
110SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 110SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
111SUBST_MESSAGE.scr= Fixing scripts. 111SUBST_MESSAGE.scr= Fixing scripts.
112 112
113SUBST_CLASSES+= fixpaths 113SUBST_CLASSES+= fixpaths
114SUBST_STAGE.fixpaths= post-install 114SUBST_STAGE.fixpaths= post-install
115SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug 115SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug
116SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN 116SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN
117SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" 117SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
118SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" 118SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
119 119
120# Don't use the base system "libedit" under NetBSD because MySQL expects 120# Don't use the base system "libedit" under NetBSD because MySQL expects
121# an incompatible prototype for "rl_completion_entry_function". 121# an incompatible prototype for "rl_completion_entry_function".
122.if ${OPSYS} == "NetBSD" 122.if ${OPSYS} == "NetBSD"
123USE_BUILTIN.editline= no 123USE_BUILTIN.editline= no
124.endif 124.endif
125 125
126.include "../../mk/readline.buildlink3.mk" 126.include "../../mk/readline.buildlink3.mk"
127 127.if ${READLINE_TYPE} == "readline"
128CMAKE_ARGS+= -DWITH_EDITLINE=system 128CMAKE_ARGS+= -DWITH_READLINE="system"
129CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline 129.else
 130CMAKE_ARGS+= -DWITH_EDITLINE="system"
 131.endif
130 132
131.include "../../devel/zlib/buildlink3.mk" 133.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.37 -r1.38 pkgsrc/databases/mysql56-client/distinfo (switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2016/09/07 12:58:25 1.37
+++ pkgsrc/databases/mysql56-client/distinfo 2016/09/30 11:54:49 1.38
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1$NetBSD: distinfo,v 1.37 2016/09/07 12:58:25 adam Exp $ 1$NetBSD: distinfo,v 1.38 2016/09/30 11:54:49 fhajny Exp $
2 2
3SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42 3SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42
4RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f 4RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f
5SHA512 (mysql-5.6.33.tar.gz) = d6f96dfd379b7ddaf3897a04ad756169a9d71319894551cba561e5ab2298dc21526004f656f50850c81bbe52af158926f87badc34d07b2b92107bc136e08359a 5SHA512 (mysql-5.6.33.tar.gz) = d6f96dfd379b7ddaf3897a04ad756169a9d71319894551cba561e5ab2298dc21526004f656f50850c81bbe52af158926f87badc34d07b2b92107bc136e08359a
6Size (mysql-5.6.33.tar.gz) = 32094894 bytes 6Size (mysql-5.6.33.tar.gz) = 32094894 bytes
7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a 7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77 8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689 9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes 10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
11SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da 11SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
13SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336 
14SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 13SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
15SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52 14SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
16SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396 15SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
17SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 16SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
18SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595 17SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
19SHA1 (patch-cmake_readline.cmake) = 5436d4bf4148e97deef2a9811a09e54503a4e744 18SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
20SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 19SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
21SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 20SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
22SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb 21SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
23SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 22SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
24SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd 23SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
25SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca 24SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
26SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795 25SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795
27SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d 26SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d
28SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884 27SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884
29SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e 28SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
30SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5 29SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5
31SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185 30SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185
32SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b 31SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
33SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5 32SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
34SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e 33SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e
35SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf 34SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf
36SHA1 (patch-storage_archive_CMakeLists.txt) = e739ef4884a154d7e33e8aae24234fd6855119b7 35SHA1 (patch-storage_archive_CMakeLists.txt) = e739ef4884a154d7e33e8aae24234fd6855119b7
37SHA1 (patch-storage_blackhole_CMakeLists.txt) = b9c526783cabd04ea7859d62cb1930ff35f905f8 36SHA1 (patch-storage_blackhole_CMakeLists.txt) = b9c526783cabd04ea7859d62cb1930ff35f905f8
38SHA1 (patch-storage_csv_CMakeLists.txt) = 739accd1fb85b051e28f5c3f16a6c3c0f77d6dae 37SHA1 (patch-storage_csv_CMakeLists.txt) = 739accd1fb85b051e28f5c3f16a6c3c0f77d6dae
39SHA1 (patch-storage_example_CMakeLists.txt) = a80b1dd3c6020b3fe958db35bebe3bd181136f0d 38SHA1 (patch-storage_example_CMakeLists.txt) = a80b1dd3c6020b3fe958db35bebe3bd181136f0d
40SHA1 (patch-storage_federated_CMakeLists.txt) = f809504bad63129a06ce455b49ee40cca940891e 39SHA1 (patch-storage_federated_CMakeLists.txt) = f809504bad63129a06ce455b49ee40cca940891e
41SHA1 (patch-storage_heap_CMakeLists.txt) = 0a1a5a7b5e83f14cec43bfa4782dd4bb7b629347 40SHA1 (patch-storage_heap_CMakeLists.txt) = 0a1a5a7b5e83f14cec43bfa4782dd4bb7b629347
42SHA1 (patch-storage_myisam_CMakeLists.txt) = 55897ae78208f78a396776d1082cb5f98631fff8 41SHA1 (patch-storage_myisam_CMakeLists.txt) = 55897ae78208f78a396776d1082cb5f98631fff8
43SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324af9855a4e 42SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324af9855a4e
44SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a71c14952c3a 43SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a71c14952c3a
45SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903 44SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903
File Deleted: pkgsrc/databases/mysql56-client/patches/Attic/patch-client_mysql.cc
cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql56-client/patches/patch-cmake_readline.cmake (switch to unified diff)

--- pkgsrc/databases/mysql56-client/patches/patch-cmake_readline.cmake 2015/10/07 11:22:00 1.3
+++ pkgsrc/databases/mysql56-client/patches/patch-cmake_readline.cmake 2016/09/30 11:54:49 1.4
@@ -1,36 +1,19 @@ @@ -1,36 +1,19 @@
1$NetBSD: patch-cmake_readline.cmake,v 1.3 2015/10/07 11:22:00 adam Exp $ 1$NetBSD: patch-cmake_readline.cmake,v 1.4 2016/09/30 11:54:49 fhajny Exp $
2 2
3* If devel/editline is installed and use base libedit, cmake 3Fix for pkgsrc editline.
4 readline.h detection fails. Disable mis-detection of 
5 /usr/pkg/include/editline/readline.h. 
6 4
7--- cmake/readline.cmake.orig 2013-05-21 15:18:39.000000000 +0000 5--- cmake/readline.cmake.orig 2016-08-26 11:22:35.000000000 +0000
8+++ cmake/readline.cmake 6+++ cmake/readline.cmake
9@@ -130,9 +130,6 @@ MACRO (MYSQL_USE_BUNDLED_EDITLINE) 7@@ -131,10 +131,10 @@ ENDMACRO()
10 ENDMACRO() 
11  8
12 MACRO (FIND_SYSTEM_EDITLINE) 9 MACRO (FIND_SYSTEM_EDITLINE)
13- FIND_PATH(FOUND_EDITLINE_READLINE 10 FIND_PATH(FOUND_EDITLINE_READLINE
14- NAMES editline/readline.h 11- NAMES editline/readline.h
15- ) 12+ NAMES readline/readline.h
 13 )
16 IF(FOUND_EDITLINE_READLINE) 14 IF(FOUND_EDITLINE_READLINE)
17 SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline") 15- SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
 16+ SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
18 ELSE() 17 ELSE()
19@@ -160,7 +157,7 @@ MACRO (FIND_SYSTEM_EDITLINE) 18 # Different path on FreeBSD
20 SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY}) 19 FIND_PATH(FOUND_EDIT_READLINE_READLINE
21 CHECK_CXX_SOURCE_COMPILES(" 
22 #include <stdio.h> 
23- #include <readline.h> 
24+ #include <readline/readline.h> 
25 int main(int argc, char **argv) 
26 { 
27 HIST_ENTRY entry; 
28@@ -170,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE) 
29  
30 CHECK_CXX_SOURCE_COMPILES(" 
31 #include <stdio.h> 
32- #include <readline.h> 
33+ #include <readline/readline.h> 
34 int main(int argc, char **argv) 
35 { 
36 typedef int MYFunction(const char*, int);