Attachment 215359 Details for Bug 247083 – patch

[patch] patch

carbon.diff (text/plain), 6.50 KB, created by Mikael Urankar on 2020-06-08 13:51:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-06-08 13:51:14 UTC

Size: 6.50 KB

patch

obsolete

>Index: www/carbonapi/Makefile
>===================================================================
>--- www/carbonapi/Makefile	(revision 538202)
>+++ www/carbonapi/Makefile	(working copy)
>@@ -1,45 +1,45 @@
> # $FreeBSD$
> 
>-PORTNAME=		carbonapi
>-DISTVERSION=		0.11.0
>-CATEGORIES=		www
>+PORTNAME=	carbonapi
>+DISTVERSION=	0.13.0
>+CATEGORIES=	www
> 
>-MAINTAINER=		a.andersson.thn@gmail.com
>-COMMENT=		Go implementation of carbonapi
>+MAINTAINER=	a.andersson.thn@gmail.com
>+COMMENT=	Go implementation of carbonapi
> 
>-LICENSE=		BSD2CLAUSE
>-LICENSE_FILE=		${WRKSRC}/LICENSE
>+LICENSE=	BSD2CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=			gmake go
>+USES=		go:modules
> 
>-USE_GITHUB=		yes
>-GH_ACCOUNT=		go-graphite
>-GH_SUBDIR=		src/github.com/${GH_ACCOUNT}/${PORTNAME}
>-USE_RC_SUBR=		${PORTNAME}
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	go-graphite
> 
>-USERS=			carbon
>-GROUPS=			carbon
>+USE_RC_SUBR=	${PORTNAME}
> 
>-OPTIONS_DEFINE=		CAIRO
>+USERS=		carbon
>+GROUPS=		carbon
> 
>-CAIRO_USES=		pkgconfig
>-CAIRO_VARS=		CARBON_API_ARGS=${PORTNAME}
>-CAIRO_VARS_OFF=		CARBON_API_ARGS=nocairo
>+OPTIONS_DEFINE=	CAIRO EXAMPLES
>+
>+CAIRO_USES=	pkgconfig
>+CAIRO_VARS=	CARBON_ARGS="-tags cairo"
> CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
> 
>-do-build:
>-	@cd ${WRKSRC}/${GH_SUBDIR} && \
>-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} VERSION=${DISTVERSION} \
>-		${MAKE_CMD} ${CARBON_API_ARGS}
>+GO_TARGET=	./cmd/carbonapi \
>+		./cmd/carbonzipper
> 
>-do-install:
>-	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbonapi
>+GO_BUILDFLAGS=	-v \
>+		${CARBON_ARGS} \
>+		-ldflags="-X main.BuildVersion=${DISTVERSION}"
>+
>+post-install:
> 	@${MKDIR} ${STAGEDIR}/var/log/carbonapi
>-	${INSTALL_PROGRAM} ${WRKSRC}/carbonapi ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/carbonapi.example.toml ${STAGEDIR}${PREFIX}/etc/carbonapi
>-	${INSTALL_DATA} ${WRKSRC}/carbonapi.example.yaml ${STAGEDIR}${PREFIX}/etc/carbonapi
>-	${INSTALL_DATA} ${WRKSRC}/graphiteWeb.example.yaml ${STAGEDIR}${PREFIX}/etc/carbonapi
>-	${INSTALL_DATA} ${WRKSRC}/graphTemplates.example.toml ${STAGEDIR}${PREFIX}/etc/carbonapi
>-	${INSTALL_DATA} ${WRKSRC}/graphTemplates.example.yaml ${STAGEDIR}${PREFIX}/etc/carbonapi
> 
>+post-install-EXAMPLES-on:
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/cmd/carbonapi/*.toml ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/cmd/carbonapi/*.yaml ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/cmd/carbonzipper/example.conf ${STAGEDIR}${EXAMPLESDIR}/carbonzipper.example.conf
>+
> .include <bsd.port.mk>
>Index: www/carbonapi/distinfo
>===================================================================
>--- www/carbonapi/distinfo	(revision 538202)
>+++ www/carbonapi/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522042565
>-SHA256 (go-graphite-carbonapi-0.11.0_GH0.tar.gz) = d54228f0fce17db1ed319bc7a65c4296b539e6fec34645bfcaed4baf39840efc
>-SIZE (go-graphite-carbonapi-0.11.0_GH0.tar.gz) = 1898657
>+TIMESTAMP = 1591623663
>+SHA256 (go-graphite-carbonapi-0.13.0_GH0.tar.gz) = ce65ee520ef44f18c37b05de23544e80dcb5b49d89d74987356378ee2252f189
>+SIZE (go-graphite-carbonapi-0.13.0_GH0.tar.gz) = 3464354
>Index: www/carbonapi/files/patch-carbonapi.example.toml
>===================================================================
>--- www/carbonapi/files/patch-carbonapi.example.toml	(revision 538202)
>+++ www/carbonapi/files/patch-carbonapi.example.toml	(nonexistent)
>@@ -1,19 +0,0 @@
>---- carbonapi.example.toml.orig	2018-03-20 21:03:28 UTC
>-+++ carbonapi.example.toml
>-@@ -11,7 +11,7 @@ maxBatchSize = 100
>- pidFile = ""
>- sendGlobsAsIs = false
>- tz = ""
>--graphTemplates = "graphTemplates.example.toml"
>-+graphTemplates = "/usr/local/etc/carbonapi/graphTemplates.example.toml"
>- 
>- [cache]
>- defaultTimeoutSec = 60
>-@@ -35,7 +35,7 @@ logger = ""
>- 
>- [[logger]]
>- encoding = "json"
>--file = "carbonapi.log"
>-+file = "/var/log/carbonapi/carbonapi.log"
>- level = "info"
>- logger = ""
>
>Property changes on: www/carbonapi/files/patch-carbonapi.example.toml
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/carbonapi/files/patch-carbonapi.example.yaml
>===================================================================
>--- www/carbonapi/files/patch-carbonapi.example.yaml	(revision 538202)
>+++ www/carbonapi/files/patch-carbonapi.example.yaml	(nonexistent)
>@@ -1,19 +0,0 @@
>---- carbonapi.example.yaml.orig	2018-03-20 21:04:44 UTC
>-+++ carbonapi.example.yaml
>-@@ -106,7 +106,7 @@ upstreams:
>- # If not zero, enabled cache for find requests
>- # This parameter controls when it will expire (in seconds)
>- # Default: 600 (10 minutes)
>--graphTemplates: graphTemplates.example.yaml
>-+graphTemplates: /usr/local/etc/carbonapi/graphTemplates.example.yaml
>- expireDelaySec: 10
>- # Uncomment this to get the behavior of graphite-web as proposed in https://github.com/graphite-project/graphite-web/pull/2239
>- # Beware this will make darkbackground graphs less readable
>-@@ -125,6 +125,6 @@ logger:
>-       encodingTime: "iso8601"
>-       encodingDuration: "seconds"
>-     - logger: ""
>--      file: "carbonapi.log"
>-+      file: "/var/log/carbonapi/carbonapi.log"
>-       level: "info"
>-       encoding: "json"
>
>Property changes on: www/carbonapi/files/patch-carbonapi.example.yaml
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/carbonapi/pkg-plist
>===================================================================
>--- www/carbonapi/pkg-plist	(revision 538202)
>+++ www/carbonapi/pkg-plist	(working copy)
>@@ -1,7 +1,11 @@
> bin/carbonapi
>-%%ETCDIR%%/carbonapi.example.toml
>-%%ETCDIR%%/carbonapi.example.yaml
>-%%ETCDIR%%/graphTemplates.example.toml
>-%%ETCDIR%%/graphTemplates.example.yaml
>-%%ETCDIR%%/graphiteWeb.example.yaml
>+bin/carbonzipper
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carbonapi.example.clickhouse.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carbonapi.example.prometheus.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carbonapi.example.toml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carbonapi.example.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphTemplates.example.toml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphTemplates.example.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphiteWeb.example.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carbonzipper.example.conf
> @dir(carbon,carbon,0750) /var/log/carbonapi

Actions: View | Diff

Attachments on bug 247083: 215358 | 215359