From owner-svn-ports-head@freebsd.org Mon Jan 1 23:00:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7CF7E89AE5; Mon, 1 Jan 2018 23:00:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEC1C29FC; Mon, 1 Jan 2018 23:00:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w01N0New095676; Mon, 1 Jan 2018 23:00:23 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w01N0N5p095673; Mon, 1 Jan 2018 23:00:23 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801012300.w01N0N5p095673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 1 Jan 2018 23:00:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457815 - head/net-mgmt/unifi5 X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: head/net-mgmt/unifi5 X-SVN-Commit-Revision: 457815 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jan 2018 23:00:24 -0000 Author: feld Date: Mon Jan 1 23:00:23 2018 New Revision: 457815 URL: https://svnweb.freebsd.org/changeset/ports/457815 Log: net-mgmt/unifi5: Update to 5.6.26 - Switch to the .deb package as the distfile as requested by Ubiquiti - Remove RESTRICTED as firmwares are no longer bundled Changelog: https://community.ubnt.com/t5/UniFi-Updates-Blog/UniFi-5-6-26-Stable-has-been-released/ba-p/2165432 Modified: head/net-mgmt/unifi5/Makefile head/net-mgmt/unifi5/distinfo head/net-mgmt/unifi5/pkg-plist Modified: head/net-mgmt/unifi5/Makefile ============================================================================== --- head/net-mgmt/unifi5/Makefile Mon Jan 1 21:19:33 2018 (r457814) +++ head/net-mgmt/unifi5/Makefile Mon Jan 1 23:00:23 2018 (r457815) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= unifi5 -PORTVERSION= 5.6.24 +PORTVERSION= 5.6.26 PORTREVISION= 0 CATEGORIES= net-mgmt java -MASTER_SITES= https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ \ - https://dl.ubnt.com/unifi/${PORTVERSION}-${UNIFI_TAG}/ \ - LOCAL/feld/${PORTNAME}-${PORTVERSION}/ -DISTNAME= UniFi.unix +MASTER_SITES= http://dl.ubnt.com/unifi/${PORTVERSION}/ +DISTNAME= unifi_sysvinit_all +EXTRACT_SUFX= .deb DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= feld@FreeBSD.org @@ -18,15 +17,17 @@ RUN_DEPENDS= mongodb>0:databases/mongodb \ snappyjava>0:archivers/snappy-java BUILD= 0 -BUNDLEDFW= 3.8.6.6650 TOMCATVER= 7.0.82 -UNIFI_TAG= e2998a5aab SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \ JAVA=${JAVA} PLIST_SUB+= BUILDVERSION="${PORTVERSION}.${BUILD}" BUNDLEDFW="${BUNDLEDFW}" TOMCATVER="${TOMCATVER}" -USES= cpe zip +EXTRACT_CMD= /usr/bin/ar +EXTRACT_BEFORE_ARGS= -p +EXTRACT_AFTER_ARGS= data.tar.xz | ${TAR} -xf - + +USES= cpe CPE_VENDOR= ubnt CPE_PRODUCT= unifi_controller USE_JAVA= yes @@ -43,18 +44,17 @@ USE_RC_SUBR= unifi USERS= unifi GROUPS= unifi -WRKSRC= ${WRKDIR}/UniFi +NO_WRKSUBDIR= yes -RESTRICTED= Redistribution of bundled firmware images is not permitted CONFLICTS= unifi2-* unifi3-* unifi4-* post-patch: - ${RM} ${WRKSRC}/lib/snappy-java-1.1.2.6.jar - (cd ${WRKSRC}/lib && ${LN} -s ${JAVAJARDIR}/snappy-java.jar snappy-java-1.1.2.6.jar) + ${RM} ${WRKSRC}/usr/lib/unifi/lib/snappy-java-1.1.2.6.jar ${WRKSRC}/usr/lib/unifi/bin/* + (cd ${WRKSRC}/usr/lib/unifi/lib && ${LN} -s ${JAVAJARDIR}/snappy-java.jar snappy-java-1.1.2.6.jar) do-install: ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi - (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) + (cd ${WRKSRC}/usr/lib/unifi && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) ${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod # Create directories that will be writable by unifi .for i in data logs run work Modified: head/net-mgmt/unifi5/distinfo ============================================================================== --- head/net-mgmt/unifi5/distinfo Mon Jan 1 21:19:33 2018 (r457814) +++ head/net-mgmt/unifi5/distinfo Mon Jan 1 23:00:23 2018 (r457815) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511012634 -SHA256 (unifi5-5.6.24/UniFi.unix.zip) = fb587555444910824aa5ce057bc72aa6de082011954c65801a2b3382721537b5 -SIZE (unifi5-5.6.24/UniFi.unix.zip) = 62201696 +TIMESTAMP = 1514773228 +SHA256 (unifi5-5.6.26/unifi_sysvinit_all.deb) = 6ade32913eddbc555c8c1120babe9baf765547aa5944f8554f59f77a0385865b +SIZE (unifi5-5.6.26/unifi_sysvinit_all.deb) = 50195710 Modified: head/net-mgmt/unifi5/pkg-plist ============================================================================== --- head/net-mgmt/unifi5/pkg-plist Mon Jan 1 21:19:33 2018 (r457814) +++ head/net-mgmt/unifi5/pkg-plist Mon Jan 1 23:00:23 2018 (r457815) @@ -62,7 +62,6 @@ %%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-juli-%%TOMCATVER%%.jar %%JAVASHAREDIR%%/unifi/lib/tomcat-embed-logging-log4j-%%TOMCATVER%%.jar %%JAVASHAREDIR%%/unifi/lib/urlrewritefilter-4.0.4.jar -%%JAVASHAREDIR%%/unifi/readme.txt %%JAVASHAREDIR%%/unifi/webapps/ROOT/WEB-INF/resourcerewrite.xml %%JAVASHAREDIR%%/unifi/webapps/ROOT/WEB-INF/urlrewrite.xml %%JAVASHAREDIR%%/unifi/webapps/ROOT/WEB-INF/web.xml