Sun Nov 12 11:45:31 2017 UTC ()
Pullup ticket #5631 - requested by sevan
sysutils/beats: build fix

Revisions pulled up:
- sysutils/beats/Makefile                                       1.19

---
   Module Name:    pkgsrc
   Committed By:   fhajny
   Date:           Thu Nov  2 15:30:50 UTC 2017

   Modified Files:
           pkgsrc/sysutils/beats: Makefile

   Log Message:
   sysutils/beats: Provide a better hint to where libpcap is. May fix
   the build in some situations.


(bsiegert)
diff -r1.16 -r1.16.4.1 pkgsrc/sysutils/beats/Makefile
cvs diff -r1.16 -r1.16.4.1 pkgsrc/sysutils/beats/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/beats/Makefile 2017/09/22 12:25:44 1.16
+++ pkgsrc/sysutils/beats/Makefile 2017/11/12 11:45:31 1.16.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2017/09/22 12:25:44 tnn Exp $ 1# $NetBSD: Makefile,v 1.16.4.1 2017/11/12 11:45:31 bsiegert Exp $
2 2
3DISTNAME= beats-5.5.2 3DISTNAME= beats-5.5.2
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
8#GITHUB_TAG= v${PKGVERSION_NOREV} 8#GITHUB_TAG= v${PKGVERSION_NOREV}
9GITHUB_TAG= 74bfb8f9ca009480a558685e745301f0171a4511 9GITHUB_TAG= 74bfb8f9ca009480a558685e745301f0171a4511
10 10
11MAINTAINER= filip@joyent.com 11MAINTAINER= filip@joyent.com
12HOMEPAGE= https://www.elastic.co/products/beats 12HOMEPAGE= https://www.elastic.co/products/beats
13COMMENT= Data Shippers for Elasticsearch 13COMMENT= Data Shippers for Elasticsearch
14LICENSE= apache-2.0 14LICENSE= apache-2.0
@@ -39,26 +39,27 @@ CONF_FILES+= share/examples/beats/${bea @@ -39,26 +39,27 @@ CONF_FILES+= share/examples/beats/${bea
39BEATS_DIR?= ${VARBASE}/db/beats 39BEATS_DIR?= ${VARBASE}/db/beats
40BEATS_LOGDIR?= ${VARBASE}/log/beats 40BEATS_LOGDIR?= ${VARBASE}/log/beats
41 41
42FILES_SUBST+= BEATS_DIR=${BEATS_DIR} 42FILES_SUBST+= BEATS_DIR=${BEATS_DIR}
43FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR} 43FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR}
44 44
45PKG_SYSCONFSUBDIR= beats 45PKG_SYSCONFSUBDIR= beats
46 46
47SMF_INSTANCES+= ${BEATS} 47SMF_INSTANCES+= ${BEATS}
48 48
49OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR} 49OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR}
50 50
51MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg 51MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg
 52MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib"
52BUILD_TARGET= # 53BUILD_TARGET= #
53 54
54INSTALLATION_DIRS+= bin share/examples/beats 55INSTALLATION_DIRS+= bin share/examples/beats
55 56
56do-build: 57do-build:
57.for beat in ${BEATS} 58.for beat in ${BEATS}
58 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD} 59 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD}
59.endfor 60.endfor
60 61
61do-install: 62do-install:
62.for beat in ${BEATS} 63.for beat in ${BEATS}
63 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin 64 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin
64 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.full.yml \ 65 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.full.yml \