Fri May 5 16:22:29 2017 UTC ()
The mysql client links against libcurses, ensure we pull in the bl3 so
that user preferences are respected.


(jperkin)
diff -r1.11 -r1.12 pkgsrc/databases/mysql-cluster/Makefile.common
diff -r1.34 -r1.35 pkgsrc/databases/mysql51-client/Makefile.common
diff -r1.58 -r1.59 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.39 -r1.40 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.4 -r1.5 pkgsrc/databases/mysql57-client/Makefile.common
cvs diff -r1.11 -r1.12 pkgsrc/databases/mysql-cluster/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql-cluster/Attic/Makefile.common 2016/09/15 06:05:08 1.11
+++ pkgsrc/databases/mysql-cluster/Attic/Makefile.common 2017/05/05 16:22:28 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.11 2016/09/15 06:05:08 jnemeth Exp $ 1# $NetBSD: Makefile.common,v 1.12 2017/05/05 16:22:28 jperkin Exp $
2# 2#
3# used by databases/mysql-cluster/Makefile 3# used by databases/mysql-cluster/Makefile
4 4
5DISTNAME= mysql-cluster-gpl-7.4.12 5DISTNAME= mysql-cluster-gpl-7.4.12
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-Cluster-7.4/} 7MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-Cluster-7.4/}
8 8
9MAINTAINER?= pkgsrc-users@NetBSD.org 9MAINTAINER?= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.mysql.com/products/cluster/ 10HOMEPAGE= http://www.mysql.com/products/cluster/
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -118,15 +118,16 @@ SUBST_STAGE.fixpaths= post-install @@ -118,15 +118,16 @@ SUBST_STAGE.fixpaths= post-install
118SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug 118SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug
119SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN 119SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN
120SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" 120SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
121SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" 121SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
122 122
123.if ${_OPSYS_SHLIB_TYPE} == "dylib" 123.if ${_OPSYS_SHLIB_TYPE} == "dylib"
124SOEXT="dylib" 124SOEXT="dylib"
125.else 125.else
126SOEXT="so" 126SOEXT="so"
127.endif 127.endif
128 128
129CMAKE_ARGS+= -DWITH_EDITLINE=bundled 129CMAKE_ARGS+= -DWITH_EDITLINE=bundled
130 130
 131.include "../../mk/curses.buildlink3.mk"
131.include "../../devel/libevent/buildlink3.mk" 132.include "../../devel/libevent/buildlink3.mk"
132.include "../../devel/zlib/buildlink3.mk" 133.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.34 -r1.35 pkgsrc/databases/mysql51-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile.common 2017/04/13 13:44:49 1.34
+++ pkgsrc/databases/mysql51-client/Attic/Makefile.common 2017/05/05 16:22:28 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.34 2017/04/13 13:44:49 mef Exp $ 1# $NetBSD: Makefile.common,v 1.35 2017/05/05 16:22:28 jperkin Exp $
2# 2#
3# used by databases/mysql51-client/Makefile 3# used by databases/mysql51-client/Makefile
4# used by databases/mysql51-server/Makefile 4# used by databases/mysql51-server/Makefile
5 5
6DISTNAME= mysql-5.1.73 6DISTNAME= mysql-5.1.73
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
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
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -128,14 +128,15 @@ SUBST_SED.scr= -e "s,chown,${CHOWN},g" @@ -128,14 +128,15 @@ SUBST_SED.scr= -e "s,chown,${CHOWN},g"
128SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 128SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
129SUBST_MESSAGE.scr= Fixing scripts. 129SUBST_MESSAGE.scr= Fixing scripts.
130 130
131# Fix broken shared library detection under Mac OS X 131# Fix broken shared library detection under Mac OS X
132SUBST_CLASSES.Darwin+= dylib 132SUBST_CLASSES.Darwin+= dylib
133SUBST_STAGE.dylib= pre-configure 133SUBST_STAGE.dylib= pre-configure
134SUBST_FILES.dylib= configure 134SUBST_FILES.dylib= configure
135SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g" 135SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g"
136 136
137pre-configure: 137pre-configure:
138 ${RM} -f ${WRKSRC}/configure~ 138 ${RM} -f ${WRKSRC}/configure~
139 cd ${WRKSRC} && autoconf && autoheader 139 cd ${WRKSRC} && autoconf && autoheader
140 140
 141.include "../../mk/curses.buildlink3.mk"
