From 48853b59499696c5963aa603011617b9c0824692 Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 2 Jan 2004 05:11:08 +0000 Subject: [PATCH] better LIB_DEPENDS entries for MySQL --- databases/MyCC/Makefile | 4 ++-- databases/mysqlgui/Makefile | 4 ++-- databases/p5-DBD-mysql/Makefile | 4 ++-- databases/py-mysql/Makefile | 4 ++-- databases/xmysql/Makefile | 4 ++-- databases/xmysqladmin/Makefile | 4 ++-- devel/mysql++/Makefile | 4 ++-- mail/courier-imap/Makefile | 4 ++-- mail/postfix/Makefile.inc | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/databases/MyCC/Makefile b/databases/MyCC/Makefile index 2c2aeaa2178..9b31972e695 100644 --- a/databases/MyCC/Makefile +++ b/databases/MyCC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2003/12/26 13:43:47 wilfried Exp $ +# $OpenBSD: Makefile,v 1.14 2004/01/02 05:11:08 brad Exp $ COMMENT= "GUI client for MySQL" @@ -24,7 +24,7 @@ MASTER_SITES= ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/ MODQT_MT= Yes MODULES= qt3 -LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql +LIB_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql MAKE_ENV= LOCALBASE=${LOCALBASE} HACK_CFLAGS="${CFLAGS}" MAKE_FLAGS= CC=${CC} CXX=${CXX} LINK=${CXX} diff --git a/databases/mysqlgui/Makefile b/databases/mysqlgui/Makefile index 8adbfc17a9b..31181fe059e 100644 --- a/databases/mysqlgui/Makefile +++ b/databases/mysqlgui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2002/09/13 22:18:28 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2004/01/02 05:11:08 brad Exp $ COMMENT= "graphical sql client for MySQL" @@ -27,7 +27,7 @@ BUILD_DEPENDS= :flvw->=1.0:x11/flvw LIB_DEPENDS= jpeg.62::graphics/jpeg \ fltk.1,fltk_images.1::x11/fltk \ fleditor.2::x11/fleditor \ - lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql \ + lib/mysql/mysqlclient.10::databases/mysql \ sqlplus.1::devel/mysql++ USE_X11= Yes diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index 015d8e9b444..a0f66886ec3 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2003/12/30 20:41:29 wilfried Exp $ +# $OpenBSD: Makefile,v 1.2 2004/01/02 05:11:08 brad Exp $ COMMENT= 'MySQL drivers for the Perl DBI' @@ -18,7 +18,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} BUILD_DEPENDS= :p5-DBI->=1.08:databases/p5-DBI RUN_DEPENDS= :p5-DBI->=1.08:databases/p5-DBI -LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-4.*:databases/mysql +LIB_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql REGRESS_DEPENDS= :mysql-server-4.*:databases/mysql,-server CONFIGURE_STYLE= perl diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile index 56191f9b842..fa35ab7eeba 100644 --- a/databases/py-mysql/Makefile +++ b/databases/py-mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/07/31 19:12:00 sturm Exp $ +# $OpenBSD: Makefile,v 1.17 2004/01/02 05:11:08 brad Exp $ COMMENT= "python interface to MySQL" @@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM= Yes MODULES= python -LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql +LIB_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql NO_REGRESS= Yes diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index fece60b5c6f..51e7acbc264 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2003/11/02 17:52:19 margarida Exp $ +# $OpenBSD: Makefile,v 1.21 2004/01/02 05:11:08 brad Exp $ COMMENT= "X11 front end to the MySQL database engine" @@ -16,7 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes LIB_DEPENDS= forms.0::x11/xforms \ - lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql \ + lib/mysql/mysqlclient.10::databases/mysql \ jpeg.62::graphics/jpeg USE_X11= Yes diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 5156ca8c1de..07b1aacfec0 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2003/12/30 06:06:27 brad Exp $ +# $OpenBSD: Makefile,v 1.20 2004/01/02 05:11:08 brad Exp $ # $FreeBSD: ports/databases/xmysqladmin/Makefile,v 1.25 1999/11/23 02:59:09 billf Exp $ BROKEN= "uses old MySQL API" @@ -19,7 +19,7 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \ http://web.tryc.on.ca/mysql/Downloads/Contrib/ LIB_DEPENDS= forms.0::x11/xforms \ - lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql \ + lib/mysql/mysqlclient.10::databases/mysql \ jpeg.62::graphics/jpeg USE_X11= Yes diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile index 12c3ec68b35..0ff0f70d1c6 100644 --- a/devel/mysql++/Makefile +++ b/devel/mysql++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2003/06/04 14:14:06 sturm Exp $ +# $OpenBSD: Makefile,v 1.13 2004/01/02 05:11:08 brad Exp $ COMMENT= "C++ API for MySQL" COMMENT-docs= "C++ API for MySQL documentation" @@ -29,7 +29,7 @@ MULTI_PACKAGES= -docs SUBPACKAGE?= .if ${SUBPACKAGE} != "-docs" -LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql +LIB_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql .endif NO_REGRESS= Yes diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 2e13d28d74d..fc9b9037b44 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2003/05/23 21:57:51 avsm Exp $ +# $OpenBSD: Makefile,v 1.36 2004/01/02 05:11:08 brad Exp $ COMMENT= "imap server for maildir format mailboxes" COMMENT-pop3= "pop3 server for maildir format mailboxes" @@ -61,7 +61,7 @@ MULTI_PACKAGES+= -mysql CONFIGURE_ARGS+= --with-authmysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql \ --with-mysql-includes=${LOCALBASE}/include/mysql -MYSQL_DEPENDS+= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql +MYSQL_DEPENDS+= lib/mysql/mysqlclient.10::databases/mysql .endif # openldap diff --git a/mail/postfix/Makefile.inc b/mail/postfix/Makefile.inc index dd749cfff64..95599010bb4 100644 --- a/mail/postfix/Makefile.inc +++ b/mail/postfix/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.30 2003/11/24 18:52:05 jakob Exp $ +# $OpenBSD: Makefile.inc,v 1.31 2004/01/02 05:11:08 brad Exp $ COMMENT= "fast, secure sendmail replacement" @@ -61,7 +61,7 @@ MAKE_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber .endif .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= mysqlclient.10:mysql-client-3.23.*:databases/mysql +LIB_DEPENDS+= lib/mysql/mysqlclient.10::databases/mysql MAKE_CCARGS+= -I${LOCALBASE}/include/mysql -DHAS_MYSQL MAKE_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient .endif