svn commit: r373573 - head/net-mgmt/unifi3

[Mark Felder]

Author: feld
Date: Fri Nov 28 18:03:57 2014
New Revision: 373573
URL: https://svnweb.freebsd.org/changeset/ports/373573
QAT: https://qat.redports.org/buildarchive/r373573/

Log:
  Update to 3.2.7
  Fix tomcat-native conflict
  
  PR:		195411, 195410

Modified:
  head/net-mgmt/unifi3/Makefile
  head/net-mgmt/unifi3/distinfo
  head/net-mgmt/unifi3/pkg-plist

Modified: head/net-mgmt/unifi3/Makefile
==============================================================================
--- head/net-mgmt/unifi3/Makefile	Fri Nov 28 18:00:01 2014	(r373572)
+++ head/net-mgmt/unifi3/Makefile	Fri Nov 28 18:03:57 2014	(r373573)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unifi3
-PORTVERSION=	3.2.5
+PORTVERSION=	3.2.7
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://dl.ubnt.com/unifi/${PORTVERSION}/
 DISTNAME=	UniFi.unix
@@ -34,7 +34,7 @@ GROUPS=	unifi
 WRKSRC=	${WRKDIR}/UniFi
 
 RESTRICTED=	Redistribution of bundled firmware images is not permitted
-CONFLICTS=	unifi2-* unifi4-*
+CONFLICTS=	unifi2-[0-9]* unifi4-[0-9]* tomcat-native-[0-9]*
 
 post-extract:
 	${MKDIR} ${WRKSRC}/webapps/ROOT

Modified: head/net-mgmt/unifi3/distinfo
==============================================================================
--- head/net-mgmt/unifi3/distinfo	Fri Nov 28 18:00:01 2014	(r373572)
+++ head/net-mgmt/unifi3/distinfo	Fri Nov 28 18:03:57 2014	(r373573)
@@ -1,2 +1,2 @@
-SHA256 (unifi3-3.2.5/UniFi.unix.zip) = 7949f26ecd4aa16d44bb36b93f73ca01d967e45ffca8c29ed90e1fcf8624d447
-SIZE (unifi3-3.2.5/UniFi.unix.zip) = 39719255
+SHA256 (unifi3-3.2.7/UniFi.unix.zip) = b00b08e7d1eb995f801f2f5f61ee5c80f9136a300518c1156d39210a66e8e989
+SIZE (unifi3-3.2.7/UniFi.unix.zip) = 35236680

Modified: head/net-mgmt/unifi3/pkg-plist
==============================================================================
--- head/net-mgmt/unifi3/pkg-plist	Fri Nov 28 18:00:01 2014	(r373572)
+++ head/net-mgmt/unifi3/pkg-plist	Fri Nov 28 18:03:57 2014	(r373573)
@@ -1,10 +1,9 @@
 %%JAVASHAREDIR%%/unifi/readme.txt
 %%JAVASHAREDIR%%/unifi/bin/mongod
-%%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.2.5.2791/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.2.5.2791/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U2Sv2/3.2.5.2791/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.2.5.2791/firmware.bin
-%%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.2.5.2791/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.2.7.2816/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U2HSR/3.2.7.2816/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.2.7.2816/firmware.bin
+%%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.2.7.2816/firmware.bin
 %%JAVASHAREDIR%%/unifi/dl/firmware/bundles.json
 %%JAVASHAREDIR%%/unifi/lib/MRJAdapter.jar
 %%JAVASHAREDIR%%/unifi/lib/ace.jar
@@ -92,17 +91,17 @@
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/library/css/cli/usercss-1.css
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/library/css/cli/usercss-2.css
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/library/css/cli/usercss-3.css
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/css/unifi.3.2.5.css
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/css/unifi.3.2.7.css
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/flex/expressInstall.swf
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-hotspot.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-lib.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-manage.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-msg_en_US.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-msg_zh_TW.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-shell.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-waiting.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-wizard.3.2.5.js
-%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi.3.2.5.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-hotspot.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-lib.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-manage.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-msg_en_US.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-msg_zh_TW.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-shell.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-waiting.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi-wizard.3.2.7.js
+%%JAVASHAREDIR%%/unifi/webapps/ROOT/library/js/unifi.3.2.7.js
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/library/swf/MapApplet.swf
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/login.jsp
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/manage.jsp
@@ -243,4 +242,5 @@
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/upnp.jsp
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/waiting.jsp
 %%JAVASHAREDIR%%/unifi/webapps/ROOT/wizard.jsp
+ at dir %%JAVASHAREDIR%%/unifi/conf
 @exec chown -R unifi:unifi %D/%%JAVASHAREDIR%%/unifi