From 6196f286094e97d57bd5d2a41add785997cb9118 Mon Sep 17 00:00:00 2001
From: Kai Knoblich <kai@FreeBSD.org>
Date: Thu, 28 Feb 2019 16:21:14 +0000
Subject: net-mgmt/unifi-devel: Update to 5.10.19

While I'm here:

* Remove unifi{2-4}- from CONFLICTS - these ports no longer exist in the
  ports tree
* Do some spring cleaning by grouping/re-arranging some variables to
  their proposed blocks
* Pet portlint

Changelog:

Controller bug fixes/changes since 5.10.18:

* Fix Mongo for 32-bit non-UCK systems.
* Fix error with getting temporary cloud credentials.

Controller bug fixes/changes since 5.10.17:

* Fix database migration errors for users without guest portal
  configurations.

Controller bug fixes/changes since 5.10.16:

* Fix translations for zh_CN.

Controller bug fixes/changes since 5.10.15:

* Fix L3 adopt and upgrade process.
* Fix external guest portal cookies.

Controller bug fixes/changes since 5.10.12:

* Fix an issue that could prevent database migration from succeeding when
  upgrading from a previous version.
* Fix issue where setting SSH username and password on a UCK would fail and
  not notify the user.
* Fix issue when clicking Submit button for changing SSH credentials.

Controller bug fixes/changes since 5.10.11:

* Add beta badge to Auto-Optimize Network feature.
* Fix a bug when disabling Auto-Optimize Network feature.
* Various bug fixes and improvements.

https://community.ubnt.com/ubnt/attachments/ubnt/Blog_UniFi/380/2/UniFi-changelog-5.10.x.txt

PR:		235905
Submitted by:	Bryce Edwards <bryce@bryce.net> (maintainer)
Approved by:	miwi (mentor)
Differential Revision:	https://reviews.freebsd.org/D19401
---
 net-mgmt/unifi-devel/Makefile | 25 +++++++++++--------------
 net-mgmt/unifi-devel/distinfo |  6 +++---
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'net-mgmt/unifi-devel')

diff --git a/net-mgmt/unifi-devel/Makefile b/net-mgmt/unifi-devel/Makefile
index 0e21707d70ee..40dfbcac26e0 100644
--- a/net-mgmt/unifi-devel/Makefile
+++ b/net-mgmt/unifi-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unifi
-PORTVERSION=	5.10.11
+PORTVERSION=	5.10.19
 PORTREVISION=	0
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}-${UNIFI_BUILD}/
@@ -24,15 +24,6 @@ RESTRICTED=	License restrictions, see https://www.ubnt.com/eula/
 RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
 		snappyjava>0:archivers/snappy-java
 
-SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
-		JAVA=${JAVA}
-
-EXTRACT_CMD=	${AR}
-EXTRACT_BEFORE_ARGS=	-p
-EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
-
-UNIFI_BUILD=	6e1800b9b9
-
 USES=		cpe
 CPE_VENDOR=	ubnt
 CPE_PRODUCT=	unifi_controller
@@ -41,19 +32,25 @@ JAVA_VERSION=	1.8
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk bsdjava
 JAVA_RUN=	yes
+USE_RC_SUBR=	unifi
+
+EXTRACT_CMD=	${AR}
+EXTRACT_BEFORE_ARGS=	-p
+EXTRACT_AFTER_ARGS=	data.tar.xz | ${TAR} -xf -
 
 NO_BUILD=	yes
 NO_ARCH=	yes
-
-USE_RC_SUBR=	unifi
+NO_WRKSUBDIR=	yes
 
 USERS=		unifi
 GROUPS=		unifi
 
-NO_WRKSUBDIR=	yes
+SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
+		JAVA=${JAVA}
 
-CONFLICTS=	unifi2-* unifi3-* unifi4-* unifi5-*
+CONFLICTS=	unifi5-*
 
+UNIFI_BUILD=	113b57454f
 DIR_LIST=	conf data logs run work
 
 post-patch:
diff --git a/net-mgmt/unifi-devel/distinfo b/net-mgmt/unifi-devel/distinfo
index f88c798c46ae..27794ff0bc98 100644
--- a/net-mgmt/unifi-devel/distinfo
+++ b/net-mgmt/unifi-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549079060
-SHA256 (unifi-5.10.11/unifi_sysvinit_all.deb) = 0823dd15ee9989369954ffe78aa736af9121f7b86e5fe5dde1739dab00a6e4ca
-SIZE (unifi-5.10.11/unifi_sysvinit_all.deb) = 81218452
+TIMESTAMP = 1550359730
+SHA256 (unifi-5.10.19/unifi_sysvinit_all.deb) = 58b8f1ea88e0cad7df3e97ea292ee011add96d0dd6819e78c60639f24370d407
+SIZE (unifi-5.10.19/unifi_sysvinit_all.deb) = 81226348
-- 
cgit v1.2.3