From owner-svn-ports-branches@freebsd.org Sat Mar 9 18:15:00 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E897B1530A43; Sat, 9 Mar 2019 18:14:59 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F0426BB93; Sat, 9 Mar 2019 18:14:59 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F9D2F09E; Sat, 9 Mar 2019 18:14:59 +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 x29IExsO002199; Sat, 9 Mar 2019 18:14:59 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x29IExNJ002197; Sat, 9 Mar 2019 18:14:59 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201903091814.x29IExNJ002197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 9 Mar 2019 18:14:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r495185 - in branches/2019Q1/net-mgmt/unifi-lts: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2019Q1/net-mgmt/unifi-lts: . files X-SVN-Commit-Revision: 495185 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7F0426BB93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 18:15:00 -0000 Author: feld Date: Sat Mar 9 18:14:58 2019 New Revision: 495185 URL: https://svnweb.freebsd.org/changeset/ports/495185 Log: MFH: r495184 net-mgmt/unifi-lts: Fix support for Mongo 3.6+ Ubiquiti still hasn't fixed UniFi-LTS after this was reported ages ago, so I guess every OS will have to fix this manually. Reported by: many Added: branches/2019Q1/net-mgmt/unifi-lts/files/mongod.in - copied unchanged from r495184, head/net-mgmt/unifi-lts/files/mongod.in Modified: branches/2019Q1/net-mgmt/unifi-lts/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/net-mgmt/unifi-lts/Makefile ============================================================================== --- branches/2019Q1/net-mgmt/unifi-lts/Makefile Sat Mar 9 18:12:18 2019 (r495184) +++ branches/2019Q1/net-mgmt/unifi-lts/Makefile Sat Mar 9 18:14:58 2019 (r495185) @@ -3,7 +3,7 @@ PORTNAME= unifi PORTVERSION= 5.6.40 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/${PORTVERSION}/ PKGNAMESUFFIX= -lts @@ -17,6 +17,7 @@ COMMENT= UniFi Controller v5 RUN_DEPENDS= mongodb36>0:databases/mongodb36 \ snappyjava>0:archivers/snappy-java +SUB_FILES= mongod SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} \ JAVA=${JAVA} @@ -54,7 +55,7 @@ post-patch: do-install: ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi (cd ${WRKSRC}/usr/lib/unifi && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) - ${LN} -sf ${PREFIX}/bin/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod + ${INSTALL_SCRIPT} ${WRKDIR}/mongod ${STAGEDIR}${JAVASHAREDIR}/unifi/bin/mongod # Create directories that will be writable by unifi .for i in data logs run work ${MKDIR} ${STAGEDIR}/${JAVASHAREDIR}/unifi/${i} Copied: branches/2019Q1/net-mgmt/unifi-lts/files/mongod.in (from r495184, head/net-mgmt/unifi-lts/files/mongod.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/net-mgmt/unifi-lts/files/mongod.in Sat Mar 9 18:14:58 2019 (r495185, copy of r495184, head/net-mgmt/unifi-lts/files/mongod.in) @@ -0,0 +1,6 @@ +#!/bin/sh + +# Remove argument that doesn't exist on mongodb 3.6+ +ARGS="$(echo -n ${@} | /usr/bin/sed 's,--nohttpinterface,,')" + +%%PREFIX%%/bin/mongod ${ARGS} &