collectdi*, icinga*: many pkglint cleanups

collectd-CGP/Makefile

@@ -16,7 +16,6 @@ LICENSE=	gnu-gpl-v3
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_TOOLS+=	pax unzip
-AUTO_MKDIRS=	yes
 EXTRACT_ONLY=	# empty
 
 INSTALLATION_DIRS=	share/collectd-graph-panel

collectd-amqp/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	amqp
 
 COMMENT=		Statistics collection daemon - amqp plugin
-PKGREVISION=		3
 
 .include "../../net/rabbitmq-c/buildlink3.mk"
 COLLECTD_LIB.rabbitmq=	${BUILDLINK_PREFIX.rabbitmq-c}

collectd-curl/Makefile

@@ -4,7 +4,6 @@ COLLECTD_PACKAGE=	curl
 COLLECTD_PLUGINS=	curl curl_json curl_xml apache bind nginx write_http ascent
 
 COMMENT=		Statistics collection daemon - curl-based plugins
-PKGREVISION=		15
 
 .include "../../devel/yajl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

collectd-dbi/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	dbi
 
 COMMENT=		Statistics collection daemon - dbi plugin
-PKGREVISION=		2
 
 .include "../../databases/libdbi/buildlink3.mk"
 COLLECTD_LIB.dbi=	${BUILDLINK_PREFIX.libdbi}

collectd-dns/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	dns
 
 COMMENT=		Statistics collection daemon - dns plugin
-PKGREVISION=		3
 
 .include "../../net/libpcap/buildlink3.mk"
 COLLECTD_LIB.pcap=	${BUILDLINK_PREFIX.libpcap}

collectd-lua/Makefile

@@ -4,7 +4,6 @@ COLLECTD_PACKAGE=	lua
 COLLECTD_PLUGINS=	lua
 
 COMMENT=		Statistics collection daemon - lua plugin
-PKGREVISION=		2
 
 .include "../../wip/collectd/Makefile.common"
 

collectd-memcachec/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	memcachec
 
 COMMENT=		Statistics collection daemon - memcachec plugin
-PKGREVISION=		2
 
 .include "../../devel/libmemcached/buildlink3.mk"
 COLLECTD_LIB.memcached=	${BUILDLINK_PREFIX.libmemcached}

collectd-mysql/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	mysql
 
 PKGNAME=		${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${MYSQL_VERSION}/}
-PKGREVISION=		2
 COMMENT=		Statistics collection daemon - mysql plugin
 
 .include "../../mk/mysql.buildlink3.mk"

collectd-notify-email/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	notify-email
 
 COMMENT=		Statistics collection daemon - notify_email plugin
-PKGREVISION=		3
 
 .include "../../mail/libesmtp/buildlink3.mk"
 COLLECTD_LIB.esmtp=	${BUILDLINK_PREFIX.libesmtp}

collectd-pinba/Makefile

@@ -7,7 +7,7 @@ COMMENT=		Statistics collection daemon - pinba plugin
 .include "../../devel/protobuf-c/buildlink3.mk"
 COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
 
-BUILD_DEPENDS+= protobuf>=3.0.0:../../devel/protobuf
+BUILD_DEPENDS+=	protobuf>=3.0.0:../../devel/protobuf
 
 .include "../../wip/collectd/Makefile.common"
 

