- Move net-mgmt/unifi to net-mgmt/unifi3

- Update port to 3.1.9

Unifi 3.x is still considered "beta". There has been a request to see
Unifi 2.x in the ports tree. They will live as separate ports,
net-mgmt/unifi2 and net-mgmt/unifi3.

PR:		ports/185000
Approved by:	swills (mentor)

7 files changed, 17 insertions, 17 deletions

diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 60bc8cf0d80a..c60c1fbd4f73 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -313,7 +313,7 @@
     SUBDIR += tcpreplay
     SUBDIR += tcptrack
     SUBDIR += torrus
-    SUBDIR += unifi
+    SUBDIR += unifi3
     SUBDIR += vidalia
     SUBDIR += virt-viewer
     SUBDIR += virtinst
diff --git a/net-mgmt/unifi/distinfo b/net-mgmt/unifi/distinfo
deleted file mode 100644
index fb2350856cd2..000000000000
--- a/net-mgmt/unifi/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (unifi-3.1.6/UniFi.unix.zip) = 1eddda84eed13c0f244a02126bebaf260caf72ae84955361f18e2c9096d9bd84
-SIZE (unifi-3.1.6/UniFi.unix.zip) = 34522586
diff --git a/net-mgmt/unifi/Makefile b/net-mgmt/unifi3/Makefile
index 34d545aa25ad..c01136363341 100644
--- a/net-mgmt/unifi/Makefile
+++ b/net-mgmt/unifi3/Makefile
@@ -1,8 +1,8 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	unifi
-PORTVERSION=	3.1.6
+PORTNAME=	unifi3
+PORTVERSION=	3.1.9
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}/
 DISTNAME=	UniFi.unix
@@ -24,7 +24,7 @@ JAVA_RUN=	yes
 
 NO_BUILD=	yes
 
-USE_RC_SUBR=	${PORTNAME}
+USE_RC_SUBR=	unifi
 
 USERS=	unifi
 GROUPS=	unifi
@@ -36,7 +36,7 @@ WRKSRC=	${WRKDIR}/UniFi
 RESTRICTED=	Redistribution of bundled firmware images is not permitted
 
 do-install:
-	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/)
+	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/)
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/unifi3/distinfo b/net-mgmt/unifi3/distinfo
new file mode 100644
index 000000000000..b931d1e4e087
--- /dev/null
+++ b/net-mgmt/unifi3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (unifi3-3.1.9/UniFi.unix.zip) = d22f3bc07b41619fbcbc6019a448863aede6157b685bf68a6a159f2d4b888fbd
+SIZE (unifi3-3.1.9/UniFi.unix.zip) = 34868244
diff --git a/net-mgmt/unifi/files/unifi.in b/net-mgmt/unifi3/files/unifi.in
index c56c4fee3aee..f1dafecb738e 100644
--- a/net-mgmt/unifi/files/unifi.in
+++ b/net-mgmt/unifi3/files/unifi.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Created by: Mark Felder <feld@feld.me>
-# $FreeBSD$
+# $FreeBSD: head/net-mgmt/unifi/files/unifi.in 334865 2013-11-25 16:52:21Z feld $
 #
 
 # PROVIDE: unifi
diff --git a/net-mgmt/unifi/pkg-descr b/net-mgmt/unifi3/pkg-descr
index 546a2822feb9..546a2822feb9 100644
--- a/net-mgmt/unifi/pkg-descr
+++ b/net-mgmt/unifi3/pkg-descr
diff --git a/net-mgmt/unifi/pkg-plist b/net-mgmt/unifi3/pkg-plist
index d982d1180cab..636270992fda 100644
--- a/net-mgmt/unifi/pkg-plist
+++ b/net-mgmt/unifi3/pkg-plist
@@ -1,8 +1,8 @@
 %%JAVASHAREDIR%%/unifi/bin/mongod
-%%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.6.2316/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.6.2316/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.6.2316/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.6.2316/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.9.2442/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.9.2442/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.9.2442/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.9.2442/firmware.bin
 %%JAVASHAREDIR%%/unifi/dl/firmware/bundles.json
 %%JAVASHAREDIR%%/unifi/lib/MRJAdapter.jar
 %%JAVASHAREDIR%%/unifi/lib/ace.jar
@@ -56,13 +56,13 @@
 %%JAVASHAREDIR%%/unifi/webapps/ROOT.war
 @dirrmtry %%JAVASHAREDIR%%/unifi/webapps
 @dirrmtry %%JAVASHAREDIR%%/unifi/lib
-@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.6.2316
+@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.9.2442
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7P
-@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.6.2316
+@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.9.2442
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7E
-@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.6.2316
+@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.9.2442
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U2S48
-@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.6.2316
+@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.9.2442
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/BZ2
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware
 @dirrmtry %%JAVASHAREDIR%%/unifi/dl