multimedia/kodi-addon-peripheral.joystick: Rename port to match upstream naming and convert to USES=kodi

7 files changed, 8 insertions, 119 deletions

diff --git a/MOVED b/MOVED
index dec18deda6b8..a48a11f582f6 100644
--- a/MOVED
+++ b/MOVED
@@ -16185,3 +16185,4 @@ print/cloud-print-connector||2021-03-01|Has expired: Google Cloud Print has been
 dns/knot2|dns/knot3|2021-03-01|Has expired: Use knot3, it is functionally compatible with 2.9.x
 print/cups-cloud-print||2021-03-01|Has expired: Google Cloud Print has been shut down by Google as of December 31, 2020
 www/helma||2021-03-01|Has expired: Upstream is basically dead and recommends ringojs.org
+multimedia/kodi-addon-peripheral-joystick|multimedia/kodi-addon-peripheral.joystick|2021-03-01|Renamed to match upstream name
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 94f4399ef87c..60f281f33751 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -147,7 +147,7 @@
     SUBDIR += kf5-kmediaplayer
     SUBDIR += kmplayer
     SUBDIR += kodi
-    SUBDIR += kodi-addon-peripheral-joystick
+    SUBDIR += kodi-addon-peripheral.joystick
     SUBDIR += kodi-addon-peripheral-joystick
     SUBDIR += kodi-addon-pvr.hts
     SUBDIR += kodi-addon-pvr.iptvsimple
diff --git a/multimedia/kodi-addon-peripheral-joystick/pkg-plist b/multimedia/kodi-addon-peripheral-joystick/pkg-plist
deleted file mode 100644
index 0c506364bd6b..000000000000
--- a/multimedia/kodi-addon-peripheral-joystick/pkg-plist
+++ /dev/null
@@ -1,108 +0,0 @@
-lib/kodi/addons/peripheral.joystick/peripheral.joystick.so
-lib/kodi/addons/peripheral.joystick/peripheral.joystick.so.1.7.1
-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
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/NVIDIA_Corporation_NVIDIA_Controller_v01.03_v0955_p7210_23b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/NVIDIA_Corporation_NVIDIA_Controller_v01.04_v0955_p7214_23b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/OUYA_Game_Controller_v2836_p0001_23b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/Xbox_360_Wireless_Receiver_v045E_p02A1_23b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/Xbox_360_Wireless_Receiver_v045E_p0719_23b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/virtual-remote_16b.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/android/virtual-remote_23b.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/application/Keyboard.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/application/Mouse.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/8Bitdo_Zero_GamePad_v05A0_p3232_16b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/GamePad_Pro_USB_v0428_p4001_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Gamepad_F310_v046D_pC21D_15b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Generic_USB_Joystick_v0079_p0006_12b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/Logitech_Dual_Action_v046D_pC216_12b_5a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/PC_USB_Wired_Stick_8838_v0738_p8838_13b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/PLAYSTATION_R_3_Controller_v054C_p0268_19b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/PS_R__Ga_epad_v054C_p0268_19b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/USB_GamePad_v0E8F_p3013_16b_10a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/cocoa/USB_Gamepad_v0079_p0011_10b_6a.xml
-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_13b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/darwinembedded/Extended_Gamepad_15b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/darwinembedded/Extended_Gamepad_16b_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
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Generic_USB_Joystick_v0079_p0006_12b_1h_5a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Logitech_Dual_Action_v046D_pC216_12b_1h_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Logitech_RumblePad_2_USB_v046D_pC218_12b_1h_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/MAYFLASH_GameCube_Controller_Adapter_v0079_p1844_16b_1h_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/PS_R__Ga_epad_v054C_p0268_19b_5a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Twin_USB_Joystick_v0810_p0001_12b_1h_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/USB_GamePad_v0E8F_p3013_16b_1h_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/USB_Gamepad_v0079_p0011_10b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/USB_Joystick_v0E8F_p3_12b_1h_5a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/Wireless_Controller_v054C_p09CC_14b_1h_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/usb_gamepad____________v0810_pE501_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/directinput/usb_gamepad_v0810_pE501_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/8Bitdo_NES30_Arcade_x__10b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/8Bitdo_NES30_GamePad_16b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/8Bitdo_NES30_GamePad_Joystick_22b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/8Bitdo_SFC30_GamePad_Joystick_22b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/8Bitdo_Zero_GamePad_16b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/DragonRise_Inc._Generic_USB_Joystick_12b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Dual_PSX-USB_Adaptor_Dual_PSX-USB_Adaptor_16b_4a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/GPIO_Controller_1_9b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/GPIO_Controller_2_9b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Gamepad_17b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Generic_USB_Joystick_12b_7a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Generic_X-Box_pad_11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Gravis_GamePad_Pro_USB_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/GreenAsia_Inc._USB_Joystick_12b_7a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/HuiJia_USB_GamePad_16b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Logitech_Gamepad_F310_11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Logitech_Inc._WingMan_RumblePad_9b_7a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Logitech_Logitech_Dual_Action_12b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Logitech_Logitech_RumblePad_2_USB_12b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/MY-POWER_CO._LTD._2In1_USB_Joystick_12b_7a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Microsoft_X-Box_360_pad_11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Microsoft_X-Box_One_pad__Firmware_2015__11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/NVIDIA_Corporation_NVIDIA_Controller_v01.03_14b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller_17b_29a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Pro_Controller_16b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/ShanWan_PS_R__Ga_epad_19b_27a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_Computer_Entertainment_Wireless_Controller_14b_18a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_Interactive_Entertainment_Wireless_Controller_14b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_17b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_19b_27a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/USB_Gamepad_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Wireless_Controller_13b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Wireless_Controller_14b_18a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Wireless_Controller_14b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Wish_Technologies_Adaptoid_14b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Xbox_360_Wireless_Receiver_15b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Xbox_360_Wireless_Receiver_15b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Xbox_360_Wireless_Receiver_XBOX_15b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/Xbox_360_Wireless_Receiver_XBOX_15b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/mayflash_limited_MAYFLASH_GameCube_Controller_Adap_16b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/usb_gamepad____________10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/linux/usb_gamepad_lowercase_10b_2a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/sdl/SDL_Game_Controller_15b_6a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/udev/8Bitdo_Zero_GamePad_v0A12_p0001_16b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/udev/Logitech_Gamepad_F310_v046D_pC21D_11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/udev/Microsoft_X-Box_One_pad__Firmware_2015__v045E_p02DD_11b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/udev/Sony_Interactive_Entertainment_Wireless_Controller_v054C_p09CC_14b_8a.xml
-share/kodi/addons/peripheral.joystick/resources/buttonmaps/xml/udev/Xbox_360_Wireless_Receiver__XBOX__v045E_p0291_15b_8a.xml
-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.de_de/strings.po
-share/kodi/addons/peripheral.joystick/resources/language/resource.language.en_gb/strings.po
-share/kodi/addons/peripheral.joystick/resources/settings.xml
diff --git a/multimedia/kodi-addon-peripheral-joystick/Makefile b/multimedia/kodi-addon-peripheral.joystick/Makefile
index c87c545c3a1c..dcf43937650c 100644
--- a/multimedia/kodi-addon-peripheral-joystick/Makefile
+++ b/multimedia/kodi-addon-peripheral.joystick/Makefile
@@ -1,9 +1,10 @@
 # Created by: Rozhuk Ivan 2018 <rozhuk.im@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	kodi-addon-peripheral-joystick
