From nobody Tue Dec 14 09:54:58 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C1C6418F4865; Tue, 14 Dec 2021 09:54:58 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCtyp3L57z56jy; Tue, 14 Dec 2021 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53D8026308; Tue, 14 Dec 2021 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BE9sw0G046036; Tue, 14 Dec 2021 09:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BE9swnq046035; Tue, 14 Dec 2021 09:54:58 GMT (envelope-from git) Date: Tue, 14 Dec 2021 09:54:58 GMT Message-Id: <202112140954.1BE9swnq046035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 737ebcdfe26f - main - databases/couchdb3: depend on devel/icu List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 737ebcdfe26f82576af80a9de649d7607f2f97de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639475698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNB7WVtlnGKkbN1qiNNLSrRkdpe3AZwMFz8I4RgA9Dw=; b=QBmX4a9yYymBMPJNgkCr0GocBipzk2sBxfzk7BGbNuW1prR+aU+NvB1lh/QszeEcgWNMnI qfVeh05LOy+oYmvYgCxFdcmkO3fgK94XG84ZTCODoLNpLJmrgIp0Ess0zuYcNyw8XVKV0q /UO/3pagEFkK1jrVRaSg2K5HTucobnAp+37XLZ/6su8Hs7LbyiwI9IuYmsMIP+B1LQOIhP 6SBWMGZyhSYm9dHFf1nEdKnjx2XJiEbBdg3gI4kBs/MW2uO+WgGJAK2SKlZYpPP79NE834 vDiuS4GsBun0U313LF5P6DOMqN6Dma+5tQMQ+gcqO3KFAFi33dXZdGPEO3j23A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639475698; a=rsa-sha256; cv=none; b=L2QBTyiXU3NDtgcnuLE5+a2h87ZFqJ/xoXRLy4TJOI8YVyl5c2Ueeu5qkolFScfviUQPpJ 4tbxP+RBW+UXKTtAy70tWkUZMcTRaIUr4jtqE5Fb9zwHCgdFGR06NR4WR4RM1TsKuKrYB8 iFoP5zWYU3ALpN5mejMQ/8Az28cZSPq0UmT0/5+PmfBq2X2jinPWSYdydchKSesTeD2hC8 yA0eK0s8KV2qFO31oS6c/vGSqA/2BRc/Xdq6mh7O7asrUarVkGZmwMBAj2g5hDeD4jieOX PnMax1IHpazWTJSryt6kS0TCTH4J0T6pY0xvaQSYfP1pciYoAfJAKT2tkYZCyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=737ebcdfe26f82576af80a9de649d7607f2f97de commit 737ebcdfe26f82576af80a9de649d7607f2f97de Author: Dave Cottlehuber AuthorDate: 2021-12-14 08:50:16 +0000 Commit: Dave Cottlehuber CommitDate: 2021-12-14 08:59:30 +0000 databases/couchdb3: depend on devel/icu While CouchDB 3.2.1 switches a large portion of comparison functionality to internal erlang code, this is still required as a dependency for ejson_compare. devel/icu is an indirect dependency of spidermonkey but we should be specific and require it also. pet with portfmt while here. --- databases/couchdb3/Makefile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile index 95f3c8b36e7c..b59c414eefe2 100644 --- a/databases/couchdb3/Makefile +++ b/databases/couchdb3/Makefile @@ -1,5 +1,6 @@ PORTNAME= couchdb3 -DISTVERSION= 3.2.1 +PORTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} @@ -7,12 +8,13 @@ DISTNAME= apache-couchdb-${DISTVERSION} MAINTAINER= dch@FreeBSD.org COMMENT= JSON document database with HTTP API and scalable multi-master sync -LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11 +LICENSE= APACHE20 BSD3CLAUSE ISCL OFL11 WTFPL LICENSE_COMB= multi -BUILD_DEPENDS= rebar:devel/rebar \ - erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER} -LIB_DEPENDS= libmozjs-78.so:lang/spidermonkey78 +BUILD_DEPENDS= erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER} \ + rebar:devel/rebar +LIB_DEPENDS= libicudata.so:devel/icu \ + libmozjs-78.so:lang/spidermonkey78 RUN_DEPENDS= erlang-runtime${ERLVER}>=${ERLVER}.0:lang/erlang-runtime${ERLVER} USES= compiler:c++17-lang cpe gmake libtool ncurses @@ -35,7 +37,9 @@ SUB_LIST= APPDIR=${APPDIR} \ PLIST_SUB= VERSION=${DISTVERSION} HAS_CONFIGURE= yes -CONFIGURE_ARGS= --skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \ +CONFIGURE_ARGS= --skip-deps \ + --user ${USERS} \ + --rebar ${LOCALBASE}/bin/rebar \ --spidermonkey-version 78 ALL_TARGET= release @@ -78,7 +82,7 @@ post-patch: .endif pre-install: - # relocate user-modifiable runtime configs to match hier(7) +# relocate user-modifiable runtime configs to match hier(7) ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \ ${STAGEDIR}${ETCDIR}/local.ini.sample @@ -86,11 +90,11 @@ pre-install: ${STAGEDIR}${ETCDIR}/vm.args.sample ${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 - # prune build artefacts and surplus headers +# prune build artefacts and surplus headers ${FIND} -E ${WRKSRC} -type f \ -regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete @${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/ - # remove runtime dirs and files that were moved to match hier(7) +# remove runtime dirs and files that were moved to match hier(7) ${RM} -rv \ ${WRKSRC}/rel/couchdb/etc/*.d \ ${WRKSRC}/rel/couchdb/etc/local.ini \ @@ -109,7 +113,7 @@ post-install: @${MKDIR} \ ${STAGEDIR}${DBDIR} \ ${STAGEDIR}${LOGDIR} - # fauxton UI is a required component +# fauxton UI is a required component (cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) post-install-DOCS-on: