Sun Mar 21 14:39:27 2010 UTC ()
Some clean up to CONFIGURE_ARGS; remove obsolete options.


(taca)
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/Makefile
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/Makefile.common
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile 2010/03/16 19:24:54 1.2
+++ pkgsrc/databases/mysql51-client/Attic/Makefile 2010/03/21 14:39:27 1.3
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.2 2010/03/16 19:24:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2010/03/21 14:39:27 taca Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 4PKGREVISION= 1
5SVR4_PKGNAME= mysqc 5SVR4_PKGNAME= mysqc
6COMMENT= MySQL 5, a free SQL database (client) 6COMMENT= MySQL 5, a free SQL database (client)
7 7
8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12.include "Makefile.common" 12.include "Makefile.common"
13 13
14CONFIGURE_ARGS+= --without-extra-tools 14CONFIGURE_ARGS+= --without-extra-tools
15CONFIGURE_ARGS+= --without-server 15CONFIGURE_ARGS+= --without-server
16CONFIGURE_ARGS+= --enable-thread-safe-client 
17UNWRAP_FILES+= scripts/mysql_config 16UNWRAP_FILES+= scripts/mysql_config
18INFO_FILES= yes 17INFO_FILES= yes
19 18
20AUTO_MKDIRS= yes 19AUTO_MKDIRS= yes
21 20
22REPLACE_PERL= scripts/mysql_convert_table_format.sh \ 21REPLACE_PERL= scripts/mysql_convert_table_format.sh \
23 scripts/mysql_find_rows.sh \ 22 scripts/mysql_find_rows.sh \
24 scripts/mysql_fix_extensions.sh \ 23 scripts/mysql_fix_extensions.sh \
25 scripts/mysql_fix_privilege_tables.sh \ 24 scripts/mysql_fix_privilege_tables.sh \
26 scripts/mysql_setpermission.sh \ 25 scripts/mysql_setpermission.sh \
27 scripts/mysql_zap.sh \ 26 scripts/mysql_zap.sh \
28 scripts/mysqlaccess.sh \ 27 scripts/mysqlaccess.sh \
29 scripts/mysqldumpslow.sh \ 28 scripts/mysqldumpslow.sh \
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/03/16 19:24:54 1.2
+++ pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/03/21 14:39:27 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.2 2010/03/16 19:24:54 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.3 2010/03/21 14:39:27 taca 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#
6 6
7DISTNAME= mysql-5.1.44 7DISTNAME= mysql-5.1.44
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} 9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
10 10
11MAINTAINER= sketch@NetBSD.org 11MAINTAINER= sketch@NetBSD.org
12HOMEPAGE= http://www.mysql.com/ 12HOMEPAGE= http://www.mysql.com/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -27,55 +27,53 @@ EXTRACT_USING= bsdtar @@ -27,55 +27,53 @@ EXTRACT_USING= bsdtar
27MYSQL_USER?= mysql 27MYSQL_USER?= mysql
28MYSQL_GROUP?= mysql 28MYSQL_GROUP?= mysql
29MYSQL_DATADIR?= ${VARBASE}/mysql 29MYSQL_DATADIR?= ${VARBASE}/mysql
30 30
31PKG_USERS_VARS+= MYSQL_USER 31PKG_USERS_VARS+= MYSQL_USER
32PKG_GROUPS_VARS+= MYSQL_GROUP 32PKG_GROUPS_VARS+= MYSQL_GROUP
33 33
34# MYSQL_CHARSET default character set 34# MYSQL_CHARSET default character set
35# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 35# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
36# 36#
37MYSQL_CHARSET?= latin1 37MYSQL_CHARSET?= latin1
38MYSQL_EXTRA_CHARSET?= all 38MYSQL_EXTRA_CHARSET?= all
39 39
 40CONFIGURE_ARGS+= --enable-thread-safe-client
40CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} 41CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
41CONFIGURE_ARGS+= --with-named-z-libs=z 
42CONFIGURE_ARGS+= --without-libwrap 42CONFIGURE_ARGS+= --without-libwrap
43CONFIG_SHELL= ${TOOLS_PATH.bash} 43CONFIG_SHELL= ${TOOLS_PATH.bash}
44 44
45.if ${OPSYS} == "IRIX" 45.if ${OPSYS} == "IRIX"
46CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 46CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
47# libgen is incorrectly detected 47# libgen is incorrectly detected
48CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" 48CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
49.endif 49.endif
50 50
51BUILD_DEFS+= VARBASE 51BUILD_DEFS+= VARBASE
52 52
53# We always use our own readline. Note that these --without-* settings 53# We always use our own readline. Note that these --without-* settings
54# are confusing, but they just mean "don't use the included readline 54# are confusing, but they just mean "don't use the included readline
55# or libedit". 55# or libedit".
56# 56#
57CONFIGURE_ARGS+= --without-readline 57CONFIGURE_ARGS+= --without-readline
58CONFIGURE_ARGS+= --without-libedit 58CONFIGURE_ARGS+= --without-libedit
59 59
60# Speed up production one-time builds; see "./configure --help" for 60# Speed up production one-time builds; see "./configure --help" for
61# more information on using or disabling this option. 61# more information on using or disabling this option.
62CONFIGURE_ARGS+= --disable-dependency-tracking 62CONFIGURE_ARGS+= --disable-dependency-tracking
63 63
64CONFIGURE_ARGS+= --without-debug 64CONFIGURE_ARGS+= --without-debug
65CONFIGURE_ARGS+= --without-bench 
66CONFIGURE_ARGS+= --with-low-memory 65CONFIGURE_ARGS+= --with-low-memory
67CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q} 66CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
68CONFIGURE_ARGS+= --with-vio 
69 67
70CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} 68CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
71CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} 69CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
72 70
73.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \ 71.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
74 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" 72 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
75CONFIGURE_ARGS+= --enable-assembler 73CONFIGURE_ARGS+= --enable-assembler
76.endif 74.endif
77 75
78CONFIGURE_ENV+= mysql_cv_compress="yes" 76CONFIGURE_ENV+= mysql_cv_compress="yes"
79 77
80CPPFLAGS+= -Dunix 78CPPFLAGS+= -Dunix
81CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 79CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat