net-mgmt/unifi6: Update to 6.0.43

Update UniFi controller software to version 6.0.43

* Improvements:
  - Disable ATF toggle for certain devices.
  - Add Advanced Feature Toggles, Data Rate Controls, MAC Authorisation in WiFi
    form.
  - Rename Client Groups to Bandwidth Profiles.
  - Display Site Switcher on Cloud Key with UniFi OS and multiple sites.
  - Add an option to download server log file in new Settings.

* Bugfixes:
  - Fix provisioning WLAN changes for USP-Plug & USP-Strip and their uplinks.
  - Fix adoption of USP-Plug & USP-Strip if user has separate 5GHz only WiFi.
  - Fix issues during migration if Site has incorrect config.
  - Fix Unknown device names in Cloud Emails.
  - Fix Firmware cache table columns and their height.
  - Fix overlapping column headers in Alert.
  - Fix alerts page crashing.
  - Fix event message rendering.
  - Fix historical U-LTE data stat processing.
  - Fix loading translations while using CORS.
  - Fix models names for APs.
  - Fix list of available backups to restore during the Setup of controller.
  - Fix headings for UDM and UBB radio details.
  - Fix blinking ports on UDM icon on Dashboard.
  - Fix blinking IPs and text messages.
  - Display Meshing settings only for last of 5GHz radios.
  - Disable Bluetooth after Setup is completed on UDM-Pro.
  - Resolve UCK-G2 identification issues.
  - Migrate minimum RSSI settings to new range (from -67 to -90 dBm).
  - Update minimum RSSI radio range in slider.
  - Update UI for WiFi form Advanced section.
  - Prevent deletion of WAN2 network on UXG-Pro.

Full changelog:
https://community.ui.com/releases/UniFi-Network-Controller-6-0-43/b28bb453-927a-4dd8-82f7-40af28505510

And while here, also:
  - reformat Makefile according to portfmt, portclippy
  - Replace ${CP} by ${INSTALL_DATA}

Reviewed by:	osa (mentor)
Approved by:	osa (mentor)
Differential Revision:	https://reviews.freebsd.org/D27802

2 files changed, 30 insertions, 33 deletions

diff --git a/net-mgmt/unifi6/Makefile b/net-mgmt/unifi6/Makefile
index 071c39bebebd..bce58b6e7388 100644
--- a/net-mgmt/unifi6/Makefile
+++ b/net-mgmt/unifi6/Makefile
@@ -2,64 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	unifi6
-PORTVERSION=	6.0.41
+PORTVERSION=	6.0.43
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \
 		https://repo1.maven.org/maven2/%SUBDIR%/:jax
 MASTER_SITE_SUBDIR=	${PORTVERSION}/:unifi \
-			javax/activation/${JAX_DISTNAME}/${JAX_VERSION}/:jax
+			javax/activation/${_JAX_DISTNAME}/${_JAX_VERSION}/:jax
 DISTFILES=	unifi_sysvinit_all.deb:unifi \
-		${JAX_DISTNAME}-${JAX_VERSION}.jar:jax
+		${_JAX_DISTNAME}-${_JAX_VERSION}.jar:jax
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	unifi_sysvinit_all.deb
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	UniFi Controller v6
 
+LICENSE=	NONE
+
 RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
 		snappyjava>0:archivers/snappy-java
 
 USES=		cpe
 
-SUB_LIST+=	GROUPS=${GROUPS} \
-		JAVA=${JAVA} \
-		JAVA_HOME=${JAVA_HOME} \
-		JAVASHAREDIR=${JAVASHAREDIR} \
-		USERS=${USERS}
-
-EXTRACT_CMD=	${AR}
-EXTRACT_BEFORE_ARGS=	-p
-EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
-
 CPE_VENDOR=	ubnt
 CPE_PRODUCT=	unifi_controller
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk bsdjava
 JAVA_RUN=	yes
-
-NO_BUILD=	yes
-NO_ARCH=	yes
-
 USE_RC_SUBR=	unifi
 
-USERS=		unifi
-GROUPS=		unifi
+CONFLICTS=	unifi-devel-* unifi-lts-* unifi5-*
 
-JAX_DISTNAME=	javax.activation-api
-JAX_VERSION=	1.2.0
+EXTRACT_CMD=	${AR}
+EXTRACT_BEFORE_ARGS=	-p
+EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+SUB_LIST+=	GROUPS=${GROUPS} \
+		JAVA=${JAVA} \
+		JAVA_HOME=${JAVA_HOME} \
+		JAVASHAREDIR=${JAVASHAREDIR} \
+		USERS=${USERS}
 
 NO_WRKSUBDIR=	yes
 
-CONFLICTS=	unifi-devel-*
-CONFLICTS+=	unifi-lts-*
-CONFLICTS+=	unifi5-*
+USERS=		unifi
+GROUPS=		unifi
 
-DIR_LIST=	conf data logs run work
+_DIR_LIST=	conf data logs run work
+_JAX_DISTNAME=	javax.activation-api
+_JAX_VERSION=	1.2.0
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${JAX_DISTNAME}-${JAX_VERSION}.jar \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${_JAX_DISTNAME}-${_JAX_VERSION}.jar \
 		${WRKSRC}/usr/lib/unifi/lib/
 
 post-patch:
@@ -80,7 +77,7 @@ do-install:
 post-install:
 	@${FIND} -s ${STAGEDIR}${JAVASHAREDIR}/unifi -not -type d | \
 		${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
-.for dir in ${DIR_LIST}
+.for dir in ${_DIR_LIST}
 	@${ECHO} "@dir(unifi,wheel,) ${JAVASHAREDIR}/unifi/${dir}" >> \
 		${TMPPLIST}
 .endfor
diff --git a/net-mgmt/unifi6/distinfo b/net-mgmt/unifi6/distinfo
index 31dccdd5e258..01280c9100f5 100644
--- a/net-mgmt/unifi6/distinfo
+++ b/net-mgmt/unifi6/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1607011626
-SHA256 (unifi6-6.0.41/unifi_sysvinit_all.deb) = 82bf8dc9df881ec7a70d7c288d426dbd7d107d51f4cd01fdddb83e4416830fd6
-SIZE (unifi6-6.0.41/unifi_sysvinit_all.deb) = 196057532
-SHA256 (unifi6-6.0.41/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
-SIZE (unifi6-6.0.41/javax.activation-api-1.2.0.jar) = 56674
+TIMESTAMP = 1609174518
+SHA256 (unifi6-6.0.43/unifi_sysvinit_all.deb) = 7ecaa303ad4900811e2e20030243a3236ca7983f7790d5c392245f201ce137b5
+SIZE (unifi6-6.0.43/unifi_sysvinit_all.deb) = 115258006
+SHA256 (unifi6-6.0.43/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
+SIZE (unifi6-6.0.43/javax.activation-api-1.2.0.jar) = 56674