Index: multimedia/kodi-addon-peripheral.joystick-devel/Makefile
===================================================================
--- multimedia/kodi-addon-peripheral.joystick-devel/Makefile	(revision 537095)
+++ multimedia/kodi-addon-peripheral.joystick-devel/Makefile	(working copy)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	peripheral.joystick
-PORTVERSION=	1.4.8
-DISTVERSIONSUFFIX=	-Leia
-PORTREVISION=	5
+PORTVERSION=	1.6.0
+DISTVERSIONSUFFIX=	-Matrix
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	kodi-addon-
 PKGNAMESUFFIX=	-devel
@@ -14,19 +13,17 @@
 
 LICENSE=	GPLv2+
 
-BROKEN=		outdated and incompatible with Kodi addon API changes
-
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \
-		kodi-devel>=19.0.a20200414:multimedia/kodi-devel
+		kodi-devel>=19.0.a20200530:multimedia/kodi-devel
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd
-RUN_DEPENDS=	kodi-devel>=19.0.a20200414:multimedia/kodi-devel
+RUN_DEPENDS=	kodi-devel>=19.0.a20200530:multimedia/kodi-devel
 
-USES=		cmake localbase
+USES=		cmake localbase compiler:c++14-lang
 USE_GITHUB=	yes
+USE_CXXSTD=	c++14
 GH_ACCOUNT=	xbmc
 
-PLIST_SUB=	SOVERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|if(CORE_SYSTEM_NAME STREQUAL linux)|if(1)|g' \
Index: multimedia/kodi-addon-peripheral.joystick-devel/distinfo
===================================================================
--- multimedia/kodi-addon-peripheral.joystick-devel/distinfo	(revision 537095)
+++ multimedia/kodi-addon-peripheral.joystick-devel/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571517672
-SHA256 (xbmc-peripheral.joystick-1.4.8-Leia_GH0.tar.gz) = b6ddefed73582a3dc9bc36a9d40f8309139802ef9cfc130933bd0fe6e569d933
-SIZE (xbmc-peripheral.joystick-1.4.8-Leia_GH0.tar.gz) = 90965
+TIMESTAMP = 1590865052
+SHA256 (xbmc-peripheral.joystick-1.6.0-Matrix_GH0.tar.gz) = 2094aab54af407fd94b9b0e0fb6ddbece4da8f7a6382820a144bbae315a05c52
+SIZE (xbmc-peripheral.joystick-1.6.0-Matrix_GH0.tar.gz) = 117163
Index: multimedia/kodi-addon-peripheral.joystick-devel/pkg-plist
===================================================================
--- multimedia/kodi-addon-peripheral.joystick-devel/pkg-plist	(revision 537095)
+++ multimedia/kodi-addon-peripheral.joystick-devel/pkg-plist	(working copy)
@@ -1,5 +1,5 @@
 lib/kodi/addons/peripheral.joystick/peripheral.joystick.so
-lib/kodi/addons/peripheral.joystick/peripheral.joystick.so.%%SOVERSION%%
+lib/kodi/addons/peripheral.joystick/peripheral.joystick.so.1.5.3
 lib/kodi/addons/peripheral.joystick/peripheral.joystick.so.19.0
 share/kodi/addons/peripheral.joystick/addon.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/Hi_keyboard_v0001_p0001_23b.xml
@@ -25,10 +25,13 @@
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/USB_Joystick_v0E8F_p0003_12b_5a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Wireless_360_Controller_v045E_p028E_15b_6a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Wireless_Controller_v054C_p09CC_14b_6a.xml
+share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Xbox_360_Wired_Controller_v045E_p028E_15b_6a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Xbox_360_Wired_Controller_v046D_pC21D_15b_6a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Xbox_One_Wired_Controller_v045E_p02DD_15b_6a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/usb_gamepad____________v0810_pE501_10b_3a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/usb_gamepad_v0810_pE501_10b_3a.xml
+share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/darwinembedded/Extended_Gamepad_14b_4a.xml
+share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/darwinembedded/Micro_Gamepad_6b.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Adaptoid_v06F7_p1_14b_2a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Bluetooth_HID_Port_v05A0_p3232_16b_1h_6a.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/GamePad_Pro_USB_v0428_p4001_10b_2a.xml
@@ -96,6 +99,7 @@
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/xarcade/X-Arcade_Tankstick_Player_1_vAA55_p0101_14b.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/xarcade/X-Arcade_Tankstick_Player_2_vAA55_p0101_14b.xml
 share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/xinput/Xbox_360-compatible_controller_15b_6a.xml
+share/kodi/addons/peripheral.joystick/resources/icon.png
 share/kodi/addons/peripheral.joystick/resources/joystickfamilies/joystickfamilies.xml
 share/kodi/addons/peripheral.joystick/resources/language/resource.language.en_gb/strings.po
 share/kodi/addons/peripheral.joystick/resources/settings.xml