aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordirk <dirk@FreeBSD.org>1999-01-15 05:22:29 +0800
committerdirk <dirk@FreeBSD.org>1999-01-15 05:22:29 +0800
commitab00ea47fccc9e23b676c4de97a59b629323e81f (patch)
treef34a291259b41401d1f6a6d8ffe116bd4857facb
parent9c0370e88ff70c4ae290e9f21dfbf24a0ca9f2f7 (diff)
downloadfreebsd-ports-gnome-ab00ea47fccc9e23b676c4de97a59b629323e81f.tar.gz
freebsd-ports-gnome-ab00ea47fccc9e23b676c4de97a59b629323e81f.tar.zst
freebsd-ports-gnome-ab00ea47fccc9e23b676c4de97a59b629323e81f.zip
Change the dependencies to MySQL:
The default is mysql322 now, but take mysql321 if it is installed. (mysql321 installs a static libmysqlclient.a only, mysql322 installs a static and shared version of the library. Note that the build dependency to mysql321 is a no op actually. It is in there to improve understanding(?).)
Diffstat
-rw-r--r--databases/gmysql/Makefile8
-rw-r--r--databases/p5-DBD-mysql/Makefile10
-rw-r--r--databases/p5-Mysql/Makefile10
-rw-r--r--databases/xmysql/Makefile8
-rw-r--r--databases/xmysqladmin/Makefile8
-rw-r--r--www/mod_php3/scripts/configure.php6
-rw-r--r--www/mod_php4/scripts/configure.php6
-rw-r--r--www/mod_php5/scripts/configure.php6
8 files changed, 47 insertions, 15 deletions
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 74bfb71c257e..ab753f0f3632 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 <ibex@physik.TU-Berlin.DE>
#
-# $Id: Makefile,v 1.2 1998/11/17 03:41:45 asami Exp $
+# $Id: Makefile,v 1.3 1999/01/08 14:18:42 dirk Exp $
#
DISTNAME= gmysql-0.3.1
@@ -13,8 +13,12 @@ MASTER_SITES= http://www.loth.demon.co.uk/gmysql/ \
MAINTAINER= dirk@FreeBSD.ORG
-BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321
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
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mysql=${PREFIX}
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 6ff7a2f69ffe..59c9d1772fab 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 <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.13 1998/12/26 21:28:59 asami Exp $
+# $Id: Makefile,v 1.14 1999/01/08 20:33:45 billf Exp $
#
DISTNAME= Msql-Mysql-modules-1.2003
@@ -14,9 +14,13 @@ MASTER_SITE_SUBDIR= DBD
MAINTAINER= vanilla@FreeBSD.ORG
-BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 \
- ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
+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 6ff7a2f69ffe..59c9d1772fab 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -3,7 +3,7 @@
# Date created: September 29th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.13 1998/12/26 21:28:59 asami Exp $
+# $Id: Makefile,v 1.14 1999/01/08 20:33:45 billf Exp $
#
DISTNAME= Msql-Mysql-modules-1.2003
@@ -14,9 +14,13 @@ MASTER_SITE_SUBDIR= DBD
MAINTAINER= vanilla@FreeBSD.ORG
-BUILD_DEPENDS= ${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql321 \
- ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
+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 2c17efec87d8..3f24a4845ff0 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 <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.13 1998/12/27 19:30:32 dirk Exp $
+# $Id: Makefile,v 1.14 1999/01/07 08:19:26 simokawa Exp $
#
DISTNAME= xmysql-1.9
@@ -14,9 +14,13 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \
MAINTAINER= andreas@FreeBSD.ORG
-BUILD_DEPENDS= mysql:${PORTSDIR}/databases/mysql321
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
# depends on xforms
ONLY_FOR_ARCHS= i386
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 321c85fa314c..4f2b22c5ce7f 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 <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.13 1998/11/21 10:00:02 andreas Exp $
+# $Id: Makefile,v 1.14 1999/01/07 08:19:29 simokawa Exp $
#
DISTNAME= xmysqladmin-0.4.4
@@ -15,9 +15,13 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \
MAINTAINER= andreas@FreeBSD.ORG
-BUILD_DEPENDS= mysql:${PORTSDIR}/databases/mysql321
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
# depends on xforms
ONLY_FOR_ARCHS= i386
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index df97a974aefe..56b3b2544021 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -59,7 +59,11 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ 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\")
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index df97a974aefe..56b3b2544021 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -59,7 +59,11 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ 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\")
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index df97a974aefe..56b3b2544021 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -59,7 +59,11 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo "BUILD_DEPENDS+= mysql:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ 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\")
generated by cgit (git 2.34.1) at 2024-12-17 18:54:13 +0800