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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -25,24 +25,14 @@ REPLACE_PERL+= scripts/mysqld_multi.sh @@ -25,24 +25,14 @@ REPLACE_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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -101,14 +101,24 @@ CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ @@ -101,14 +101,24 @@ CXXFLAGS+= -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"