net-mgmt/unifi5: Update to 5.11.46

Also pull in port improvements from glewis@ to enable customizing which Java
that Unifi runs with

PR:		240016

3 files changed, 53 insertions, 13 deletions

diff --git a/net-mgmt/unifi5/Makefile b/net-mgmt/unifi5/Makefile
index 35325cdb54e4..9952d3a59639 100644
--- a/net-mgmt/unifi5/Makefile
+++ b/net-mgmt/unifi5/Makefile
@@ -2,12 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	unifi5
-PORTVERSION=	5.11.39
+PORTVERSION=	5.11.46
 PORTREVISION=	0
 CATEGORIES=	net-mgmt java
-MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}/
-DISTNAME=	unifi_sysvinit_all
-EXTRACT_SUFX=	.deb
+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
+DISTFILES=	unifi_sysvinit_all.deb:unifi \
+		${JAX_DISTNAME}-${JAX_VERSION}.jar:jax
+EXTRACT_ONLY=	unifi_sysvinit_all.deb
+
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
@@ -17,7 +22,7 @@ RUN_DEPENDS=	mongodb36>0:databases/mongodb36 \
 		snappyjava>0:archivers/snappy-java
 
 SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \
-		JAVA=${JAVA}
+		JAVA=${JAVA} JAVA_HOME=${JAVA_HOME}
 
 EXTRACT_CMD=	/usr/bin/ar
 EXTRACT_BEFORE_ARGS=	-p
@@ -27,7 +32,7 @@ USES=		cpe
 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
@@ -40,12 +45,19 @@ USE_RC_SUBR=	unifi
 USERS=		unifi
 GROUPS=		unifi
 
+JAX_DISTNAME=	javax.activation-api
+JAX_VERSION=	1.2.0
+
 NO_WRKSUBDIR=	yes
 
 CONFLICTS=	unifi-devel-*
 
 DIR_LIST=	conf data logs run work
 
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${JAX_DISTNAME}-${JAX_VERSION}.jar \
+		${WRKSRC}/usr/lib/unifi/lib/
+
 post-patch:
 	(cd ${WRKSRC}/usr/lib/unifi/lib && ${LN} -f -s ${JAVAJARDIR}/snappy-java.jar snappy-java-*.jar)
 	${RM} -r ${WRKSRC}/usr/lib/unifi/lib/native
diff --git a/net-mgmt/unifi5/distinfo b/net-mgmt/unifi5/distinfo
index 58582dae7419..6f941427f355 100644
--- a/net-mgmt/unifi5/distinfo
+++ b/net-mgmt/unifi5/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1568307406
-SHA256 (unifi5-5.11.39/unifi_sysvinit_all.deb) = d2736dababcf96596a2c9ad82ee2fcbd02ee4d3a864284175b43f5afdab62f6c
-SIZE (unifi5-5.11.39/unifi_sysvinit_all.deb) = 97384556
+TIMESTAMP = 1568823069
+SHA256 (unifi5-5.11.46/unifi_sysvinit_all.deb) = 05318bcfa94efc069f53150c4af82da2fe0e77d4e6544e35a64224d8836e4db0
+SIZE (unifi5-5.11.46/unifi_sysvinit_all.deb) = 97379754
+SHA256 (unifi5-5.11.46/javax.activation-api-1.2.0.jar) = 43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393
+SIZE (unifi5-5.11.46/javax.activation-api-1.2.0.jar) = 56674
diff --git a/net-mgmt/unifi5/files/unifi.in b/net-mgmt/unifi5/files/unifi.in
index 4a59ad775dba..01c336f448fe 100644
--- a/net-mgmt/unifi5/files/unifi.in
+++ b/net-mgmt/unifi5/files/unifi.in
@@ -12,6 +12,29 @@
 # Add the following line to /etc/rc.conf to enable `unifi':
 #
 # unifi_enable="YES"
+#
+# Other configuration settings for unifi that can be set in /etc/rc.conf:
+#
+# unifi_user (str)
+#   This is the user that unifi runs as
+#   Set to %%USERS%% by default
+#
+# unifi_group (str)
+#   This is the group that unifi runs as
+#   Set to %%GROUPS%% by default
+#
+# unifi_chdir (str)
+#   This is the directory that unifi chdirs into before starting
+#   Set to %%JAVASHAREDIR%%/unifi by default
+#
+# unifi_java_home (str)
+#   The path to the base directory for the Java to use to run unifi
+#   Defaults to %%JAVA_HOME%%
+#
+# unifi_javaflags (str)
+#   Flags passed to Java to run unifi
+#   Set to "-Djava.awt.headless=true -Xmx1024M" by default
+#
 
 . /etc/rc.subr
 name=unifi
@@ -23,16 +46,19 @@ load_rc_config ${name}
 : ${unifi_user:=%%USERS%%}
 : ${unifi_group:=%%GROUPS%%}
 : ${unifi_chdir=%%JAVASHAREDIR%%/unifi}
-: ${unifi_javaflags:="-Djava.awt.headless=true -Xmx1024M"}
+: ${unifi_java_home=%%JAVA_HOME%%}
+: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M"}
 
 pidfile="/var/run/unifi/${name}.pid"
-procname=%%JAVA%%
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} %%JAVA%% ${unifi_javaflags} -jar lib/ace.jar start"
+procname=${unifi_java_home}/bin/java
+command=/usr/sbin/daemon
+command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} com.ubnt.ace.Launcher start"
 start_precmd=start_precmd
 stop_precmd=stop_precmd
 stop_postcmd=stop_postcmd
 
+export CLASSPATH=$(echo ${unifi_chdir}/lib/*.jar | tr ' ' ':')
+
 start_precmd()
 {
 	if [ ! -e /var/run/unifi ] ; then