Date: Sun, 30 Jan 2022 20:01:52 GMT From: Dries Michiels <driesm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: aa6955e8224b - main - net-mgmt/netdata: Simplify post-patch logic Message-ID: <202201302001.20UK1qVm075752@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa6955e8224b7ef8d94fee90740a8f7f6d2dc814 commit aa6955e8224b7ef8d94fee90740a8f7f6d2dc814 Author: Dries Michiels <driesm@FreeBSD.org> AuthorDate: 2022-01-30 19:51:08 +0000 Commit: Dries Michiels <driesm@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201302001.20UK1qVm075752>