diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index e5992fe4fbb..ba92fdefd9b 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,13 +1,16 @@ +# $OpenBSD: Makefile,v 1.10 2001/03/07 19:05:33 brad Exp $ # $FreeBSD: ports/databases/xmysql/Makefile,v 1.22 1999/08/31 06:41:26 mharo Exp $ -# $OpenBSD: Makefile,v 1.9 2001/02/08 20:00:25 espie Exp $ DISTNAME= xmysql-1.9 CATEGORIES= databases -NEED_VERSION= 1.230 +NEED_VERSION= 1.336 MASTER_SITES= http://www.tcx.se/Contrib/ \ http://www.buoy.com/mysql/Contrib/ \ http://web.tryc.on.ca/mysql/Downloads/Contrib/ +LIB_DEPENDS= xforms.0::x11/xforms \ + mysqlclient::databases/mysql + MAINTAINER= ports@openbsd.org PERMIT_PACKAGE_CDROM= Yes @@ -17,9 +20,6 @@ PERMIT_DISTFILES_FTP= Yes FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} -LIB_DEPENDS= xforms.0::x11/xforms \ - mysqlclient.10::databases/mysql - USE_X11= yes .include diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 589b2b91b0c..d87d9fca5a9 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,13 +1,16 @@ # $FreeBSD: ports/databases/xmysqladmin/Makefile,v 1.25 1999/11/23 02:59:09 billf Exp $ -# $OpenBSD: Makefile,v 1.9 2001/02/08 20:11:45 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2001/03/07 19:05:33 brad Exp $ DISTNAME= xmysqladmin-1.0 CATEGORIES= databases -NEED_VERSION= 1.230 +NEED_VERSION= 1.336 MASTER_SITES= http://www.tcx.se/Contrib/ \ http://www.buoy.com/mysql/Contrib/ \ http://web.tryc.on.ca/mysql/Downloads/Contrib/ +LIB_DEPENDS= xforms.0::x11/xforms \ + mysqlclient::databases/mysql + MAINTAINER= ports@openbsd.org PERMIT_PACKAGE_CDROM= Yes @@ -17,9 +20,6 @@ PERMIT_DISTFILES_FTP= Yes FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} -LIB_DEPENDS= xforms.0::x11/xforms \ - mysqlclient.10::databases/mysql - USE_X11= yes ALL_TARGET= xmysqladmin diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 1adf31a6a7a..ebd8d4ede3d 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2001/02/28 15:13:19 brad Exp $ +# $OpenBSD: Makefile,v 1.22 2001/03/07 19:05:34 brad Exp $ DISTNAME= exim-3.22 CATEGORIES= mail @@ -45,7 +45,7 @@ EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lldap -llber .if ${FLAVOR:L:Mmysql} LIBS+= ${LOCALBASE}/lib/mysql -LIB_DEPENDS+= mysqlclient.10::databases/mysql +LIB_DEPENDS+= mysqlclient::databases/mysql EXIM_MAKECAT+= "LOOKUP_MYSQL=yes\n" EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include/mysql EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient diff --git a/net/snort/Makefile b/net/snort/Makefile index 1120192b17a..4304eb5c041 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2001/02/28 14:32:08 brad Exp $ +# $OpenBSD: Makefile,v 1.12 2001/03/07 19:05:34 brad Exp $ DISTNAME= snort-1.7 CATEGORIES= net security @@ -28,14 +28,14 @@ CONFIGURE_ARGS+= --enable-flexresp .endif .if ${FLAVOR:L:Mpostgresql} -LIB_DEPENDS+= pg::databases/postgresql +LIB_DEPENDS+= pg.2::databases/postgresql CONFIGURE_ARGS+= --with-postgresql="${PREFIX}/pgsql" .else CONFIGURE_ARGS+= --without-postgresql .endif .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= mysqlclient.10::databases/mysql +LIB_DEPENDS+= mysqlclient::databases/mysql CONFIGURE_ARGS+= --with-mysql="${PREFIX}" .else CONFIGURE_ARGS+= --without-mysql diff --git a/www/php3/Makefile b/www/php3/Makefile index 45e22bd9cdb..1e56bbb2a98 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2001/02/27 23:00:26 avsm Exp $ +# $OpenBSD: Makefile,v 1.32 2001/03/07 19:05:34 brad Exp $ # This port current only works with archs supporting dynamic loading ONLY_FOR_ARCHS= i386 m68k sparc @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --without-gd .if ${FLAVOR:L:Mmysql} CONFIGURE_ARGS+= --with-mysql -LIB_DEPENDS+= mysqlclient.10::databases/mysql +LIB_DEPENDS+= mysqlclient::databases/mysql .else CONFIGURE_ARGS+= --without-mysql .endif diff --git a/www/php4/Makefile b/www/php4/Makefile index 5d1ea9a30ca..fffdffe6352 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2001/03/06 09:04:30 avsm Exp $ +# $OpenBSD: Makefile,v 1.33 2001/03/07 19:05:34 brad Exp $ # This port current only works with archs supporting dynamic loading ONLY_FOR_ARCHS= i386 m68k sparc @@ -150,7 +150,7 @@ CONFIGURE_ARGS+= --disable-filepro .if ${FLAVOR:L:Mmysql} CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -LIB_DEPENDS+= mysqlclient.10::databases/mysql +LIB_DEPENDS+= mysqlclient::databases/mysql .if ${FLAVOR:L:Mmysql_bundled} .BEGIN: @echo "Conflicting flavor: ${FLAVOR}"