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
This commit is contained in:
Dirk Froemberg 1999-01-18 15:38:00 +00:00
parent ba0f21a846
commit cd6e410a24
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=16183
8 changed files with 11 additions and 43 deletions

View file

@ -3,7 +3,7 @@
# Date created: Sun Nov 15 22:07:12 CET 1998
# Whom: Dirk Froemberg <ibex@physik.TU-Berlin.DE>
#
# $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}

View file

@ -3,7 +3,7 @@
# Date created: September 29th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $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

View file

@ -3,7 +3,7 @@
# Date created: September 29th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $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

View file

@ -3,7 +3,7 @@
# Date created: Tue Sep 2 15:46:09 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $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

View file

@ -3,7 +3,7 @@
# Date created: Di 2 Sep 1997 16:29:27 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $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

View file

@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")

View file

@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")

View file

@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")