CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 23 13:08:51 UTC 2020

Modified Files:
        pkgsrc/databases/myodbc: Makefile
        pkgsrc/devel/rt4: MESSAGE
        pkgsrc/mail/akonadi: options.mk

Log Message:
*: Remove references to mysql55


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/myodbc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/rt4/MESSAGE
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/akonadi/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/myodbc/Makefile
diff -u pkgsrc/databases/myodbc/Makefile:1.42 pkgsrc/databases/myodbc/Makefile:1.43
--- pkgsrc/databases/myodbc/Makefile:1.42       Fri Mar 20 11:45:32 2020
+++ pkgsrc/databases/myodbc/Makefile    Sat May 23 13:08:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/03/20 11:45:32 nia Exp $
+# $NetBSD: Makefile,v 1.43 2020/05/23 13:08:51 nia Exp $
 
 DISTNAME=      mysql-connector-odbc-5.3.2-src
 PKGNAME=       ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
@@ -22,7 +22,7 @@ INSTALLATION_DIRS+=   share/mysql-connecto
 
 .include "options.mk"
 
-MYSQL_VERSIONS_ACCEPTED=       56 55
+MYSQL_VERSIONS_ACCEPTED=       56
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/rt4/MESSAGE
diff -u pkgsrc/devel/rt4/MESSAGE:1.4 pkgsrc/devel/rt4/MESSAGE:1.5
--- pkgsrc/devel/rt4/MESSAGE:1.4        Sat Jan 30 23:54:20 2016
+++ pkgsrc/devel/rt4/MESSAGE    Sat May 23 13:08:51 2020
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2016/01/30 23:54:20 ryoon Exp $
+$NetBSD: MESSAGE,v 1.5 2020/05/23 13:08:51 nia Exp $
 
 To use RT 4, you will need to perform the following steps.
 
 1. Setup your postfix.
 
-2. If you want to use with MySQL server, install databases/mysql55-server
+2. If you want to use with MySQL server, install databases/mysql57-server
    and start it. You can use other supported database management system.
 
 3. If you want to use www/ap2-fcgid with apache24, install www/ap2-fcgid

Index: pkgsrc/mail/akonadi/options.mk
diff -u pkgsrc/mail/akonadi/options.mk:1.5 pkgsrc/mail/akonadi/options.mk:1.6
--- pkgsrc/mail/akonadi/options.mk:1.5  Fri Mar 13 10:13:04 2020
+++ pkgsrc/mail/akonadi/options.mk      Sat May 23 13:08:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/03/13 10:13:04 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2020/05/23 13:08:51 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.akonadi
 
@@ -13,14 +13,12 @@ PKG_SUGGESTED_OPTIONS=              sqlite
 ### Use mysql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-MYSQL_VERSIONS_ACCEPTED=       56 55
+MYSQL_VERSIONS_ACCEPTED=       56
 .include "../../mk/mysql.buildlink3.mk"
 DEPENDS+=      qt4-mysql-[0-9]*:../../x11/qt4-mysql
 CMAKE_ARGS+=   -DAKONADI_BUILD_QSQLITE=off
 .  if ${_MYSQL_VERSION} == "56"
 .    include "../../databases/mysql56-server/buildlink3.mk"
-.  elif ${_MYSQL_VERSION} == "55"
-.    include "../../databases/mysql55-server/buildlink3.mk"
 .  else
 PKG_FAIL_REASON+=      "Unknown MySQL version: ${_MYSQL_VERSION}"
 .  endif