Tue Jun 18 19:59:35 2013 UTC ()
Server needs the same changes as client to not build the integrated
editline, so move them to Makefile.common.


(joerg)
diff -r1.5 -r1.6 pkgsrc/databases/mysql56-client/Makefile
diff -r1.6 -r1.7 pkgsrc/databases/mysql56-client/Makefile.common
cvs diff -r1.5 -r1.6 pkgsrc/databases/mysql56-client/Makefile (switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile 2013/06/16 20:39:12 1.5
+++ pkgsrc/databases/mysql56-client/Makefile 2013/06/18 19:59:35 1.6
@@ -1,48 +1,38 @@ @@ -1,48 +1,38 @@
1# $NetBSD: Makefile,v 1.5 2013/06/16 20:39:12 joerg Exp $ 1# $NetBSD: Makefile,v 1.6 2013/06/18 19:59:35 joerg Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4SVR4_PKGNAME= mysqc 4SVR4_PKGNAME= mysqc
5COMMENT= MySQL 5, a free SQL database (client) 5COMMENT= MySQL 5, a free SQL database (client)
6 6
7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
8 8
9.include "Makefile.common" 9.include "Makefile.common"
10 10
11CMAKE_ARGS+= -DWITHOUT_SERVER=ON 11CMAKE_ARGS+= -DWITHOUT_SERVER=ON
12UNWRAP_FILES+= scripts/mysql_config 12UNWRAP_FILES+= scripts/mysql_config
13INFO_FILES= yes 13INFO_FILES= yes
14INSTALL_DIRS+= client include libmysql man scripts tests 14INSTALL_DIRS+= client include libmysql man scripts tests
15 15
16REPLACE_PERL= scripts/mysql_convert_table_format.sh 16REPLACE_PERL= scripts/mysql_convert_table_format.sh
17REPLACE_PERL+= scripts/mysql_find_rows.sh 17REPLACE_PERL+= scripts/mysql_find_rows.sh
18REPLACE_PERL+= scripts/mysql_fix_extensions.sh 18REPLACE_PERL+= scripts/mysql_fix_extensions.sh
19REPLACE_PERL+= scripts/mysql_install_db.pl.in 19REPLACE_PERL+= scripts/mysql_install_db.pl.in
20REPLACE_PERL+= scripts/mysql_secure_installation.pl.in 20REPLACE_PERL+= scripts/mysql_secure_installation.pl.in
21REPLACE_PERL+= scripts/mysql_setpermission.sh 21REPLACE_PERL+= scripts/mysql_setpermission.sh
22REPLACE_PERL+= scripts/mysql_zap.sh 22REPLACE_PERL+= scripts/mysql_zap.sh
23REPLACE_PERL+= scripts/mysqlaccess.sh 23REPLACE_PERL+= scripts/mysqlaccess.sh
24REPLACE_PERL+= scripts/mysqld_multi.sh 24REPLACE_PERL+= scripts/mysqld_multi.sh
25REPLACE_PERL+= scripts/mysqldumpslow.sh 25REPLACE_PERL+= scripts/mysqldumpslow.sh
26REPLACE_PERL+= scripts/mysqlhotcopy.sh 26REPLACE_PERL+= scripts/mysqlhotcopy.sh
27 27
28# Replace manual pages which only include other ones with a symbolic link 28# Replace manual pages which only include other ones with a symbolic link
29# if manual compression is activated. The manual pages won't work otherwise. 29# if manual compression is activated. The manual pages won't work otherwise.
30.if defined(MANZ) 30.if defined(MANZ)
31post-install: 31post-install:
32. for mf in mysql_client_test_embedded.1 mysqltest_embedded.1 32. for mf in mysql_client_test_embedded.1 mysqltest_embedded.1
33 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf} 33 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
34 ${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf} 34 ${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
35. endfor 35. endfor
36.endif 36.endif
37 37
38.include "../../devel/readline/buildlink3.mk" 
39 
40CMAKE_ARGS+= -DWITH_EDITLINE=system 
41.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) 
42CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so 
43.else 
44CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so 
45.endif 
46CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline 
47 
48.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/databases/mysql56-client/Makefile.common (switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2013/06/16 20:39:12 1.6
+++ pkgsrc/databases/mysql56-client/Makefile.common 2013/06/18 19:59:35 1.7
@@ -1,114 +1,124 @@ @@ -1,114 +1,124 @@
1# $NetBSD: Makefile.common,v 1.6 2013/06/16 20:39:12 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.7 2013/06/18 19:59:35 joerg 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.12 6DISTNAME= mysql-5.6.12
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_CHARSET default character set 28# MYSQL_CHARSET default character set
29# MYSQL_EXTRA_CHARSET additional character set to be compiled in 29# MYSQL_EXTRA_CHARSET additional character set to be compiled in
30MYSQL_USER?= mysql 30MYSQL_USER?= mysql
31MYSQL_GROUP?= mysql 31MYSQL_GROUP?= mysql
32MYSQL_DATADIR?= ${VARBASE}/mysql 32MYSQL_DATADIR?= ${VARBASE}/mysql
33MYSQL_CHARSET?= latin1 33MYSQL_CHARSET?= latin1
34MYSQL_COLLATION?= latin1_swedish_ci 34MYSQL_COLLATION?= latin1_swedish_ci
35MYSQL_EXTRA_CHARSET?= all 35MYSQL_EXTRA_CHARSET?= all
36 36
37PKG_USERS_VARS+= MYSQL_USER 37PKG_USERS_VARS+= MYSQL_USER
38PKG_GROUPS_VARS+= MYSQL_GROUP 38PKG_GROUPS_VARS+= MYSQL_GROUP
39 39
40CONFIG_SHELL= ${TOOLS_PATH.bash} 40CONFIG_SHELL= ${TOOLS_PATH.bash}
41 41
42.if ${OPSYS} == "IRIX" 42.if ${OPSYS} == "IRIX"
43CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 43CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
44.endif 44.endif
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
63# always use our own readline, not MySQL bundled one 63# always use our own readline, not MySQL bundled one
64CMAKE_ARGS+= -DWITH_ZLIB="system" 64CMAKE_ARGS+= -DWITH_ZLIB="system"
65CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} 65CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
66CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q} 66CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
67CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} 67CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
68 68
69# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. 69# MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
70.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) 70.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
71GNU_ARCH.i386= i486 71GNU_ARCH.i386= i486
72CFLAGS+= -march=i486 72CFLAGS+= -march=i486
73.endif 73.endif
74 74
75# Ensure the correct DTrace ABI is used. 75# Ensure the correct DTrace ABI is used.
76.if !empty(ABI) 76.if !empty(ABI)
77CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 77CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
78.endif 78.endif
79 79
80CPPFLAGS+= -Dunix 80CPPFLAGS+= -Dunix
81CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 81CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
82CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 82CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
83 83
84.if ${OPSYS} != "Interix" 84.if ${OPSYS} != "Interix"
85CFLAGS+= -fPIC -DPIC 85CFLAGS+= -fPIC -DPIC
86CXXFLAGS+= -fPIC -DPIC 86CXXFLAGS+= -fPIC -DPIC
87.endif 87.endif
88 88
89# force HAVE_CURSES_H on Solaris since the configure script is broken 89# force HAVE_CURSES_H on Solaris since the configure script is broken
90# and does not properly detect this, breaking the build later on. 90# and does not properly detect this, breaking the build later on.
91.if ${OPSYS} == "SunOS" 91.if ${OPSYS} == "SunOS"
92CFLAGS+= -DHAVE_CURSES_H 92CFLAGS+= -DHAVE_CURSES_H
93CXXFLAGS+= -DHAVE_CURSES_H 93CXXFLAGS+= -DHAVE_CURSES_H
94.endif 94.endif
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
101.endif 101.endif
102 102
103LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 103LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
104 104
105SUBST_CLASSES+= scr 105SUBST_CLASSES+= scr
106SUBST_STAGE.scr= pre-configure 106SUBST_STAGE.scr= pre-configure
107SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 107SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
108 scripts/mysql_secure_installation.sh \ 108 scripts/mysql_secure_installation.sh \
109 support-files/mysql.server.sh 109 support-files/mysql.server.sh
110SUBST_SED.scr= -e "s,chown,${CHOWN},g" 110SUBST_SED.scr= -e "s,chown,${CHOWN},g"
111SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 111SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
112SUBST_MESSAGE.scr= Fixing scripts. 112SUBST_MESSAGE.scr= Fixing scripts.
113 113
 114.include "../../devel/readline/buildlink3.mk"
 115
 116CMAKE_ARGS+= -DWITH_EDITLINE=system
 117.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
 118CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so
 119.else
 120CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so
 121.endif
 122CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline
 123
114.include "../../devel/zlib/buildlink3.mk" 124.include "../../devel/zlib/buildlink3.mk"