pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/grafana grafana: fix build with Go 1.13, bump revi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9590865a8016
branches:  trunk
changeset: 346570:9590865a8016
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Jan 01 17:49:03 2020 +0000

description:
grafana: fix build with Go 1.13, bump revision.

This version of grafana has a vendored copy of xerrors which uses some
calls that were removed later in the Go 1.13 development process.

diffstat:

 www/grafana/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 981a1c92466f -r 9590865a8016 www/grafana/Makefile
--- a/www/grafana/Makefile      Wed Jan 01 17:42:11 2020 +0000
+++ b/www/grafana/Makefile      Wed Jan 01 17:49:03 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2019/12/13 07:44:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.23 2020/01/01 17:49:03 bsiegert Exp $
 
 DISTNAME=      grafana-6.3.4
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -72,6 +72,9 @@
 CONF_FILES+=   ${PREFIX}/share/grafana/conf/sample.ini \
                ${PKG_SYSCONFDIR}/grafana.conf
 
+pre-patch:
+       ${RM} -rf ${WRKSRC}/vendor/golang.org/x/xerrors
+
 #post-build:
 #      cd ${WRKSRC} && yarn install --pure-lockfile && yarn build
 
@@ -82,5 +85,6 @@
        cd ${WRKSRC} && ${PAX} -rw conf \
                ${DESTDIR}${PREFIX}/share/grafana/
 
+.include "../../devel/go-xerrors/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index