collectd-postgresql/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	postgresql
 
 PKGNAME=		${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
-PKGREVISION=		2
 COMMENT=		Statistics collection daemon - postgresql plugin
 
 .include "../../mk/pgsql.buildlink3.mk"

collectd-riemann/Makefile

@@ -4,7 +4,6 @@ COLLECTD_PACKAGE=	riemann
 COLLECTD_PLUGINS=	write_riemann
 
 COMMENT=		Statistics collection daemon - riemann plugin
-PKGREVISION=		7
 
 #.include "../../devel/protobuf-c/buildlink3.mk"
 .include "../../sysutils/riemann-client/buildlink3.mk"

collectd-rrdtool/Makefile

@@ -4,7 +4,6 @@ COLLECTD_PACKAGE=	rrdtool
 COLLECTD_PLUGINS=	rrdtool rrdcached
 
 COMMENT=		Statistics collection daemon - rrdtool plugins
-PKGREVISION=		9
 
 .include "../../databases/rrdtool/buildlink3.mk"
 COLLECTD_LIB.rrd=	${BUILDLINK_PREFIX.rrdtool}

collectd-snmp/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	snmp
 
 COMMENT=		Statistics collection daemon - snmp plugin
-PKGREVISION=		3
 
 .include "../../net/net-snmp/buildlink3.mk"
 COLLECTD_LIB.netsnmp=	${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config

collectd-unbound/Makefile

@@ -1,9 +1,7 @@
 # $NetBSD$
-#
 
 DISTNAME=		collectd-unbound
 PKGNAME=		${DISTNAME}-20150830
-PKGREVISION=		12
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GITHUB:=falzm/}
 GITHUB_PROJECT=		${DISTNAME}

collectd-web/DESCR

@@ -0,0 +1,6 @@
+The main objective of this is to develop an easy to use and
+customizable web interface for Collectd (Resource monitoring
+software). Two days of research where enough to realize that collectd
+didn't have a real frontend and the one bundled with the backend
+was really made for testing purposes, so much of the usability and
+strength of statistics was left aside.

collectd-web/Makefile

@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=httpdss/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr@gmail.com
-HOMEPAGE=	https://github.com/httpdss/
+HOMEPAGE=	https://github.com/httpdss/collectd-web
 COMMENT=	Web interface for Collectd
 LICENSE=	gnu-gpl-v2
 
@@ -34,7 +34,7 @@ do-configure:
 	# empty target is needed, otherwise REPLACE_* do not happen
 
 do-install:
-	cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${PREFIX}/share/collectd-web
+	cd ${WRKSRC} && pax -rw -pp . ${DESTDIR}${PREFIX}/share/collectd-web
 
 .include "../../lang/perl5/module.mk"
 .include "../../lang/python/application.mk"

collectd-write_prometheus/Makefile

@@ -3,7 +3,6 @@
 COLLECTD_PACKAGE=	write_prometheus
 
 COMMENT=		Statistics collection daemon - write_prometheus plugin
-PKGREVISION=		7
 
 .include "../../devel/protobuf-c/buildlink3.mk"
 COLLECTD_LIB.protobuf-c=${BUILDLINK_PREFIX.protobuf-c}

collectd/Makefile

@@ -17,7 +17,7 @@ DEFAULT_PLUGINS+=	aggregation apcups csv email exec filecount	\
 			target_scale target_set	target_v5upgrade	\
 			teamspeak2 threshold unixsock uuid write_graphite
 
-DEFAULT_PLUGINS+= check_uptime chrony logparser memcached notify_nagios write_influxdb_udp write_log write_sensu write_syslog write_tsdb zookeeper
+DEFAULT_PLUGINS+=	check_uptime chrony logparser memcached notify_nagios write_influxdb_udp write_log write_sensu write_syslog write_tsdb zookeeper
 
 .for option in ${DEFAULT_PLUGINS}
 CONFIGURE_ARGS+=	--enable-${option}

collectd/Makefile.common

@@ -33,6 +33,7 @@
 # used by wip/collectd-yajl/Makefile
 # used by wip/p5-collectd/Makefile
 # used by wip/py-collectd/Makefile
+# used by wip/collectd-memcachec/Makefile
 
 DISTNAME=	collectd-5.11.0
 MASTER_SITES=	http://collectd.org/files/
@@ -79,8 +80,8 @@ COLLECTD_LIBS=		aquaero5 hiredis curl dbi esmtp ganglia gcrypt	\
 			tokyotyrant upsclient varnish xmms yajl
 COLLECTD_LIBS+=		atasmart dpdk gps iptc jansson jevents ldap microhttpd mosquitto netapp netsnmpagent pqos protobuf protobuf-c qpid-proton rdkafka ssl slurm udev xenctrl
 
-CONFIGURE_ARGS+=	--with-cuda=no --with-java=no --with-mic=no --with-oracle=no	\
+CONFIGURE_ARGS+=	--with-cuda=no --with-java=no --with-mic=no --with-oracle=no \
-			--with-perl-bindings=no 	\
+			--with-perl-bindings=no \
 			--disable-all-plugins
 
 .for lib in ${COLLECTD_LIBS}

collectd/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/11/21 15:18:22 fhajny Exp $
+@comment $NetBSD: PLIST.collectd-v 1.8 2017/11/21 15:18:22 fhajny Exp $
 bin/collectd-nagios
 bin/collectd-tg
 bin/collectdctl
@@ -11,23 +11,23 @@ include/collectd/server.h
 include/collectd/types.h
 lib/collectd/aggregation.la
 lib/collectd/apcups.la
-${PLIST.apple-sensors}lib/collectd/apple_sensors.la
+${PLIST.collectd-apple-sensors}lib/collectd/apple_sensors.la
-${PLIST.battery}lib/collectd/battery.la
+${PLIST.collectd-battery}lib/collectd/battery.la
 lib/collectd/check_uptime.la
 lib/collectd/chrony.la
-${PLIST.contextswitch}lib/collectd/contextswitch.la
+${PLIST.collectd-contextswitch}lib/collectd/contextswitch.la
-${PLIST.cpu}lib/collectd/cpu.la
+${PLIST.collectd-cpu}lib/collectd/cpu.la
 lib/collectd/csv.la
-${PLIST.df}lib/collectd/df.la
+${PLIST.collectd-df}lib/collectd/df.la
-${PLIST.disk}lib/collectd/disk.la
+${PLIST.collectd-disk}lib/collectd/disk.la
 lib/collectd/email.la
-${PLIST.entropy}lib/collectd/entropy.la
+${PLIST.collectd-entropy}lib/collectd/entropy.la
 lib/collectd/exec.la
 lib/collectd/filecount.la
 lib/collectd/hddtemp.la
-${PLIST.interface}lib/collectd/interface.la
+${PLIST.collectd-interface}lib/collectd/interface.la
-${PLIST.irq}lib/collectd/irq.la
+${PLIST.collectd-irq}lib/collectd/irq.la
-${PLIST.load}lib/collectd/load.la
+${PLIST.collectd-load}lib/collectd/load.la
 lib/collectd/logfile.la
 lib/collectd/logparser.la
 lib/collectd/match_empty_counter.la
@@ -37,20 +37,20 @@ lib/collectd/match_timediff.la
 lib/collectd/match_value.la
 lib/collectd/mbmon.la
 lib/collectd/memcached.la
-${PLIST.memory}lib/collectd/memory.la
+${PLIST.collectd-memory}lib/collectd/memory.la
-${PLIST.multimeter}lib/collectd/multimeter.la
+${PLIST.collectd-multimeter}lib/collectd/multimeter.la
-${PLIST.netstat_udp}lib/collectd/netstat_udp.la
+${PLIST.collectd-netstat-udp}lib/collectd/netstat_udp.la
-${PLIST.nfs}lib/collectd/nfs.la
+${PLIST.collectd-nfs}lib/collectd/nfs.la
 lib/collectd/notify_nagios.la
 lib/collectd/ntpd.la
 lib/collectd/olsrd.la
 lib/collectd/openvpn.la
-${PLIST.pf}lib/collectd/pf.la
+${PLIST.collectd-pf}lib/collectd/pf.la
 lib/collectd/powerdns.la
-${PLIST.processes}lib/collectd/processes.la
+${PLIST.collectd-processes}lib/collectd/processes.la
 lib/collectd/statsd.la
-${PLIST.swap}lib/collectd/swap.la
+${PLIST.collectd-swap}lib/collectd/swap.la
-${PLIST.syslog}lib/collectd/syslog.la
+${PLIST.collectd-syslog}lib/collectd/syslog.la
 lib/collectd/table.la
 lib/collectd/tail.la
 lib/collectd/tail_csv.la
@@ -59,13 +59,13 @@ lib/collectd/target_replace.la
 lib/collectd/target_scale.la
 lib/collectd/target_set.la
 lib/collectd/target_v5upgrade.la
-${PLIST.tcpconns}lib/collectd/tcpconns.la
+${PLIST.collectd-tcpconns}lib/collectd/tcpconns.la
 lib/collectd/teamspeak2.la
-${PLIST.ted}lib/collectd/ted.la
+${PLIST.collectd-ted}lib/collectd/ted.la
 lib/collectd/threshold.la
 lib/collectd/unixsock.la
-${PLIST.uptime}lib/collectd/uptime.la
+${PLIST.collectd-uptime}lib/collectd/uptime.la
-${PLIST.users}lib/collectd/users.la
+${PLIST.collectd-users}lib/collectd/users.la
 lib/collectd/uuid.la
 lib/collectd/write_graphite.la
 lib/collectd/write_influxdb_udp.la
@@ -73,8 +73,8 @@ lib/collectd/write_log.la
 lib/collectd/write_sensu.la
 lib/collectd/write_syslog.la
 lib/collectd/write_tsdb.la
-${PLIST.zfs-arc}lib/collectd/zfs_arc.la
+${PLIST.collectd-zfs-arc}lib/collectd/zfs_arc.la
-${PLIST.zone}lib/collectd/zone.la
+${PLIST.collectd-zone}lib/collectd/zone.la
 lib/collectd/zookeeper.la
 lib/libcollectdclient.la
 lib/pkgconfig/libcollectdclient.pc

collectd/distinfo

@@ -12,7 +12,7 @@ SHA1 (patch-src_cpu.c) = 099f04b0a156ae78f5f5809d6db639534d4556a1
 SHA1 (patch-src_df.c) = de699d221b003b70c22308cf43f4d61daa4071f7
 SHA1 (patch-src_entropy.c) = 77ddaf1df7ab898d3009f94bfcca82d16e22f9fe
 SHA1 (patch-src_irq.c) = 51f0e61a58b439f5e4e8de873e887700fc3dd67e
-SHA1 (patch-src_libcollectclient_network__buffer.c) = 541332bcffcbcbb2e398275f93e2aa1ae8861598
+SHA1 (patch-src_libcollectdclient_network__buffer.c) = 541332bcffcbcbb2e398275f93e2aa1ae8861598
 SHA1 (patch-src_memory.c) = ddfa79d68ebbaeed3bf1f35acbadda111d0387af
 SHA1 (patch-src_netstat__udp.c) = 4763c9c26a5639a84d1ed306b40c5b761110f632
 SHA1 (patch-src_nfs.c) = a38e2b2096b0b7c1d52bba18dcbb78f3cdc264a9

collectd/options.mk

@@ -1,43 +1,41 @@
 # $NetBSD: options.mk,v 1.11 2017/11/21 16:02:20 he Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.collectd
-PKG_SUPPORTED_OPTIONS=	cpu df interface load memory syslog uptime
+PKG_SUPPORTED_OPTIONS=	collectd-cpu collectd-df collectd-interface collectd-load collectd-memory collectd-syslog collectd-uptime
-PKG_SUPPORTED_OPTIONS+=	multimeter ted
+PKG_SUPPORTED_OPTIONS+=	collectd-multimeter collectd-ted
-PKG_SUGGESTED_OPTIONS=	cpu df interface load memory syslog uptime
+PKG_SUGGESTED_OPTIONS=	collectd-cpu collectd-df collectd-interface collectd-load collectd-memory collectd-syslog collectd-uptime
-PKG_SUGGESTED_OPTIONS+=	multimeter ted
+PKG_SUGGESTED_OPTIONS+=	collectd-multimeter collectd-ted
 
-PKG_SUPPORTED_OPTIONS.NetBSD+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUPPORTED_OPTIONS.NetBSD+=	collectd-contextswitch collectd-disk collectd-entropy collectd-irq collectd-pf collectd-netstat-udp
-PKG_SUPPORTED_OPTIONS.NetBSD+=	swap tcpconns users processes
+PKG_SUPPORTED_OPTIONS.NetBSD+=	collectd-swap collectd-tcpconns collectd-users collectd-processes collectd-nfs
-PKG_SUGGESTED_OPTIONS.NetBSD+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUGGESTED_OPTIONS.NetBSD+=	collectd-contextswitch collectd-disk collectd-entropy collectd-irq collectd-pf collectd-netstat-udp
-PKG_SUGGESTED_OPTIONS.NetBSD+=	swap tcpconns users processes
+PKG_SUGGESTED_OPTIONS.NetBSD+=	collectd-swap collectd-tcpconns collectd-users collectd-processes collectd-nfs
-PKG_SUPPORTED_OPTIONS.NetBSD+=	nfs
-PKG_SUGGESTED_OPTIONS.NetBSD+=	nfs
 
-PKG_SUPPORTED_OPTIONS.FreeBSD+=	contextswitch pf processes swap tcpconns zfs-arc
+PKG_SUPPORTED_OPTIONS.FreeBSD+=	collectd-contextswitch collectd-pf collectd-processes collectd-swap collectd-tcpconns collectd-zfs-arc
-PKG_SUGGESTED_OPTIONS.FreeBSD+=	contextswitch pf processes swap tcpconns zfs-arc
+PKG_SUGGESTED_OPTIONS.FreeBSD+=	collectd-contextswitch collectd-pf collectd-processes collectd-swap collectd-tcpconns collectd-zfs-arc
 
-PKG_SUPPORTED_OPTIONS.Darwin+=	apple-sensors battery contextswitch disk
+PKG_SUPPORTED_OPTIONS.Darwin+=	collectd-apple-sensors collectd-battery collectd-contextswitch collectd-disk
-PKG_SUPPORTED_OPTIONS.Darwin+=	processes swap tcpconns users
+PKG_SUPPORTED_OPTIONS.Darwin+=	collectd-processes collectd-swap collectd-tcpconns collectd-users
-PKG_SUGGESTED_OPTIONS.Darwin+=	apple-sensors battery contextswitch disk
+PKG_SUGGESTED_OPTIONS.Darwin+=	collectd-apple-sensors collectd-battery collectd-contextswitch collectd-disk
-PKG_SUGGESTED_OPTIONS.Darwin+=	processes swap tcpconns users
+PKG_SUGGESTED_OPTIONS.Darwin+=	collectd-processes collectd-swap collectd-tcpconns collectd-users
 
-PKG_SUPPORTED_OPTIONS.SunOS+=	disk nfs swap users zfs-arc zone
+PKG_SUPPORTED_OPTIONS.SunOS+=	collectd-disk collectd-nfs collectd-swap collectd-users collectd-zfs-arc collectd-zone
-PKG_SUGGESTED_OPTIONS.SunOS+=	disk nfs swap users zfs-arc zone
+PKG_SUGGESTED_OPTIONS.SunOS+=	collectd-disk collectd-nfs collectd-swap collectd-users collectd-zfs-arc collectd-zone
 
 PKG_SUPPORTED_OPTIONS+=		collectd-debug
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		apple-sensors battery contextswitch cpu entropy \
+PLIST_VARS+=		collectd-apple-sensors collectd-battery collectd-contextswitch collectd-cpu collectd-entropy \
-			df disk		\
+			collectd-df collectd-disk \
-			interface irq load netstat_udp \
+			collectd-interface collectd-irq collectd-load collectd-netstat-udp \
-			memory nfs pf processes swap	\
+			collectd-memory collectd-nfs collectd-pf collectd-processes collectd-swap \
-			syslog tcpconns uptime users zfs-arc zone \
+			collectd-syslog collectd-tcpconns collectd-uptime collectd-users collectd-zfs-arc collectd-zone \
-			multimeter ted
+			collectd-multimeter collectd-ted
 
 .for option in ${PLIST_VARS}
 .  if !empty(PKG_OPTIONS:M${option})
-CONFIGURE_ARGS+=	--enable-${option:S/-/_/}
+CONFIGURE_ARGS+=	--enable-${option:S/collectd-//:S/-/_/}
 PLIST.${option}=	yes
 .  endif
 .endfor

icinga2/Makefile

@@ -1,10 +1,10 @@
 # $NetBSD: Makefile $
 
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	icinga2-2.9.1
 PKGREVISION=	1
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=icinga/}
 CATEGORIES=	net sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=icinga/}
 
 MAINTAINER=	ef@math.uni-bonn.de
 HOMEPAGE=	https://www.icinga.com/products/icinga-2/
