summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2013-05-20 14:59:59 +0000
committerfhajny <fhajny@pkgsrc.org>2013-05-20 14:59:59 +0000
commit116ca3c5b32b6ed506654293ecdc2d27df169a4f (patch)
tree6241fd0d7f54b508b92303fe039313e4a9932cd2 /databases
parent683ad66067306accd4d6f4c254109af129cb7c08 (diff)
downloadpkgsrc-116ca3c5b32b6ed506654293ecdc2d27df169a4f.tar.gz
Rely on mysql{55,56}-client's bl3 to restrict the dependency of server
on client. Fixes situations where a binary mysql55-server package picks up mysql56-client as the best dependency because of the missing upper limit. Bump PKGREVISION.
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql55-server/Makefile8
-rw-r--r--databases/mysql56-server/Makefile8
2 files changed, 6 insertions, 10 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 8c76fb1e11b..dcaf23f2c1d 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2013/04/01 01:18:00 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2013/05/20 14:59:59 fhajny Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
+PKGREVISION= 1
SVR4_PKGNAME= mysqs
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
-# might be removed in the future
-# if mysqld_safe script is installed here, or rc.d script invokes mysqld
-DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql55-client
-
.include "../../databases/mysql55-client/Makefile.common"
INFO_FILES= yes
@@ -76,6 +73,7 @@ CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
.endif
+.include "../../databases/mysql55-client/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 97f00957e63..438199dab07 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2013/04/01 01:18:35 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/20 14:59:59 fhajny Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
+PKGREVISION= 1
SVR4_PKGNAME= mysqs
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
-# might be removed in the future
-# if mysqld_safe script is installed here, or rc.d script invokes mysqld
-DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql56-client
-
.include "../../databases/mysql56-client/Makefile.common"
INFO_FILES= yes
@@ -86,6 +83,7 @@ CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
.endif
+.include "../../databases/mysql56-client/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"