From cd6e410a24a8499e65ce41269b612260cc0b836a Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Mon, 18 Jan 1999 15:38:00 +0000 Subject: Don't try to find out which mysql version is installed. Use a simple library dependency to mysql322. The "autodetection" introduces more problems than it solves. Requested by: Satoshi --- databases/gmysql/Makefile | 10 +++------- databases/p5-DBD-mysql/Makefile | 6 +----- databases/p5-Mysql/Makefile | 6 +----- databases/xmysql/Makefile | 10 +++------- databases/xmysqladmin/Makefile | 10 +++------- 5 files changed, 11 insertions(+), 31 deletions(-) (limited to 'databases') diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile index ab753f0f3632..a72e0a7aeb7d 100644 --- a/databases/gmysql/Makefile +++ b/databases/gmysql/Makefile @@ -3,7 +3,7 @@ # Date created: Sun Nov 15 22:07:12 CET 1998 # Whom: Dirk Froemberg # -# $Id: Makefile,v 1.3 1999/01/08 14:18:42 dirk Exp $ +# $Id: Makefile,v 1.4 1999/01/14 21:22:24 dirk Exp $ # DISTNAME= gmysql-0.3.1 @@ -13,12 +13,8 @@ MASTER_SITES= http://www.loth.demon.co.uk/gmysql/ \ MAINTAINER= dirk@FreeBSD.ORG -LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 -.if !exists(${PREFIX}/lib/mysql/libmysqlclient.a) || exists(${PREFIX}/lib/mysql/libmysqlclient.so) -LIB_DEPENDS+= mysqlclient.5:${PORTSDIR}/databases/mysql322 -.else -BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 -.endif +LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \ + mysqlclient.5:${PORTSDIR}/databases/mysql322 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${PREFIX} diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index 59c9d1772fab..af34886be661 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -3,7 +3,7 @@ # Date created: September 29th 1996 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.14 1999/01/08 20:33:45 billf Exp $ +# $Id: Makefile,v 1.15 1999/01/14 21:22:26 dirk Exp $ # DISTNAME= Msql-Mysql-modules-1.2003 @@ -16,11 +16,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \ ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI -.if !exists(${PREFIX}/lib/mysql/libmysqlclient.a) || exists(${PREFIX}/lib/mysql/libmysqlclient.so) LIB_DEPENDS= mysqlclient.5:${PORTSDIR}/databases/mysql322 -.else -BUILD_DEPENDS+= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 -.endif CONFIGURE_ENV= PREFIX=${PREFIX} MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1 USE_PERL5= YES diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile index 59c9d1772fab..af34886be661 100644 --- a/databases/p5-Mysql/Makefile +++ b/databases/p5-Mysql/Makefile @@ -3,7 +3,7 @@ # Date created: September 29th 1996 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.14 1999/01/08 20:33:45 billf Exp $ +# $Id: Makefile,v 1.15 1999/01/14 21:22:26 dirk Exp $ # DISTNAME= Msql-Mysql-modules-1.2003 @@ -16,11 +16,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \ ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI -.if !exists(${PREFIX}/lib/mysql/libmysqlclient.a) || exists(${PREFIX}/lib/mysql/libmysqlclient.so) LIB_DEPENDS= mysqlclient.5:${PORTSDIR}/databases/mysql322 -.else -BUILD_DEPENDS+= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 -.endif CONFIGURE_ENV= PREFIX=${PREFIX} MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1 USE_PERL5= YES diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 3f24a4845ff0..a02e63a525c6 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -3,7 +3,7 @@ # Date created: Tue Sep 2 15:46:09 CEST 1997 # Whom: Andreas Klemm # -# $Id: Makefile,v 1.14 1999/01/07 08:19:26 simokawa Exp $ +# $Id: Makefile,v 1.15 1999/01/14 21:22:28 dirk Exp $ # DISTNAME= xmysql-1.9 @@ -15,12 +15,8 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \ MAINTAINER= andreas@FreeBSD.ORG LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms -.if !exists(${PREFIX}/lib/mysql/libmysqlclient.a) || exists(${PREFIX}/lib/mysql/libmysqlclient.so) -LIB_DEPENDS+= mysqlclient.5:${PORTSDIR}/databases/mysql322 -.else -BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 -.endif + xforms.0:${PORTSDIR}/x11-toolkits/xforms \ + mysqlclient.5:${PORTSDIR}/databases/mysql322 # depends on xforms ONLY_FOR_ARCHS= i386 diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 4f2b22c5ce7f..8d0526cf61d5 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -3,7 +3,7 @@ # Date created: Di 2 Sep 1997 16:29:27 CEST # Whom: Andreas Klemm # -# $Id: Makefile,v 1.14 1999/01/07 08:19:29 simokawa Exp $ +# $Id: Makefile,v 1.15 1999/01/14 21:22:29 dirk Exp $ # DISTNAME= xmysqladmin-0.4.4 @@ -16,12 +16,8 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \ MAINTAINER= andreas@FreeBSD.ORG LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms -.if !exists(${PREFIX}/lib/mysql/libmysqlclient.a) || exists(${PREFIX}/lib/mysql/libmysqlclient.so) -LIB_DEPENDS+= mysqlclient.5:${PORTSDIR}/databases/mysql322 -.else -BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 -.endif + xforms.0:${PORTSDIR}/x11-toolkits/xforms \ + mysqlclient.5:${PORTSDIR}/databases/mysql322 # depends on xforms ONLY_FOR_ARCHS= i386 -- cgit v1.2.3