Mon Oct 29 13:27:25 2018 UTC ()
beats: Don't use "go build -i", it overwrites system files!

Users who have previously installed this package by building as root should
very carefully check their Go installations.  Running "pkg_admin check" will
almost certainly fail.


(jperkin)
diff -r1.31 -r1.32 pkgsrc/sysutils/beats/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/beats/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/beats/Makefile 2018/10/19 16:49:58 1.31
+++ pkgsrc/sysutils/beats/Makefile 2018/10/29 13:27:25 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2018/10/19 16:49:58 jperkin Exp $ 1# $NetBSD: Makefile,v 1.32 2018/10/29 13:27:25 jperkin Exp $
2 2
3DISTNAME= beats-6.2.4 3DISTNAME= beats-6.2.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/}
7GITHUB_PROJECT= beats 7GITHUB_PROJECT= beats
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= filip@joyent.com 10MAINTAINER= filip@joyent.com
11HOMEPAGE= https://www.elastic.co/products/beats 11HOMEPAGE= https://www.elastic.co/products/beats
12COMMENT= Data Shippers for Elasticsearch 12COMMENT= Data Shippers for Elasticsearch
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14 14
@@ -44,26 +44,30 @@ BEATS_DIR?= ${VARBASE}/db/beats @@ -44,26 +44,30 @@ BEATS_DIR?= ${VARBASE}/db/beats
44BEATS_LOGDIR?= ${VARBASE}/log/beats 44BEATS_LOGDIR?= ${VARBASE}/log/beats
45 45
46FILES_SUBST+= BEATS_DIR=${BEATS_DIR} 46FILES_SUBST+= BEATS_DIR=${BEATS_DIR}
47FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR} 47FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR}
48 48
49PKG_SYSCONFSUBDIR= beats 49PKG_SYSCONFSUBDIR= beats
50 50
51SMF_INSTANCES+= ${BEATS} 51SMF_INSTANCES+= ${BEATS}
52 52
53OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR} 53OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR}
54 54
55MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg 55MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg
56MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib" 56MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib"
 57
 58# The build system defaults to -i which modifies system files!
 59MAKE_ENV+= GOBUILD_FLAGS=
 60
57BUILD_TARGET= # 61BUILD_TARGET= #
58 62
59INSTALLATION_DIRS+= bin share/examples/beats 63INSTALLATION_DIRS+= bin share/examples/beats
60 64
61do-build: 65do-build:
62.for beat in ${BEATS} 66.for beat in ${BEATS}
63 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD} 67 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD}
64.endfor 68.endfor
65 69
66do-install: 70do-install:
67.for beat in ${BEATS} 71.for beat in ${BEATS}
68 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin 72 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin
69 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \ 73 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \