*/*: sync with upstream

Taken from: HardenedBSD
2019-04-26 08:52:20 +02:00 · 2019-04-26 08:52:20 +02:00 · 43e88e63d3
parent 7b160c1de6
commit 43e88e63d3
180 changed files with 922 additions and 2634 deletions
--- a/audio/Makefile
+++ b/audio/Makefile
@ -635,6 +635,7 @@
    SUBDIR += pear-Text_Spell_Audio
    SUBDIR += penguinsap
    SUBDIR += pianobar
+    SUBDIR += pianod2
    SUBDIR += picard
    SUBDIR += picard-plugins
    SUBDIR += pithos
--- a/audio/pianod2/Makefile
+++ b/audio/pianod2/Makefile
@ -0,0 +1,54 @@
+# Created by: John Hixson <jhixson@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	pianod2
+PORTVERSION=	301
+CATEGORIES=	audio
+MASTER_SITES=	http://deviousfish.com/Downloads/pianod2/Devel/
+
+MAINTAINER=	jhixson@FreeBSD.org
+COMMENT=	Free, multi-source, network-controlled music player daemon
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libao.so:audio/libao \
+	libavcodec.so:multimedia/ffmpeg \
+	libgcrypt.so:security/libgcrypt \
+	libgstreamer-1.0.so:multimedia/gstreamer1 \
+	libgzstream.so:devel/gzstream \
+	libcurl.so:ftp/curl \
+	libgnutls.so:security/gnutls \
+	libjson-c.so:devel/json-c \
+	libSDL.so:devel/sdl12 \
+	libtag.so:audio/taglib
+RUN_DEPENDS=	mksh>0:shells/mksh
+
+USES=	autoreconf compiler:c11 gettext gmake gnome pkgconfig shebangfix
+
+USE_GNOME=	glib20
+USE_GSTREAMER=	ffmpeg
+
+USE_RC_SUBR=	pianod
+
+GNU_CONFIGURE=	yes
+
+SHEBANG_FILES=	contrib/piano contrib/runmix
+ksh_CMD=	${LOCALBASE}/bin/mksh
+
+CONFIGURE_ARGS=	--with-compression \
+	--with-accesscontrol \
+	--with-engine=gstreamer \
+	--with-libao \
+	--with-libsdl \
+	--with-tonegenerator \
+	--with-pandora \
+	--with-tls \
+	--with-taglib
+
+MAKE_ARGS=	CC="${CC}" PREFIX="${PREFIX}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+.include <bsd.port.mk>
--- a/audio/pianod2/distinfo
+++ b/audio/pianod2/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1548905797
+SHA256 (pianod2-301.tar.gz) = d6fa01d786af65fe3b4e6f4f97fa048db6619b9443e23f655d3ea8ab4766caee
+SIZE (pianod2-301.tar.gz) = 796928
--- a/audio/pianod2/files/patch-configure.ac
+++ b/audio/pianod2/files/patch-configure.ac
@ -0,0 +1,23 @@
+--- configure.ac.orig	2018-12-07 06:39:29 UTC
+++ configure.ac
+@@ -19,7 +19,7 @@
+ AC_PREREQ([2.68])
+ AC_CONFIG_MACRO_DIRS([m4])
+ AC_INIT([pianod2],
+-	m4_esyscmd([svn info svn://svn.deviousfish.com/pianod2 | grep Revision: | awk '{print $2}' | tr -d '\n']),
+	[301],
+ 	[pianod@lists.deviousfish.com],
+ 	,[http://deviousfish.com/pianod2])
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+@@ -543,9 +543,9 @@ AS_IF([test "$with_libao" != "no" ], [
+ 
+ # Check for libsdl
+ AS_IF([test "$with_libsdl" != "no" ], [
+-    DF_CHECK_LIBRARY([libsdl], [libsdl],
+    DF_CHECK_LIBRARY([libSDL], [libSDL],
+ 	[SDL/SDL.h SDL/SDL_version.h SDL/SDL_audio.h],,
+-	[sdl], [SDL_OpenAudio],,
+	[SDL], [SDL_OpenAudio],,
+ 	[], [DF_DO_WITHOUT([libsdl])]
+     )
+     DF_DECIDE_WITH([libsdl])
--- a/audio/pianod2/files/patch-src-Makefile.am
+++ b/audio/pianod2/files/patch-src-Makefile.am
@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2018-03-16 18:13:50 UTC
+++ src/Makefile.am
+@@ -44,7 +44,7 @@ libao_ldadd		= -lao
+ endif
+ 
+ if WITH_LIBSDL
+-libsdl_ldadd		= -lsdl
+libsdl_ldadd		= -lSDL
+ endif
+ 
+ if WITH_LIBAVDEVICE
--- a/audio/pianod2/files/patch-src-common-xmlio.cpp
+++ b/audio/pianod2/files/patch-src-common-xmlio.cpp
@ -0,0 +1,14 @@
+--- src/common/xmlio.cpp.orig	2018-03-16 18:13:50 UTC
+++ src/common/xmlio.cpp
+@@ -212,11 +212,7 @@ static char *select_nobody_user (const char *nobody_na
+             // Stupid apple/BSDism: nobody.pw_gid should be gid_t but is int.
+             // Other varieties get this right.
+         } while (getgrouplist (nobody_name, nobody.pw_gid,
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+                                nobody_groups,
+-#else
+-                               (int *) nobody_groups,
+-#endif
+                                &nobody_groups_count) < 0);
+     }
+     return home;
--- a/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp
+++ b/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp
@ -0,0 +1,10 @@
+--- src/mediaunits/pandora/pandorasource.cpp.orig	2018-03-16 18:13:50 UTC
+++ src/mediaunits/pandora/pandorasource.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include <limits.h>
+ #include <unistd.h>
+#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
+ 
--- a/audio/pianod2/files/pianod.in
+++ b/audio/pianod2/files/pianod.in
@ -0,0 +1,30 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: pianod
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable this service:
+#
+# pianod_enable (bool):    Set to NO by default.
+#                          Set it to YES to enable pianod.
+# pianod_args (string):    Additional arguments to pianod
+#
+
+. /etc/rc.subr
+
+name=pianod
+rcvar=pianod_enable
+
+: ${pianod_enable:="NO"}
+: ${pianod_args:=""}
+
+pidfile=/var/run/pianod.pid
+procname="%%PREFIX%%/bin/pianod"
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} ${procname} ${pianod_args}"
+
+load_rc_config ${name}
+run_rc_command "$1"
--- a/audio/pianod2/pkg-descr
+++ b/audio/pianod2/pkg-descr
@ -0,0 +1,4 @@
+pianod2 is a free, multi-source, network-controlled music player daemon
+for use as central music server or scriptable backend.
+
+WWW: http://deviousfish.com/Pianod2/index.html
--- a/audio/pianod2/pkg-plist
+++ b/audio/pianod2/pkg-plist
@ -0,0 +1,40 @@
+bin/piano
+bin/pianod
+bin/runmix
+man/man1/piano.1.gz
+man/man1/pianod.1.gz
+man/man1/runmix.1.gz
+share/pianod/html/client.css
+share/pianod/html/client.lib.js
+share/pianod/html/console.css
+share/pianod/html/console.html
+share/pianod/html/console.html.de
+share/pianod/html/console.html.en
+share/pianod/html/console.html.en_us
+share/pianod/html/console.html.es
+share/pianod/html/console.html.fr
+share/pianod/html/console.lib.js
+share/pianod/html/index.html
+share/pianod/html/index.html.de
+share/pianod/html/index.html.en
+share/pianod/html/index.html.en_us
+share/pianod/html/index.html.es
+share/pianod/html/index.html.fr
+share/pianod/html/no-art.jpeg
+share/pianod/html/pianod-button.gif
+share/pianod/html/pianod-icon.gif
+share/pianod/html/robots.txt
+share/pianod/html/translate.js
+share/pianod/html/translate.js.de
+share/pianod/html/translate.js.en
+share/pianod/html/translate.js.en_us
+share/pianod/html/translate.js.es
+share/pianod/html/translate.js.fr
+share/pianod/html/viewer.css
+share/pianod/html/viewer.html
+share/pianod/html/viewer.html.de
+share/pianod/html/viewer.html.en
+share/pianod/html/viewer.html.en_us
+share/pianod/html/viewer.html.es
+share/pianod/html/viewer.html.fr
+share/pianod/html/viewer.lib.js
--- a/audio/specimen/Makefile
+++ b/audio/specimen/Makefile
@ -10,6 +10,9 @@ MASTER_SITES=	http://zhevny.com/specimen/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI controllable audio sampler

+DEPRECATED=	Unmaintained, depends on expiring x11-toolkits/phat
+EXPIRATION_DATE=	2019-05-28
+
 # Between 0.109.0 and earlier versions there was an api change in JACK.
 # However, the library version number was not changed.  The line above
 # is supposed to work around that.
--- a/audio/stk/Makefile
+++ b/audio/stk/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	stk
-PORTVERSION=	4.6.0
+PORTVERSION=	4.6.1
 CATEGORIES=	audio
 MASTER_SITES=	http://ccrma.stanford.edu/software/stk/release/

--- a/audio/stk/distinfo
+++ b/audio/stk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1504376994
-SHA256 (stk-4.6.0.tar.gz) = 648fcb9a0a4243d2d93fc72b29955953f4e794edf04c31f2ed0ed720d05287d2
-SIZE (stk-4.6.0.tar.gz) = 2403223
+TIMESTAMP = 1556434208
+SHA256 (stk-4.6.1.tar.gz) = e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101
+SIZE (stk-4.6.1.tar.gz) = 2593348
--- a/audio/stk/pkg-plist
+++ b/audio/stk/pkg-plist
@ -64,6 +64,7 @@ include/stk/Phonemes.h
 include/stk/PitShift.h
 include/stk/Plucked.h
 include/stk/PoleZero.h
+include/stk/Recorder.h
 include/stk/ReedTable.h
 include/stk/Resonate.h
 include/stk/Rhodey.h
@ -101,7 +102,7 @@ include/stk/Whistle.h
 include/stk/Wurley.h
 include/stk/WvIn.h
 include/stk/WvOut.h
-lib/libstk-4.6.0.so
+lib/libstk-4.6.1.so
 lib/libstk.so
 %%DATADIR%%/rawwaves/ahh.raw
 %%DATADIR%%/rawwaves/bassdrum.raw
--- a/comms/fllog/files/patch-src_logbook_textio.cxx
+++ b/comms/fllog/files/patch-src_logbook_textio.cxx
@ -0,0 +1,11 @@
+--- src/logbook/textio.cxx.orig	2019-04-25 08:17:16 UTC
+++ src/logbook/textio.cxx
+@@ -74,7 +74,7 @@ void cTextFile::writeCSVHeader(FILE *txtFile)
+ 	if (btnSelectBand->value())      fprintf (txtFile, "%s", ",\"BAND\"");
+ 	if (btnSelectFreq->value())      fprintf (txtFile, "%s", ",\"FREQ\"");
+ 	if (btnSelectMode->value())      fprintf (txtFile, "%s", ",\"MODE\"");
+-	if (btnSelectMode->value())      fprintf (txtFile, "%s", ",\SUB_MODE\"");
+	if (btnSelectMode->value())      fprintf (txtFile, "%s", ",\"SUB_MODE\"");
+ 	if (btnSelectTX_pwr->value())    fprintf (txtFile, "%s", ",\"TX_PWR\"");
+ 	if (btnSelectRSTsent->value())   fprintf (txtFile, "%s", ",\"RSTSENT\"");
+ 	if (btnSelectRSTrcvd->value())   fprintf (txtFile, "%s", ",\"RSTRCVD\"");
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	freetds
-PORTVERSION=	1.1.23
+PORTVERSION=	1.1.24
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556302299
-SHA256 (freetds-dev.1.1.23.tar.bz2) = ab3e5d1ffa4e86e057895c8c5e6ffc798fa9779769285d3ca58154dd5cf5feba
-SIZE (freetds-dev.1.1.23.tar.bz2) = 2261612
+TIMESTAMP = 1556386337
+SHA256 (freetds-dev.1.1.24.tar.bz2) = cd3e324c86639e4627e02ec87e2c304eec76ef0efc0697d277eb90b2cab7b033
+SIZE (freetds-dev.1.1.24.tar.bz2) = 2262108
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@ -1,7 +1,6 @@
 # $FreeBSD$

 PORTNAME=	mariadb
-PORTREVISION=	1
 PKGNAMESUFFIX=	55-client

 COMMENT=	Multithreaded SQL database (client)
--- a/databases/mariadb55-client/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
+--- client/CMakeLists.txt.orig	2019-04-26 12:37:01 UTC
 +++ client/CMakeLists.txt
-@@ -34,11 +34,12 @@ IF(UNIX)
+@@ -35,12 +35,13 @@ IF(UNIX)
   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
 
@ -9,12 +9,13 @@
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-
 +ENDIF()
 
+-
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-@@ -50,15 +51,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ 
+@@ -51,15 +52,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
 
@ -34,17 +35,18 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -76,10 +81,12 @@ IF(WIN32)
+@@ -76,11 +81,13 @@ IF(WIN32)
+   MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
 ENDIF(WIN32)
 
- # async_example is just a code example, do not install it.
 +IF(FALSE)
+ # async_example is just a code example, do not install it.
 ADD_EXECUTABLE(async_example async_example.c)
 TARGET_LINK_LIBRARIES(async_example mysqlclient)
 +ENDIF()
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap 
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME?=	mariadb
-PORTVERSION=	5.5.63
-PORTREVISION?=	1
+PORTVERSION=	5.5.64
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1549015056
-SHA256 (mariadb-5.5.63.tar.gz) = ef1cf79eec32ced9d1051998a8e458bb33dfbc62de297cba37ee8e9f952b21ea
-SIZE (mariadb-5.5.63.tar.gz) = 45946425
+TIMESTAMP = 1556393099
+SHA256 (mariadb-5.5.64.tar.gz) = c103f3c54741b296980d6be48b221340eebaa97c6bd95a02fd8d530a5df5c343
+SIZE (mariadb-5.5.64.tar.gz) = 45953561
--- a/databases/mariadb55-server/files/patch-MDEV-15961
+++ b/databases/mariadb55-server/files/patch-MDEV-15961
@ -1,47 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-15961
-
--- mysys/stacktrace.c.orig	2018-01-18 17:10:31 UTC
-+++ mysys/stacktrace.c
-@@ -34,19 +34,19 @@
- #include <execinfo.h>
- #endif
- 
-+#ifdef __linux__
- #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
-
- static char *heap_start;
-
-#ifdef HAVE_BSS_START
- extern char *__bss_start;
-#endif
-+#else
-+#define PTR_SANE(p) (p)
-+#endif /* __linux */
- 
- void my_init_stacktrace()
- {
-#ifdef HAVE_BSS_START
-+#ifdef __linux__
-   heap_start = (char*) &__bss_start;
-#endif
-+#endif /* __linux__ */
- }
- 
- #ifdef __linux__
-@@ -131,14 +131,14 @@ static int safe_print_str(const char *ad
- 
- void my_safe_print_str(const char* val, int max_len)
- {
-+#ifdef __linux__
-   char *heap_end;
- 
-#ifdef __linux__
-   if (!safe_print_str(val, max_len))
-     return;
-#endif
- 
-   heap_end= (char*) sbrk(0);
-+#endif
- 
-   if (!PTR_SANE(val))
-   {
--- a/databases/mariadb55-server/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-client_CMakeLists.txt
@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
+--- client/CMakeLists.txt.orig	2019-04-26 12:37:01 UTC
 +++ client/CMakeLists.txt
-@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
+@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(${SSL_DEFINES})
@ -8,7 +8,7 @@
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -33,6 +34,7 @@ IF(UNIX)
+@@ -34,6 +35,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
@ -16,7 +16,7 @@
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -40,6 +42,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+@@ -41,6 +43,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
 
 
@ -24,7 +24,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
-@@ -49,17 +52,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
+@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -46,7 +46,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
-@@ -69,17 +76,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
+@@ -70,17 +77,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
@ -63,8 +63,8 @@
 TARGET_LINK_LIBRARIES(async_example mysqlclient)
 +ENDIF()
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin 
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	paranoia
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG

@ -14,8 +14,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 RUN_DEPENDS=	rubygem-activerecord4>=4.0:databases/rubygem-activerecord4

-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/databases/rubygem-paranoia/distinfo
+++ b/databases/rubygem-paranoia/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1523459706
-SHA256 (rubygem/paranoia-2.4.1.gem) = a84b0277e5e4afc1467d2ef443291a7d52e3d0a8dd068644db89705b8dd6d708
-SIZE (rubygem/paranoia-2.4.1.gem) = 23040
+TIMESTAMP = 1556383947
+SHA256 (rubygem/paranoia-2.4.2.gem) = 97cda1624732623aae9a331ea624e2dc4eeb67b58611cb39d8545dddc09fab3b
+SIZE (rubygem/paranoia-2.4.2.gem) = 23040
--- a/devel/ghq/Makefile
+++ b/devel/ghq/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	ghq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.0
+DISTVERSION=	0.10.2
 CATEGORIES=	devel

 MAINTAINER=	tobik@FreeBSD.org
@ -11,14 +11,15 @@ COMMENT=	Remote repository management made easy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		go
+USES=		go:modules
 GO_PKGNAME=	github.com/motemen/ghq
 USE_GITHUB=	yes
 GH_ACCOUNT=	motemen
-GH_TUPLE=	urfave:cli:b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b:cli/vendor/github.com/urfave/cli \
-		motemen:go-colorine:45d19169413a019e4e2be69629dde5c7d92f8706:go_colorine/vendor/github.com/motemen/go-colorine \
-		daviddengcn:go-colortext:186a3d44e9200d7eb331356ca4864f52708e1399:go_colortext/vendor/github.com/daviddengcn/go-colortext \
-		mitchellh:go-homedir:af06845cf3004701891bf4fdb884bfe4920b3727:go_homedir/vendor/github.com/mitchellh/go-homedir
+GH_TUPLE=	daviddengcn:go-colortext:186a3d44e920:go_colortext/vendor/github.com/daviddengcn/go-colortext \
+		golang:net:4829fb13d2c6:net/vendor/golang.org/x/net \
+		motemen:go-colorine:45d19169413a:go_colorine/vendor/github.com/motemen/go-colorine \
+		urfave:cli:v1.20.0:cli/vendor/github.com/urfave/cli \
+		blang:semver:v3.5.1:semver/vendor/github.com/blang/semver

 PLIST_FILES=	bin/ghq \
 		share/zsh/site-functions/_ghq
--- a/devel/ghq/distinfo
+++ b/devel/ghq/distinfo
@ -1,11 +1,13 @@
-TIMESTAMP = 1549105807
-SHA256 (motemen-ghq-v0.9.0_GH0.tar.gz) = c5b9ff71ab533a2789da27368603852a3969c5cf8137b12b95e1bcbdaa816cf6
-SIZE (motemen-ghq-v0.9.0_GH0.tar.gz) = 17413
-SHA256 (mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727_GH0.tar.gz) = 89fc9db4b4e755e6190ab36192d74be56e69005bc46975232f524388bedea4db
-SIZE (mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727_GH0.tar.gz) = 3362
-SHA256 (motemen-go-colorine-45d19169413a019e4e2be69629dde5c7d92f8706_GH0.tar.gz) = 3a1684f54b1cf101a4470cc4fb7bf245e925985c631c247664b822a975e9a81c
-SIZE (motemen-go-colorine-45d19169413a019e4e2be69629dde5c7d92f8706_GH0.tar.gz) = 88147
-SHA256 (daviddengcn-go-colortext-186a3d44e9200d7eb331356ca4864f52708e1399_GH0.tar.gz) = 3957e4cb7a2a1c45c3ed849c91b44755fa3d1eee80a03dddb23804f3a1cf4550
-SIZE (daviddengcn-go-colortext-186a3d44e9200d7eb331356ca4864f52708e1399_GH0.tar.gz) = 4537
-SHA256 (urfave-cli-b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b_GH0.tar.gz) = f3c79af3916d5676323bb7a82bf7b37fe03bd6e8106b03f8170d26389cf688ff
-SIZE (urfave-cli-b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b_GH0.tar.gz) = 65421
+TIMESTAMP = 1556437583
+SHA256 (motemen-ghq-v0.10.2_GH0.tar.gz) = a19d60c4dbd7e56f171ff311a8934f9b0301ca25108061add26990e6b3d46025
+SIZE (motemen-ghq-v0.10.2_GH0.tar.gz) = 29279
+SHA256 (daviddengcn-go-colortext-186a3d44e920_GH0.tar.gz) = 7f7d7eb82df56329938c44a32ca9c7e866a5816c3bf0a348ab657200fd407d47
+SIZE (daviddengcn-go-colortext-186a3d44e920_GH0.tar.gz) = 4534
+SHA256 (golang-net-4829fb13d2c6_GH0.tar.gz) = e757f40c8863728f9dea4ba658b3e29fe87ae7788df182cdb07a331935702e62
+SIZE (golang-net-4829fb13d2c6_GH0.tar.gz) = 1098715
+SHA256 (motemen-go-colorine-45d19169413a_GH0.tar.gz) = 88d37bae10fca6de298c55e3b68e0fae14a0e6225783179e37fb3cbe6342ab6e
+SIZE (motemen-go-colorine-45d19169413a_GH0.tar.gz) = 88149
+SHA256 (urfave-cli-v1.20.0_GH0.tar.gz) = c5ba59f5742c99618b5ba34211699287cd3e80c41488bb267035ce0163e3bade
+SIZE (urfave-cli-v1.20.0_GH0.tar.gz) = 58397
+SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57
+SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@ -14,10 +14,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 OPTIONS_DEFINE=	DOCS

+USES=		libtool ncurses perl5 shebangfix
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-USES=		libtool ncurses perl5 shebangfix
+USE_CSTD=	c99

 INFO=		global
 PORTDOCS=	AUTHORS ChangeLog FAQ INSTALL LICENSE NEWS README THANKS
--- a/devel/p5-Algorithm-Cluster/Makefile
+++ b/devel/p5-Algorithm-Cluster/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Algorithm-Cluster
-PORTVERSION=	1.57
+PORTVERSION=	1.58
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MDEHOON
@ -14,7 +14,7 @@ COMMENT=	Perl interface to C clustering library
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual

-BROKEN_FreeBSD_13_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
+BROKEN_FreeBSD_13_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output #'

 USES=		perl5
 USE_PERL5=	configure
--- a/devel/p5-Algorithm-Cluster/distinfo
+++ b/devel/p5-Algorithm-Cluster/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1543058667
-SHA256 (Algorithm-Cluster-1.57.tar.gz) = 7033c23d602c98ac4ae67061e684b19c116ead4b5326001ff9d10cf19b9fc71e
-SIZE (Algorithm-Cluster-1.57.tar.gz) = 461381
+TIMESTAMP = 1556375584
+SHA256 (Algorithm-Cluster-1.58.tar.gz) = 0d4d9e21fcf1cf2c3f58c75a49ecac12b706da418c4b09dc6aed55c0e243bbf0
+SIZE (Algorithm-Cluster-1.58.tar.gz) = 460607
--- a/devel/p5-FFI-CheckLib/Makefile
+++ b/devel/p5-FFI-CheckLib/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	FFI-CheckLib
-PORTVERSION=	0.23
+PORTVERSION=	0.24
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-FFI-CheckLib/distinfo
+++ b/devel/p5-FFI-CheckLib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1542641811
-SHA256 (FFI-CheckLib-0.23.tar.gz) = 4ec7abca15f070dac2392d36b48a3ad27d80b4ee4cb2944a69e7ea0cb4da5166
-SIZE (FFI-CheckLib-0.23.tar.gz) = 27347
+TIMESTAMP = 1556375476
+SHA256 (FFI-CheckLib-0.24.tar.gz) = 93726e7772f24d64351326846536332432df3f1f9cbff76ef95f1f66a0a7b3c7
+SIZE (FFI-CheckLib-0.24.tar.gz) = 27866
--- a/devel/py-oslo.cache/Makefile
+++ b/devel/py-oslo.cache/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.cache
-PORTVERSION=	1.33.2
+PORTVERSION=	1.34.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.cache/distinfo
+++ b/devel/py-oslo.cache/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551529764
-SHA256 (oslo.cache-1.33.2.tar.gz) = 02ae8a1a54b0b3872f59e752bc52426f5edd1e9eaacf651ae7cc2842e5889f8c
-SIZE (oslo.cache-1.33.2.tar.gz) = 55778
+TIMESTAMP = 1556375482
+SHA256 (oslo.cache-1.34.0.tar.gz) = cec4f87194df3d5df9ade6b1e684e1b1ec46347d9de2f77aef0ab3e568a6057b
+SIZE (oslo.cache-1.34.0.tar.gz) = 55660
--- a/devel/py-oslo.config/Makefile
+++ b/devel/py-oslo.config/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.config
-PORTVERSION=	6.8.1
-PORTREVISION=	1
+PORTVERSION=	6.9.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.config/distinfo
+++ b/devel/py-oslo.config/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551434513
-SHA256 (oslo.config-6.8.1.tar.gz) = 7ea34cf642df4d18f92637b58dee92c1667c141aa004ce472e257fafc278ce11
-SIZE (oslo.config-6.8.1.tar.gz) = 149525
+TIMESTAMP = 1556375487
+SHA256 (oslo.config-6.9.0.tar.gz) = 70fb3ad10f0efe6ff0c9c1c8c186ac8253c16faddd1f85cf80dca262a65ac896
+SIZE (oslo.config-6.9.0.tar.gz) = 151079
--- a/devel/py-oslo.db/Makefile
+++ b/devel/py-oslo.db/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.db
-PORTVERSION=	4.45.0
+PORTVERSION=	4.46.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.db/distinfo
+++ b/devel/py-oslo.db/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1553606059
-SHA256 (oslo.db-4.45.0.tar.gz) = 8a67558e835c50e144a870b37ef979306798687525f8bfa741a36f7c78d8f0b9
-SIZE (oslo.db-4.45.0.tar.gz) = 172505
+TIMESTAMP = 1556375494
+SHA256 (oslo.db-4.46.0.tar.gz) = 8d540fe3f5f082d7d6b463c45d2f03d1df49c34c84479828851762b1c199d1ac
+SIZE (oslo.db-4.46.0.tar.gz) = 173985
--- a/devel/py-oslo.log/Makefile
+++ b/devel/py-oslo.log/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.log
-PORTVERSION=	3.42.3
-PORTREVISION=	1
+PORTVERSION=	3.43.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.log/distinfo
+++ b/devel/py-oslo.log/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551199833
-SHA256 (oslo.log-3.42.3.tar.gz) = b836a6b23beb35120663d52e54312527946a613f8959d51761fed2df9d2cf55c
-SIZE (oslo.log-3.42.3.tar.gz) = 87865
+TIMESTAMP = 1556375500
+SHA256 (oslo.log-3.43.0.tar.gz) = 44d6bf88b159e044a9b332f35ef98d138e404d014ec3108fce8343bb7fb24faa
+SIZE (oslo.log-3.43.0.tar.gz) = 88203
--- a/devel/py-oslo.messaging/Makefile
+++ b/devel/py-oslo.messaging/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.messaging
-PORTVERSION=	9.5.0
-PORTREVISION=	1
+PORTVERSION=	9.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.messaging/distinfo
+++ b/devel/py-oslo.messaging/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551799757
-SHA256 (oslo.messaging-9.5.0.tar.gz) = c68037d9ac0826d1be718215a6aa25257cffe9648b92a246bd46e776dbb2e9b3
-SIZE (oslo.messaging-9.5.0.tar.gz) = 251799
+TIMESTAMP = 1556375506
+SHA256 (oslo.messaging-9.6.0.tar.gz) = ffef9ceb5a4b8d1c9e2564c1183c3a402f5b44538a2e7385860152486a2a6134
+SIZE (oslo.messaging-9.6.0.tar.gz) = 251010
--- a/devel/py-oslo.middleware/Makefile
+++ b/devel/py-oslo.middleware/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.middleware
-PORTVERSION=	3.37.1
+PORTVERSION=	3.38.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}webob>=1.8.0:www/py-webob@${PY_FLAVOR}

 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
--- a/devel/py-oslo.middleware/distinfo
+++ b/devel/py-oslo.middleware/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551424003
-SHA256 (oslo.middleware-3.37.1.tar.gz) = 00345830acd9567db09c00d76cffee3f4a4dda65744f92117a344f75fb3cd811
-SIZE (oslo.middleware-3.37.1.tar.gz) = 56354
+TIMESTAMP = 1556375511
+SHA256 (oslo.middleware-3.38.0.tar.gz) = 73d6e5ac96b1c41b3db1168323b83aeff0f995b0fcc72561b98c45aacd76b5d3
+SIZE (oslo.middleware-3.38.0.tar.gz) = 56886
--- a/devel/py-oslo.policy/Makefile
+++ b/devel/py-oslo.policy/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.policy
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.policy/distinfo
+++ b/devel/py-oslo.policy/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551424007
-SHA256 (oslo.policy-2.1.1.tar.gz) = 173434bf896ec9a362d635072e38511d543137c7b8bda419592f732138081d13
-SIZE (oslo.policy-2.1.1.tar.gz) = 90438
+TIMESTAMP = 1556375516
+SHA256 (oslo.policy-2.2.0.tar.gz) = eadaaae32d6f653634ebf1e2cdf87ae21d6f05d555c0a0daa577c905ea31893b
+SIZE (oslo.policy-2.2.0.tar.gz) = 91297
--- a/devel/py-oslo.privsep/Makefile
+++ b/devel/py-oslo.privsep/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.privsep
-PORTVERSION=	1.32.1
-PORTREVISION=	1
+PORTVERSION=	1.33.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.privsep/distinfo
+++ b/devel/py-oslo.privsep/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551424010
-SHA256 (oslo.privsep-1.32.1.tar.gz) = be9bd1cb84c7f876a3da3687c38bee6fdafb74b726b06f9d1e528e643410ad64
-SIZE (oslo.privsep-1.32.1.tar.gz) = 35671
+TIMESTAMP = 1556375522
+SHA256 (oslo.privsep-1.33.0.tar.gz) = 2c04ff2f6162a5a51eeaeaa553727bc35a9b83c229d70d92ac5b3d3eb2e7bd38
+SIZE (oslo.privsep-1.33.0.tar.gz) = 36206
--- a/devel/py-oslo.serialization/Makefile
+++ b/devel/py-oslo.serialization/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.serialization
-PORTVERSION=	2.28.2
+PORTVERSION=	2.29.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.serialization/distinfo
+++ b/devel/py-oslo.serialization/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551424014
-SHA256 (oslo.serialization-2.28.2.tar.gz) = c3c73eb1fa45aaf4cdf3b82a0cf85497a245c7e88e803fdafa29e4315d991eb3
-SIZE (oslo.serialization-2.28.2.tar.gz) = 30807
+TIMESTAMP = 1556375529
+SHA256 (oslo.serialization-2.29.0.tar.gz) = 67ccfdf91fbb1f0ec3e6ee0151bf020143af4f9236781a9d0398b450b1a897fa
+SIZE (oslo.serialization-2.29.0.tar.gz) = 30901
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.utils
-PORTVERSION=	3.40.3
+PORTVERSION=	3.41.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.utils/distinfo
+++ b/devel/py-oslo.utils/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551434588
-SHA256 (oslo.utils-3.40.3.tar.gz) = 92fdd8b7f5cb079f03648015c186c8292a0a7bba918cdab32fdd1133b83280a1
-SIZE (oslo.utils-3.40.3.tar.gz) = 90561
+TIMESTAMP = 1556375536
+SHA256 (oslo.utils-3.41.0.tar.gz) = 3f6ed3da33ddd1648baa6cd20b1cf64ceb6c3cb3e1c745d63e793a7e5b1520c2
+SIZE (oslo.utils-3.41.0.tar.gz) = 90947
--- a/devel/py-oslo.versionedobjects/Makefile
+++ b/devel/py-oslo.versionedobjects/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.versionedobjects
-PORTVERSION=	1.35.1
+PORTVERSION=	1.36.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.versionedobjects/distinfo
+++ b/devel/py-oslo.versionedobjects/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551424017
-SHA256 (oslo.versionedobjects-1.35.1.tar.gz) = 8861f980fb35bc1f9c2da26d0de65c50b707dfe253934f06ec584291636db578
-SIZE (oslo.versionedobjects-1.35.1.tar.gz) = 150347
+TIMESTAMP = 1556375540
+SHA256 (oslo.versionedobjects-1.36.0.tar.gz) = bd5931ec22d75c53347802704d4d73c79bf87c622fdcfb04d1ce7beae433cd6b
+SIZE (oslo.versionedobjects-1.36.0.tar.gz) = 150526
--- a/devel/py-oslo.vmware/Makefile
+++ b/devel/py-oslo.vmware/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oslo.vmware
-PORTVERSION=	2.32.2
+PORTVERSION=	2.33.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-oslo.vmware/distinfo
+++ b/devel/py-oslo.vmware/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551434593
-SHA256 (oslo.vmware-2.32.2.tar.gz) = 3c5f861726b135628fb887254eb7252c6ef1268b1d5102c3f7900038608a7461
-SIZE (oslo.vmware-2.32.2.tar.gz) = 334130
+TIMESTAMP = 1556375549
+SHA256 (oslo.vmware-2.33.0.tar.gz) = 288ed375a5512c2eb01c9e5465b07b23a91f7fc48db1a3a39bea1985c9009a1d
+SIZE (oslo.vmware-2.33.0.tar.gz) = 333735
--- a/devel/py-traits/Makefile
+++ b/devel/py-traits/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	traits
-PORTVERSION=	5.0.0
+PORTVERSION=	5.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-traits/distinfo
+++ b/devel/py-traits/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1550474419
-SHA256 (traits-5.0.0.tar.gz) = 8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0
-SIZE (traits-5.0.0.tar.gz) = 437001
+TIMESTAMP = 1556410550
+SHA256 (traits-5.1.1.tar.gz) = c4489dffb3272f94549a01fccbe447675c0186d2b8d59e8c7013c328e7c39553
+SIZE (traits-5.1.1.tar.gz) = 436742
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@ -2,10 +2,9 @@
 # $FreeBSD$

 PORTNAME=	qca
-PORTVERSION=	2.1.3
-PORTREVISION=	7
+PORTVERSION=	2.2.1
 CATEGORIES=	devel
-MASTER_SITES=	KDE/stable/qca/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
 PKGNAMESUFFIX=	-qt5

 MAINTAINER=	kde@FreeBSD.org
@ -30,10 +29,12 @@ USE_QT=	core buildtools_build qmake_build

 PLIST_SUB=	SHLIB_VER=${PORTVERSION}

-OPTIONS_DEFINE=	GNUPG OPENSSL SASL TEST
+OPTIONS_DEFINE=	BOTAN GNUPG OPENSSL SASL TEST
 OPTIONS_DEFAULT=GNUPG OPENSSL
 OPTIONS_SUB=	yes

+BOTAN_LIB_DEPENDS=	libbotan-2.so:security/botan2
+
 GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
 GNUPG_RUN_DEPENDS=	gpg2:security/gnupg

--- a/devel/qca/distinfo
+++ b/devel/qca/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1518775098
-SHA256 (qca-2.1.3.tar.xz) = 003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353
-SIZE (qca-2.1.3.tar.xz) = 686340
+TIMESTAMP = 1556314674
+SHA256 (qca-2.2.1.tar.xz) = d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02
+SIZE (qca-2.2.1.tar.xz) = 691676
--- a/devel/qca/files/patch-git_e854f357
+++ b/devel/qca/files/patch-git_e854f357
@ -1,38 +0,0 @@
-From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 12 Apr 2018 00:45:50 +0200
-Subject: Make Qt5Network conditional on BUILD_TESTS
-
-Summary: I did not find it in use somewhere else.
-
-Reviewers: iromanov, sitter, rjvbb
-
-Reviewed By: rjvbb
-
-Subscribers: fvogt
-
-Differential Revision: https://phabricator.kde.org/D12129
---
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 28b0169..65b95f8 100644
--- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
-   message(STATUS "Building with Qt5 support")
-   # Got from ECM
-   # Distros have no ECM. So I just copied required cmake modules.
-  find_package(Qt5Transitional REQUIRED Core Network)
-+  if(BUILD_TESTS)
-+    find_package(Qt5Transitional REQUIRED Core Network)
-+  else()
-+    find_package(Qt5Transitional REQUIRED Core)
-+  endif()
-   include(ECMQt4To5Porting)
- 
-   include(GNUInstallDirs)
-- 
-cgit v0.11.2
-
--- a/devel/qca/files/patch-openssl110_01
+++ b/devel/qca/files/patch-openssl110_01
@ -1,44 +0,0 @@
-Revert a change to the 2.1 branch that conflicts with a more extensive one from
-the master branch (159e144abf, "Disable missed openssl cipher suites"). That
-one is more extensive and is necessary for a clean backport of the upstream
-change adding support for OpenSSL 1.1.0.
---
-From ecec3886ac73a5cfc8eb1f5929171afb89b204c3 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Mon, 25 Feb 2019 13:31:51 +0100
-Subject: [PATCH 1/2] Revert "tlsunittest: disable some ciphers"
-
-This reverts commit 89800d4341a3346cee53bc28e18d9a3972e33378.
---
- unittest/tls/tlsunittest.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/unittest/tls/tlsunittest.cpp b/unittest/tls/tlsunittest.cpp
-index fb8fa10..74c0b18 100644
--- unittest/tls/tlsunittest.cpp
-+++ unittest/tls/tlsunittest.cpp
-@@ -69,9 +69,7 @@ void TLSUnitTest::testCipherList()
- 	QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_SHA") );
-
-	// Fedora 22 has no TLS_RSA_WITH_RC4_128_MD5
-	// QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_MD5") );
-+	QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_MD5") );
- 
- 	// Fedora 20 openssl has no this cipher suites.
- 	// I just believe that F20 has the most strict patent rules
-@@ -98,9 +96,7 @@ void TLSUnitTest::testCipherList()
- 	QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_SHA") );
-
-	// Fedora 22 has no SSL_RSA_WITH_RC4_128_MD5
-	// QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") );
-+	QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") );
- 
- 	// QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_DES_CBC_SHA") );
- 	// QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_DES_CBC_SHA") );
-- 
-2.20.1
-
--- a/devel/qca/files/patch-openssl110_02
+++ b/devel/qca/files/patch-openssl110_02
@ -1,47 +0,0 @@
-This change is part of the master branch but was never integrated into the 2.1
-branch, which only has a similar but less extensive commit mentioning Fedora 22.
-
-This backport is necessary for a clean cherry-pick of the change adding support
-for OpenSSL 1.1.0 upstream.
---
-From 802180b9611e816b12b58c279824106514941d53 Mon Sep 17 00:00:00 2001
-From: Ivan Romanov <drizt@land.ru>
-Date: Sat, 30 Sep 2017 15:45:59 +0500
-Subject: [PATCH 2/2] Disable missed openssl cipher suites
-
-Fedora 26 has no them.
---
- unittest/tls/tlsunittest.cpp | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/unittest/tls/tlsunittest.cpp b/unittest/tls/tlsunittest.cpp
-index 74c0b18..38caf2d 100644
--- unittest/tls/tlsunittest.cpp
-+++ unittest/tls/tlsunittest.cpp
-@@ -68,8 +68,12 @@ void TLSUnitTest::testCipherList()
- 	QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") );
-	QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_SHA") );
-	QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_MD5") );
-+
-+	// Fedora 26 openssl has no this cipher suites.
-+	// QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_MD5") );
-+	// QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") );
- 
- 	// Fedora 20 openssl has no this cipher suites.
- 	// I just believe that F20 has the most strict patent rules
-@@ -95,8 +99,6 @@ void TLSUnitTest::testCipherList()
- 	QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") );
- 	QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") );
-	QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_SHA") );
-	QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") );
- 
- 	// QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_DES_CBC_SHA") );
- 	// QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_DES_CBC_SHA") );
-- 
-2.20.1
-
--- a/devel/qca/files/patch-openssl110_03
+++ b/devel/qca/files/patch-openssl110_03
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk-core
-DISTVERSION=	2.11.262
+DISTVERSION=	2.11.263
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556288847
-SHA256 (rubygem/aws-sdk-core-2.11.262.gem) = fdac0f08a0f73315d22768577dbdaa87c29335785220f761e74869b7f1bf76b0
-SIZE (rubygem/aws-sdk-core-2.11.262.gem) = 1550336
+TIMESTAMP = 1556375563
+SHA256 (rubygem/aws-sdk-core-2.11.263.gem) = bab3c3b60fb7c9e6ae3c6e7a79a89af28f40410ea0f71a5e869ae38ca86c9fea
+SIZE (rubygem/aws-sdk-core-2.11.263.gem) = 1550848
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk-resources
-DISTVERSION=	2.11.262
+DISTVERSION=	2.11.263
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556288850
-SHA256 (rubygem/aws-sdk-resources-2.11.262.gem) = 892f4cbbcc95487698cf315f129213f9acb81a528dffbafd528494f30b7ac750
-SIZE (rubygem/aws-sdk-resources-2.11.262.gem) = 48640
+TIMESTAMP = 1556375565
+SHA256 (rubygem/aws-sdk-resources-2.11.263.gem) = fb0ed69650c2ed8bccf8b2735dbbbeb0c6e867f17e955e68dc91c3ff1f93f89d
+SIZE (rubygem/aws-sdk-resources-2.11.263.gem) = 48640
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	aws-sdk
-DISTVERSION=	2.11.262
+DISTVERSION=	2.11.263
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-aws-sdk/distinfo
+++ b/devel/rubygem-aws-sdk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556288836
-SHA256 (rubygem/aws-sdk-2.11.262.gem) = aac05da04c739bc024f2f70fad43a7a3848377798ad3e3bc6511cb27116f966c
-SIZE (rubygem/aws-sdk-2.11.262.gem) = 4608
+TIMESTAMP = 1556375559
+SHA256 (rubygem/aws-sdk-2.11.263.gem) = 90a2f26567d34e82364fde0b67e091454be1f5f3e2a2672c793b318ac35e3b3b
+SIZE (rubygem/aws-sdk-2.11.263.gem) = 4608
--- a/devel/rubygem-bootsnap/Makefile
+++ b/devel/rubygem-bootsnap/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	bootsnap
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -11,7 +12,7 @@ COMMENT=	Boot large ruby/rails apps faster
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-RUN_DEPENDS=	rubygem-msgpack1>=1.0:devel/rubygem-msgpack1
+RUN_DEPENDS=	rubygem-msgpack>=1.0:devel/rubygem-msgpack

 USES=		gem shebangfix
 USE_RUBY=	yes
--- a/devel/rubygem-ddtrace/Makefile
+++ b/devel/rubygem-ddtrace/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ddtrace
 PORTVERSION=	0.22.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -12,7 +13,7 @@ COMMENT=	Tracking client of Datadog for Ruby
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-RUN_DEPENDS=	rubygem-msgpack1>=0:devel/rubygem-msgpack1
+RUN_DEPENDS=	rubygem-msgpack>=0:devel/rubygem-msgpack

 USES=		gem
 USE_RUBY=	yes
--- a/devel/rubygem-fluent-logger/Makefile
+++ b/devel/rubygem-fluent-logger/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	fluent-logger
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -11,11 +12,12 @@ COMMENT=	Structured event logger for Ruby

 LICENSE=	APACHE20

-RUN_DEPENDS=	rubygem-msgpack1>=1.0.0:devel/rubygem-msgpack1
+RUN_DEPENDS=	rubygem-msgpack>=1.0.0:devel/rubygem-msgpack
+
+USES=		gem
+USE_RUBY=	yes

 NO_ARCH=	yes
-USE_RUBY=	yes
-USES=		gem

 PLIST_FILES=	bin/fluent-post

--- a/devel/rubygem-metasm/Makefile
+++ b/devel/rubygem-metasm/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	metasm
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -11,9 +11,10 @@ COMMENT=	Cross-architecture assembler, disassembler, linker, and debugger
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENCE

-NO_ARCH=	yes
-
+USES=		gem shebangfix
 USE_RUBY=	yes
-USES=		gem
+
+NO_ARCH=	yes
+SHEBANG_FILES=	samples/emubios.rb

 .include <bsd.port.mk>
--- a/devel/rubygem-metasm/distinfo
+++ b/devel/rubygem-metasm/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1488787978
-SHA256 (rubygem/metasm-1.0.3.gem) = 45139e74b4f37baef6b6691daf599bef4b79b373ff1c18a704d46c4af0295a3f
-SIZE (rubygem/metasm-1.0.3.gem) = 756736
+TIMESTAMP = 1556373406
+SHA256 (rubygem/metasm-1.0.4.gem) = 09d10215a13898eda80067d69cb337591f3071846b08878e26a744bd11bb7555
+SIZE (rubygem/metasm-1.0.4.gem) = 802816
--- a/devel/rubygem-msgpack/Makefile
+++ b/devel/rubygem-msgpack/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	msgpack
-PORTVERSION=	1.2.9
+PORTVERSION=	1.2.10
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-msgpack/distinfo
+++ b/devel/rubygem-msgpack/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1554559805
-SHA256 (rubygem/msgpack-1.2.9.gem) = 1a70d9a1dbaa24fbdab3d88780b34c5723a9e9a3007aea3de9949fd352d9487f
-SIZE (rubygem/msgpack-1.2.9.gem) = 79872
+TIMESTAMP = 1556375568
+SHA256 (rubygem/msgpack-1.2.10.gem) = 9099f8eb23b29232e130193b08903f3612ba12c1f17934791364b651698468f0
+SIZE (rubygem/msgpack-1.2.10.gem) = 79872
--- a/devel/rubygem-msgpack1/Makefile
+++ b/devel/rubygem-msgpack1/Makefile
@ -13,7 +13,10 @@ COMMENT=	Gems for MessagePack
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USE_RUBY=	yes
+DEPRECATED=	Use devel/rubygem-msgpack instead
+EXPIRATION_DATE=2019-04-30
+
 USES=		gem
+USE_RUBY=	yes

 .include <bsd.port.mk>
--- a/devel/rubygem-os/Makefile
+++ b/devel/rubygem-os/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	os
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

@ -12,8 +12,9 @@ COMMENT=	Allows for some useful and easy functions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/devel/rubygem-os/distinfo
+++ b/devel/rubygem-os/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1489868175
-SHA256 (rubygem/os-1.0.0.gem) = 3387ec2c7357df363f3767921501e3c1eb5e0b102a0e0221ca423f0cf70b80e8
-SIZE (rubygem/os-1.0.0.gem) = 11776
+TIMESTAMP = 1556375572
+SHA256 (rubygem/os-1.0.1.gem) = e3a8124676944a62f8706e6b3942786aad4ee585460bc7c9df548c17c02c251b
+SIZE (rubygem/os-1.0.1.gem) = 12288
--- a/devel/smack/Makefile
+++ b/devel/smack/Makefile
@ -11,6 +11,10 @@ COMMENT=	Low-level I/O storage library which packs data

 LICENSE=	GPLv2

+BROKEN=		unfetchable
+DEPRECATED=	Unmaintained, upstream disappeared, underlinks
+EXPIRATION_DATE=	2019-05-28
+
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libsnappy.so:archivers/snappy

--- a/editors/rubygem-neovim/Makefile
+++ b/editors/rubygem-neovim/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	neovim
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	editors rubygems
 MASTER_SITES=	RG

@ -13,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 RUN_DEPENDS=	nvim:editors/neovim \
-		rubygem-msgpack1>=1.1:devel/rubygem-msgpack1 \
+		rubygem-msgpack>=1.1:devel/rubygem-msgpack \
 		rubygem-multi_json>=1.0:devel/rubygem-multi_json
 TEST_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler \
 		rubygem-rake>=0:devel/rubygem-rake \
@ -21,6 +22,7 @@ TEST_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler \

 USES=		gem
 USE_RUBY=	yes
+
 NO_ARCH=	yes

 PLIST_FILES=	bin/neovim-ruby-host
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.28
 CATEGORIES=	emulators
-MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
+MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
 DISTNAME=	VirtualBox-${PORTVERSION}

--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.28
 CATEGORIES=	emulators
-MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
+MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	VirtualBox-${PORTVERSION}

--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.28
 CATEGORIES=	emulators
-MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
+MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
 EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}

--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@ -91,7 +91,7 @@ LDAP_USE=		OPENLDAP=yes
 LIBXSLT_CONFIGURE_WITH=	xslt
 LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt

-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.8.1.msi:emulators/wine-mono-devel
+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.8.3.msi:emulators/wine-mono-devel

 MPG123_CONFIGURE_WITH=	mpg123
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
--- a/emulators/wine-mono-devel/Makefile
+++ b/emulators/wine-mono-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	wine-mono
-DISTVERSION=	4.8.1
+DISTVERSION=	4.8.3
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/
 PKGNAMESUFFIX=	-devel
--- a/emulators/wine-mono-devel/distinfo
+++ b/emulators/wine-mono-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555940198
-SHA256 (wine-mono-4.8.1.msi) = 4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032
-SIZE (wine-mono-4.8.1.msi) = 115878912
+TIMESTAMP = 1556404313
+SHA256 (wine-mono-4.8.3.msi) = d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76
+SIZE (wine-mono-4.8.3.msi) = 116183552
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	homebank
-PORTVERSION=	5.2.3
-PORTREVISION=	1
+PORTVERSION=	5.2.4
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/

--- a/finance/homebank/distinfo
+++ b/finance/homebank/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1552982536
-SHA256 (homebank-5.2.3.tar.gz) = 6a64cc9a54e2b2dce9750797598995b54f430ea438455b474d2c83c69f41aff1
-SIZE (homebank-5.2.3.tar.gz) = 2665397
+TIMESTAMP = 1556421403
+SHA256 (homebank-5.2.4.tar.gz) = 79a89ab8816a5973fa6afe75157fa375953795c79c224d510e8af0afed2512d2
+SIZE (homebank-5.2.4.tar.gz) = 2673200
--- a/finance/homebank/files/patch-fix-236942.patch
+++ b/finance/homebank/files/patch-fix-236942.patch
@ -1,63 +0,0 @@
-=== modified file 'src/ui-assist-import.c'
--- src/ui-assist-import.c	2019-03-17 16:01:28 +0000
-+++ src/ui-assist-import.c	2019-03-21 18:12:19 +0000
-@@ -1994,6 +1994,12 @@
- 				data->txndata = NULL;
- 			}
- 			data->txndata = g_array_sized_new(FALSE, TRUE, sizeof(ImpTxnData), nbacc);
-+
-+			//#1820618 patch for glib < 2.58 https://gitlab.gnome.org/GNOME/glib/issues/1374
-+			if( glib_minor_version < 58 )
-+			{
-+				g_array_set_size(data->txndata, nbacc);
-+			}
- 			
- 			DB( g_print(" accnb=%d @%p\n", nbacc, data->txndata) );
- 			
-
-=== modified file 'src/ui-assist-start.c'
--- src/ui-assist-start.c	2019-03-17 16:01:28 +0000
-+++ src/ui-assist-start.c	2019-03-21 18:12:19 +0000
-@@ -35,7 +35,7 @@
- /* our global datas */
- extern struct HomeBank *GLOBALS;
- 
-extern gchar *CYA_ACC_TYPE[];
-+extern HbKvData CYA_ACC_TYPE[];
- 
- /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
- 
-@@ -84,7 +84,7 @@
- 	}
- 
- 	item->kcur = GLOBALS->kcur;
-	item->type = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_type));
-+	item->type = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_type));
- 
- 	item->number = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_number)));
- 
-@@ -390,7 +390,8 @@
- 	row++;
- 	label = make_label_widget(_("_Type:"));
- 	gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
-	widget = make_cycle(label, CYA_ACC_TYPE);
-+	//widget = make_cycle(label, CYA_ACC_TYPE);
-+	widget = hbtk_combo_box_new_with_data(label, CYA_ACC_TYPE);
- 	data->CY_type = widget;
- 	gtk_widget_set_hexpand(widget, TRUE);
- 	gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
-
-=== modified file 'src/ui-widgets.c'
--- src/ui-widgets.c	2019-03-17 16:01:28 +0000
-+++ src/ui-widgets.c	2019-03-21 18:12:19 +0000
-@@ -695,7 +695,8 @@
- 			break;
- 		if( tmp->key == key )
- 		{
-			retval = (gchar *)tmp->name;
-+			//#1820372
-+			retval = (gchar *)_(tmp->name);
- 			break;
- 		}
- 	}
-
--- a/games/ski/Makefile
+++ b/games/ski/Makefile
@ -2,16 +2,22 @@
 # $FreeBSD$

 PORTNAME=	ski