141.include "../../devel/zlib/buildlink3.mk" 142.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.58 -r1.59 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2017/05/03 12:37:01 1.58
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2017/05/05 16:22:29 1.59
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.58 2017/05/03 12:37:01 mef Exp $ 1# $NetBSD: Makefile.common,v 1.59 2017/05/05 16:22:29 jperkin Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.56 6DISTNAME= mysql-5.5.56
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
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/mysql55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
@@ -121,17 +121,18 @@ SUBST_CLASSES+= fixpaths @@ -121,17 +121,18 @@ SUBST_CLASSES+= fixpaths
121SUBST_STAGE.fixpaths= post-install 121SUBST_STAGE.fixpaths= post-install
122SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug 122SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug
123SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN 123SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN
124SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" 124SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
125SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" 125SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
126 126
127.include "../../mk/readline.buildlink3.mk" 127.include "../../mk/readline.buildlink3.mk"
128 128
129.if !empty(READLINE_TYPE:Mreadline) 129.if !empty(READLINE_TYPE:Mreadline)
130CMAKE_ARGS+= -DREADLINE_FOUND=system 130CMAKE_ARGS+= -DREADLINE_FOUND=system
131.endif 131.endif
132CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline 132CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
133 133
 134.include "../../mk/curses.buildlink3.mk"
134.include "../../devel/zlib/buildlink3.mk" 135.include "../../devel/zlib/buildlink3.mk"
135.include "../../security/openssl/buildlink3.mk" 136.include "../../security/openssl/buildlink3.mk"
136 137
137PKG_SUPPORTED_OPTIONS+= dtrace embedded-server ndb-cluster sphinx 138PKG_SUPPORTED_OPTIONS+= dtrace embedded-server ndb-cluster sphinx
cvs diff -r1.39 -r1.40 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2017/04/11 20:21:02 1.39
+++ pkgsrc/databases/mysql56-client/Makefile.common 2017/05/05 16:22:29 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.39 2017/04/11 20:21:02 adam Exp $ 1# $NetBSD: Makefile.common,v 1.40 2017/05/05 16:22:29 jperkin 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.36 6DISTNAME= mysql-5.6.36
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
@@ -120,14 +120,15 @@ SUBST_SED.fixpaths+= -e "s,${WRAPPER_BIN @@ -120,14 +120,15 @@ SUBST_SED.fixpaths+= -e "s,${WRAPPER_BIN
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.if ${READLINE_TYPE} == "readline" 127.if ${READLINE_TYPE} == "readline"
128CMAKE_ARGS+= -DWITH_READLINE="system" 128CMAKE_ARGS+= -DWITH_READLINE="system"
129.else 129.else
130CMAKE_ARGS+= -DWITH_EDITLINE="system" 130CMAKE_ARGS+= -DWITH_EDITLINE="system"
131.endif 131.endif
132 132
 133.include "../../mk/curses.buildlink3.mk"
133.include "../../devel/zlib/buildlink3.mk" 134.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/databases/mysql57-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/Makefile.common 2017/04/11 20:49:15 1.4
+++ pkgsrc/databases/mysql57-client/Makefile.common 2017/05/05 16:22:29 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.4 2017/04/11 20:49:15 adam Exp $ 1# $NetBSD: Makefile.common,v 1.5 2017/05/05 16:22:29 jperkin Exp $
2# 2#
3# used by databases/mysql57-client/Makefile 3# used by databases/mysql57-client/Makefile
4# used by databases/mysql57-server/Makefile 4# used by databases/mysql57-server/Makefile
5 5
6DISTNAME= mysql-5.7.18 6DISTNAME= mysql-5.7.18
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
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/mysql57-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
@@ -112,18 +112,19 @@ SUBST_MESSAGE.scr= Fixing scripts. @@ -112,18 +112,19 @@ SUBST_MESSAGE.scr= Fixing scripts.
112# Don't use the base system "libedit" under NetBSD because MySQL expects 112# Don't use the base system "libedit" under NetBSD because MySQL expects
113# an incompatible prototype for "rl_completion_entry_function". 113# an incompatible prototype for "rl_completion_entry_function".
114.if ${OPSYS} == "NetBSD" 114.if ${OPSYS} == "NetBSD"
115USE_BUILTIN.editline= no 115USE_BUILTIN.editline= no
116.endif 116.endif
117 117
118.include "../../mk/readline.buildlink3.mk" 118.include "../../mk/readline.buildlink3.mk"
119.if ${READLINE_TYPE} == "readline" 119.if ${READLINE_TYPE} == "readline"
120CMAKE_ARGS+= -DWITH_READLINE="system" 120CMAKE_ARGS+= -DWITH_READLINE="system"
121.else 121.else
122CMAKE_ARGS+= -DWITH_EDITLINE="system" 122CMAKE_ARGS+= -DWITH_EDITLINE="system"
123.endif 123.endif
124 124
 125.include "../../mk/curses.buildlink3.mk"
125.include "../../archivers/lz4/buildlink3.mk" 126.include "../../archivers/lz4/buildlink3.mk"
126.include "../../devel/boost-libs/buildlink3.mk" 127.include "../../devel/boost-libs/buildlink3.mk"
127.include "../../devel/libevent/buildlink3.mk" 128.include "../../devel/libevent/buildlink3.mk"
128.include "../../devel/zlib/buildlink3.mk" 129.include "../../devel/zlib/buildlink3.mk"
129.include "../../security/openssl/buildlink3.mk" 130.include "../../security/openssl/buildlink3.mk"