@@ -21,7 +21,7 @@ PKG_USERS=		${ICINGA2_USER}:${ICINGA2_GROUP}
 PKG_GROUPS=		${ICINGA2_GROUP} ${ICINGA2_COMMAND_GROUP}
 PKG_USERS_VARS+=	ICINGA2_USER
 PKG_GROUPS_VARS+=	ICINGA2_GROUP ICINGA2_COMMAND_GROUP
-BUILD_DEFS+=		ICINGA2_USER ICINGA2_GROUP ICINGA2_COMMAND_GROUP
+BUILD_DEFS+=		ICINGA2_USER ICINGA2_GROUP ICINGA2_COMMAND_GROUP VARBASE PKG_SYSCONFBASE
 
 USE_LANGUAGES=	c c++ c++11
 USE_CMAKE=	yes
@@ -52,9 +52,9 @@ INSTALLATION_DIRS+=	${EGDIR}/zones.d
 RUNDIR_PARENT=		${VARBASE}/run
 RUNDIR=			${RUNDIR_PARENT}/icinga2
 
-SPOOLDIR_PARENT=	${VARBASE}/spool
+SPOOLDIR_PARENT=		${VARBASE}/spool
-SPOOLDIR=		${SPOOLDIR_PARENT}/icinga2
+SPOOLDIR=			${SPOOLDIR_PARENT}/icinga2
-PKG_HOME.${ICINGA2_USER}=${SPOOLDIR}
+PKG_HOME.${ICINGA2_USER}=	${SPOOLDIR}
 
 # All the _PERMS values are chosen to mimic what icinga2.spec says
 

