CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 13 10:05:43 UTC 2020

Modified Files:
        pkgsrc/audio/amarok: Makefile
        pkgsrc/mail/akonadi: options.mk
        pkgsrc/misc/php-orangehrm: MESSAGE
        pkgsrc/mk: mysql.buildlink3.mk
        pkgsrc/www/php-soycms: MESSAGE
        pkgsrc/www/php-tiki6: MESSAGE
Removed Files:
        pkgsrc/databases/mysql51-client: DESCR MESSAGE Makefile Makefile.common
            PLIST buildlink3.mk distinfo options.mk
        pkgsrc/databases/mysql51-client/patches: patch-aa patch-ab patch-ac
            patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj
            patch-ak patch-am patch-an patch-ao patch-ap patch-aq patch-ar
            patch-as patch-at patch-au patch-av patch-aw patch-ax patch-ay
            patch-client_mysql.cc patch-vio_viossl.c
        pkgsrc/databases/mysql51-server: DEINSTALL DESCR MESSAGE Makefile PLIST
            buildlink3.mk distinfo
        pkgsrc/databases/mysql51-server/files: mysqld.sh
        pkgsrc/databases/mysql51-server/files/smf: manifest.xml mysqld.sh
        pkgsrc/databases/mysql51-server/patches: patch-aa patch-ab patch-ac
            patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj
            patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq
            patch-ar patch-as patch-at patch-au patch-ax
            patch-include_my__net.h patch-mysys_my__net.c
            patch-mysys_my__thr__init.c patch-sql_ha_ndbcluster.cc
            patch-vio_viossl.c

Log Message:
*: Remove mysql51 - EOL since 2013, completely broken with OpenSSL 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 pkgsrc/audio/amarok/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql51-client/DESCR \
    pkgsrc/databases/mysql51-client/MESSAGE
cvs rdiff -u -r1.28 -r0 pkgsrc/databases/mysql51-client/Makefile
cvs rdiff -u -r1.38 -r0 pkgsrc/databases/mysql51-client/Makefile.common
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql51-client/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/databases/mysql51-client/buildlink3.mk
cvs rdiff -u -r1.30 -r0 pkgsrc/databases/mysql51-client/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/databases/mysql51-client/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql51-client/patches/patch-aa \
    pkgsrc/databases/mysql51-client/patches/patch-ac \
    pkgsrc/databases/mysql51-client/patches/patch-ag \
    pkgsrc/databases/mysql51-client/patches/patch-ah \
    pkgsrc/databases/mysql51-client/patches/patch-ai \
    pkgsrc/databases/mysql51-client/patches/patch-aj \
    pkgsrc/databases/mysql51-client/patches/patch-am \
    pkgsrc/databases/mysql51-client/patches/patch-au \
    pkgsrc/databases/mysql51-client/patches/patch-aw \
    pkgsrc/databases/mysql51-client/patches/patch-ay
cvs rdiff -u -r1.5 -r0 pkgsrc/databases/mysql51-client/patches/patch-ab
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/databases/mysql51-client/patches/patch-ad \
    pkgsrc/databases/mysql51-client/patches/patch-an \
    pkgsrc/databases/mysql51-client/patches/patch-ao \
    pkgsrc/databases/mysql51-client/patches/patch-aq \
    pkgsrc/databases/mysql51-client/patches/patch-ar \
    pkgsrc/databases/mysql51-client/patches/patch-as \
    pkgsrc/databases/mysql51-client/patches/patch-ax
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mysql51-client/patches/patch-ae \
    pkgsrc/databases/mysql51-client/patches/patch-ap
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql51-client/patches/patch-af \
    pkgsrc/databases/mysql51-client/patches/patch-ak \
    pkgsrc/databases/mysql51-client/patches/patch-at \
    pkgsrc/databases/mysql51-client/patches/patch-av
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql51-client/patches/patch-client_mysql.cc \
    pkgsrc/databases/mysql51-client/patches/patch-vio_viossl.c
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/databases/mysql51-server/DEINSTALL \
    pkgsrc/databases/mysql51-server/MESSAGE
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql51-server/DESCR
cvs rdiff -u -r1.35 -r0 pkgsrc/databases/mysql51-server/Makefile
cvs rdiff -u -r1.28 -r0 pkgsrc/databases/mysql51-server/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/databases/mysql51-server/buildlink3.mk
cvs rdiff -u -r1.33 -r0 pkgsrc/databases/mysql51-server/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mysql51-server/files/mysqld.sh
cvs rdiff -u -r1.6 -r0 pkgsrc/databases/mysql51-server/files/smf/manifest.xml
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql51-server/files/smf/mysqld.sh
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/databases/mysql51-server/patches/patch-aa \
    pkgsrc/databases/mysql51-server/patches/patch-ac \
    pkgsrc/databases/mysql51-server/patches/patch-ad \
    pkgsrc/databases/mysql51-server/patches/patch-af \
    pkgsrc/databases/mysql51-server/patches/patch-ah \
    pkgsrc/databases/mysql51-server/patches/patch-ai \
    pkgsrc/databases/mysql51-server/patches/patch-am \
    pkgsrc/databases/mysql51-server/patches/patch-an \
    pkgsrc/databases/mysql51-server/patches/patch-ao \
    pkgsrc/databases/mysql51-server/patches/patch-ap \
    pkgsrc/databases/mysql51-server/patches/patch-aq \
    pkgsrc/databases/mysql51-server/patches/patch-ar \
    pkgsrc/databases/mysql51-server/patches/patch-as \
    pkgsrc/databases/mysql51-server/patches/patch-ax
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mysql51-server/patches/patch-ab \
    pkgsrc/databases/mysql51-server/patches/patch-al
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql51-server/patches/patch-ae \
    pkgsrc/databases/mysql51-server/patches/patch-aj
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql51-server/patches/patch-ag \
    pkgsrc/databases/mysql51-server/patches/patch-ak
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql51-server/patches/patch-at \
    pkgsrc/databases/mysql51-server/patches/patch-au \
    pkgsrc/databases/mysql51-server/patches/patch-include_my__net.h \
    pkgsrc/databases/mysql51-server/patches/patch-mysys_my__net.c \
    pkgsrc/databases/mysql51-server/patches/patch-mysys_my__thr__init.c \
    pkgsrc/databases/mysql51-server/patches/patch-sql_ha_ndbcluster.cc \
    pkgsrc/databases/mysql51-server/patches/patch-vio_viossl.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/akonadi/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/php-orangehrm/MESSAGE
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mk/mysql.buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/php-soycms/MESSAGE
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-tiki6/MESSAGE

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

