Framework: sync with upstream

Taken from: HardenedBSD

Mk/bsd.options.mk

@@ -131,6 +131,13 @@
 #				Option enabled  -D${content}=no
 #				Option disabled -D${content}=yes
 #
+# ${opt}_MESON_ENABLED		Will add to MESON_ARGS:
+#				Option enabled	-D${content}=enabled
+#				Option disabled	-D${content}=disabled
+# ${opt}_MESON_DISABLED		Will add to MESON_ARGS:
+#				Option enabled	-D${content}=disabled
+#				Option disabled	-D${content}=enabled
+#
 # ${opt}_IMPLIES		When opt is enabled, options named in IMPLIES will
 #				get enabled too.
 # ${opt}_PREVENTS		When opt is enabled, if any options in PREVENTS are
@@ -503,6 +510,12 @@ MESON_ARGS+=		${${opt}_MESON_YES:C/.*/-D&=yes/}
 .    if defined(${opt}_MESON_NO)
 MESON_ARGS+=		${${opt}_MESON_NO:C/.*/-D&=no/}
 .    endif
+.    if defined(${opt}_MESON_ENABLED)
+MESON_ARGS+=		${${opt}_MESON_ENABLED:C/.*/-D&=enabled/}
+.    endif
+.    if defined(${opt}_MESON_DISABLED)
+MESON_ARGS+=		${${opt}_MESON_DISABLED:C/.*/-D&=disabled/}
+.    endif
 .    for configure in CONFIGURE CMAKE MESON QMAKE
 .      if defined(${opt}_${configure}_ON)
 ${configure}_ARGS+=	${${opt}_${configure}_ON}
@@ -565,6 +578,12 @@ MESON_ARGS+=		${${opt}_MESON_YES:C/.*/-D&=no/}
 .    if defined(${opt}_MESON_NO)
 MESON_ARGS+=		${${opt}_MESON_NO:C/.*/-D&=yes/}
 .    endif
+.    if defined(${opt}_MESON_ENABLED)
+MESON_ARGS+=		${${opt}_MESON_ENABLED:C/.*/-D&=disabled/}
+.    endif
+.    if defined(${opt}_MESON_DISABLED)
+MESON_ARGS+=		${${opt}_MESON_DISABLED:C/.*/-D&=enabled/}
+.    endif
 .    for configure in CONFIGURE CMAKE MESON QMAKE
 .      if defined(${opt}_${configure}_OFF)
 ${configure}_ARGS+=	${${opt}_${configure}_OFF}

Mk/bsd.wx.mk

@@ -111,9 +111,9 @@ _WX_Definitions_Done=	yes
 
 _WX_COMPS_ALL=		wx contrib python
 _WX_DEP_TYPES_ALL=	build lib run
-_WX_VERS_ALL=		2.8 3.0
-_WX_VERS_UC_ALL=	2.8 3.0
-_WX_VERS_SKIP=		3.0
+_WX_VERS_ALL=		2.8 3.0 3.1
+_WX_VERS_UC_ALL=	2.8 3.0 3.1
+_WX_VERS_SKIP=		3.0 3.1
 _WX_VERS_LISTS=		WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
 
 #
@@ -140,7 +140,7 @@ _WX_PORT_wx_3.0=	x11-toolkits/wxgtk30
 _WX_LIB_wx_3.0=		wx_baseu-3.0
 
 _WX_PORT_python_3.0=	x11-toolkits/py-wxPython30
-_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx-3.0-gtk2/wx/__init__.py
+_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx-3.0-gtk3/wx/__init__.py
 
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
@@ -405,8 +405,14 @@ _WX_VER=		${ver}
 # Set variables.
 #
 
-WX_CONFIG?=		${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
-WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER}
+.if ${_WX_VER:R} == 3
+_GTKVER=	3
+.else
+_GTKVER=	2
+.endif
+
+WX_CONFIG?=		${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config
+WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk${_GTKVER}${_WX_UC}-${_WX_VER}
 WX_VERSION?=		${_WX_VER}
 
 .endif		# _WX_Need_Version

UPDATING

@@ -32,6 +32,17 @@ you update your ports collection, before attempting any port upgrades.
 
       sudo -u ejabberd -H ejabberdctl remove_mam_for_user <user> <server>
 
+20190207:
+  AFFECTS: users of net-mgmt/mk-livestatus
+  AUTHOR: [email protected]
+
+  The default Nagios version supported by net-mgmt/mk-livestatus changed
+  from Nagios 3 to Nagios 4 - the respective Nagios package was added to
+  net-mgmt/mk-livestatus' runtime dependencies.
+
+  If you still need support for Nagios 3 you just need to change the
+  options for net-mgmt/mk-livestatus and compile the port yourself.
+
 20190202:
   AFFECTS: users of archivers/urbackup-server
   AUTHOR: [email protected]