icinga2/options.mk

@@ -10,10 +10,9 @@ PKG_SUGGESTED_OPTIONS+=	icinga2-livestatus icinga2-notification icinga2-perfdata
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	ido mysql pgsql
+PLIST_VARS+=	mysql pgsql
 
 .if !empty(PKG_OPTIONS:Mmysql)
-PLIST.ido=	yes
 PLIST.mysql=	yes
 CMAKE_ARGS+=	-DICINGA2_WITH_MYSQL=ON
 .include "../../mk/mysql.buildlink3.mk"
@@ -21,7 +20,6 @@ CMAKE_ARGS+=	-DICINGA2_WITH_MYSQL=ON
 CMAKE_ARGS+=	-DICINGA2_WITH_MYSQL=OFF
 .endif
 .if !empty(PKG_OPTIONS:Mpgsql)
-PLIST.ido=	yes
 PLIST.pgsql=	yes
 CMAKE_ARGS+=	-DICINGA2_WITH_PGSQL=ON
 .include "../../mk/pgsql.buildlink3.mk"
@@ -30,13 +28,13 @@ CMAKE_ARGS+=	-DICINGA2_WITH_PGSQL=OFF
 .endif
 
 .for option in checker compat livestatus notification perfdata
-PLIST_VARS+=	${option}
+PLIST_VARS+=		${option}
-.if !empty(PKG_OPTIONS:Micinga2-${option})
+.  if !empty(PKG_OPTIONS:Micinga2-${option})
-CMAKE_ARGS+=	-DICINGA2_WITH_${option:tu}=ON
+CMAKE_ARGS+=		-DICINGA2_WITH_${option:tu}=ON
-PLIST.${option}=yes
+PLIST.${option}=	yes
-.else
+.  else
-CMAKE_ARGS+=	-DICINGA2_WITH_${option:tu}=OFF
+CMAKE_ARGS+=		-DICINGA2_WITH_${option:tu}=OFF
-.endif
+.  endif
 .endfor
 
 .if !empty(PKG_OPTIONS:Micinga2-studio)

