Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk MySQL 5.5 and PostgreSQL 9.4 are no longer with us
details: https://anonhg.NetBSD.org/pkgsrc/rev/8b97e6f9b5f9
branches: trunk
changeset: 432531:8b97e6f9b5f9
user: adam <adam%pkgsrc.org@localhost>
date: Sat May 23 07:35:56 2020 +0000
description:
MySQL 5.5 and PostgreSQL 9.4 are no longer with us
diffstat:
mk/mysql.buildlink3.mk | 14 +++-----------
mk/pgsql.buildlink3.mk | 13 ++-----------
2 files changed, 5 insertions(+), 22 deletions(-)
diffs (104 lines):
diff -r 95761e4c6e3b -r 8b97e6f9b5f9 mk/mysql.buildlink3.mk
--- a/mk/mysql.buildlink3.mk Sat May 23 07:30:18 2020 +0000
+++ b/mk/mysql.buildlink3.mk Sat May 23 07:35:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.26 2020/03/15 17:50:28 rillig Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.27 2020/05/23 07:35:56 adam 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: 57 56 55 MARIADB55
+# Possible: 57 56 MARIADB55
# Default: 57
#
# Package-settable variables:
@@ -34,7 +34,7 @@
.include "../../mk/bsd.prefs.mk"
MYSQL_VERSION_DEFAULT?= 57
-MYSQL_VERSIONS_ACCEPTED?= 57 56 55 MARIADB55
+MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB55
# transform the list into individual variables
.for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -51,9 +51,6 @@
. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
_MYSQL_VERSION_56_INSTALLED= yes
_MYSQL_VERSION_INSTALLED= 56
-. else
-_MYSQL_VERSION_55_INSTALLED= yes
-_MYSQL_VERSION_INSTALLED= 55
. endif
. endif
.else
@@ -68,9 +65,6 @@
. elif exists(${LOCALBASE}/share/mariadb)
_MYSQL_VERSION_MARIADB55_INSTALLED= yes
_MYSQL_VERSION_INSTALLED= MARIADB55
-. else
-_MYSQL_VERSION_55_INSTALLED= yes
-_MYSQL_VERSION_INSTALLED= 55
. endif
. endif
.endif
@@ -119,8 +113,6 @@
MYSQL_PKGSRCDIR= ../../databases/mysql56-client
.elif ${_MYSQL_VERSION} == "MARIADB55"
MYSQL_PKGSRCDIR= ../../databases/mariadb55-client
-.elif ${_MYSQL_VERSION} == "55"
-MYSQL_PKGSRCDIR= ../../databases/mysql55-client
.else
# force an error
PKG_FAIL_REASON+= "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package."
diff -r 95761e4c6e3b -r 8b97e6f9b5f9 mk/pgsql.buildlink3.mk
--- a/mk/pgsql.buildlink3.mk Sat May 23 07:30:18 2020 +0000
+++ b/mk/pgsql.buildlink3.mk Sat May 23 07:35:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.50 2019/10/07 19:21:48 adam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.51 2020/05/23 07:35:56 adam Exp $
#
# User-settable variables:
#
@@ -25,7 +25,7 @@
.include "../../mk/bsd.prefs.mk"
PGSQL_VERSION_DEFAULT?= 95
-PGSQL_VERSIONS_ACCEPTED?= 12 11 10 96 95 94
+PGSQL_VERSIONS_ACCEPTED?= 12 11 10 96 95
# transform the list into individual variables
.for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -55,9 +55,6 @@
. if exists(${LOCALBASE}/lib/libecpg.6.7.dylib)
_PGSQL_VERSION_95_INSTALLED= yes
. endif
-. if exists(${LOCALBASE}/lib/libecpg.6.6.dylib)
-_PGSQL_VERSION_94_INSTALLED= yes
-. endif
.else
. if exists(${LOCALBASE}/lib/libecpg.so.6.12)
_PGSQL_VERSION_12_INSTALLED= yes
@@ -74,9 +71,6 @@
. if exists(${LOCALBASE}/lib/libecpg.so.6.7)
_PGSQL_VERSION_95_INSTALLED= yes
. endif
-. if exists(${LOCALBASE}/lib/libecpg.so.6.6)
-_PGSQL_VERSION_94_INSTALLED= yes
-. endif
.endif
# if a version is explicitely required, take it
@@ -129,9 +123,6 @@
.elif ${_PGSQL_VERSION} == "95"
PGSQL_TYPE= postgresql95-client
PGPKGSRCDIR= ../../databases/postgresql95-client
-.elif ${_PGSQL_VERSION} == "94"
-PGSQL_TYPE= postgresql94-client
-PGPKGSRCDIR= ../../databases/postgresql94-client
.else
# force an error
PGSQL_TYPE= none
Home |
Main Index |
Thread Index |
Old Index