diff options
| -rw-r--r-- | mk/mysql.buildlink3.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk index e5c800427fd..7455595cf4c 100644 --- a/mk/mysql.buildlink3.mk +++ b/mk/mysql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: mysql.buildlink3.mk,v 1.11 2010/03/18 14:38:13 taca Exp $ +# $NetBSD: mysql.buildlink3.mk,v 1.12 2010/09/23 14:27:11 taca 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: 51 50 41 +# Possible: 51 50 # 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?= 51 50 41 +MYSQL_VERSIONS_ACCEPTED?= 51 50 # transform the list into individual variables .for mv in ${MYSQL_VERSIONS_ACCEPTED} @@ -49,11 +49,6 @@ _MYSQL_VERSION_50_INSTALLED= yes _MYSQL_VERSION_INSTALLED= 50 .endif -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) -_MYSQL_VERSION_41_INSTALLED= yes -_MYSQL_VERSION_INSTALLED= 41 -.endif - # if a version is explicitely required, take it .if defined(MYSQL_VERSION_REQD) _MYSQL_VERSION= ${MYSQL_VERSION_REQD} @@ -95,8 +90,6 @@ _MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTACCEPTED} MYSQL_PKGSRCDIR= ../../databases/mysql51-client .elif ${_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." |