icingaweb2/Makefile

@@ -28,17 +28,19 @@ NO_BUILD=	YES
 # Can't set NO_CONFIGURE=YES since REPLACE_INTERPRETER needs a configure phase
 do-configure:
 
-PKG_SYSCONFSUBDIR=	icingaweb2
+PKG_SYSCONFSUBDIR=		icingaweb2
-EGDIR=			${PREFIX}/share/examples/icingaweb2
+EGDIR=				${PREFIX}/share/examples/icingaweb2
-SHAREDIR=		${PREFIX}/share/icingaweb2
+SHAREDIR=			${PREFIX}/share/icingaweb2
-INCDIR=			${PREFIX}/lib/php
+INCDIR=				${PREFIX}/lib/php
-INSTALLATION_DIRS+=	${PREFIX}/bin ${EGDIR} ${SHAREDIR}
+INSTALLATION_DIRS+=		${PREFIX}/bin ${EGDIR} ${SHAREDIR}
-STORAGEDIR=		${VARBASE}/db/icingaweb2
+STORAGEDIR=			${VARBASE}/db/icingaweb2
-LOGDIR=			${VARBASE}/log/icingaweb2
+LOGDIR=				${VARBASE}/log/icingaweb2
-OWN_DIRS+=		${STORAGEDIR} ${LOGDIR}
+OWN_DIRS+=			${STORAGEDIR} ${LOGDIR}
-RUNDIR_PARENT=		${VARBASE}/run
+RUNDIR_PARENT=			${VARBASE}/run
-EDITOR=			vi
+EDITOR=				vi
-PKG_SYSCONFDIR.icinga2?=${PKG_SYSCONFBASE}/icinga2
+PKG_SYSCONFDIR.icinga2?=	${PKG_SYSCONFBASE}/icinga2
+
+BUILD_DEFS+=	VARBASE PKG_SYSCONFBASE
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -51,10 +53,10 @@ PKG_SYSCONFDIR.icinga2?=${PKG_SYSCONFBASE}/icinga2
 
 # Install example configuration files.
 # Contents taken from the "Advanced Topics: Icinga Web 2 Manual Setup: Icinga Web 2 Manual Configuration" manual section