-PORTVERSION=	1.7.1
+PORTNAME=	peripheral.joystick
+DISTVERSION=	1.7.1
 DISTVERSIONSUFFIX=	-Matrix
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	rozhuk.im@gmail.com
@@ -11,19 +12,14 @@ COMMENT=	Joystick support for Kodi
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \
-		${LOCALBASE}/include/kodi/addon-instance/Peripheral.h:multimedia/kodi
-LIB_DEPENDS=	libp8-platform.so:devel/p8-platform \
-		libkodiplatform.so:devel/kodi-platform \
-		libtinyxml.so:textproc/tinyxml \
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto
+LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd
-RUN_DEPENDS=	kodi:multimedia/kodi
 
-USES=		cmake:noninja compiler:c++14-lang
+USES=		cmake:noninja compiler:c++14-lang kodi
 USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
-GH_PROJECT=	peripheral.joystick
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|if(CORE_SYSTEM_NAME STREQUAL linux)|if(1)|g' \
diff --git a/multimedia/kodi-addon-peripheral-joystick/distinfo b/multimedia/kodi-addon-peripheral.joystick/distinfo
index 91a74be45c5a..91a74be45c5a 100644
--- a/multimedia/kodi-addon-peripheral-joystick/distinfo
+++ b/multimedia/kodi-addon-peripheral.joystick/distinfo
diff --git a/multimedia/kodi-addon-peripheral-joystick/pkg-descr b/multimedia/kodi-addon-peripheral.joystick/pkg-descr
index e52e1ac27339..e52e1ac27339 100644
--- a/multimedia/kodi-addon-peripheral-joystick/pkg-descr
+++ b/multimedia/kodi-addon-peripheral.joystick/pkg-descr
diff --git a/multimedia/kodi-addon-peripheral-joystick/pkg-message b/multimedia/kodi-addon-peripheral.joystick/pkg-message
index 810d2216e331..810d2216e331 100644
--- a/multimedia/kodi-addon-peripheral-joystick/pkg-message
+++ b/multimedia/kodi-addon-peripheral.joystick/pkg-message