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 (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,132 +1,133 @@ @@ -1,132 +1,133 @@
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++
15USE_TOOLS+= bash gmake perl:run python:run 15USE_TOOLS+= bash gmake perl:run python:run
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19.include "options.mk" 19.include "options.mk"
20 20
21# MYSQL_USER username of the database administrator 21# MYSQL_USER username of the database administrator
22# MYSQL_GROUP group of the database administrator 22# MYSQL_GROUP group of the database administrator
23# MYSQL_DATADIR home directory (location of the databases) 23# MYSQL_DATADIR home directory (location of the databases)
24# MYSQL_PIDFILE process ID file 24# MYSQL_PIDFILE process ID file
25# MYSQL_CHARSET default character set 25# MYSQL_CHARSET default character set
26# MYSQL_EXTRA_CHARSET additional character set to be compiled in 26# MYSQL_EXTRA_CHARSET additional character set to be compiled in
27MYSQL_USER?= mysql 27MYSQL_USER?= mysql
28MYSQL_GROUP?= mysql 28MYSQL_GROUP?= mysql
29MYSQL_DATADIR?= ${VARBASE}/mysql 29MYSQL_DATADIR?= ${VARBASE}/mysql
30MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid 30MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
31MYSQL_CHARSET?= latin1 31MYSQL_CHARSET?= latin1
32MYSQL_COLLATION?= latin1_swedish_ci 32MYSQL_COLLATION?= latin1_swedish_ci
33MYSQL_EXTRA_CHARSET?= all 33MYSQL_EXTRA_CHARSET?= all
34 34
35PKG_USERS_VARS+= MYSQL_USER 35PKG_USERS_VARS+= MYSQL_USER
36PKG_GROUPS_VARS+= MYSQL_GROUP 36PKG_GROUPS_VARS+= MYSQL_GROUP
37 37
38CONFIG_SHELL= ${TOOLS_PATH.bash} 38CONFIG_SHELL= ${TOOLS_PATH.bash}
39 39
40CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H 40CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H
41 41
42BUILD_DEFS+= VARBASE 42BUILD_DEFS+= VARBASE
43 43
44# paths 44# paths
45CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" 45CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql"
46CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" 46CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql"
47CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" 47CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql"
48CMAKE_ARGS+= -DINSTALL_INFODIR="info" 48CMAKE_ARGS+= -DINSTALL_INFODIR="info"
49CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" 49CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}"
50CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" 50CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql"
51CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" 51CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test"
52CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" 52CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin"
53CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" 53CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin"
54CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" 54CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin"
55CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" 55CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
56CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" 56CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql"
57CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} 57CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR}
58 58
59CMAKE_ARGS+= -DWITH_LIBEVENT="system" 59CMAKE_ARGS+= -DWITH_LIBEVENT="system"
60CMAKE_ARGS+= -DWITH_BUNDLED_LIBEVENT=OFF 60CMAKE_ARGS+= -DWITH_BUNDLED_LIBEVENT=OFF
61CMAKE_ARGS+= -DWITH_ZLIB="system" 61CMAKE_ARGS+= -DWITH_ZLIB="system"
62CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 62CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
63CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 63CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
64CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 64CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
65CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF 65CMAKE_ARGS+= -DWITH_NDB_JAVA=OFF
66 66
67# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 67# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
68.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 68.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
69GNU_ARCH.i386= i486 69GNU_ARCH.i386= i486
70CFLAGS+= -march=i486 70CFLAGS+= -march=i486
71.endif 71.endif
72 72
73# Ensure the correct DTrace ABI is used. 73# Ensure the correct DTrace ABI is used.
74.if !empty(ABI) 74.if !empty(ABI)
75CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 75CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
76.endif 76.endif
77 77
78CPPFLAGS+= -Dunix 78CPPFLAGS+= -Dunix
79CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 79CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
80 80
81.if ${OPSYS} != "Interix" 81.if ${OPSYS} != "Interix"
82CFLAGS+= -fPIC -DPIC 82CFLAGS+= -fPIC -DPIC
83CXXFLAGS+= -fPIC -DPIC 83CXXFLAGS+= -fPIC -DPIC
84.endif 84.endif
85 85
86# force HAVE_CURSES_H on Solaris since the configure script is broken 86# force HAVE_CURSES_H on Solaris since the configure script is broken
87# and does not properly detect this, breaking the build later on. Also 87# and does not properly detect this, breaking the build later on. Also
88# explicitly disable epoll support as it is Linux-specific. 88# explicitly disable epoll support as it is Linux-specific.
89CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO 89CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
90CFLAGS.SunOS+= -DHAVE_CURSES_H 90CFLAGS.SunOS+= -DHAVE_CURSES_H
91CXXFLAGS.SunOS+= -DHAVE_CURSES_H 91CXXFLAGS.SunOS+= -DHAVE_CURSES_H
92 92
93.include "../../mk/pthread.buildlink3.mk" 93.include "../../mk/pthread.buildlink3.mk"
94 94
95.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 95.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
96CFLAGS+= -DSIGNALS_DONT_BREAK_READ 96CFLAGS+= -DSIGNALS_DONT_BREAK_READ
97CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 97CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
98.endif 98.endif
99 99
100LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 100LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
101 101
102SUBST_CLASSES+= scr 102SUBST_CLASSES+= scr
103SUBST_STAGE.scr= pre-configure 103SUBST_STAGE.scr= pre-configure
104SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 104SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
105 scripts/mysql_secure_installation.sh \ 105 scripts/mysql_secure_installation.sh \
106 support-files/mysql.server.sh 106 support-files/mysql.server.sh
107SUBST_SED.scr= -e "s,chown,${CHOWN},g" 107SUBST_SED.scr= -e "s,chown,${CHOWN},g"
108SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 108SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
109SUBST_MESSAGE.scr= Fixing scripts. 109SUBST_MESSAGE.scr= Fixing scripts.
110 110
111SUBST_CLASSES+= vars 111SUBST_CLASSES+= vars
112SUBST_STAGE.vars= pre-configure 112SUBST_STAGE.vars= pre-configure
113SUBST_FILES.vars= scripts/mysql_install_db.pl.in 113SUBST_FILES.vars= scripts/mysql_install_db.pl.in
114SUBST_VARS.vars= PKG_SYSCONFDIR 114SUBST_VARS.vars= PKG_SYSCONFDIR
115 115
116SUBST_CLASSES+= fixpaths 116SUBST_CLASSES+= fixpaths
117SUBST_STAGE.fixpaths= post-install 117SUBST_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 (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,141 +1,142 @@ @@ -1,141 +1,142 @@
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
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18.include "options.mk" 18.include "options.mk"
19 19
20EXTRACT_USING= bsdtar 20EXTRACT_USING= bsdtar
21 21
22# MYSQL_USER username of the database administrator 22# MYSQL_USER username of the database administrator
23# MYSQL_GROUP group of the database administrator 23# MYSQL_GROUP group of the database administrator
24# MYSQL_DATADIR home directory of the database administrator and 24# MYSQL_DATADIR home directory of the database administrator and
25# location of the databases 25# location of the databases
26# MYSQL_PIDFILE process ID file 26# MYSQL_PIDFILE process ID file
27MYSQL_USER?= mysql 27MYSQL_USER?= mysql
28MYSQL_GROUP?= mysql 28MYSQL_GROUP?= mysql
29MYSQL_DATADIR?= ${VARBASE}/mysql 29MYSQL_DATADIR?= ${VARBASE}/mysql
30MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid 30MYSQL_PIDFILE?= ${MYSQL_DATADIR}/${HOST}.pid
31 31
32PKG_USERS_VARS+= MYSQL_USER 32PKG_USERS_VARS+= MYSQL_USER
33PKG_GROUPS_VARS+= MYSQL_GROUP 33PKG_GROUPS_VARS+= MYSQL_GROUP
34 34
35# MYSQL_CHARSET default character set 35# MYSQL_CHARSET default character set
36# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 36# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
37MYSQL_CHARSET?= latin1 37MYSQL_CHARSET?= latin1
38MYSQL_EXTRA_CHARSET?= all 38MYSQL_EXTRA_CHARSET?= all
39 39
40CONFIGURE_ARGS+= --enable-thread-safe-client 40CONFIGURE_ARGS+= --enable-thread-safe-client
41CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} 41CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
42CONFIGURE_ARGS+= --without-libwrap 42CONFIGURE_ARGS+= --without-libwrap
43CONFIG_SHELL= ${TOOLS_PATH.bash} 43CONFIG_SHELL= ${TOOLS_PATH.bash}
44 44
45CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H 45CFLAGS.IRIX+= -DIRIX5 -DNEEDS_BSTRING_H
46# libgen is incorrectly detected 46# libgen is incorrectly detected
47CONFIGURE_ENV.IRIX+= ac_cv_lib_gen_p2open="no" 47CONFIGURE_ENV.IRIX+= ac_cv_lib_gen_p2open="no"
48 48
49BUILD_DEFS+= VARBASE 49BUILD_DEFS+= VARBASE
50 50
51# We always use our own readline. Note that these --without-* settings 51# We always use our own readline. Note that these --without-* settings
52# are confusing, but they just mean "don't use the included readline 52# are confusing, but they just mean "don't use the included readline
53# or libedit". 53# or libedit".
54CONFIGURE_ARGS+= --without-readline 54CONFIGURE_ARGS+= --without-readline
55CONFIGURE_ARGS+= --without-libedit 55CONFIGURE_ARGS+= --without-libedit
56 56
57# Speed up production one-time builds; see "./configure --help" for 57# Speed up production one-time builds; see "./configure --help" for
58# more information on using or disabling this option. 58# more information on using or disabling this option.
59CONFIGURE_ARGS+= --disable-dependency-tracking 59CONFIGURE_ARGS+= --disable-dependency-tracking
60 60
61CONFIGURE_ARGS+= --without-debug 61CONFIGURE_ARGS+= --without-debug
62CONFIGURE_ARGS+= --with-low-memory 62CONFIGURE_ARGS+= --with-low-memory
63CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib} 63CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib}
64CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} 64CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
65CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} 65CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
66 66
67.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \ 67.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
68 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" 68 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
69CONFIGURE_ARGS+= --enable-assembler 69CONFIGURE_ARGS+= --enable-assembler
70.endif 70.endif
71 71
72# MySQL 5.1 depends on builtin functions which enabled with i486 and 72# MySQL 5.1 depends on builtin functions which enabled with i486 and
73# later with GCC. 73# later with GCC.
74.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 74.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
75GNU_ARCH.i386= i486 75GNU_ARCH.i386= i486
76CFLAGS+= -march=i486 76CFLAGS+= -march=i486
77.endif 77.endif
78 78
79CONFIGURE_ENV.NetBSD+= ac_cv_func_gethostbyname_r="no" 79CONFIGURE_ENV.NetBSD+= ac_cv_func_gethostbyname_r="no"
80 80
81CONFIGURE_ENV+= mysql_cv_compress="yes" 81CONFIGURE_ENV+= mysql_cv_compress="yes"
82 82
83CPPFLAGS+= -Dunix 83CPPFLAGS+= -Dunix
84CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 84CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
85 85
86.if ${OPSYS} != "Interix" 86.if ${OPSYS} != "Interix"
87CFLAGS+= -fPIC -DPIC 87CFLAGS+= -fPIC -DPIC
88CXXFLAGS+= -fPIC -DPIC 88CXXFLAGS+= -fPIC -DPIC
89.endif 89.endif
90 90
91# force HAVE_CURSES_H on Solaris since the configure script is broken 91# force HAVE_CURSES_H on Solaris since the configure script is broken
92# and does not properly detect this, breaking the build later on. 92# and does not properly detect this, breaking the build later on.
93CFLAGS.SunOS+= -DHAVE_CURSES_H 93CFLAGS.SunOS+= -DHAVE_CURSES_H
94CXXFLAGS.SunOS+= -DHAVE_CURSES_H 94CXXFLAGS.SunOS+= -DHAVE_CURSES_H
95 95
96.include "../../mk/pthread.buildlink3.mk" 96.include "../../mk/pthread.buildlink3.mk"
97 97
98.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 98.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
99CFLAGS+= -DSIGNALS_DONT_BREAK_READ 99CFLAGS+= -DSIGNALS_DONT_BREAK_READ
100CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 100CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
101CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no 101CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
102CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 102CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
103.endif 103.endif
104 104
105USE_LANGUAGES= c c++ 105USE_LANGUAGES= c c++
106USE_TOOLS+= autoconf bash autoheader gmake perl:run 106USE_TOOLS+= autoconf bash autoheader gmake perl:run
107LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 107LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
108 108
109# reset the platform diff on SunOS unless it's a GNU diff 109# reset the platform diff on SunOS unless it's a GNU diff
110# which is required by the MySQL build 110# which is required by the MySQL build
111.if ${OPSYS} == "SunOS" && empty(TOOLS_PLATFORM.diff:Mgdiff) 111.if ${OPSYS} == "SunOS" && empty(TOOLS_PLATFORM.diff:Mgdiff)
112TOOLS_PLATFORM.diff= # empty 112TOOLS_PLATFORM.diff= # empty
113.endif 113.endif
114 114
115SUBST_CLASSES+= mk 115SUBST_CLASSES+= mk
116SUBST_STAGE.mk= pre-configure 116SUBST_STAGE.mk= pre-configure
117SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \ 117SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
118 mysys/Makefile.in strings/Makefile.in 118 mysys/Makefile.in strings/Makefile.in
119SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" 119SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
120SUBST_MESSAGE.mk= Fixing Makefiles. 120SUBST_MESSAGE.mk= Fixing Makefiles.
121 121
122SUBST_CLASSES+= scr 122SUBST_CLASSES+= scr
123SUBST_STAGE.scr= pre-configure 123SUBST_STAGE.scr= pre-configure
124SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 124SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
125 scripts/mysql_secure_installation.sh \ 125 scripts/mysql_secure_installation.sh \
126 support-files/mysql.server.sh 126 support-files/mysql.server.sh
127SUBST_SED.scr= -e "s,chown,${CHOWN},g" 127SUBST_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 (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,137 +1,138 @@ @@ -1,137 +1,138 @@
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
15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-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}
62CMAKE_ARGS+= -DWITH_SSL=system 62CMAKE_ARGS+= -DWITH_SSL=system
63 63
64# always use our own readline, not MySQL bundled one 64# always use our own readline, not MySQL bundled one
65CMAKE_ARGS+= -DWITH_LIBEDIT=OFF 65CMAKE_ARGS+= -DWITH_LIBEDIT=OFF
66CMAKE_ARGS+= -DWITH_READLINE=OFF 66CMAKE_ARGS+= -DWITH_READLINE=OFF
67CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 67CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
68CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 68CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
69CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 69CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
70BROKEN_READLINE_DETECTION= yes # At least on RHEL 5.6 70BROKEN_READLINE_DETECTION= yes # At least on RHEL 5.6
71 71
72# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 72# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
73.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 73.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
74GNU_ARCH.i386= i486 74GNU_ARCH.i386= i486
75CFLAGS+= -march=i486 75CFLAGS+= -march=i486
76.endif 76.endif
77 77
78# Ensure the correct DTrace ABI is used. 78# Ensure the correct DTrace ABI is used.
79.if !empty(ABI) 79.if !empty(ABI)
80CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 80CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
81.endif 81.endif
82 82
83CPPFLAGS+= -Dunix 83CPPFLAGS+= -Dunix
84CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 84CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
85 85
86.if ${OPSYS} != "Interix" 86.if ${OPSYS} != "Interix"
87CFLAGS+= -fPIC -DPIC 87CFLAGS+= -fPIC -DPIC
88CXXFLAGS+= -fPIC -DPIC 88CXXFLAGS+= -fPIC -DPIC
89.endif 89.endif
90 90
91# force HAVE_CURSES_H on Solaris since the configure script is broken 91# force HAVE_CURSES_H on Solaris since the configure script is broken
92# and does not properly detect this, breaking the build later on. 92# and does not properly detect this, breaking the build later on.
93CFLAGS.SunOS+= -DHAVE_CURSES_H 93CFLAGS.SunOS+= -DHAVE_CURSES_H
94CXXFLAGS.SunOS+= -DHAVE_CURSES_H 94CXXFLAGS.SunOS+= -DHAVE_CURSES_H
95 95
96# SCO OpenServer 5.0.7/3.2's readdir_r has 2 arguments and return struct dirent. 96# SCO OpenServer 5.0.7/3.2's readdir_r has 2 arguments and return struct dirent.
97.if ${OS_VARIANT} == "SCOOSR5" 97.if ${OS_VARIANT} == "SCOOSR5"
98CMAKE_ARGS+= -DHAVE_READDIR_R=OFF 98CMAKE_ARGS+= -DHAVE_READDIR_R=OFF
99.endif 99.endif
100 100
101.include "../../mk/pthread.buildlink3.mk" 101.include "../../mk/pthread.buildlink3.mk"
102 102
103.if (defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")) || \ 103.if (defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")) || \
104 ${OS_VARIANT} == "SCOOSR5" 104 ${OS_VARIANT} == "SCOOSR5"
105CFLAGS+= -DSIGNALS_DONT_BREAK_READ 105CFLAGS+= -DSIGNALS_DONT_BREAK_READ
106CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 106CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
107.endif 107.endif
108 108
109LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 109LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
110 110
111SUBST_CLASSES+= scr 111SUBST_CLASSES+= scr
112SUBST_STAGE.scr= pre-configure 112SUBST_STAGE.scr= pre-configure
113SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 113SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
114 scripts/mysql_secure_installation.sh \ 114 scripts/mysql_secure_installation.sh \
115 support-files/mysql.server.sh 115 support-files/mysql.server.sh
116SUBST_SED.scr= -e "s,chown,${CHOWN},g" 116SUBST_SED.scr= -e "s,chown,${CHOWN},g"
117SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 117SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
118SUBST_MESSAGE.scr= Fixing scripts. 118SUBST_MESSAGE.scr= Fixing scripts.
119 119
120SUBST_CLASSES+= fixpaths 120SUBST_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 (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,133 +1,134 @@ @@ -1,133 +1,134 @@
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
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.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 (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,129 +1,130 @@ @@ -1,129 +1,130 @@
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
15PATCHDIR?= ${.CURDIR}/../../databases/mysql57-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql57-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash bison gmake perl:run 19USE_TOOLS+= bash bison 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+= -DCMAKE_BUILD_TYPE=Release 63CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
64 64
65CMAKE_ARGS+= -DWITH_BOOST="system" 65CMAKE_ARGS+= -DWITH_BOOST="system"
66CMAKE_ARGS+= -DWITH_LZ4="system" 66CMAKE_ARGS+= -DWITH_LZ4="system"
67CMAKE_ARGS+= -DWITH_SSL="system" 67CMAKE_ARGS+= -DWITH_SSL="system"
68CMAKE_ARGS+= -DWITH_ZLIB="system" 68CMAKE_ARGS+= -DWITH_ZLIB="system"
69CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 69CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
70CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 70CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
71CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 71CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
72 72
73# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 73# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
74.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 74.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
75GNU_ARCH.i386= i486 75GNU_ARCH.i386= i486
76CFLAGS+= -march=i486 76CFLAGS+= -march=i486
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
81#CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 81#CFLAGS+= -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/mysqld_safe.sh \ 106SUBST_FILES.scr= scripts/mysqld_safe.sh \
107 support-files/mysql.server.sh 107 support-files/mysql.server.sh
108SUBST_SED.scr= -e "s,chown,${CHOWN},g" 108SUBST_SED.scr= -e "s,chown,${CHOWN},g"
109SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 109SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
110SUBST_MESSAGE.scr= Fixing scripts. 110SUBST_MESSAGE.scr= Fixing scripts.
111 111
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"