-CONFS= roles.ini resources.ini config.ini authentication.ini groups.ini roles.ini
+CONFS=		roles.ini resources.ini config.ini authentication.ini groups.ini roles.ini
-CONFDIRS= modules modules/monitoring
+CONFDIRS=	modules modules/monitoring
-CONFS+=	modules/monitoring/config.ini modules/monitoring/backends.ini modules/monitoring/commandtransports.ini
+CONFS+=		modules/monitoring/config.ini modules/monitoring/backends.ini modules/monitoring/commandtransports.ini
-CONFDIRS+= enabledModules
+CONFDIRS+=	enabledModules
 # symlinks in enabledModules?
 
 # for extraction, see post-extract below
@@ -72,11 +74,11 @@ SUBST_SED.sampleconfig-db=	-e 's,@DB_TYPE@,pgsql,g'
 SUBST_SED.sampleconfig-db+=	-e 's,@DB_PORT@,5432,g'
 .endif
 
-SUBST_CLASSES+=			sampleconfig-path
+SUBST_CLASSES+=				sampleconfig-path
-SUBST_STAGE.sampleconfig-path=	pre-configure
+SUBST_STAGE.sampleconfig-path=		pre-configure
-SUBST_MESSAGE.sampleconfig-path=Fixing paths in config examples.
+SUBST_MESSAGE.sampleconfig-path=	Fixing paths in config examples.
-SUBST_FILES.sampleconfig-path=	etc/examples/config.ini
+SUBST_FILES.sampleconfig-path=		etc/examples/config.ini
-SUBST_VARS.sampleconfig-path=	SHAREDIR LOGDIR
+SUBST_VARS.sampleconfig-path=		SHAREDIR LOGDIR
 
 # for installation of the example configuration files, see do-install below
 
