Mon Jan 23 08:44:22 2012 UTC ()
readline isn't just a build dependency, if 'ndb_mgm' is built it has a
full dependency on readline.

Bump PKGREVISION


(sbd)
diff -r1.8 -r1.9 pkgsrc/databases/mysql51-server/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/databases/mysql51-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/Makefile 2010/11/14 16:39:36 1.8
+++ pkgsrc/databases/mysql51-server/Attic/Makefile 2012/01/23 08:44:22 1.9
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.8 2010/11/14 16:39:36 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2012/01/23 08:44:22 sbd Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
5COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
6 6
7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../databases/mysql51-client/Makefile.common" 11.include "../../databases/mysql51-client/Makefile.common"
12 12
13CONFIGURE_ARGS+= --with-libwrap 13CONFIGURE_ARGS+= --with-libwrap
14CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} 14CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER}
15 15
16.if !empty(PKG_OPTIONS:Membedded-server) 16.if !empty(PKG_OPTIONS:Membedded-server)
17CONFIGURE_ARGS+= --with-embedded-privilege-control 17CONFIGURE_ARGS+= --with-embedded-privilege-control
18CONFIGURE_ARGS+= --with-embedded-server 18CONFIGURE_ARGS+= --with-embedded-server
19CONFIGURE_ARGS+= --with-pic 19CONFIGURE_ARGS+= --with-pic
20PLIST.embedded= yes 20PLIST.embedded= yes
21.endif 21.endif
22 22
23.if !empty(PKG_OPTIONS:Mndb-cluster) 23.if !empty(PKG_OPTIONS:Mndb-cluster)
24CONFIGURE_ARGS+= --with-plugins=innobase,ndbcluster 24CONFIGURE_ARGS+= --with-plugins=innobase,ndbcluster
25REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter \ 25REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter \
26 storage/ndb/tools/ndb_size.pl 26 storage/ndb/tools/ndb_size.pl
27PLIST.ndb= yes 27PLIST.ndb= yes
 28BUILDLINK_DEPMETHOD.readline= full
28.else 29.else
29CONFIGURE_ARGS+= --with-plugins=innobase 30CONFIGURE_ARGS+= --with-plugins=innobase
30.endif 31.endif
31 32
32.if !empty(PKG_OPTIONS:Mpstack) 33.if !empty(PKG_OPTIONS:Mpstack)
33CONFIGURE_ARGS+= --with-pstack 34CONFIGURE_ARGS+= --with-pstack
34PLIST.pstack= yes 35PLIST.pstack= yes
35.endif 36.endif
36 37
37.if !empty(PKG_OPTIONS:Mmysqlmanager) 38.if !empty(PKG_OPTIONS:Mmysqlmanager)
38CONFIGURE_ARGS+= --with-mysqlmanager 39CONFIGURE_ARGS+= --with-mysqlmanager
39PLIST.manager= yes 40PLIST.manager= yes
40.endif 41.endif
@@ -74,31 +75,32 @@ REPLACE_PERL+= mysql-test/lib/My/SafePr @@ -74,31 +75,32 @@ REPLACE_PERL+= mysql-test/lib/My/SafePr
74 75
75INSTALLATION_DIRS= bin 76INSTALLATION_DIRS= bin
76 77
77.include "../../mk/bsd.prefs.mk" 78.include "../../mk/bsd.prefs.mk"
78 79
79.if !empty(PKGSRC_COMPILER:Msunpro) 80.if !empty(PKGSRC_COMPILER:Msunpro)
80CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 81CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
81CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 82CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
82.endif 83.endif
83 84
84.include "../../databases/mysql51-client/buildlink3.mk" 85.include "../../databases/mysql51-client/buildlink3.mk"
85.include "../../security/tcp_wrappers/buildlink3.mk" 86.include "../../security/tcp_wrappers/buildlink3.mk"
86 87
87# We only need readline to placate the configure script. None of the 88# Only 'ndb_mgm' needs readline otherwise we only need it to placate the
88# binaries are actually linked against -lreadline, so make this only 89# configure script. As ndb_mgm is only build if the 'ndb-cluster' option
89# a build-time dependency. 90# is enabled that option sets a full dependency on readline otherwise
 91# make this only a build-time dependency.
90# 92#
91BUILDLINK_DEPMETHOD.readline= build 93BUILDLINK_DEPMETHOD.readline?= build
92.include "../../devel/readline/buildlink3.mk" 94.include "../../devel/readline/buildlink3.mk"
93 95
94post-configure: 96post-configure:
95 cd ${WRKSRC}/include && cp -f config.h my_config.h 97 cd ${WRKSRC}/include && cp -f config.h my_config.h
96 ${RM} -f ${WRKSRC}/mysql-test/mysql-test-run 98 ${RM} -f ${WRKSRC}/mysql-test/mysql-test-run
97 99
98post-build: 100post-build:
99 cd ${WRKSRC}/scripts && \ 101 cd ${WRKSRC}/scripts && \
100 ${BUILD_MAKE_CMD} mysqld_safe mysql_install_db 102 ${BUILD_MAKE_CMD} mysqld_safe mysql_install_db
101 103
102post-install: 104post-install:
103 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe \ 105 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe \
104 ${DESTDIR}${PREFIX}/bin 106 ${DESTDIR}${PREFIX}/bin