Sat May 23 13:08:51 2020 UTC ()
*: Remove references to mysql55


(nia)
diff -r1.42 -r1.43 pkgsrc/databases/myodbc/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/rt4/MESSAGE
diff -r1.5 -r1.6 pkgsrc/mail/akonadi/options.mk
cvs diff -r1.42 -r1.43 pkgsrc/databases/myodbc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/myodbc/Makefile 2020/03/20 11:45:32 1.42
+++ pkgsrc/databases/myodbc/Makefile 2020/05/23 13:08:51 1.43
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.42 2020/03/20 11:45:32 nia Exp $ 1# $NetBSD: Makefile,v 1.43 2020/05/23 13:08:51 nia Exp $
2 2
3DISTNAME= mysql-connector-odbc-5.3.2-src 3DISTNAME= mysql-connector-odbc-5.3.2-src
4PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//} 4PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/} 7MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.mysql.com/ 10HOMEPAGE= https://www.mysql.com/
11COMMENT= ODBC driver (server side) for MySQL 11COMMENT= ODBC driver (server side) for MySQL
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15CMAKE_ARGS= -Wno-dev 15CMAKE_ARGS= -Wno-dev
16#CMAKE_ARGS+= -DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client} 16#CMAKE_ARGS+= -DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
17CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql 17CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19 19
20INSTALLATION_DIRS= share/doc/mysql-connector-odbc 20INSTALLATION_DIRS= share/doc/mysql-connector-odbc
21INSTALLATION_DIRS+= share/mysql-connector-odbc/test 21INSTALLATION_DIRS+= share/mysql-connector-odbc/test
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25MYSQL_VERSIONS_ACCEPTED= 56 55 25MYSQL_VERSIONS_ACCEPTED= 56
26 26
27.include "../../devel/libltdl/buildlink3.mk" 27.include "../../devel/libltdl/buildlink3.mk"
28.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
29.include "../../mk/mysql.buildlink3.mk" 29.include "../../mk/mysql.buildlink3.mk"
30.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/devel/rt4/MESSAGE (expand / switch to unified diff)

--- pkgsrc/devel/rt4/MESSAGE 2016/01/30 23:54:20 1.4
+++ pkgsrc/devel/rt4/MESSAGE 2020/05/23 13:08:51 1.5
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.4 2016/01/30 23:54:20 ryoon Exp $ 2$NetBSD: MESSAGE,v 1.5 2020/05/23 13:08:51 nia Exp $
3 3
4To use RT 4, you will need to perform the following steps. 4To use RT 4, you will need to perform the following steps.
5 5
61. Setup your postfix. 61. Setup your postfix.
7 7
82. If you want to use with MySQL server, install databases/mysql55-server 82. If you want to use with MySQL server, install databases/mysql57-server
9 and start it. You can use other supported database management system. 9 and start it. You can use other supported database management system.
10 10
113. If you want to use www/ap2-fcgid with apache24, install www/ap2-fcgid 113. If you want to use www/ap2-fcgid with apache24, install www/ap2-fcgid
12 and www/apache24. 12 and www/apache24.
13 13
144. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf 144. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
15 15
16 FcgidMaxRequestLen 1073741824 16 FcgidMaxRequestLen 1073741824
17 17
18 DocumentRoot ${PREFIX}/share/rt4/data/html 18 DocumentRoot ${PREFIX}/share/rt4/data/html
19 ScriptAlias / ${PREFIX}/share/rt4/sbin/rt-server.fcgi/ 19 ScriptAlias / ${PREFIX}/share/rt4/sbin/rt-server.fcgi/
20 20
21 <Directory "${PREFIX}/share/rt4/data/html"> 21 <Directory "${PREFIX}/share/rt4/data/html">
cvs diff -r1.5 -r1.6 pkgsrc/mail/akonadi/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/akonadi/options.mk 2020/03/13 10:13:04 1.5
+++ pkgsrc/mail/akonadi/options.mk 2020/05/23 13:08:51 1.6
@@ -1,36 +1,34 @@ @@ -1,36 +1,34 @@
1# $NetBSD: options.mk,v 1.5 2020/03/13 10:13:04 wiz Exp $ 1# $NetBSD: options.mk,v 1.6 2020/05/23 13:08:51 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.akonadi 3PKG_OPTIONS_VAR= PKG_OPTIONS.akonadi
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db 5PKG_OPTIONS_REQUIRED_GROUPS= db
6PKG_OPTIONS_GROUP.db= mysql sqlite 6PKG_OPTIONS_GROUP.db= mysql sqlite
7 7
8PKG_SUGGESTED_OPTIONS= sqlite 8PKG_SUGGESTED_OPTIONS= sqlite
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12### 12###
13### Use mysql backend 13### Use mysql backend
14### 14###
15.if !empty(PKG_OPTIONS:Mmysql) 15.if !empty(PKG_OPTIONS:Mmysql)
16MYSQL_VERSIONS_ACCEPTED= 56 55 16MYSQL_VERSIONS_ACCEPTED= 56
17.include "../../mk/mysql.buildlink3.mk" 17.include "../../mk/mysql.buildlink3.mk"
18DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql 18DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql
19CMAKE_ARGS+= -DAKONADI_BUILD_QSQLITE=off 19CMAKE_ARGS+= -DAKONADI_BUILD_QSQLITE=off
20. if ${_MYSQL_VERSION} == "56" 20. if ${_MYSQL_VERSION} == "56"
21. include "../../databases/mysql56-server/buildlink3.mk" 21. include "../../databases/mysql56-server/buildlink3.mk"
22. elif ${_MYSQL_VERSION} == "55" 
23. include "../../databases/mysql55-server/buildlink3.mk" 
24. else 22. else
25PKG_FAIL_REASON+= "Unknown MySQL version: ${_MYSQL_VERSION}" 23PKG_FAIL_REASON+= "Unknown MySQL version: ${_MYSQL_VERSION}"
26. endif 24. endif
27SUBST_CLASSES+= mysql 25SUBST_CLASSES+= mysql
28SUBST_STAGE.mysql= pre-configure 26SUBST_STAGE.mysql= pre-configure
29SUBST_MESSAGE.mysql= Fix mysqld path. 27SUBST_MESSAGE.mysql= Fix mysqld path.
30SUBST_FILES.mysql= server/CMakeLists.txt 28SUBST_FILES.mysql= server/CMakeLists.txt
31SUBST_SED.mysql= -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:" 29SUBST_SED.mysql= -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:"
32.endif 30.endif
33 31
34### 32###
35### Use postgresql backend 33### Use postgresql backend
36### 34###