@@ -90,27 +92,27 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 
 
 # Remove unneeded files in directories that are installed
-RMFILES= application/fonts/fontello-ifont/config.json application/fonts/fontello-ifont/demo.html
+RMFILES=	application/fonts/fontello-ifont/config.json application/fonts/fontello-ifont/demo.html
-RMFILES+= application/fonts/fontello-ifont/font/ifont.eot application/fonts/fontello-ifont/font/ifont.svg application/fonts/fontello-ifont/font/ifont.ttf application/fonts/fontello-ifont/font/ifont.woff application/fonts/fontello-ifont/font/ifont.woff2
+RMFILES+=	application/fonts/fontello-ifont/font/ifont.eot application/fonts/fontello-ifont/font/ifont.svg application/fonts/fontello-ifont/font/ifont.ttf application/fonts/fontello-ifont/font/ifont.woff application/fonts/fontello-ifont/font/ifont.woff2
-RMFILES+= application/fonts/fontello-ifont/LICENSE.txt application/fonts/fontello-ifont/README.txt
+RMFILES+=	application/fonts/fontello-ifont/LICENSE.txt application/fonts/fontello-ifont/README.txt
-RMFILES+= application/fonts/icingaweb.md
+RMFILES+=	application/fonts/icingaweb.md
-RMFILES+= application/VERSION
+RMFILES+=	application/VERSION
-RMFILES+= library/vendor/dompdf/lib/php-font-lib/LICENSE
+RMFILES+=	library/vendor/dompdf/lib/php-font-lib/LICENSE
-RMFILES+= library/vendor/dompdf/LICENSE library/vendor/dompdf/SOURCE
+RMFILES+=	library/vendor/dompdf/LICENSE library/vendor/dompdf/SOURCE
-RMFILES+= library/vendor/HTMLPurifier/LICENSE library/vendor/HTMLPurifier/SOURCE
+RMFILES+=	library/vendor/HTMLPurifier/LICENSE library/vendor/HTMLPurifier/SOURCE
-RMFILES+= library/vendor/JShrink/LICENSE library/vendor/JShrink/SOURCE
+RMFILES+=	library/vendor/JShrink/LICENSE library/vendor/JShrink/SOURCE
-RMFILES+= library/vendor/lessphp/LICENSE library/vendor/lessphp/SOURCE
+RMFILES+=	library/vendor/lessphp/LICENSE library/vendor/lessphp/SOURCE
-RMFILES+= library/vendor/Parsedown/LICENSE library/vendor/Parsedown/SOURCE
+RMFILES+=	library/vendor/Parsedown/LICENSE library/vendor/Parsedown/SOURCE
-RMFILES+= library/vendor/Zend/LICENSE.txt library/vendor/Zend/README.md library/vendor/Zend/VERSION
+RMFILES+=	library/vendor/Zend/LICENSE.txt library/vendor/Zend/README.md library/vendor/Zend/VERSION
-RMFILES+= public/js/vendor/SOURCE.jquery.tipsy
+RMFILES+=	public/js/vendor/SOURCE.jquery.tipsy
 
 # for actual removal, see post-extract below
 
 
 # Some file have the executable bit set, but shouldn't
