Sat Sep 17 12:56:17 2011 UTC ()
Only make "readlink" a run-time dependence if we are actually building
the embedded server which is the only binary that requires the library.

No revision bump as there is no changed to the default binary package.


(tron)
diff -r1.4 -r1.5 pkgsrc/databases/mysql55-server/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/databases/mysql55-server/Attic/Makefile (switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/Makefile 2011/09/17 11:33:35 1.4
+++ pkgsrc/databases/mysql55-server/Attic/Makefile 2011/09/17 12:56:17 1.5
@@ -1,77 +1,81 @@ @@ -1,77 +1,81 @@
1# $NetBSD: Makefile,v 1.4 2011/09/17 11:33:35 tron Exp $ 1# $NetBSD: Makefile,v 1.5 2011/09/17 12:56:17 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 1 4PKGREVISION= 1
5SVR4_PKGNAME= mysqs 5SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 6COMMENT= MySQL 5, a free SQL database (server)
7 7
8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
9 9
10# might be removed in the future 10# might be removed in the future
11# if mysqld_safe script is installed here, or rc.d script invokes mysqld 11# if mysqld_safe script is installed here, or rc.d script invokes mysqld
12DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql55-client 12DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql55-client
13 13
14.include "../../databases/mysql55-client/Makefile.common" 14.include "../../databases/mysql55-client/Makefile.common"
15 15
16INFO_FILES= yes 16INFO_FILES= yes
17CMAKE_ARGS+= -DWITH_LIBWRAP=ON 17CMAKE_ARGS+= -DWITH_LIBWRAP=ON
18 18
19.if !empty(PKG_OPTIONS:Membedded-server) 19.if !empty(PKG_OPTIONS:Membedded-server)
20CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 20CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
21PLIST.embedded= yes 21PLIST.embedded= yes
 22.else
 23# We only need readline to placate the configure script if we don't build
 24# the embedded server as it is the only binary linked against "readline".
 25BUILDLINK_DEPMETHOD.readline= build
22.endif 26.endif
23 27
24# ndb-cluster does not configure with cmake 28# ndb-cluster does not configure with cmake
25#.if !empty(PKG_OPTIONS:Mndb-cluster) 29#.if !empty(PKG_OPTIONS:Mndb-cluster)
26#CMAKE_ARGS+= -DWITH_NDBCLUSTER_STORAGE_ENGINE=ON 30#CMAKE_ARGS+= -DWITH_NDBCLUSTER_STORAGE_ENGINE=ON
27#REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter 31#REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter
28#REPLACE_PERL+= storage/ndb/tools/ndb_size.pl 32#REPLACE_PERL+= storage/ndb/tools/ndb_size.pl
29#PLIST.ndb= yes 33#PLIST.ndb= yes
30#.endif 34#.endif
31 35
32PLIST_VARS+= embedded ndb auth_socket 36PLIST_VARS+= embedded ndb auth_socket
33 37
34.if ${OPSYS} == "Linux" 38.if ${OPSYS} == "Linux"
35PLIST.auth_socket= yes 39PLIST.auth_socket= yes
36.endif 40.endif
37 41
38PTHREAD_OPTS+= require 42PTHREAD_OPTS+= require
39 43
40PKG_GROUPS= ${MYSQL_GROUP} 44PKG_GROUPS= ${MYSQL_GROUP}
41PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} 45PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
42 46
43PKG_GECOS.${MYSQL_USER}= MySQL database administrator 47PKG_GECOS.${MYSQL_USER}= MySQL database administrator
44PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} 48PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
45PKG_SHELL.${MYSQL_USER}= ${SH} 49PKG_SHELL.${MYSQL_USER}= ${SH}
46 50
47RCD_SCRIPTS= mysqld 51RCD_SCRIPTS= mysqld
48 52
49FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} 53FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
50FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 54FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
51FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 55FILES_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
52MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} 56MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR}
53MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 57MESSAGE_SUBST+= MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
54BUILD_DEFS+= MYSQL_DATADIR 58BUILD_DEFS+= MYSQL_DATADIR
55 59
56REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl 60REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl
57REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl 61REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl
58REPLACE_PERL+= mysql-test/mysql-stress-test.pl 62REPLACE_PERL+= mysql-test/mysql-stress-test.pl
59REPLACE_PERL+= mysql-test/mysql-test-run.pl 63REPLACE_PERL+= mysql-test/mysql-test-run.pl
60REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl 64REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
61REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl 65REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl
62REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl 66REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl
63REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl 67REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
64REPLACE_PERL+= mysql-test/mtr 68REPLACE_PERL+= mysql-test/mtr
65 69
66INSTALLATION_DIRS= bin 70INSTALLATION_DIRS= bin
67 71
68.include "../../mk/compiler.mk" 72.include "../../mk/compiler.mk"
69 73
70.if !empty(PKGSRC_COMPILER:Msunpro) 74.if !empty(PKGSRC_COMPILER:Msunpro)
71CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 75CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
72CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 76CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
73.endif 77.endif
74 78
75.include "../../devel/readline/buildlink3.mk" 79.include "../../devel/readline/buildlink3.mk"
76.include "../../security/tcp_wrappers/buildlink3.mk" 80.include "../../security/tcp_wrappers/buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"