-PORTVERSION=	6.12
+PORTVERSION=	6.13
 CATEGORIES=	games python
-MASTER_SITES=	http://catb.org/~esr/ski/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Skiing simulation with curses interface in python

 LICENSE=	BSD3CLAUSE

+BUILD_DEPENDS=	xmlto:textproc/xmlto
+
 USES=		python:3.2+,run
+
+USE_GITLAB=	yes
+GL_ACCOUNT=	esr
+GL_COMMIT=	0b50570a28a99de2ea797f703b104ec03835d24d
+
 NO_BUILD=	yes

 PLIST_FILES=	bin/${PORTNAME} \
--- a/games/ski/distinfo
+++ b/games/ski/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1537955537
-SHA256 (ski-6.12.tar.gz) = 2f34f64868deb0cc773528c68d9829119fac359c44a704695214d87773df5a33
-SIZE (ski-6.12.tar.gz) = 17788
+TIMESTAMP = 1556376211
+SHA256 (esr-ski-0b50570a28a99de2ea797f703b104ec03835d24d_GL0.tar.gz) = af76ffc35c30137571419bf55de7c5ec146cbab1856b35f79c63810c92fc8c94
+SIZE (esr-ski-0b50570a28a99de2ea797f703b104ec03835d24d_GL0.tar.gz) = 18427
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@ -13,6 +13,9 @@ COMMENT=	Editing tool used for painting and retouching of movies
 LICENSE=	GPLv2 LGPL21 MIT
 LICENSE_COMB=	multi

