beats: remove, newer version in sysutils/beats

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: beats: remove, newer version in sysutils/beats
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Fri, 14 Jul 2017 20:15:02 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jul 14 22:15:02 2017 +0200
Changeset:	621c5367ffa94b29f7d8993ee1885d0f70549ef2

Modified Files:
	Makefile
Removed Files:
	beats/DESCR
	beats/Makefile
	beats/PLIST
	beats/TODO
	beats/distinfo
	beats/files/smf/manifest.xml
	beats/patches/patch-vendor_github.com_tsg_gopacket_pcap_pcap.go

Log Message:
beats: remove, newer version in sysutils/beats

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=621c5367ffa94b29f7d8993ee1885d0f70549ef2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 -
 beats/DESCR                                        |  5 --
 beats/Makefile                                     | 71 ------------------
 beats/PLIST                                        | 21 ------
 beats/TODO                                         |  3 -
 beats/distinfo                                     |  7 --
 beats/files/smf/manifest.xml                       | 83 ----------------------
 ...tch-vendor_github.com_tsg_gopacket_pcap_pcap.go | 22 ------
 8 files changed, 213 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 35e9668211..89b55e4fc9 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,6 @@ SUBDIR+=	bastard
 SUBDIR+=	beads
 SUBDIR+=	beanstalkd
 SUBDIR+=	beast
-SUBDIR+=	beats
 SUBDIR+=	bedtools2
 SUBDIR+=	belle-sip
 SUBDIR+=	bertini
