From 99933ce85b260a4c74a11a666355d5fbdc0885c9 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 26 Mar 2008 13:23:34 +0000 Subject: Re-add support for mysql-4.1 (but not 4.0). --- mk/mysql.buildlink3.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk index 08f6739e553..148ae6cb8b9 100644 --- a/mk/mysql.buildlink3.mk +++ b/mk/mysql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: mysql.buildlink3.mk,v 1.8 2008/03/26 06:22:49 wiz Exp $ +# $NetBSD: mysql.buildlink3.mk,v 1.9 2008/03/26 13:23:34 wiz Exp $ # # This file is included by packages that require some version of the # MySQL database client. @@ -8,7 +8,7 @@ # MYSQL_VERSION_DEFAULT # The preferred MySQL version. # -# Possible: 50 +# Possible: 50 41 # Default: 50 # # === Package-settable variables === @@ -31,7 +31,7 @@ _SYS_VARS.mysql= MYSQL_PKGSRCDIR .include "../../mk/bsd.prefs.mk" MYSQL_VERSION_DEFAULT?= 50 -MYSQL_VERSIONS_ACCEPTED?= 50 +MYSQL_VERSIONS_ACCEPTED?= 50 41 # transform the list into individual variables .for mv in ${MYSQL_VERSIONS_ACCEPTED} @@ -43,6 +43,10 @@ _MYSQL_VERSION_${mv}_OK= yes _MYSQL_VERSION_50_INSTALLED= yes .endif +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +_MYSQL_VERSION_41_INSTALLED= yes +.endif + # if a version is explicitely required, take it .if defined(MYSQL_VERSION_REQD) _MYSQL_VERSION= ${MYSQL_VERSION_REQD} @@ -82,6 +86,8 @@ _MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTACCEPTED} # .if ${_MYSQL_VERSION} == "50" MYSQL_PKGSRCDIR= ../../databases/mysql5-client +.elif ${_MYSQL_VERSION} == "41" +MYSQL_PKGSRCDIR= ../../databases/mysql4-client .else # force an error PKG_FAIL_REASON+= "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package." -- cgit v1.2.3