+DEPRECATED=	Vulnerable since 2015, unmaintained and underlinks
+EXPIRATION_DATE=	2019-05-28
+
 LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
 		libftgl.so:graphics/ftgl \
 		liblcms.so:graphics/lcms \
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@ -49,7 +49,8 @@ DOCS_PORTDOCS=		*

 OPENMP_USES=		compiler:openmp
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
-.if !exists(/usr/include/omp.h)
+.if ${MACHINE_ARCH} == i386 || !exists(/usr/include/omp.h)
+# XXX base/230888 via #pragma omp atomic
 # XXX ports/199603 + ports/210337
 OPENMP_VARS=		OPENMP=gcc-
 .endif
--- a/lang/erlang-runtime21/Makefile
+++ b/lang/erlang-runtime21/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	erlang
 DISTVERSIONPREFIX=	OTP-
-DISTVERSION=	21.3.6
+DISTVERSION=	21.3.7
 # NB when bumping OTP versions also bump PORTREVISION in databases/couchdb2
 CATEGORIES=	lang parallel java
 PKGNAMESUFFIX=	-runtime21
--- a/lang/erlang-runtime21/distinfo
+++ b/lang/erlang-runtime21/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1555589452
-SHA256 (erlang/erlang-otp-OTP-21.3.6_GH0.tar.gz) = 6d310bd97c1d3ef64771143a5ace522ba5f916d501b277315a315e3760edfd0b
-SIZE (erlang/erlang-otp-OTP-21.3.6_GH0.tar.gz) = 54030023
+TIMESTAMP = 1556393101
+SHA256 (erlang/erlang-otp-OTP-21.3.7_GH0.tar.gz) = c14aebda6afae82809325c18d51a66e618b3f237b856080a7d8f4b5bb089e758
+SIZE (erlang/erlang-otp-OTP-21.3.7_GH0.tar.gz) = 54031065
 SHA256 (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 36f397e6aef97eebda629badb0570cb4ddc979a6d1557bc487a9e13671facf8f
 SIZE (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 1422685
--- a/lang/gravity/Makefile
+++ b/lang/gravity/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	gravity
-DISTVERSION=	0.6.6
+DISTVERSION=	0.6.9
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-lang

--- a/lang/gravity/distinfo
+++ b/lang/gravity/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555774373
-SHA256 (marcobambini-gravity-0.6.6_GH0.tar.gz) = 62238c12a73278bb85e0614210a91f3393227057ab7814e3af2b5931ad31ee4d
-SIZE (marcobambini-gravity-0.6.6_GH0.tar.gz) = 860584
+TIMESTAMP = 1556435617
+SHA256 (marcobambini-gravity-0.6.9_GH0.tar.gz) = 3b73405e68b86093324c66f34557a45250dee8d4880c7aeeaa6f31955a134c72
+SIZE (marcobambini-gravity-0.6.9_GH0.tar.gz) = 861841
--- a/math/mppp/Makefile
+++ b/math/mppp/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	mppp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	math

 MAINTAINER=	yuri@FreeBSD.org
@ -17,12 +18,11 @@ BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:math/gmp \
 RUN_DEPENDS=	${LOCALBASE}/include/gmp.h:math/gmp \
 		${LOCALBASE}/include/mpfr.h:math/mpfr

-USES=		cmake
+USES=		cmake compiler:c++14-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni

-TEST_USES=	compiler:c++14-lang
-TEST_ARGS=	-DMPPP_BUILD_TESTS=ON -DMPPP_WITH_MPFR=ON #-DMPPP_WITH_QUADMATH=ON (quadmath requires __float128, only available in clang6)
+TEST_ARGS=	-DMPPP_BUILD_TESTS=ON -DMPPP_WITH_MPFR=ON -DMPPP_WITH_QUADMATH=ON
 BENCHMARK_ARGS=	-DMPPP_BUILD_BENCHMARKS=ON -DMPPP_BENCHMARK_BOOST=ON

 do-test:
--- a/Show More
+++ b/Show More