Attachment 191672 Details for Bug 226808 – Fix portlint warning

[patch] Fix portlint warning

carbon-api.diff (text/plain), 8.75 KB, created by Andreas Andersson on 2018-03-20 22:00:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Andersson

Created: 2018-03-20 22:00:37 UTC

Size: 8.75 KB

patch

obsolete

>Index: www/carbonapi/Makefile
>===================================================================
>--- www/carbonapi/Makefile	(nonexistent)
>+++ www/carbonapi/Makefile	(working copy)
>@@ -0,0 +1,46 @@
>+# $FreeBSD$
>+
>+PORTNAME=		carbonapi
>+DISTVERSION=		0.10.0.1
>+CATEGORIES=		www
>+
>+MAINTAINER=		a.andersson.thn@gmail.com
>+COMMENT=		Go implementation of carbonapi
>+
>+LICENSE=		BSD2CLAUSE
>+LICENSE_FILE=		${WRKSRC}/LICENSE
>+
>+BUILD_DEPENDS=		go>=1.8:lang/go
>+
>+USES=			gmake
>+
>+USE_GITHUB=		yes
>+GH_ACCOUNT=		go-graphite
>+GH_SUBDIR=		src/github.com/${GH_ACCOUNT}/${PORTNAME}
>+USE_RC_SUBR=		${PORTNAME}
>+
>+USERS=			carbon
>+GROUPS=			carbon
>+
>+OPTIONS_DEFINE=		CAIRO
>+
>+CAIRO_USES=		pkgconfig
>+CAIRO_VARS=		CARBON_API_ARGS=${PORTNAME}
>+CAIRO_VARS_OFF=		CARBON_API_ARGS=nocairo
>+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}
>+
>+do-install:
>+	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbonapi
>+	@${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}/graphTemplates.example.toml ${STAGEDIR}${PREFIX}/etc/carbonapi
>+	${INSTALL_DATA} ${WRKSRC}/graphTemplates.example.yaml ${STAGEDIR}${PREFIX}/etc/carbonapi
>+
>+.include <bsd.port.mk>
>
>Property changes on: www/carbonapi/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/distinfo
>===================================================================
>--- www/carbonapi/distinfo	(nonexistent)
>+++ www/carbonapi/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1521573171
>+SHA256 (go-graphite-carbonapi-0.10.0.1_GH0.tar.gz) = c8d701c23d75fd709aeb59168f04c356a22e0d8b2911f43712d36699b8a3e868
>+SIZE (go-graphite-carbonapi-0.10.0.1_GH0.tar.gz) = 1884119
>
>Property changes on: www/carbonapi/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/files/carbonapi.in
>===================================================================
>--- www/carbonapi/files/carbonapi.in	(nonexistent)
>+++ www/carbonapi/files/carbonapi.in	(working copy)
>@@ -0,0 +1,42 @@
>+# $FreeBSD: head/www/carbonapi/files/carbonapi.in 442509 2017-06-03 16:57:23Z swills $
>+#
>+# PROVIDE: carbonapi
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+# Add the following lines to /etc/rc.conf to enable carbonapi
>+# carbonapi_enable="YES"
>+#
>+# carbonapi_enable (bool): 	Set to YES to enable carbonapi
>+#				Default: NO
>+# carbonapi_conf (str):		carbonapi configration file
>+#				Default: empty
>+# carbonapi_user (str):		carbonapi daemon user
>+#				Default: carbon
>+# carbonapi_group (str):		carbonapi daemon group
>+#				Default: carbon
>+
>+. /etc/rc.subr
>+
>+name="carbonapi"
>+rcvar=carbonapi_enable
>+load_rc_config $name
>+
>+: ${carbonapi_enable:="NO"}
>+: ${carbonapi_user:="carbon"}
>+: ${carbonapi_group:="carbon"}
>+: ${carbonapi_conf:=""}
>+: ${carbonapi_options:="-config ${carbonapi_conf}"} 
>+
>+pidfile="/var/run/${name}.pid"
>+procname="%%PREFIX%%/bin/carbonapi"
>+command=/usr/sbin/daemon
>+command_args="-f -c -p ${pidfile} ${procname} ${carbonapi_options}"
>+start_precmd="carbonapi_precmd"
>+
>+carbonapi_precmd()
>+{
>+    install -o ${carbonapi_user} /dev/null ${pidfile}
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: www/carbonapi/files/carbonapi.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/files/patch-carbonapi.example.toml
>===================================================================
>--- www/carbonapi/files/patch-carbonapi.example.toml	(nonexistent)
>+++ www/carbonapi/files/patch-carbonapi.example.toml	(working copy)
>@@ -0,0 +1,19 @@
>+--- 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
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/files/patch-carbonapi.example.yaml
>===================================================================
>--- www/carbonapi/files/patch-carbonapi.example.yaml	(nonexistent)
>+++ www/carbonapi/files/patch-carbonapi.example.yaml	(working copy)
>@@ -0,0 +1,19 @@
>+--- 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
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/pkg-descr
>===================================================================
>--- www/carbonapi/pkg-descr	(nonexistent)
>+++ www/carbonapi/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+carbonapi is a frontend for carbonzipper and can partially replace graphiteweb.
>+
>+WWW: https://github.com/go-graphite/carbonapi
>
>Property changes on: www/carbonapi/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/pkg-message
>===================================================================
>--- www/carbonapi/pkg-message	(nonexistent)
>+++ www/carbonapi/pkg-message	(working copy)
>@@ -0,0 +1,4 @@
>+NOTE ABOUT CARBONAPI:
>+
>+This daemon can be configured with both yaml and toml. Choose one and specify 
>+it's path in carbonapi_conf in /etc/rc.conf or with sysrc.
>
>Property changes on: www/carbonapi/pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/carbonapi/pkg-plist
>===================================================================
>--- www/carbonapi/pkg-plist	(nonexistent)
>+++ www/carbonapi/pkg-plist	(working copy)
>@@ -0,0 +1,6 @@
>+bin/carbonapi
>+%%ETCDIR%%/carbonapi.example.toml
>+%%ETCDIR%%/carbonapi.example.yaml
>+%%ETCDIR%%/graphTemplates.example.toml
>+%%ETCDIR%%/graphTemplates.example.yaml
>+@dir(carbon,carbon,0750) /var/log/carbonapi
>
>Property changes on: www/carbonapi/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

a.andersson.thn: maintainer-approval+

Actions: View | Diff

Attachments on bug 226808: 191671 | 191672 | 191689