Modified files:

Index: pkgsrc/audio/amarok/Makefile
diff -u pkgsrc/audio/amarok/Makefile:1.195 pkgsrc/audio/amarok/Makefile:1.196
--- pkgsrc/audio/amarok/Makefile:1.195  Tue Mar 10 22:09:18 2020
+++ pkgsrc/audio/amarok/Makefile        Fri Mar 13 10:05:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2020/03/10 22:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.196 2020/03/13 10:05:41 nia Exp $
 
 DISTNAME=      amarok-${VERS}
 VERS=          2.8.0
@@ -39,6 +39,8 @@ SUBST_SED.mysql=      -e s:/opt/mysqle/:${BUI
 
 .include "options.mk"
 
+MYSQL_VERSIONS_ACCEPTED=       56 55
+
 .include "../../mk/mysql.buildlink3.mk"
 .if ${_MYSQL_VERSION} == "56"
 .include "../../databases/mysql56-server/buildlink3.mk"
@@ -46,9 +48,6 @@ SUBST_SED.mysql+=     -e s:@@WLR@@:${COMPILE
 .elif ${_MYSQL_VERSION} == "55"
 .include "../../databases/mysql55-server/buildlink3.mk"
 SUBST_SED.mysql+=      -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib:
-.elif ${_MYSQL_VERSION} == "51"
-.include "../../databases/mysql51-server/buildlink3.mk"
-SUBST_SED.mysql+=      -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib/mysql:
 .else
 PKG_FAIL_REASON+=      "Unknown mysql version: ${_MYSQL_VERSION}"
 .endif

Index: pkgsrc/mail/akonadi/options.mk
diff -u pkgsrc/mail/akonadi/options.mk:1.3 pkgsrc/mail/akonadi/options.mk:1.4
--- pkgsrc/mail/akonadi/options.mk:1.3  Wed Jul  4 13:40:22 2018
+++ pkgsrc/mail/akonadi/options.mk      Fri Mar 13 10:05:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:22 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2020/03/13 10:05:42 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.akonadi
 
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=                sqlite
 ### Use mysql backend
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
-.      include "../../mk/mysql.buildlink3.mk"
+MYSQL_VERSIONS_ACCEPTED=       56 55
 .include "../../mk/mysql.buildlink3.mk"
 DEPENDS+=      qt4-mysql-[0-9]*:../../x11/qt4-mysql
 CMAKE_ARGS+=   -DAKONADI_BUILD_QSQLITE=off
@@ -21,8 +21,6 @@ CMAKE_ARGS+=  -DAKONADI_BUILD_QSQLITE=off
 .    include "../../databases/mysql56-server/buildlink3.mk"
 .  elif ${_MYSQL_VERSION} == "55"
 .    include "../../databases/mysql55-server/buildlink3.mk"
-.  elif ${_MYSQL_VERSION} == "51"
-.    include "../../databases/mysql51-server/buildlink3.mk"
 .  else
 PKG_FAIL_RESASON+=     "Unknown MySQL version: ${_MYSQL_VERSION}"
 .  endif

Index: pkgsrc/misc/php-orangehrm/MESSAGE
diff -u pkgsrc/misc/php-orangehrm/MESSAGE:1.3 pkgsrc/misc/php-orangehrm/MESSAGE:1.4
--- pkgsrc/misc/php-orangehrm/MESSAGE:1.3       Mon Jan  1 10:23:04 2018
+++ pkgsrc/misc/php-orangehrm/MESSAGE   Fri Mar 13 10:05:42 2020
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2018/01/01 10:23:04 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2020/03/13 10:05:42 nia Exp $
 
 To use OrangeHRM, you will need to perform the following steps.
 
-1. To use MySQL server, install databases/mysql51-server and enable it.
+1. To use MySQL server, install databases/mysql57-server and enable it.
 
        # ${RCD_SCRIPTS_DIR}/mysqld start
 

Index: pkgsrc/mk/mysql.buildlink3.mk
diff -u pkgsrc/mk/mysql.buildlink3.mk:1.24 pkgsrc/mk/mysql.buildlink3.mk:1.25
--- pkgsrc/mk/mysql.buildlink3.mk:1.24  Mon Sep  2 02:23:02 2019
+++ pkgsrc/mk/mysql.buildlink3.mk       Fri Mar 13 10:05:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.24 2019/09/02 02:23:02 rillig Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.25 2020/03/13 10:05:41 nia 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 51 MARIADB55
+#      Possible: 57 56 55 MARIADB55
 #      Default: 57
 #
 # Package-settable variables:
@@ -34,7 +34,7 @@ _SYS_VARS.mysql=      MYSQL_PKGSRCDIR
 .include "../../mk/bsd.prefs.mk"
 
 MYSQL_VERSION_DEFAULT?=                57
-MYSQL_VERSIONS_ACCEPTED?=      57 56 55 51 MARIADB55
+MYSQL_VERSIONS_ACCEPTED?=      57 56 55 MARIADB55
 
 # transform the list into individual variables
 .for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -56,10 +56,6 @@ _MYSQL_VERSION_55_INSTALLED= yes
 _MYSQL_VERSION_INSTALLED=      55
 .    endif
 .  endif
-.  if exists(${LOCALBASE}/lib/mysql/libmysqlclient.16.dylib)
-_MYSQL_VERSION_51_INSTALLED=   yes
-_MYSQL_VERSION_INSTALLED=      51
-.  endif
 .else
 .  if exists(${LOCALBASE}/lib/libmysqlclient.so.20)
 _MYSQL_VERSION_57_INSTALLED=   yes
@@ -77,10 +73,6 @@ _MYSQL_VERSION_55_INSTALLED= yes
 _MYSQL_VERSION_INSTALLED=      55
 .    endif
 .  endif
-.  if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.16)
-_MYSQL_VERSION_51_INSTALLED=   yes
-_MYSQL_VERSION_INSTALLED=      51
-.  endif
 .endif
 
 
@@ -129,8 +121,6 @@ MYSQL_PKGSRCDIR=    ../../databases/mysql56
 MYSQL_PKGSRCDIR=       ../../databases/mariadb55-client
 .elif ${_MYSQL_VERSION} == "55"
 MYSQL_PKGSRCDIR=       ../../databases/mysql55-client
-.elif ${_MYSQL_VERSION} == "51"
-MYSQL_PKGSRCDIR=       ../../databases/mysql51-client
 .else
 # force an error
 PKG_FAIL_REASON+=      "[mysql.buildlink3.mk] ${_MYSQL_VERSION} is not a valid mysql package."

Index: pkgsrc/www/php-soycms/MESSAGE
diff -u pkgsrc/www/php-soycms/MESSAGE:1.1 pkgsrc/www/php-soycms/MESSAGE:1.2
--- pkgsrc/www/php-soycms/MESSAGE:1.1   Thu Dec 13 16:07:55 2012
+++ pkgsrc/www/php-soycms/MESSAGE       Fri Mar 13 10:05:41 2020
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2012/12/13 16:07:55 ryoon Exp $
+$NetBSD: MESSAGE,v 1.2 2020/03/13 10:05:41 nia Exp $
 
 To use SOY CMS with Apache 2.4 and PHP 5.4, you will need to perform
 the following steps.
@@ -14,7 +14,7 @@ the following steps.
 
 3. Install MySQL database server.
 
-       # cd databases/mysql51-server
+       # cd databases/mysql57-server
        # make install
 
 4. Start MySQL server, and setup MySQL server

Index: pkgsrc/www/php-tiki6/MESSAGE
diff -u pkgsrc/www/php-tiki6/MESSAGE:1.4 pkgsrc/www/php-tiki6/MESSAGE:1.5
--- pkgsrc/www/php-tiki6/MESSAGE:1.4    Mon Jan  1 10:23:09 2018
+++ pkgsrc/www/php-tiki6/MESSAGE        Fri Mar 13 10:05:42 2020
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2018/01/01 10:23:09 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2020/03/13 10:05:42 nia Exp $
 
 To use tiki with Apache, you will need to perform the following steps.
 
@@ -13,7 +13,7 @@ To use tiki with Apache, you will need t
 
 3. Install MySQL database server.
 
-       # cd databases/mysql51-server
+       # cd databases/mysql57-server
        # make install
 
 4. Start MySQL server, and setup MySQL server