diff --git a/beats/DESCR b/beats/DESCR
deleted file mode 100644
index 3add6f1255..0000000000
--- a/beats/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The Beats are lightweight processes, written in Go, that you install
-on your servers to capture all sorts of operational data like logs,
-operating system metrics or network packet data, and to send it to
-Elasticsearch, either directly or via Logstash, so it can be
-visualized with Kibana.
diff --git a/beats/Makefile b/beats/Makefile
deleted file mode 100644
index d77c313ec3..0000000000
--- a/beats/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=		beats-5.1.1
-CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_GITHUB:=elastic/}
-GITHUB_PROJECT=		beats
-GITHUB_TAG=		v${PKGVERSION_NOREV}
-
-MAINTAINER=		filip%joyent.com@localhost
-HOMEPAGE=		https://www.elastic.co/products/beats
-COMMENT=		Data Shippers for Elasticsearch
-LICENSE=		apache-2.0
-
-.include "../../lang/go/version.mk"
-BUILD_DEPENDS+=		go-${GO_VERSION}*:../../lang/go
-
-EXTRACT_USING=		bsdtar
-USE_TOOLS+=		gmake
-
-WRKSRC=			${WRKDIR}/src/github.com/elastic/beats
-
-# Components to build/install
-BEATS=			filebeat heartbeat metricbeat packetbeat
-
-.for beat in ${BEATS}
-CONF_FILES+=		share/examples/beats/${beat}.yml			\
-				${PKG_SYSCONFDIR}/${beat}.yml
-CONF_FILES+=		share/examples/beats/${beat}.template.json		\
-				${PKG_SYSCONFDIR}/${beat}.template.json
-CONF_FILES+=		share/examples/beats/${beat}.template-es2x.json		\
-				${PKG_SYSCONFDIR}/${beat}.template-es2x.json
-.endfor
-
-BEATS_DIR?=		${VARBASE}/db/beats
-BEATS_LOGDIR?=		${VARBASE}/log/beats
-
-FILES_SUBST+=		BEATS_DIR=${BEATS_DIR}
-FILES_SUBST+=		BEATS_LOGDIR=${BEATS_LOGDIR}
-
-PKG_SYSCONFSUBDIR=	beats
-
-SMF_INSTANCES+=		${BEATS}
-
-OWN_DIRS+=		${BEATS_DIR} ${BEATS_LOGDIR}
-
-MAKE_ENV+=		GOPATH=${WRKDIR}:${PREFIX}/gopkg
-BUILD_DIRS=		${BEATS}
-BUILD_TARGET=		#
-
-INSTALLATION_DIRS+=	bin share/examples/beats
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-	${MV} ${WRKDIR}/${DISTNAME}/* ${WRKSRC}
-
-do-install:
-.for beat in ${BEATS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.full.yml			\
-		${DESTDIR}${PREFIX}/share/examples/beats
-	${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.template-es2x.json		\
-		${DESTDIR}${PREFIX}/share/examples/beats
-	${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.template.json			\
-		${DESTDIR}${PREFIX}/share/examples/beats
-	${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.yml				\
-		${DESTDIR}${PREFIX}/share/examples/beats
-.endfor
-
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/beats/PLIST b/beats/PLIST
deleted file mode 100644
index 400daee9d9..0000000000
--- a/beats/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD$
-bin/filebeat
-bin/heartbeat
-bin/metricbeat
-bin/packetbeat
-share/examples/beats/filebeat.full.yml
-share/examples/beats/filebeat.template-es2x.json
-share/examples/beats/filebeat.template.json
-share/examples/beats/filebeat.yml
-share/examples/beats/heartbeat.full.yml
-share/examples/beats/heartbeat.template-es2x.json
-share/examples/beats/heartbeat.template.json
-share/examples/beats/heartbeat.yml
-share/examples/beats/metricbeat.full.yml
-share/examples/beats/metricbeat.template-es2x.json
-share/examples/beats/metricbeat.template.json
-share/examples/beats/metricbeat.yml
-share/examples/beats/packetbeat.full.yml
-share/examples/beats/packetbeat.template-es2x.json
-share/examples/beats/packetbeat.template.json
-share/examples/beats/packetbeat.yml
diff --git a/beats/TODO b/beats/TODO
deleted file mode 100644
index c22e99df40..0000000000
--- a/beats/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- topbeat needs some patching, disabled for now
-- doesn't seem to find syslog on SunOS properly
-- not much testing done so far
diff --git a/beats/distinfo b/beats/distinfo
deleted file mode 100644
index 5be5d984a9..0000000000
--- a/beats/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (beats-5.1.1.tar.gz) = 6847fc4b96adcf38b3b46a2c31a6109797bfd07b
-RMD160 (beats-5.1.1.tar.gz) = 9cc18d886df86e4cead9c9ab546a127a8f643893
-SHA512 (beats-5.1.1.tar.gz) = 0eb646faa7ff8fb310f97507c105b1dac5ee1ed114c858f92905ae8a1e7a3a2a2a095e52a5155194df9b699e93dd93f00e9da9b1d71b22fbcc539feaa705b984
-Size (beats-5.1.1.tar.gz) = 16500866 bytes
-SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 2ef13f84cbf2e1da428e7b08625ffa6111ebcdf5
diff --git a/beats/files/smf/manifest.xml b/beats/files/smf/manifest.xml
deleted file mode 100644
index f811747a7f..0000000000
--- a/beats/files/smf/manifest.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-<service_bundle type='manifest' name='export'>
-  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
-    <dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
-      <service_fmri value='svc:/system/filesystem/local'/>
-    </dependency>
-    <dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
-      <service_fmri value='svc:/network/service'/>
-    </dependency>
-    <dependency name='name-services' grouping='require_all' restart_on='refresh' type='service'>
-      <service_fmri value='svc:/milestone/name-services'/>
-    </dependency>
-    <dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
-      <service_fmri value='svc:/system/system-log'/>
-    </dependency>
-    <method_context working_directory='@BEATS_DIR@' />
-    <property_group name='startd' type='framework'>
-      <propval name='ignore_error' type='astring' value='core,signal'/>
-      <propval name='duration' type='astring' value='child' />
-    </property_group>
-    <instance name='filebeat' enabled='false'>
-      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/filebeat.yml'/>
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/bin/filebeat -path.config @PKG_SYSCONFDIR@ -path.data @BEATS_DIR@ -path.logs @BEATS_LOGDIR@' timeout_seconds='60'/>
-      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>Beats: filebeat data shipper</loctext>
-        </common_name>
-        <documentation>
-          <doc_link name='elastic.co' uri='https://www.elastic.co/guide/en/beats/filebeat/current/index.html' />
-        </documentation>
-      </template>
-    </instance>
-    <instance name='heartbeat' enabled='false'>
-      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/heartbeat.yml'/>
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/bin/heartbeat -path.config @PKG_SYSCONFDIR@ -path.data @BEATS_DIR@ -path.logs @BEATS_LOGDIR@' timeout_seconds='60'/>
-      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>Beats: heartbeat data shipper</loctext>
-        </common_name>
-        <documentation>
-          <doc_link name='elastic.co' uri='https://www.elastic.co/guide/en/beats/heartbeat/current/index.html' />
-        </documentation>
-      </template>
-    </instance>
-    <instance name='metricbeat' enabled='false'>
-      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/metricbeat.yml'/>
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/bin/metricbeat -path.config @PKG_SYSCONFDIR@ -path.data @BEATS_DIR@ -path.logs @BEATS_LOGDIR@' timeout_seconds='60'/>
-      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>Beats: metricbeat data shipper</loctext>
-        </common_name>
-        <documentation>
-          <doc_link name='elastic.co' uri='https://www.elastic.co/guide/en/beats/metricbeat/current/index.html' />
-        </documentation>
-      </template>
-    </instance>
-    <instance name='packetbeat' enabled='false'>
-      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/packetbeat.yml'/>
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/bin/packetbeat -path.config @PKG_SYSCONFDIR@ -path.data @BEATS_DIR@ -path.logs @BEATS_LOGDIR@' timeout_seconds='60'/>
-      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>Beats: packetbeat data shipper</loctext>
-        </common_name>
-        <documentation>
-          <doc_link name='elastic.co' uri='https://www.elastic.co/guide/en/beats/packetbeat/current/index.html' />
-        </documentation>
-      </template>
-    </instance>
-  </service>
-</service_bundle>
diff --git a/beats/patches/patch-vendor_github.com_tsg_gopacket_pcap_pcap.go b/beats/patches/patch-vendor_github.com_tsg_gopacket_pcap_pcap.go
deleted file mode 100644
index bc5ff8ca20..0000000000
--- a/beats/patches/patch-vendor_github.com_tsg_gopacket_pcap_pcap.go
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Just require pcap, fixes NetBSD.
-
---- vendor/github.com/tsg/gopacket/pcap/pcap.go.orig	2016-12-06 07:41:08.000000000 +0000
-+++ vendor/github.com/tsg/gopacket/pcap/pcap.go
-@@ -8,14 +8,7 @@
- package pcap
- 
- /*
--#cgo linux LDFLAGS: -lpcap
--#cgo freebsd LDFLAGS: -lpcap
--#cgo openbsd LDFLAGS: -lpcap
--#cgo darwin LDFLAGS: -lpcap
--#cgo solaris LDFLAGS: -lpcap
--#cgo windows CFLAGS: -I C:/WpdPack/Include
--#cgo windows,386 LDFLAGS: -L C:/WpdPack/Lib -lwpcap
--#cgo windows,amd64 LDFLAGS: -L C:/WpdPack/Lib/x64 -lwpcap
-+#cgo LDFLAGS: -lpcap
- #include <stdlib.h>
- #include <pcap.h>
-
Prev by Date: libretro-vecx: Update to 20170914, improves line drawing
Next by Date: Import MuseScore-2.0.3 as wip/musescore.
Previous by Thread: libretro-vecx: Update to 20170914, improves line drawing
Next by Thread: Import MuseScore-2.0.3 as wip/musescore.
Indexes:
Home | Main Index | Thread Index | Old Index