Received: by mail.netbsd.org (Postfix, from userid 605) id A83B284D84; Thu, 8 Aug 2019 13:24:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 314AE84D77 for ; Thu, 8 Aug 2019 13:24:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ZEC32D-qrAtl for ; Thu, 8 Aug 2019 13:24:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id AD26884C6C for ; Thu, 8 Aug 2019 13:24:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A1434FBF4; Thu, 8 Aug 2019 13:24:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1565270681153580" MIME-Version: 1.0 Date: Thu, 8 Aug 2019 13:24:41 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/net/unifi To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20190808132441.A1434FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1565270681153580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Thu Aug 8 13:24:41 UTC 2019 Modified Files: pkgsrc/net/unifi: Makefile Log Message: net/unif: Improve comments To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/unifi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1565270681153580 Content-Disposition: inline Content-Length: 2064 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/unifi/Makefile diff -u pkgsrc/net/unifi/Makefile:1.10 pkgsrc/net/unifi/Makefile:1.11 --- pkgsrc/net/unifi/Makefile:1.10 Thu Aug 8 13:18:06 2019 +++ pkgsrc/net/unifi/Makefile Thu Aug 8 13:24:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/08/08 13:18:06 gdt Exp $ +# $NetBSD: Makefile,v 1.11 2019/08/08 13:24:41 gdt Exp $ DISTNAME= unifi-5.10.26 CATEGORIES= net @@ -11,7 +11,7 @@ COMMENT= Provisioning software for netwo LICENSE= ubiquiti-license # Bundled firmware images cannot be redistributed -RESTRICTED= No redistribution allowed +RESTRICTED= No permission to redistribute NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} @@ -37,15 +37,19 @@ EXTRACT_ONLY+= ${SNAPPY}.tar.gz CHECK_SHLIBS_SKIP= unifi/lib/native/* INSTALLATION_DIRS= unifi -# emulated JDK doesn't work; epoll issues. Also needs native libraries. + +# Emulated JDK doesn't work due to epoll issues. Also, would require +# matching emulated native libraries, and we only compile actual +# native libaries. PKG_JVMS_ACCEPTED= openjdk8 PKGSRC_MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} USE_LANGUAGES= c c++ # for snappy JNI library USE_TOOLS+= gmake pax WRKSRC= ${WRKDIR}/UniFi -# mongodb 3.4.4 is known to work well with unifi; avoid mongodb4 for now. -DEPENDS+= mongodb>=2.4.14:../../databases/mongodb3 +# Upstream documents 3.4.15, but 3.4.4 actually works. Avoid mongodb4 because it +# has a problematic license. +DEPENDS+= mongodb>=3.4.4:../../databases/mongodb3 FILES_SUBST+= UNIFI_USER=${UNIFI_USER:Q} UNIFI_GROUP=${UNIFI_GROUP:Q} FILES_SUBST+= JAVA=${PKG_JAVA_HOME}/bin/java @@ -70,7 +74,7 @@ post-extract: ln -s ${WRKDIR}/${SNAPPY} ${WRKDIR}/${SNAPPY_JAVA}/target do-build: -# bundled mongod is a linux binary, replace with symlink to native binary +# bundled mongod is a linux binary; replace with symlink to native binary rm -f ${WRKSRC}/bin/mongod ln -s ${PREFIX}/bin/mongod ${WRKSRC}/bin/mongod cd ${WRKDIR}/${SNAPPY_JAVA} && ${BUILD_MAKE_CMD} native --_----------=_1565270681153580--