diff options
| author | schmonz <schmonz> | 2004-04-03 16:06:16 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2004-04-03 16:06:16 +0000 |
| commit | c4f6554b229e31154554a20f0852ab70e08a6d95 (patch) | |
| tree | 1a8695e114c44997d162acfb1840efd158c50ce8 | |
| parent | 818b79199c0737cddf6da70ade794c612879b2ce (diff) | |
| download | pkgsrc-c4f6554b229e31154554a20f0852ab70e08a6d95.tar.gz | |
USE_BUILTIN.zlib wasn't being set, resulting in missing symbols
for "compress" and "uncompress". Convert to bl3 to fix build.
| -rw-r--r-- | databases/mysql-client/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql-client/Makefile.common | 6 | ||||
| -rw-r--r-- | databases/mysql-server/Makefile | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 25cb680481a..19c2b0cc5cf 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2003/10/05 17:55:13 martti Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/03 16:06:16 schmonz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -7,7 +7,7 @@ COMMENT= MySQL, a free SQL database (client) .include "Makefile.common" CONFIGURE_ARGS+= --without-server -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_NEW_TEXINFO= YES INFO_FILES= mysql.info @@ -17,5 +17,5 @@ post-install: cd ${PREFIX}/share/mysql; ${RM} -f mysql.server ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info -.include "../../devel/readline/buildlink2.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index bf3a2053f95..25cb883ae95 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile.common,v 1.23 2004/04/03 16:06:16 schmonz Exp $ DISTNAME= mysql-3.23.58 CATEGORIES= databases @@ -28,7 +28,7 @@ MYSQL_DATADIR?= /var/mysql MYSQL_CHARSET?= latin1 MYSQL_EXTRA_CHARSET?= all -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined GNU_CONFIGURE= # defined USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} @@ -77,4 +77,4 @@ post-extract: ${RM} $${file}.orig; \ done -.include "../../devel/zlib/buildlink2.mk" +.include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 78e0bc87f1b..bf68b2b802b 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2004/01/22 08:02:16 grant Exp $ +# $NetBSD: Makefile,v 1.53 2004/04/03 16:06:16 schmonz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -8,7 +8,7 @@ COMMENT= MySQL, a free SQL database (server) CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --without-berkeley-db -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_PKGINSTALL= YES @@ -44,9 +44,9 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1 -.include "../../mk/pthread.buildlink2.mk" -.include "../../databases/mysql-client/buildlink2.mk" -.include "../../security/tcp_wrappers/buildlink2.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../databases/mysql-client/buildlink3.mk" +.include "../../security/tcp_wrappers/buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CFLAGS+= -DSIGNALS_DONT_BREAK_READ |