-NONEXECFILES= application/fonts/fontello-ifont/css/*
+NONEXECFILES=	application/fonts/fontello-ifont/css/*
-NONEXECFILES+= public/font/*
+NONEXECFILES+=	public/font/*
-NONEXECFILES+= library/vendor/HTMLPurifier/DefinitionCache/Serializer/README
+NONEXECFILES+=	library/vendor/HTMLPurifier/DefinitionCache/Serializer/README
 
 # for actual chmod, see post-extract below
 
@@ -277,7 +279,7 @@ PLIST_SUBST+=	SHAREDIR="${SHAREDIR:S.${PREFIX}/..}"
 PLIST_SUBST+=	INCDIR="${INCDIR:S.${PREFIX}/..}"
 PLIST_SUBST+=	EGDIR="${EGDIR:S.${PREFIX}/..}"
 
-GENERATE_PLIST+= printf "${EGDIR:S.${PREFIX}/..}/%s\n" ${CONFS};
+GENERATE_PLIST+=	printf "${EGDIR:S.${PREFIX}/..}/%s\n" ${CONFS};
 
 .include "../../mk/bsd.pkg.mk"
 .include "../../lang/php/phpversion.mk"

icingaweb2/options.mk

@@ -1,8 +1,8 @@
 # $NetBSD: options.mk $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.icingaweb2
+PKG_OPTIONS_VAR=		PKG_OPTIONS.icingaweb2
-PKG_OPTIONS_NONEMPTY_SETS= ido
+PKG_OPTIONS_NONEMPTY_SETS=	ido
-PKG_OPTIONS_SET.ido=	mysql pgsql
+PKG_OPTIONS_SET.ido=		mysql pgsql
 
 .include "../../mk/bsd.options.mk"