Sat Sep 20 07:13:22 2008 UTC ()
I'll take maintainership.


(sketch)
diff -r1.33 -r1.34 pkgsrc/databases/mysql5-client/Makefile.common
cvs diff -r1.33 -r1.34 pkgsrc/databases/mysql5-client/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/Makefile.common 2008/09/18 11:50:44 1.33
+++ pkgsrc/databases/mysql5-client/Attic/Makefile.common 2008/09/20 07:13:22 1.34
@@ -1,130 +1,130 @@ @@ -1,130 +1,130 @@
1# $NetBSD: Makefile.common,v 1.33 2008/09/18 11:50:44 taca Exp $ 1# $NetBSD: Makefile.common,v 1.34 2008/09/20 07:13:22 sketch Exp $
2# 2#
3# used by databases/mysql5-client/Makefile 3# used by databases/mysql5-client/Makefile
4# used by databases/mysql5-server/Makefile 4# used by databases/mysql5-server/Makefile
5# 5#
6 6
7DISTNAME= mysql-5.0.67 7DISTNAME= mysql-5.0.67
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/} 9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= sketch@NetBSD.org
12HOMEPAGE= http://www.mysql.com/ 12HOMEPAGE= http://www.mysql.com/
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
26MYSQL_USER?= mysql 26MYSQL_USER?= mysql
27MYSQL_GROUP?= mysql 27MYSQL_GROUP?= mysql
28MYSQL_DATADIR?= ${VARBASE}/mysql 28MYSQL_DATADIR?= ${VARBASE}/mysql
29 29
30PKG_USERS_VARS+= MYSQL_USER 30PKG_USERS_VARS+= MYSQL_USER
31PKG_GROUPS_VARS+= MYSQL_GROUP 31PKG_GROUPS_VARS+= MYSQL_GROUP
32 32
33# MYSQL_CHARSET default character set 33# MYSQL_CHARSET default character set
34# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 34# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
35# 35#
36MYSQL_CHARSET?= latin1 36MYSQL_CHARSET?= latin1
37MYSQL_EXTRA_CHARSET?= all 37MYSQL_EXTRA_CHARSET?= all
38 38
39CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} 39CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
40CONFIGURE_ARGS+= --with-named-z-libs=z 40CONFIGURE_ARGS+= --with-named-z-libs=z
41CONFIGURE_ARGS+= --without-libwrap 41CONFIGURE_ARGS+= --without-libwrap
42 42
43.if ${OPSYS} == "IRIX" 43.if ${OPSYS} == "IRIX"
44CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H 44CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
45# libgen is incorrectly detected 45# libgen is incorrectly detected
46CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" 46CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
47.endif 47.endif
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".
54# 54#
55CONFIGURE_ARGS+= --without-readline 55CONFIGURE_ARGS+= --without-readline
56CONFIGURE_ARGS+= --without-libedit 56CONFIGURE_ARGS+= --without-libedit
57 57
58# Speed up production one-time builds; see "./configure --help" for 58# Speed up production one-time builds; see "./configure --help" for
59# more information on using or disabling this option. 59# more information on using or disabling this option.
60CONFIGURE_ARGS+= --disable-dependency-tracking 60CONFIGURE_ARGS+= --disable-dependency-tracking
61 61
62CONFIGURE_ARGS+= --without-debug 62CONFIGURE_ARGS+= --without-debug
63CONFIGURE_ARGS+= --without-bench 63CONFIGURE_ARGS+= --without-bench
64CONFIGURE_ARGS+= --with-low-memory 64CONFIGURE_ARGS+= --with-low-memory
65CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q} 65CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
66CONFIGURE_ARGS+= --with-vio 66CONFIGURE_ARGS+= --with-vio
67 67
68CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} 68CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q}
69CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} 69CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
70 70
71.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \ 71.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
72 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" 72 ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
73CONFIGURE_ARGS+= --enable-assembler 73CONFIGURE_ARGS+= --enable-assembler
74.endif 74.endif
75 75
76# Avoid an ICE in gcc2 on sparc64 76# Avoid an ICE in gcc2 on sparc64
77CONFIGURE_ENV+= F77=${FALSE:Q} 77CONFIGURE_ENV+= F77=${FALSE:Q}
78CONFIGURE_ENV+= mysql_cv_compress="yes" 78CONFIGURE_ENV+= mysql_cv_compress="yes"
79 79
80CPPFLAGS+= -Dunix 80CPPFLAGS+= -Dunix
81CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 81CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
82 82
83# force HAVE_CURSES_H on Solaris since the configure script is broken 83# force HAVE_CURSES_H on Solaris since the configure script is broken
84# and does not properly detect this, breaking the build later on. 84# and does not properly detect this, breaking the build later on.
85.if ${OPSYS} == "SunOS" 85.if ${OPSYS} == "SunOS"
86CFLAGS+= -DHAVE_CURSES_H 86CFLAGS+= -DHAVE_CURSES_H
87CXXFLAGS+= -DHAVE_CURSES_H 87CXXFLAGS+= -DHAVE_CURSES_H
88.endif 88.endif
89 89
90.include "../../mk/pthread.buildlink3.mk" 90.include "../../mk/pthread.buildlink3.mk"
91 91
92.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 92.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
93CFLAGS+= -DSIGNALS_DONT_BREAK_READ 93CFLAGS+= -DSIGNALS_DONT_BREAK_READ
94CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 94CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
95CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no 95CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
96CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 96CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
97.endif 97.endif
98 98
99USE_LANGUAGES= c c++ 99USE_LANGUAGES= c c++
100USE_TOOLS+= autoconf autoheader gmake perl:run 100USE_TOOLS+= autoconf autoheader gmake perl:run
101LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 101LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
102 102
103SUBST_CLASSES= mk 103SUBST_CLASSES= mk
104SUBST_STAGE.mk= post-patch 104SUBST_STAGE.mk= post-patch
105SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \ 105SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
106 mysys/Makefile.in strings/Makefile.in 106 mysys/Makefile.in strings/Makefile.in
107SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" 107SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
108SUBST_MESSAGE.mk= Fixing Makefiles. 108SUBST_MESSAGE.mk= Fixing Makefiles.
109 109
110SUBST_CLASSES+= scr 110SUBST_CLASSES+= scr
111SUBST_STAGE.scr= post-patch 111SUBST_STAGE.scr= post-patch
112SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 112SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
113 scripts/mysql_secure_installation.sh \ 113 scripts/mysql_secure_installation.sh \
114 support-files/mysql.server.sh 114 support-files/mysql.server.sh
115SUBST_SED.scr= -e "s,chown,${CHOWN},g" 115SUBST_SED.scr= -e "s,chown,${CHOWN},g"
116SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 116SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
117SUBST_MESSAGE.scr= Fixing scripts. 117SUBST_MESSAGE.scr= Fixing scripts.
118 118
119# Fix broken shared library detection under Mac OS X 119# Fix broken shared library detection under Mac OS X
120.if ${OPSYS} == "Darwin" 120.if ${OPSYS} == "Darwin"
121SUBST_CLASSES+= dylib 121SUBST_CLASSES+= dylib
122SUBST_STAGE.dylib= post-patch 122SUBST_STAGE.dylib= post-patch
123SUBST_FILES.dylib= configure 123SUBST_FILES.dylib= configure
124SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g" 124SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g"
125.endif 125.endif
126 126
127pre-configure: 127pre-configure:
128 cd ${WRKSRC} && autoconf && autoheader 128 cd ${WRKSRC} && autoconf && autoheader
129 129
130.include "../../devel/zlib/buildlink3.mk" 130.include "../../devel/zlib/buildlink3.mk"