From nobody Sun Jan 30 20:01:52 2022 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 51977197884C; Sun, 30 Jan 2022 20:01:53 +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 4Jn2CP1Qcpz3l42; Sun, 30 Jan 2022 20:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643572913; 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=uZvPSzwpjOdUWF4RCGnTGy1AJix1CDDQ3BCRtU9ZYOw=; b=AZGNVso0QcY0CUnJ6pWiFNAi5i1MOY5WH8o+hFPyzVAGB2N6x7LCTRztqa9kng/cZnx4+e uwbAXrYTMMv8DnHjod7UVjkvgCS9CR2+Sjr3HdrrJ1SS6wyn5furWj2nt9/4C+AaLrXptW wfza/u6eyE+GXmSvGJTexkB7nFmU9ragST5yS3+amE50bzVfwSaODlPyc2JaCTdPc9THlv ri5DC9k1vD9eEXdZ6wHs0u9XnJHSLlvC/fxW/Dgr+4yS/B1LPrqPK0CkwaiI7a++TsVh/b S310XmODSO0bW71hwip/nF7kxTn1H8iE999LJ54Z6fmy355X4llhGkGiNeIqPQ== 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 0D36D70A3; Sun, 30 Jan 2022 20:01:53 +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 20UK1qTq075753; Sun, 30 Jan 2022 20:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20UK1qVm075752; Sun, 30 Jan 2022 20:01:52 GMT (envelope-from git) Date: Sun, 30 Jan 2022 20:01:52 GMT Message-Id: <202201302001.20UK1qVm075752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: aa6955e8224b - main - net-mgmt/netdata: Simplify post-patch logic 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: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa6955e8224b7ef8d94fee90740a8f7f6d2dc814 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643572913; 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=uZvPSzwpjOdUWF4RCGnTGy1AJix1CDDQ3BCRtU9ZYOw=; b=OMsRDBLRG80ScLhRGrqcGbNAAOzLsf/A61S3jEGHF689cYL5ym7b/0j+h5rpV3LmsK4Wcb Ndw0xlpB0Kcr2mQIvRqxNjIrLHu/dWOc+zWk8d1M17cOyjqfd4fy7FZbgooAOQShN6eZyF DqZyolmrsQ4QSrDDD1jqgPp0PhZ92uPLWS1zWAXU8ve0wC6O8R2+ZXl99h7QykxziQcldv 16aql+n3J5fSIJSoQjpumV0YecQ+Kh4XiSk+q42Gsn9VNemjqmUK8sysgc8ZzEQqSh1+jy lAj8eeY+mI7o1S6me4/wsB2NYyVFHq2GWqeBJa5s/kKWxS9/0Xa6WlPViKp1Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643572913; a=rsa-sha256; cv=none; b=KZE5Dj9aQNl4PP1fct9NVIrG9Bf9qK/ZSxXOQGnLqAwfsjAkcZu2Br5GmDgNgQnRAdn0pn vAjRinjtIr+EvOI7tvxGQlVVEdRwRgvpaa8moiVcNE6bSN3FXw56TrRwoK1oH2dvpJpgge wSGnV4GZrBRzknk4AX0AL7oD2FC9w6CLCfCqwWd1W+PM84a6AHtR21zeJxOxyciPjkuSD3 ug2R4CF62TapBVL6Nkys/KFiXkHzFi7gYwwHC24T0aZVgs5PImC6Q2m/2JAzfd25tl09Yc PHLZR4/0EzpDgqCM/qtmbq70KoopnG0gQBTQURNtw9LMcH3d2PUymylQ+0KsJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa6955e8224b7ef8d94fee90740a8f7f6d2dc814 commit aa6955e8224b7ef8d94fee90740a8f7f6d2dc814 Author: Dries Michiels AuthorDate: 2022-01-30 19:51:08 +0000 Commit: Dries Michiels CommitDate: 2022-01-30 19:51:08 +0000 net-mgmt/netdata: Simplify post-patch logic While here pet portclippy and portfmt. Reviewed by: 0mp, dizzy Differential Revision: https://reviews.freebsd.org/D33590 --- net-mgmt/netdata/Makefile | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index fc95bd6d115a..c0217a2545ef 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -6,7 +6,8 @@ DISTVERSION= 1.32.1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ \ https://github.com/forkbomb9/netdata/commit/:dashboard -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 91757292561eba170fe363b1f1023583216ca26f.patch:dashboard +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + 91757292561eba170fe363b1f1023583216ca26f.patch:dashboard EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org @@ -20,23 +21,22 @@ PATCH_DEPENDS= gpatch:devel/patch LIB_DEPENDS= libjson-c.so:devel/json-c \ libuuid.so:misc/e2fsprogs-libuuid \ libuv.so:devel/libuv -RUN_DEPENDS= bash:shells/bash \ - curl:ftp/curl \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} + bash:shells/bash \ + curl:ftp/curl USES= autoreconf cpe gmake pathfix pkgconfig:both python shebangfix \ ssl +USE_RC_SUBR= ${PORTNAME} SHEBANG_GLOB= * -USE_RC_SUBR= ${PORTNAME} +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-unit-tests INSTALL_TARGET= install-strip CPPFLAGS+= -D_WANT_VMMETER -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-unit-tests - SUB_FILES= ${PORTNAME}.conf.sample SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \ NETDATA_LOG=${NETDATA_LOG} \ @@ -84,22 +84,6 @@ NETDATA_CACHE= /var/cache/${PORTNAME} NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} -.if ! ${PORT_OPTIONS:MCLOUD} -post-patch: - cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/91757292561eba170fe363b1f1023583216ca26f.patch - @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ - ${PATCH_WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ - ${PATCH_WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \ - ${PATCH_WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \ - ${PATCH_WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \ - ${PATCH_WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ - ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in -.else post-patch: @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ ${PATCH_WRKSRC}/configure.ac @@ -113,7 +97,9 @@ post-patch: ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in -.endif + +post-patch-CLOUD-off: + cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/91757292561eba170fe363b1f1023583216ca26f.patch post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}