diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index 9da0b9d5405..6d852b26a38 100644
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.113 2017/11/16 23:20:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.114 2018/01/11 19:27:01 rpe Exp $
 
 BROKEN-hppa =		no atomic ops
 COMMENT =		Music Player Daemon
 VER =			0.20.10
-REVISION =		0
+REVISION =		1
 DISTNAME =		mpd-${VER}
 CATEGORIES =		audio
 HOMEPAGE =		http://www.musicpd.org/
diff --git a/audio/mpd/pkg/mpd.rc b/audio/mpd/pkg/mpd.rc
index 62fa8487b03..9344d445c9a 100644
--- a/audio/mpd/pkg/mpd.rc
+++ b/audio/mpd/pkg/mpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mpd.rc,v 1.5 2017/11/02 19:22:40 jca Exp $
+# $OpenBSD: mpd.rc,v 1.6 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/mpd"
 
diff --git a/audio/squeezelite/Makefile b/audio/squeezelite/Makefile
index cb11ee2813b..9c8e8ac3927 100644
--- a/audio/squeezelite/Makefile
+++ b/audio/squeezelite/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2017/08/21 18:34:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=	lightweight headless squeezebox emulator
 
 V=		1.8
-REVISION=	3
+REVISION=	4
 DISTNAME=	squeezelite-v$V
 PKGNAME=	squeezelite-$V
 
diff --git a/audio/squeezelite/pkg/squeezelite.rc b/audio/squeezelite/pkg/squeezelite.rc
index 1ae225aae76..981fecc831e 100644
--- a/audio/squeezelite/pkg/squeezelite.rc
+++ b/audio/squeezelite/pkg/squeezelite.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: squeezelite.rc,v 1.1 2016/04/04 12:05:37 sthen Exp $
+# $OpenBSD: squeezelite.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/squeezelite -z"
 daemon_user="_squeezelite"
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 7c3f84e25aa..9361a31fac3 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2016/08/02 10:10:13 kirby Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT =		minimalistic Mumble server
 
 GH_ACCOUNT =		fatbob313
 GH_PROJECT =		umurmur
 GH_TAGNAME =		0.2.16a
-REVISION =		4
+REVISION =		5
 CATEGORIES =		audio
 
 HOMEPAGE =		http://umurmur.net/
diff --git a/audio/umurmur/pkg/umurmurd.rc b/audio/umurmur/pkg/umurmurd.rc
index 891d2b7e334..e9631dbe544 100644
--- a/audio/umurmur/pkg/umurmurd.rc
+++ b/audio/umurmur/pkg/umurmurd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: umurmurd.rc,v 1.3 2015/06/12 09:50:43 dcoppa Exp $
+# $OpenBSD: umurmurd.rc,v 1.4 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/umurmurd"
 
diff --git a/audio/ympd/Makefile b/audio/ympd/Makefile
index 324276676ea..e25559d594f 100644
--- a/audio/ympd/Makefile
+++ b/audio/ympd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/05/27 19:57:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=	Music Player Daemon web client
 
@@ -7,7 +7,7 @@ GH_PROJECT =	ympd
 GH_TAGNAME =	v1.3.0
 DISTNAME =	ympd-1.3.0
 
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	audio www
 
diff --git a/audio/ympd/pkg/ympd.rc b/audio/ympd/pkg/ympd.rc
index c31760566f9..9036ee66de0 100644
--- a/audio/ympd/pkg/ympd.rc
+++ b/audio/ympd/pkg/ympd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ympd.rc,v 1.4 2017/05/27 19:57:05 ajacoutot Exp $
+# $OpenBSD: ympd.rc,v 1.5 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ympd"
 daemon_flags="-u _ympd"
diff --git a/audio/zeya/Makefile b/audio/zeya/Makefile
index dcab467c8dc..9da313348ff 100644
--- a/audio/zeya/Makefile
+++ b/audio/zeya/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2017/05/27 19:57:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT =	html5-powered web music server
 
 MODPY_EGG_VERSION = 0.6
 DISTNAME =	zeya_${MODPY_EGG_VERSION}.orig
 PKGNAME =	zeya-${MODPY_EGG_VERSION}
-REVISION =	3
+REVISION =	4
 CATEGORIES =	audio www
 
 HOMEPAGE =	http://web.psung.name/zeya/
diff --git a/audio/zeya/pkg/zeya.rc b/audio/zeya/pkg/zeya.rc
index cefa72d5ccc..8150696f2fd 100644
--- a/audio/zeya/pkg/zeya.rc
+++ b/audio/zeya/pkg/zeya.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: zeya.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: zeya.rc,v 1.4 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/zeya"
 daemon_flags="--path=/var/tmp"
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 69dfe8e8f2c..7d18282e7df 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.57 2017/12/16 20:53:06 zhuk Exp $
+# $OpenBSD: Makefile,v 1.58 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
 DISTNAME=	conserver-8.2.1
-REVISION=	4
+REVISION=	5
 CATEGORIES=	comms
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/comms/conserver/pkg/conserver.rc b/comms/conserver/pkg/conserver.rc
index 21abaa6bd86..f88b5e4284f 100755
--- a/comms/conserver/pkg/conserver.rc
+++ b/comms/conserver/pkg/conserver.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: conserver.rc,v 1.7 2014/08/21 19:58:07 sthen Exp $
+# $OpenBSD: conserver.rc,v 1.8 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/conserver -d"
 daemon_flags="-n"
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index c68edd06b07..0d8d8694878 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.79 2017/11/16 18:39:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.80 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=		send/receive faxes and share modems
 DISTNAME=		hylafax-6.0.6
-REVISION =		9
+REVISION =		10
 CATEGORIES=		comms
 
 HOMEPAGE=		http://www.HylaFAX.org/
diff --git a/comms/hylafax/pkg/faxq.rc b/comms/hylafax/pkg/faxq.rc
index 81bed2a14e4..4a18f3af7ec 100644
--- a/comms/hylafax/pkg/faxq.rc
+++ b/comms/hylafax/pkg/faxq.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: faxq.rc,v 1.1 2011/05/24 16:24:35 giovanni Exp $
+# $OpenBSD: faxq.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/faxq"
 
diff --git a/comms/hylafax/pkg/hfaxd.rc b/comms/hylafax/pkg/hfaxd.rc
index 9135c4e2987..4c3f37e7725 100644
--- a/comms/hylafax/pkg/hfaxd.rc
+++ b/comms/hylafax/pkg/hfaxd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: hfaxd.rc,v 1.1 2011/05/24 16:24:35 giovanni Exp $
+# $OpenBSD: hfaxd.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/hfaxd"
 daemon_flags="-l 0.0.0.0 -i hylafax -l ::0 -i hylafax"
diff --git a/comms/lcdproc/Makefile b/comms/lcdproc/Makefile
index d4778d4e41c..6f6933326b6 100644
--- a/comms/lcdproc/Makefile
+++ b/comms/lcdproc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2016/03/18 16:09:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT =		interface to various LCD displays
 DISTNAME =		lcdproc-0.5.5
-REVISION =		7
+REVISION =		8
 CATEGORIES =		comms devel
 HOMEPAGE =		http://www.lcdproc.org
 
diff --git a/comms/lcdproc/pkg/lcdd.rc b/comms/lcdproc/pkg/lcdd.rc
index 9a806a2035c..fd8aaea0d4e 100644
--- a/comms/lcdproc/pkg/lcdd.rc
+++ b/comms/lcdproc/pkg/lcdd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: lcdd.rc,v 1.1 2011/12/02 12:39:23 edd Exp $
+# $OpenBSD: lcdd.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/LCDd"
 
diff --git a/comms/lcdproc/pkg/lcdexec.rc b/comms/lcdproc/pkg/lcdexec.rc
index 17addde9e52..5b94284e8b8 100644
--- a/comms/lcdproc/pkg/lcdexec.rc
+++ b/comms/lcdproc/pkg/lcdexec.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: lcdexec.rc,v 1.1.1.1 2011/12/01 19:05:11 edd Exp $
+# $OpenBSD: lcdexec.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/lcdexec"
 daemon_user="_lcdproc"
diff --git a/comms/lcdproc/pkg/lcdproc.rc b/comms/lcdproc/pkg/lcdproc.rc
index 7535d926152..318172a5275 100644
--- a/comms/lcdproc/pkg/lcdproc.rc
+++ b/comms/lcdproc/pkg/lcdproc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: lcdproc.rc,v 1.1.1.1 2011/12/01 19:05:11 edd Exp $
+# $OpenBSD: lcdproc.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/lcdproc"
 daemon_user="_lcdproc"
diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
index 947520961de..a80575c8ae0 100644
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2017/12/04 17:56:27 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT =	gateway to send and receive SMS through GSM mobile phones
 
 DISTNAME =	smstools3-3.1.21
+REVISION =	0
 
 CATEGORIES =	comms
 FIX_EXTRACT_PERMISSIONS=Yes
diff --git a/comms/smstools/pkg/smsd.rc b/comms/smstools/pkg/smsd.rc
index 5f6812edc71..67b7c14ba80 100644
--- a/comms/smstools/pkg/smsd.rc
+++ b/comms/smstools/pkg/smsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smsd.rc,v 1.2 2011/03/02 08:59:20 sthen Exp $
+# $OpenBSD: smsd.rc,v 1.3 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/smsd"
 
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index ae5043a8ea7..2e5000a615f 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/01/03 17:43:24 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT =	time-series datastore for metrics, events, and analytics
 
 V =		1.4.2
 DISTNAME =	influxdb-${V}
+REVISION =	0
 
 HOMEPAGE =	https://influxdata.com
 # selfhosted because we bundle go deps
diff --git a/databases/influxdb/pkg/influxdb.rc b/databases/influxdb/pkg/influxdb.rc
index d6a38b0140c..5524a9797c7 100644
--- a/databases/influxdb/pkg/influxdb.rc
+++ b/databases/influxdb/pkg/influxdb.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: influxdb.rc,v 1.1.1.1 2018/01/03 17:43:24 landry Exp $
+# $OpenBSD: influxdb.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/influxd"
 daemon_user="_influx"
diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile
index b665871048a..390aa034917 100644
--- a/databases/mariadb/Makefile
+++ b/databases/mariadb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2017/11/05 19:17:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.60 2018/01/11 19:27:01 rpe Exp $
 
 # archs with atomic ops
 ONLY_FOR_ARCHS-server=	alpha aarch64 amd64 i386 mips64 mips64el powerpc sparc64
@@ -14,6 +14,7 @@ PKGNAME-main=	mariadb-client-${VERSION}
 PKGNAME-server=	mariadb-server-${VERSION}
 PKGNAME-tests= 	mariadb-tests-${VERSION}
 EPOCH=		1
+REVISION-server=0
 
 CATEGORIES=	databases
 MASTER_SITES=	http://mariadb.mirror.iweb.com//${DISTNAME}/source/ \
diff --git a/databases/mariadb/pkg/mysqld.rc b/databases/mariadb/pkg/mysqld.rc
index 040e23c4452..d1f4e36d554 100755
--- a/databases/mariadb/pkg/mysqld.rc
+++ b/databases/mariadb/pkg/mysqld.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mysqld.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: mysqld.rc,v 1.5 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mysqld_safe"
 
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index b726ef6a149..cd43cdceaa3 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2017/12/26 19:18:57 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.32 2018/01/11 19:27:01 rpe Exp $
 
 PORTROACH =	limitw:1,even
 USE_WXNEEDED =	Yes
@@ -12,7 +12,7 @@ COMMENT =	scalable, high-performance document-oriented database
 DISTNAME =	mongodb-src-r3.2.13
 PKGNAME =	${DISTNAME:S/src-r//}
 CATEGORIES =	databases
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	https://www.mongodb.com/
 
diff --git a/databases/mongodb/pkg/mongod.rc b/databases/mongodb/pkg/mongod.rc
index ab04d351d74..f90bdbd138d 100644
--- a/databases/mongodb/pkg/mongod.rc
+++ b/databases/mongodb/pkg/mongod.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mongod.rc,v 1.1.1.1 2011/06/02 00:26:32 fgsch Exp $
+# $OpenBSD: mongod.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mongod"
 daemon_flags="-f ${SYSCONFDIR}/mongodb.conf"
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index c39c470b605..a4e7b36c13d 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.159 2017/08/26 12:10:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.160 2018/01/11 19:27:01 rpe Exp $
 
 DPB_PROPERTIES =	parallel
 
@@ -9,6 +9,7 @@ DISTNAME =		openldap-2.4.45
 PKGNAME-main =		${DISTNAME:S/-/-client-/}
 PKGNAME-server =	${DISTNAME:S/-/-server-/}
 REVISION =		4
+REVISION-server =	0
 
 # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
 FULLPKGNAME-main =	${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
diff --git a/databases/openldap/pkg/slapd.rc b/databases/openldap/pkg/slapd.rc
index 3158513aecb..a8d87c4a989 100644
--- a/databases/openldap/pkg/slapd.rc
+++ b/databases/openldap/pkg/slapd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: slapd.rc,v 1.4 2012/05/05 14:41:30 sthen Exp $
+# $OpenBSD: slapd.rc,v 1.5 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/slapd"
 daemon_flags="-u _openldap"
diff --git a/databases/openldap23/Makefile b/databases/openldap23/Makefile
index 6d1c3862b41..02923b379b8 100644
--- a/databases/openldap23/Makefile
+++ b/databases/openldap23/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2017/12/04 18:58:08 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=	open-source LDAP software (server, legacy version)
 
 DISTNAME=	openldap-2.3.43
 PKGNAME=	${DISTNAME:S/-/-server-/}
-REVISION=	19
+REVISION=	20
 
 CATEGORIES=	databases net
 
diff --git a/databases/openldap23/pkg/slapd.rc b/databases/openldap23/pkg/slapd.rc
index bc9929b44cf..a8d87c4a989 100644
--- a/databases/openldap23/pkg/slapd.rc
+++ b/databases/openldap23/pkg/slapd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: slapd.rc,v 1.4 2012/05/05 14:42:39 sthen Exp $
+# $OpenBSD: slapd.rc,v 1.5 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/slapd"
 daemon_flags="-u _openldap"
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 686b33f2483..d3e39a599ef 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2017/12/19 08:58:15 pea Exp $
+# $OpenBSD: Makefile,v 1.25 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
 V = 		1.7.2
 DISTNAME = 	pgbouncer-${V}
+REVISION =      0
 
 CATEGORIES = 	databases
 
diff --git a/databases/pgbouncer/pkg/pgbouncer.rc b/databases/pgbouncer/pkg/pgbouncer.rc
index eff49f643ae..3bf6043bd65 100644
--- a/databases/pgbouncer/pkg/pgbouncer.rc
+++ b/databases/pgbouncer/pkg/pgbouncer.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pgbouncer.rc,v 1.3 2011/12/17 22:01:12 sthen Exp $
+# $OpenBSD: pgbouncer.rc,v 1.4 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/pgbouncer -d"
 daemon_flags="-q -u _pgbouncer ${SYSCONFDIR}/pgbouncer/pgbouncer.ini"
diff --git a/databases/pgcluu/Makefile b/databases/pgcluu/Makefile
index 875dd74316c..edcb3ca5c4d 100644
--- a/databases/pgcluu/Makefile
+++ b/databases/pgcluu/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2017/08/09 12:49:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT=		PostgreSQL performances monitoring and auditing tool
 
 DISTNAME=		pgcluu-2.6
 CATEGORIES=		databases sysutils
+REVISION=		0
 
 HOMEPAGE=		http://pgcluu.darold.net/
 
diff --git a/databases/pgcluu/pkg/pgcluu_collectd.rc b/databases/pgcluu/pkg/pgcluu_collectd.rc
index 88df1f85f15..f31a774f0f7 100644
--- a/databases/pgcluu/pkg/pgcluu_collectd.rc
+++ b/databases/pgcluu/pkg/pgcluu_collectd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pgcluu_collectd.rc,v 1.2 2015/06/17 12:10:42 jasper Exp $
+# $OpenBSD: pgcluu_collectd.rc,v 1.3 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/pgcluu_collectd --daemon"
 daemon_flags="-i 60 -h localhost -U postgres --disable-sar -f /var/run/pgcluu_collectd.pid /var/db/pgcluu"
diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile
index 488a30b7606..b2da86e9a27 100644
--- a/databases/pgpool/Makefile
+++ b/databases/pgpool/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2017/12/19 09:02:03 pea Exp $
+# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT= 	connection pool server for PostgreSQL
 
 DISTNAME= 	pgpool-II-3.7.0
+REVISION=       0
 
 CATEGORIES= 	databases
 
diff --git a/databases/pgpool/pkg/pgpool.rc b/databases/pgpool/pkg/pgpool.rc
index 248fc4001e8..0302c7afcde 100644
--- a/databases/pgpool/pkg/pgpool.rc
+++ b/databases/pgpool/pkg/pgpool.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pgpool.rc,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
+# $OpenBSD: pgpool.rc,v 1.2 2018/01/11 19:27:01 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/pgpool"
 daemon_user="_pgpool"
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 530590b9e8d..093b0238850 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.231 2017/11/30 16:13:12 pea Exp $
+# $OpenBSD: Makefile,v 1.232 2018/01/11 19:27:01 rpe Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@@ -16,6 +16,7 @@ PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
+REVISION-server=0
 
 CATEGORIES=	databases
 SHARED_LIBS=	ecpg		7.9 \
diff --git a/databases/postgresql/pkg/postgresql.rc b/databases/postgresql/pkg/postgresql.rc
index f2038268ef6..587328c2df1 100644
--- a/databases/postgresql/pkg/postgresql.rc
+++ b/databases/postgresql/pkg/postgresql.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: postgresql.rc,v 1.11 2014/09/23 08:41:10 sthen Exp $
+# $OpenBSD: postgresql.rc,v 1.12 2018/01/11 19:27:01 rpe Exp $
 
 datadir="/var/postgresql/data"
 
diff --git a/databases/puppetdb/Makefile b/databases/puppetdb/Makefile
index 544eaf69e94..35a7ebf4139 100644
--- a/databases/puppetdb/Makefile
+++ b/databases/puppetdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2018/01/11 19:27:01 rpe Exp $
 
 PORTROACH=	limit:^2
 
@@ -11,7 +11,7 @@ PKGNAME-main=	${DISTNAME}
 PKGNAME-plugin= puppetdb-terminus-$V
 CATEGORIES=	databases
 
-REVISION-main=	4
+REVISION-main=	5
 REVISION-plugin=3
 
 HOMEPAGE=	http://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb/pkg/puppetdb.rc b/databases/puppetdb/pkg/puppetdb.rc
index e4443701632..4464539f053 100644
--- a/databases/puppetdb/pkg/puppetdb.rc
+++ b/databases/puppetdb/pkg/puppetdb.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppetdb.rc,v 1.6 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: puppetdb.rc,v 1.7 2018/01/11 19:27:02 rpe Exp $
 
 daemon=$(${LOCALBASE}/bin/javaPathHelper -c puppetdb)
 daemon_flags="-cp ${PREFIX}/share/puppetdb/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core services -c ${SYSCONFDIR}/puppetdb/conf.d/"
diff --git a/databases/puppetdb4/Makefile b/databases/puppetdb4/Makefile
index 673bc0cefee..9095a81cc3f 100644
--- a/databases/puppetdb4/Makefile
+++ b/databases/puppetdb4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/12/01 10:01:32 sebastia Exp $
+# $OpenBSD: Makefile,v 1.19 2018/01/11 19:27:02 rpe Exp $
 
 PORTROACH=	limit:^4
 
@@ -11,6 +11,7 @@ DISTNAME=	puppetdb-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-plugin= puppetdb-termini-$V
 CATEGORIES=	databases
+REVISION-main=	0
 
 HOMEPAGE=	http://docs.puppetlabs.com/puppetdb/latest/
 
diff --git a/databases/puppetdb4/pkg/puppetdb.rc b/databases/puppetdb4/pkg/puppetdb.rc
index 7de493bdfb2..d4b4e1106fa 100644
--- a/databases/puppetdb4/pkg/puppetdb.rc
+++ b/databases/puppetdb4/pkg/puppetdb.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppetdb.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: puppetdb.rc,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 daemon=$(${LOCALBASE}/bin/javaPathHelper -c puppetdb)
 daemon_flags="-cp ${PREFIX}/share/puppetdb/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main --config ${SYSCONFDIR}/puppetlabs/puppetdb/conf.d/ -b ${SYSCONFDIR}/puppetlabs/puppetdb/bootstrap.cfg"
diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
index e2eb8e79391..9f9125d4e81 100644
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/12/04 08:04:15 sebastia Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main=	fast, scalable, and reliable data warehouse for Puppet
 COMMENT-plugin= PuppetDB terminus plugin
@@ -8,6 +8,7 @@ DISTNAME=	puppetdb-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-plugin= puppetdb-termini-$V
 CATEGORIES=	databases
+REVISION-main=	0
 
 HOMEPAGE=	http://docs.puppetlabs.com/puppetdb/latest/
 
diff --git a/databases/puppetdb5/pkg/puppetdb.rc b/databases/puppetdb5/pkg/puppetdb.rc
index 1cc4584455e..b4a1337ff96 100644
--- a/databases/puppetdb5/pkg/puppetdb.rc
+++ b/databases/puppetdb5/pkg/puppetdb.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppetdb.rc,v 1.1.1.1 2017/11/20 12:47:32 sebastia Exp $
+# $OpenBSD: puppetdb.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon=$(${LOCALBASE}/bin/javaPathHelper -c puppetdb)
 daemon_flags="-cp ${PREFIX}/share/puppetdb/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main --config ${SYSCONFDIR}/puppetlabs/puppetdb/conf.d/ -b ${SYSCONFDIR}/puppetlabs/puppetdb/bootstrap.cfg"
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index e3efa04e269..ee56eb7c0c3 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.99 2017/09/22 05:46:35 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.100 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT =		persistent key-value database
 DISTNAME =		redis-4.0.2
 CATEGORIES =		databases
 HOMEPAGE =		http://redis.io/
+REVISION =		0
 
 MAINTAINER = 		David Coppa <dcoppa@openbsd.org>
 
diff --git a/databases/redis/pkg/redis.rc b/databases/redis/pkg/redis.rc
index 7c9385b3bae..401e36258b1 100644
--- a/databases/redis/pkg/redis.rc
+++ b/databases/redis/pkg/redis.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: redis.rc,v 1.5 2015/07/15 16:15:35 ajacoutot Exp $
+# $OpenBSD: redis.rc,v 1.6 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/redis-server"
 daemon_flags="${SYSCONFDIR}/redis/redis.conf"
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 33ef9e71d83..d4b90beaff4 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT=			distributed data store
 DISTNAME=			riak-2.1.4
 CATEGORIES=			databases
 HOMEPAGE=			http://basho.com/
-REVISION=			0
+REVISION=			1
 
 MAINTAINER=			Jonathan Matthew <jmatthew@openbsd.org>
 
diff --git a/databases/riak/pkg/riak.rc b/databases/riak/pkg/riak.rc
index d8f9f6e00e1..39f37d04b13 100644
--- a/databases/riak/pkg/riak.rc
+++ b/databases/riak/pkg/riak.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: riak.rc,v 1.2 2012/08/28 05:46:41 ajacoutot Exp $
+# $OpenBSD: riak.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/riak"
 daemon_user="_riak"
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 926a18a2262..b1f2cbafce6 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/11/05 18:49:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main =		distributed builds for C, C++ and Objective C
 COMMENT-gtk =		GTK+ monitor for distcc
@@ -17,6 +17,7 @@ PKGNAME-server =	distcc-server-${VERSION}
 EPOCH =			0
 REVISION =		0
 CATEGORIES =		devel net
+REVISION-server =	0
 
 HOMEPAGE =		https://github.com/distcc/distcc
 
diff --git a/devel/distcc/pkg/distccd.rc b/devel/distcc/pkg/distccd.rc
index aa7445145cb..57746736d3f 100644
--- a/devel/distcc/pkg/distccd.rc
+++ b/devel/distcc/pkg/distccd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: distccd.rc,v 1.1.1.1 2015/12/28 08:15:31 jasper Exp $
+# $OpenBSD: distccd.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${PREFIX}/bin/distccd"
 daemon_user="_distcc"
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 93c09a50568..f182d3b178b 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.184 2017/12/02 15:24:31 benoit Exp $
+# $OpenBSD: Makefile,v 1.185 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main =	GIT - Tree History Storage Tool
 COMMENT-svn =	GIT - subversion interoperability tools
@@ -10,6 +10,7 @@ PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}
 PKGNAME-x11 =	git-x11-${V}
 CATEGORIES =	devel
+REVISION-main =	0
 
 HOMEPAGE =	https://git-scm.com/
 
diff --git a/devel/git/pkg/gitdaemon.rc b/devel/git/pkg/gitdaemon.rc
index 1e02fb18ea2..daf33d41548 100644
--- a/devel/git/pkg/gitdaemon.rc
+++ b/devel/git/pkg/gitdaemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gitdaemon.rc,v 1.2 2017/12/01 14:47:45 sthen Exp $
+# $OpenBSD: gitdaemon.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/git daemon --detach"
 daemon_flags="--user=_gitdaemon"
diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 76f06bdc43d..d5d6eb1a213 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/09/08 17:25:18 jsing Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT =		various tools for the Go programming language
 GH_ACCOUNT =		golang
@@ -7,6 +7,7 @@ GH_COMMIT = 		1807494da808122833b9bd8e3e5fa179ef237d41
 DISTNAME =		go-tools-1.9.20170824
 CATEGORIES =		devel
 HOMEPAGE =		https://godoc.org/golang.org/x/tools
+REVISION =		0
 
 MAINTAINER =		Dmitrij D. Czarkoff <czarkoff@openbsd.org>
 
diff --git a/devel/go-tools/pkg/godoc.rc b/devel/go-tools/pkg/godoc.rc
index 7699ef1ef9b..4cfd4f77373 100644
--- a/devel/go-tools/pkg/godoc.rc
+++ b/devel/go-tools/pkg/godoc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: godoc.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: godoc.rc,v 1.4 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/godoc"
 daemon_flags="-http=localhost:6060 -v=true"
diff --git a/devel/jenkins/pkg/jenkins.rc b/devel/jenkins/pkg/jenkins.rc
index 0e2c78c1875..f53349787fd 100644
--- a/devel/jenkins/pkg/jenkins.rc
+++ b/devel/jenkins/pkg/jenkins.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: jenkins.rc,v 1.10 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: jenkins.rc,v 1.11 2018/01/11 19:27:02 rpe Exp $
 
 daemon=$(${LOCALBASE}/bin/javaPathHelper -c jenkins)
 daemon_flags="-Djava.io.tmpdir=/var/cache/jenkins -jar ${TRUEPREFIX}/share/jenkins/jenkins.war --httpPort=8000 --httpsPort=-1 --ajp13Port=-1"
diff --git a/devel/py-buildbot/buildbot/Makefile b/devel/py-buildbot/buildbot/Makefile
index c43bb558df6..10fb3128a5c 100644
--- a/devel/py-buildbot/buildbot/Makefile
+++ b/devel/py-buildbot/buildbot/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/18 20:35:45 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT =	continuous integration framework
 
 DISTNAME =	buildbot-${MODPY_EGG_VERSION}
+REVISION =	0
 
 RUN_DEPENDS =	databases/py-sqlalchemy \
 		databases/py-sqlalchemy-migrate>=0.7.2 \
diff --git a/devel/py-buildbot/buildbot/pkg/buildbot.rc b/devel/py-buildbot/buildbot/pkg/buildbot.rc
index 7ff8fb7c929..f53cfb5c8c5 100644
--- a/devel/py-buildbot/buildbot/pkg/buildbot.rc
+++ b/devel/py-buildbot/buildbot/pkg/buildbot.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: buildbot.rc,v 1.1.1.1 2017/12/18 20:35:45 landry Exp $
+# $OpenBSD: buildbot.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/buildbot"
 daemon_flags="${HOMEDIR}"
diff --git a/devel/py-buildslave/Makefile b/devel/py-buildslave/Makefile
index b0cbf47fbd5..f37738afcbf 100644
--- a/devel/py-buildslave/Makefile
+++ b/devel/py-buildslave/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2017/12/18 20:42:31 landry Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT=	buildworker for the buildbot CI system
 
 MODPY_EGG_VERSION=	0.9.14
 DISTNAME=	buildbot-worker-${MODPY_EGG_VERSION}
 PKGNAME=	py-buildslave-${MODPY_EGG_VERSION:S/p/pl/}
+REVISION=	0
 
 CATEGORIES=	devel
 
diff --git a/devel/py-buildslave/pkg/buildslave.rc b/devel/py-buildslave/pkg/buildslave.rc
index b3fa58556bf..4fbd64f2264 100644
--- a/devel/py-buildslave/pkg/buildslave.rc
+++ b/devel/py-buildslave/pkg/buildslave.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: buildslave.rc,v 1.4 2017/12/18 20:42:31 landry Exp $
+# $OpenBSD: buildslave.rc,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/buildbot-worker"
 daemon_flags="${HOMEDIR}"
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index f9c1c650fa0..60ee27c9fdd 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.163 2017/11/02 17:50:55 naddy Exp $
+# $OpenBSD: Makefile,v 1.164 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main=		subversion revision control system
 COMMENT-perl=		perl interface to subversion
@@ -21,7 +21,7 @@ FULLPKGPATH-ap2=	devel/subversion,-ap2
 FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
 FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
 
-REVISION-main=	3
+REVISION-main=	4
 REVISION-perl=	1
 REVISION-python=0
 REVISION-ruby=	0
diff --git a/devel/subversion/pkg/svnserve.rc b/devel/subversion/pkg/svnserve.rc
index dcb8c5217b5..920a044ee7e 100644
--- a/devel/subversion/pkg/svnserve.rc
+++ b/devel/subversion/pkg/svnserve.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: svnserve.rc,v 1.1 2016/05/29 17:42:22 jung Exp $
+# $OpenBSD: svnserve.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/svnserve -d"
 daemon_user="_svnserve"
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 20337a2a0c7..f82d2bb6ec5 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/12/17 20:10:12 pascal Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main =		Worms-like strategy game
 COMMENT-server =	Worms-like strategy game, server
@@ -12,6 +12,7 @@ V =			$R
 DISTNAME =		hedgewars-src-$V
 PKGNAME-main =		hedgewars-$V
 PKGNAME-server =	hedgewars-server-$V
+REVISION-server =	0
 
 CATEGORIES =		games
 
diff --git a/games/hedgewars/pkg/hedgewars_server.rc b/games/hedgewars/pkg/hedgewars_server.rc
index 8482df39e67..d054fa88c4c 100644
--- a/games/hedgewars/pkg/hedgewars_server.rc
+++ b/games/hedgewars/pkg/hedgewars_server.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: hedgewars_server.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: hedgewars_server.rc,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/hedgewars-server"
 daemon_user="_hedgewars"
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 577c17e8a3a..630ce040062 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/11/26 03:32:48 abieber Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:02 rpe Exp $
 
 BROKEN-i386=	need to free up a register
 ONLY_FOR_ARCHS= amd64 i386
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386
 COMMENT=	clone of the original Quake III Arena
 
 DISTNAME=	ioquake3-2017.11.09
-REVISION=	0
+REVISION=	1
 
 GH_ACCOUNT=	ioquake
 GH_PROJECT=	ioq3
diff --git a/games/ioquake3/pkg/ioq3ded.rc b/games/ioquake3/pkg/ioq3ded.rc
index b8fb03321e6..5b7b2e875d6 100644
--- a/games/ioquake3/pkg/ioq3ded.rc
+++ b/games/ioquake3/pkg/ioq3ded.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ioq3ded.rc,v 1.5 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: ioq3ded.rc,v 1.6 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ioq3ded"
 daemon_user="_ioq3"
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 3fc1c6f2d7e..82e21f7e4a5 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.71 2018/01/11 19:27:02 rpe Exp $
 
 PORTROACH = 	limitw:1,even
 
@@ -6,7 +6,7 @@ BROKEN-hppa =		missing atomic ops
 COMMENT=	fantasy turn-based strategy game
 
 DISTNAME=	wesnoth-1.12.6
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	games x11
 
diff --git a/games/wesnoth/pkg/wesnothd.rc b/games/wesnoth/pkg/wesnothd.rc
index 6c25272ef74..ab60b838d8f 100644
--- a/games/wesnoth/pkg/wesnothd.rc
+++ b/games/wesnoth/pkg/wesnothd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: wesnothd.rc,v 1.1 2012/11/20 15:08:00 pascal Exp $
+# $OpenBSD: wesnothd.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/wesnothd"
 daemon_flags="-d"
diff --git a/games/yquake2/Makefile b/games/yquake2/Makefile
index 59ccdea3c88..e64d3f07bc8 100644
--- a/games/yquake2/Makefile
+++ b/games/yquake2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/12/10 12:14:36 awolk Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:02 rpe Exp $
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 
@@ -8,6 +8,7 @@ V=		7.10
 PKGNAME=	${N}-${V}
 DISTNAME=	quake2-${V}
 CATEGORIES=	games
+REVISION=	0
 
 HOMEPAGE=	http://www.yamagi.org/quake2/
 MAINTAINER=	Adam Wolk <awolk@openbsd.org>
diff --git a/games/yquake2/pkg/q2ded.rc b/games/yquake2/pkg/q2ded.rc
index c679d165c9a..1664ca65126 100644
--- a/games/yquake2/pkg/q2ded.rc
+++ b/games/yquake2/pkg/q2ded.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: q2ded.rc,v 1.4 2017/11/09 16:20:32 awolk Exp $
+# $OpenBSD: q2ded.rc,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/share/yquake2/q2ded"
 daemon_user="_yquake2"
diff --git a/geo/mapcache/Makefile b/geo/mapcache/Makefile
index 5af490b09b6..2f6db5ce6fc 100644
--- a/geo/mapcache/Makefile
+++ b/geo/mapcache/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/10/28 15:17:20 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT=	GIS WMTS/TMS tile caching server
 
 DISTNAME =	mapcache-1.6.1
 SHARED_LIBS +=	mapcache 2.0
+REVISION =	0
 
 CATEGORIES=	geo www
 
diff --git a/geo/mapcache/pkg/mapcache.rc b/geo/mapcache/pkg/mapcache.rc
index 3059f36fac3..3c75b0513e6 100644
--- a/geo/mapcache/pkg/mapcache.rc
+++ b/geo/mapcache/pkg/mapcache.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mapcache.rc,v 1.2 2015/07/15 23:56:36 ajacoutot Exp $
+# $OpenBSD: mapcache.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${LOCALBASE}/bin/spawn-fcgi"
 # chroot version
diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile
index 109350e5b4a..ffc367633f1 100644
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2017/11/22 08:16:30 landry Exp $
+# $OpenBSD: Makefile,v 1.53 2018/01/11 19:27:02 rpe Exp $
 
 MULTI_PACKAGES=	-utils -main -php -perl
 
@@ -15,6 +15,7 @@ PKGNAME-php=	php-mapscript-${V}
 PKGNAME-perl=	p5-mapscript-${V}
 SHARED_LIBS +=	mapserver 2.0
 README-main =	0
+REVISION-main=	0
 
 CATEGORIES=	geo www
 
diff --git a/geo/mapserver/pkg/mapserv.rc b/geo/mapserver/pkg/mapserv.rc
index da2daa0c2df..393de93872f 100644
--- a/geo/mapserver/pkg/mapserv.rc
+++ b/geo/mapserver/pkg/mapserv.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mapserv.rc,v 1.2 2015/07/15 23:56:36 ajacoutot Exp $
+# $OpenBSD: mapserv.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${LOCALBASE}/bin/spawn-fcgi"
 daemon_flags="-c ${VARBASE}/www -s run/mapserv.sock -u www -- /cgi-bin/mapserv"
diff --git a/graphics/orthanc/server/Makefile b/graphics/orthanc/server/Makefile
index 083834836ab..f7979a9bc8d 100644
--- a/graphics/orthanc/server/Makefile
+++ b/graphics/orthanc/server/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2017/08/11 19:56:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT =		RESTful DICOM server for healthcare and medical research
 
 DISTNAME =		Orthanc-1.3.0
 PKGNAME =		${DISTNAME:L}
-REVISION =		1
+REVISION =		2
 
 HOMEPAGE =		http://www.orthanc-server.com/
 
diff --git a/graphics/orthanc/server/pkg/orthanc.rc b/graphics/orthanc/server/pkg/orthanc.rc
index 91fe284eb3a..56e5ce1f439 100644
--- a/graphics/orthanc/server/pkg/orthanc.rc
+++ b/graphics/orthanc/server/pkg/orthanc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: orthanc.rc,v 1.2 2017/08/09 15:23:07 jasper Exp $
+# $OpenBSD: orthanc.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${PREFIX}/sbin/Orthanc"
 daemon_flags="--logdir=/var/log/orthanc ${SYSCONFDIR}/orthanc/"
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 7c25be3eb30..4fdbf76c63c 100755
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.79 2017/06/01 07:42:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.80 2018/01/11 19:27:02 rpe Exp $
 
 BROKEN-alpha=		ICE hp5590.c:1141: error: unrecognizable insn
 
 COMMENT=		API for accessing scanners, backends
 
 DISTNAME=		sane-backends-1.0.27
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=  sane                 2.0      # unknown
 
diff --git a/graphics/sane-backends/pkg/saned.rc b/graphics/sane-backends/pkg/saned.rc
index 3f8d86e2c89..0e1a05d5c65 100755
--- a/graphics/sane-backends/pkg/saned.rc
+++ b/graphics/sane-backends/pkg/saned.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: saned.rc,v 1.8 2015/12/02 11:00:50 ajacoutot Exp $
+# $OpenBSD: saned.rc,v 1.9 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/saned -a"
 daemon_flags="_saned"
diff --git a/lang/php/5.6/Makefile b/lang/php/5.6/Makefile
index 180b3e48dd6..e12df1197e8 100644
--- a/lang/php/5.6/Makefile
+++ b/lang/php/5.6/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.55 2017/11/17 06:47:17 martijn Exp $
+# $OpenBSD: Makefile,v 1.56 2018/01/11 19:27:02 rpe Exp $
 
 BROKEN-alpha=	pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 
 PV=		5.6
 V=		${PV}.31
-REVISION=	0
+REVISION=	1
 
 MASTER_SITES0=	https://download.suhosin.org/
 
diff --git a/lang/php/5.6/pkg/php56_fpm.rc b/lang/php/5.6/pkg/php56_fpm.rc
index 5eadec1e133..78be0240d47 100755
--- a/lang/php/5.6/pkg/php56_fpm.rc
+++ b/lang/php/5.6/pkg/php56_fpm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: php56_fpm.rc,v 1.1 2015/09/18 09:18:23 sthen Exp $
+# $OpenBSD: php56_fpm.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
 
diff --git a/lang/php/7.0/Makefile b/lang/php/7.0/Makefile
index d8b6053277c..d7a9e7bd3ac 100644
--- a/lang/php/7.0/Makefile
+++ b/lang/php/7.0/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2017/11/17 06:47:17 martijn Exp $
+# $OpenBSD: Makefile,v 1.39 2018/01/11 19:27:02 rpe Exp $
 
 BROKEN-sparc64=	SIGBUS during phar generation
 
 PV=		7.0
 V=		${PV}.23
-REVISION=	0
+REVISION=	1
 
 BUILD_DEPENDS+=	devel/bison
 
diff --git a/lang/php/7.0/pkg/php70_fpm.rc b/lang/php/7.0/pkg/php70_fpm.rc
index b90b8a8bfea..3ab784d1646 100755
--- a/lang/php/7.0/pkg/php70_fpm.rc
+++ b/lang/php/7.0/pkg/php70_fpm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: php70_fpm.rc,v 1.1.1.1 2015/12/14 17:58:46 robert Exp $
+# $OpenBSD: php70_fpm.rc,v 1.2 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}"
 
diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index d6e1857a9cf..ca103fd5f87 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2017/12/16 23:09:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.47 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main=		interface between mailer MTA and content checkers
 COMMENT-utils=		utilities to monitor amavisd-new server
@@ -7,8 +7,8 @@ V=			2.11.0
 DISTNAME=		amavisd-new-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-utils=		amavisd-new-utils-${V}
-REVISION-main=		2
-REVISION-utils=		1
+REVISION-main=		3
+REVISION-utils=		2
 CATEGORIES=		mail security
 
 HOMEPAGE=		http://www.amavis.org/
diff --git a/mail/amavisd-new/pkg/amavis_mc.rc b/mail/amavisd-new/pkg/amavis_mc.rc
index 05b55099185..535837aa4af 100644
--- a/mail/amavisd-new/pkg/amavis_mc.rc
+++ b/mail/amavisd-new/pkg/amavis_mc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: amavis_mc.rc,v 1.2 2015/07/15 19:26:44 ajacoutot Exp $
+# $OpenBSD: amavis_mc.rc,v 1.3 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/amavis-mc"
 
diff --git a/mail/amavisd-new/pkg/amavisd.rc b/mail/amavisd-new/pkg/amavisd.rc
index cf97e4cb7bb..4e2d8dcfac4 100644
--- a/mail/amavisd-new/pkg/amavisd.rc
+++ b/mail/amavisd-new/pkg/amavisd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: amavisd.rc,v 1.7 2015/07/15 19:26:44 ajacoutot Exp $
+# $OpenBSD: amavisd.rc,v 1.8 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/amavisd"
 
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index ee8f79a3bbe..0f53ad36460 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT =		mail server storing messages in a database
 
 DISTNAME =		archiveopteryx-3.2.0
 CATEGORIES =		mail databases
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://www.archiveopteryx.org/
 
diff --git a/mail/archiveopteryx/pkg/aox.rc b/mail/archiveopteryx/pkg/aox.rc
index 20c72d63056..a9ae18245c6 100644
--- a/mail/archiveopteryx/pkg/aox.rc
+++ b/mail/archiveopteryx/pkg/aox.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: aox.rc,v 1.4 2011/03/20 09:19:25 ajacoutot Exp $
+# $OpenBSD: aox.rc,v 1.5 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/aox"
 
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 6f57e0ec100..66d3b367092 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2017/09/29 22:05:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.72 2018/01/11 19:27:02 rpe Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -13,6 +13,7 @@ PKGNAME-ldap=		${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
 PKGNAME-pgsql=		${DISTNAME:S/lib-/lib-pgsql-/}
 PKGNAME-userdb=		${DISTNAME:S/lib-/lib-userdb-/}
+REVISION-main=		0
 
 SHARED_LIBS +=  courierauth          1.0      # .0.0
 SHARED_LIBS +=  courierauthsasl      1.0      # .0.0
diff --git a/mail/courier-authlib/pkg/courier_authdaemond.rc b/mail/courier-authlib/pkg/courier_authdaemond.rc
index bb4f4583141..a2a5cd2ebc5 100644
--- a/mail/courier-authlib/pkg/courier_authdaemond.rc
+++ b/mail/courier-authlib/pkg/courier_authdaemond.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: courier_authdaemond.rc,v 1.6 2015/07/15 21:14:06 ajacoutot Exp $
+# $OpenBSD: courier_authdaemond.rc,v 1.7 2018/01/11 19:27:02 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/authdaemond"
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 6eae2acdf17..2c8da3ff3bb 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.115 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.116 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
@@ -8,6 +8,8 @@ DISTNAME=		courier-imap-${V}
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-pop3=	courier-pop3-${V}
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
+REVISION-main=		0
+REVISION-pop3=		0
 
 CATEGORIES=		mail
 
diff --git a/mail/courier-imap/pkg/courier_imap.rc b/mail/courier-imap/pkg/courier_imap.rc
index b43718a30b7..b01e6a9c3d3 100644
--- a/mail/courier-imap/pkg/courier_imap.rc
+++ b/mail/courier-imap/pkg/courier_imap.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: courier_imap.rc,v 1.6 2015/07/15 21:14:06 ajacoutot Exp $
+# $OpenBSD: courier_imap.rc,v 1.7 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/imapd.rc"
 
diff --git a/mail/courier-imap/pkg/courier_imap_ssl.rc b/mail/courier-imap/pkg/courier_imap_ssl.rc
index 327c0a072d1..1bdf93f59d2 100644
--- a/mail/courier-imap/pkg/courier_imap_ssl.rc
+++ b/mail/courier-imap/pkg/courier_imap_ssl.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: courier_imap_ssl.rc,v 1.2 2015/07/15 21:14:06 ajacoutot Exp $
+# $OpenBSD: courier_imap_ssl.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
 
diff --git a/mail/courier-imap/pkg/courier_pop3.rc b/mail/courier-imap/pkg/courier_pop3.rc
index f3d90e09e64..26080ad5e2c 100644
--- a/mail/courier-imap/pkg/courier_pop3.rc
+++ b/mail/courier-imap/pkg/courier_pop3.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: courier_pop3.rc,v 1.6 2015/07/15 21:14:06 ajacoutot Exp $
+# $OpenBSD: courier_pop3.rc,v 1.7 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/pop3d.rc"
 
diff --git a/mail/courier-imap/pkg/courier_pop3_ssl.rc b/mail/courier-imap/pkg/courier_pop3_ssl.rc
index 53b0d5c9cc9..63e8130172e 100644
--- a/mail/courier-imap/pkg/courier_pop3_ssl.rc
+++ b/mail/courier-imap/pkg/courier_pop3_ssl.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: courier_pop3_ssl.rc,v 1.2 2015/07/15 21:14:06 ajacoutot Exp $
+# $OpenBSD: courier_pop3_ssl.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index edea09d846c..526fe548b96 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.112 2018/01/03 07:55:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.113 2018/01/11 19:27:03 rpe Exp $
 
 PORTROACH=		limitw:1,even
 
@@ -6,6 +6,7 @@ COMMENT=		Cyrus IMAP server
 
 V=			3.0.5
 DISTNAME=		cyrus-imapd-${V}
+REVISION=		0
 
 SHARED_LIBS +=	cyrus                     0.0 # 0.0
 SHARED_LIBS +=	cyrus_imap                0.0 # 0.0
diff --git a/mail/cyrus-imapd/pkg/cyrus_imapd.rc b/mail/cyrus-imapd/pkg/cyrus_imapd.rc
index de119dd820c..b88b0473c73 100755
--- a/mail/cyrus-imapd/pkg/cyrus_imapd.rc
+++ b/mail/cyrus-imapd/pkg/cyrus_imapd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cyrus_imapd.rc,v 1.11 2017/05/28 15:46:12 ajacoutot Exp $
+# $OpenBSD: cyrus_imapd.rc,v 1.12 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/cyrus/libexec/master -d"
 
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index f6a2ffc4e6d..6497a468a5b 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.40 2014/09/17 09:13:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	DKIM milter
 
 DISTNAME=	dkim-milter-2.8.3
-REVISION=	5
+REVISION=	6
 CATEGORIES=	mail
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 
diff --git a/mail/dkim-milter/pkg/dkim_filter.rc b/mail/dkim-milter/pkg/dkim_filter.rc
index 6ed8afc2e23..e97c618f177 100644
--- a/mail/dkim-milter/pkg/dkim_filter.rc
+++ b/mail/dkim-milter/pkg/dkim_filter.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dkim_filter.rc,v 1.1 2014/01/15 00:20:42 sthen Exp $
+# $OpenBSD: dkim_filter.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/dkim-filter"
 daemon_flags="-x ${SYSCONFDIR}/dkim-filter.conf"
diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile
index 62c7c5d15ee..f94d926b89e 100644
--- a/mail/dkimproxy/Makefile
+++ b/mail/dkimproxy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2013/07/17 05:57:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =		SMTP proxy to verify or add DKIM signatures
 
 DISTNAME =		dkimproxy-1.4.1
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		mail
 
diff --git a/mail/dkimproxy/pkg/dkimproxy_in.rc b/mail/dkimproxy/pkg/dkimproxy_in.rc
index 6741ed25504..bcde37cefd6 100644
--- a/mail/dkimproxy/pkg/dkimproxy_in.rc
+++ b/mail/dkimproxy/pkg/dkimproxy_in.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dkimproxy_in.rc,v 1.2 2013/07/17 05:57:49 ajacoutot Exp $
+# $OpenBSD: dkimproxy_in.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/dkimproxy.in --daemonize"
 daemon_flags="--conf_file=${SYSCONFDIR}/dkimproxy_in.conf --user=_dkimproxy --group=_dkimproxy"
diff --git a/mail/dkimproxy/pkg/dkimproxy_out.rc b/mail/dkimproxy/pkg/dkimproxy_out.rc
index bdc36205340..9e334f90414 100644
--- a/mail/dkimproxy/pkg/dkimproxy_out.rc
+++ b/mail/dkimproxy/pkg/dkimproxy_out.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dkimproxy_out.rc,v 1.2 2013/07/17 05:57:49 ajacoutot Exp $
+# $OpenBSD: dkimproxy_out.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/dkimproxy.out --daemonize"
 daemon_flags="--conf_file=${SYSCONFDIR}/dkimproxy_out.conf --user=_dkimproxy --group=_dkimproxy"
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index a4c58a9b2d6..3529c0f3cff 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.262 2017/11/05 19:27:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.263 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT-server=	compact IMAP/POP3 server
 COMMENT-ldap=	LDAP authentication / dictionary support for Dovecot
@@ -17,6 +17,7 @@ PKGNAME-mysql=	dovecot-mysql-${V_DOVECOT}
 PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/${V_MAJOR}/
+REVISION-server=0
 
 SHARED_LIBS=	dovecot-compression 0.0 \
 		dovecot-dsync	0.0 \
diff --git a/mail/dovecot/pkg/dovecot.rc b/mail/dovecot/pkg/dovecot.rc
index 44f4b2071e6..eb06c9f4cef 100644
--- a/mail/dovecot/pkg/dovecot.rc
+++ b/mail/dovecot/pkg/dovecot.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dovecot.rc,v 1.1 2011/03/03 00:40:05 sthen Exp $
+# $OpenBSD: dovecot.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dovecot"
 
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index f4ea10d673e..8341d839cd9 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.62 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT-main =	anti-spam filter
 COMMENT-pgsql =	PostgreSQL driver for dspam
@@ -6,7 +6,7 @@ COMMENT-mysql =	MySQL driver for dspam
 
 VERSION =	3.10.2
 DISTNAME =	dspam-${VERSION}
-REVISION-main =	6
+REVISION-main =	7
 REVISION-mysql = 5
 REVISION-pgsql = 4
 
diff --git a/mail/dspam/pkg/dspam.rc b/mail/dspam/pkg/dspam.rc
index 15bb0b00a87..cb2b4ba7957 100644
--- a/mail/dspam/pkg/dspam.rc
+++ b/mail/dspam/pkg/dspam.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dspam.rc,v 1.1 2013/09/14 17:12:16 landry Exp $
+# $OpenBSD: dspam.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/dspam --daemon"
 daemon_user="_dspam"
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 79ac6f3e85a..e69b96ffeb1 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.115 2017/12/01 14:38:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.116 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT-main =		flexible mail transfer agent
 COMMENT-eximon =	X11 monitor tool for Exim MTA
@@ -8,6 +8,7 @@ DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
 FULLPKGPATH-eximon =	${PKGPATH},-eximon
+REVISION-main =		0
 
 CATEGORIES =		mail
 
diff --git a/mail/exim/pkg/exim.rc b/mail/exim/pkg/exim.rc
index 7e70ddd568a..853ce694cd0 100644
--- a/mail/exim/pkg/exim.rc
+++ b/mail/exim/pkg/exim.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: exim.rc,v 1.3 2015/07/15 17:10:35 ajacoutot Exp $
+# $OpenBSD: exim.rc,v 1.4 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/exim -bd"
 daemon_flags="-q30m"
diff --git a/mail/greyscanner/Makefile b/mail/greyscanner/Makefile
index 541933dfb57..bab2dd21e48 100644
--- a/mail/greyscanner/Makefile
+++ b/mail/greyscanner/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/09 12:14:12 bentley Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =	greytrapping daemon to complement OpenBSD spamd
 
 DISTNAME =	greyscanner-1.02
 CATEGORIES =	mail
 HOMEPAGE =	https://bitbucket.org/jimrazmus/greyscanner/
-REVISION =	0
+REVISION =	1
 
 MAINTAINER =	Jim Razmus II <jim@openbsd.org>
 
diff --git a/mail/greyscanner/pkg/greyscanner.rc b/mail/greyscanner/pkg/greyscanner.rc
index 5b96a5b1146..4af8abcecb1 100644
--- a/mail/greyscanner/pkg/greyscanner.rc
+++ b/mail/greyscanner/pkg/greyscanner.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: greyscanner.rc,v 1.1 2011/05/01 20:05:54 sthen Exp $
+# $OpenBSD: greyscanner.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/greyscanner"
 
diff --git a/mail/kopano/core/Makefile b/mail/kopano/core/Makefile
index e2b75689cf3..de45c0d8c8c 100644
--- a/mail/kopano/core/Makefile
+++ b/mail/kopano/core/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2018/01/10 15:46:11 robert Exp $
+# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-mapi=	kopano MAPI extensions for PHP
 
 PKGNAME-main=	kopano-core-${V}.${BUILD}
 PKGNAME-mapi=	kopano-mapi-${V}.${BUILD}
+REVISION-main=	0
 
 CATEGORIES=	mail www productivity
 
diff --git a/mail/kopano/core/pkg/kopano.rc b/mail/kopano/core/pkg/kopano.rc
index ab78cbf6d5b..eb880f5806a 100755
--- a/mail/kopano/core/pkg/kopano.rc
+++ b/mail/kopano/core/pkg/kopano.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/mail/kopano/core/pkg/kopano_gateway.rc b/mail/kopano/core/pkg/kopano_gateway.rc
index 23b85d8b9f0..ed04b54839b 100755
--- a/mail/kopano/core/pkg/kopano_gateway.rc
+++ b/mail/kopano/core/pkg/kopano_gateway.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_gateway.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano_gateway.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-gateway"
 
diff --git a/mail/kopano/core/pkg/kopano_ical.rc b/mail/kopano/core/pkg/kopano_ical.rc
index 66d5f0880aa..7b2a2c1c8e2 100755
--- a/mail/kopano/core/pkg/kopano_ical.rc
+++ b/mail/kopano/core/pkg/kopano_ical.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_ical.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano_ical.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-ical"
 
diff --git a/mail/kopano/core/pkg/kopano_monitor.rc b/mail/kopano/core/pkg/kopano_monitor.rc
index 7ce7780ad91..2d68f2185d9 100755
--- a/mail/kopano/core/pkg/kopano_monitor.rc
+++ b/mail/kopano/core/pkg/kopano_monitor.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_monitor.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano_monitor.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-monitor"
 
diff --git a/mail/kopano/core/pkg/kopano_search.rc b/mail/kopano/core/pkg/kopano_search.rc
index 1cb7f95cd58..4f47310fc42 100755
--- a/mail/kopano/core/pkg/kopano_search.rc
+++ b/mail/kopano/core/pkg/kopano_search.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_search.rc,v 1.2 2017/11/25 10:59:19 robert Exp $
+# $OpenBSD: kopano_search.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-search"
 
diff --git a/mail/kopano/core/pkg/kopano_server.rc b/mail/kopano/core/pkg/kopano_server.rc
index 4a1f6f6b3d9..adcdc90b307 100755
--- a/mail/kopano/core/pkg/kopano_server.rc
+++ b/mail/kopano/core/pkg/kopano_server.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_server.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano_server.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-server"
 
diff --git a/mail/kopano/core/pkg/kopano_spooler.rc b/mail/kopano/core/pkg/kopano_spooler.rc
index 73e1fba538e..a573cf4a4e5 100755
--- a/mail/kopano/core/pkg/kopano_spooler.rc
+++ b/mail/kopano/core/pkg/kopano_spooler.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kopano_spooler.rc,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
+# $OpenBSD: kopano_spooler.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kopano-spooler"
 
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 0c493821785..f5271097041 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.87 2018/01/03 08:03:56 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.88 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	mailing list manager with web interface
 
 DISTNAME=	mailman-2.1.25
 CATEGORIES=	mail www
+REVISION=	0
 
 HOMEPAGE=	https://www.gnu.org/software/mailman/
 
diff --git a/mail/mailman/pkg/mailman.rc b/mail/mailman/pkg/mailman.rc
index 71a7d35f120..08e8706b143 100644
--- a/mail/mailman/pkg/mailman.rc
+++ b/mail/mailman/pkg/mailman.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mailman.rc,v 1.10 2012/01/26 11:34:42 ajacoutot Exp $
+# $OpenBSD: mailman.rc,v 1.11 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/lib/mailman/bin/mailmanctl"
 daemon_flags="-s start"
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index ffa4a746602..b741d33781f 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2015/07/15 20:45:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	virus/spam scanning framework
 
@@ -9,7 +9,7 @@ DISTNAME=	MailScanner-${V}.${Vss}
 PKGNAME=	mailscanner-${V}.${Vss:S/-/./}
 CATEGORIES=	mail
 MASTER_SITES=	https://s3.amazonaws.com/mailscanner/release/v4/tar/
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.mailscanner.info/
 
diff --git a/mail/mailscanner/pkg/mailscanner.rc b/mail/mailscanner/pkg/mailscanner.rc
index cfc2cc85508..b288925ce2f 100644
--- a/mail/mailscanner/pkg/mailscanner.rc
+++ b/mail/mailscanner/pkg/mailscanner.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mailscanner.rc,v 1.2 2015/07/15 20:45:24 ajacoutot Exp $
+# $OpenBSD: mailscanner.rc,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/check_mailscanner"
 
diff --git a/mail/milter-checkrcpt/Makefile b/mail/milter-checkrcpt/Makefile
index f461edfb217..17f86ad8cac 100644
--- a/mail/milter-checkrcpt/Makefile
+++ b/mail/milter-checkrcpt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2015/01/13 11:26:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	sendmail milter plugin for recipient checking
 
 DISTNAME=	milter-checkrcpt-0.3
-REVISION=	2
+REVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.ch/
 
diff --git a/mail/milter-checkrcpt/pkg/milter_checkrcpt.rc b/mail/milter-checkrcpt/pkg/milter_checkrcpt.rc
index 82367243bd4..b2175dc839f 100644
--- a/mail/milter-checkrcpt/pkg/milter_checkrcpt.rc
+++ b/mail/milter-checkrcpt/pkg/milter_checkrcpt.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: milter_checkrcpt.rc,v 1.1.1.1 2011/07/11 12:12:53 okan Exp $
+# $OpenBSD: milter_checkrcpt.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/milter-checkrcpt"
 
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 7e0cb41d2d8..a2f3d43811e 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2016/10/11 20:36:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	greylist milter
 
 DISTNAME=	milter-greylist-4.2.7
-REVISION=	3
+REVISION=	4
 CATEGORIES=	mail
 HOMEPAGE=	http://hcpnet.free.fr/milter-greylist/
 
diff --git a/mail/milter-greylist/pkg/milter_greylist.rc b/mail/milter-greylist/pkg/milter_greylist.rc
index 039456bbbc9..c2c5fc0a4fd 100755
--- a/mail/milter-greylist/pkg/milter_greylist.rc
+++ b/mail/milter-greylist/pkg/milter_greylist.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: milter_greylist.rc,v 1.1 2011/05/13 12:52:22 okan Exp $
+# $OpenBSD: milter_greylist.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/milter-greylist"
 
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 7e6a8fc9ba1..c511ae6d094 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2015/01/13 11:26:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	sendmail milter plugin for regular expression filtering
 
 DISTNAME=	milter-regex-1.9
-REVISION=	2
+REVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.ch/
 
diff --git a/mail/milter-regex/pkg/milter_regex.rc b/mail/milter-regex/pkg/milter_regex.rc
index ea7806ceee2..b574836eec0 100644
--- a/mail/milter-regex/pkg/milter_regex.rc
+++ b/mail/milter-regex/pkg/milter_regex.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: milter_regex.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: milter_regex.rc,v 1.5 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/milter-regex"
 
diff --git a/mail/milter-spamd/Makefile b/mail/milter-spamd/Makefile
index 7d4e0332a0a..90fb8ebf99b 100644
--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2015/07/15 19:47:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	sendmail milter plugin for SpamAssassin spamd
 
 DISTNAME=	milter-spamd-0.6
-REVISION=	3
+REVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.ch/
 
diff --git a/mail/milter-spamd/pkg/milter_spamd.rc b/mail/milter-spamd/pkg/milter_spamd.rc
index 8dc257223be..561c171c0a8 100644
--- a/mail/milter-spamd/pkg/milter_spamd.rc
+++ b/mail/milter-spamd/pkg/milter_spamd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: milter_spamd.rc,v 1.6 2015/07/15 19:47:35 ajacoutot Exp $
+# $OpenBSD: milter_spamd.rc,v 1.7 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/milter-spamd"
 
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 86ee1ff47c3..4b1d9173b1b 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.47 2017/10/31 07:34:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	mailfilter to identify and mark spam
 
 DISTNAME=	mimedefang-2.83
 CATEGORIES=	mail
+REVISION=	0
 
 HOMEPAGE=	http://www.mimedefang.org/
 MASTER_SITES=	${HOMEPAGE}static/
diff --git a/mail/mimedefang/pkg/mimedefang.rc b/mail/mimedefang/pkg/mimedefang.rc
index 032ffec148b..0a36d2f91c3 100755
--- a/mail/mimedefang/pkg/mimedefang.rc
+++ b/mail/mimedefang/pkg/mimedefang.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mimedefang.rc,v 1.3 2017/09/02 12:04:10 ajacoutot Exp $
+# $OpenBSD: mimedefang.rc,v 1.4 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mimedefang"
 daemon_flags="-Gqr -U _mdefang -p /var/spool/MIMEDefang/mimedefang.sock -m /var/spool/MIMEDefang/mimedefang-multiplexor.sock"
diff --git a/mail/mimedefang/pkg/mimedefang_multiplexor.rc b/mail/mimedefang/pkg/mimedefang_multiplexor.rc
index 941a29c0dfc..4553d2cc862 100755
--- a/mail/mimedefang/pkg/mimedefang_multiplexor.rc
+++ b/mail/mimedefang/pkg/mimedefang_multiplexor.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mimedefang_multiplexor.rc,v 1.11 2017/09/02 12:04:10 ajacoutot Exp $
+# $OpenBSD: mimedefang_multiplexor.rc,v 1.12 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mimedefang-multiplexor"
 daemon_flags="-G -U _mdefang -E -l -m 2 -q 10 -x 10 -b 600"
diff --git a/mail/p5-Mail-Milter-Authentication/Makefile b/mail/p5-Mail-Milter-Authentication/Makefile
index e0a3158fc09..44917723347 100644
--- a/mail/p5-Mail-Milter-Authentication/Makefile
+++ b/mail/p5-Mail-Milter-Authentication/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/09/02 12:25:36 giovanni Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =	perl implementation of email authentication standards
 
@@ -6,6 +6,7 @@ V =		1.1.0
 DISTNAME =	Mail-Milter-Authentication-v${V}
 PKGNAME =	p5-Mail-Milter-Authentication-${V}
 CATEGORIES =	mail
+REVISION =	0
 
 MAINTAINER =	Giovanni Bechis <giovanni@openbsd.org>
 
diff --git a/mail/p5-Mail-Milter-Authentication/pkg/mail_milter_authentication.rc b/mail/p5-Mail-Milter-Authentication/pkg/mail_milter_authentication.rc
index a174898076c..12b2f9042a2 100644
--- a/mail/p5-Mail-Milter-Authentication/pkg/mail_milter_authentication.rc
+++ b/mail/p5-Mail-Milter-Authentication/pkg/mail_milter_authentication.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mail_milter_authentication.rc,v 1.1.1.1 2016/05/27 16:28:44 giovanni Exp $
+# $OpenBSD: mail_milter_authentication.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/authentication_milter"
 daemon_flags="-d"
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index a807b76ad21..cce8803c35c 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.102 2017/11/07 07:39:07 giovanni Exp $
+# $OpenBSD: Makefile,v 1.103 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=		mailfilter to identify and mark spam
 
 VER=			3.4.1
 DISTNAME=		Mail-SpamAssassin-${VER}
 PKGNAME=		p5-${DISTNAME}
-REVISION=		8
+REVISION=		9
 RULESNAME=		Mail-SpamAssassin-rules-${VER}.r1675274.tgz
 CATEGORIES=		mail perl5
 
diff --git a/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc b/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
index 52524e1e05b..6a592ec4343 100644
--- a/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
+++ b/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: spamassassin.rc,v 1.5 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: spamassassin.rc,v 1.6 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/spamd -d"
 daemon_flags="-u _spamdaemon -P"
diff --git a/mail/pop3d/Makefile b/mail/pop3d/Makefile
index 8da283b56dc..e59a6dd57ff 100644
--- a/mail/pop3d/Makefile
+++ b/mail/pop3d/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/10/23 17:59:18 jturner Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =		POP3 daemon with POP3S and STARTTLS extensions
 
@@ -8,6 +8,7 @@ GH_PROJECT =		pop3d
 GH_TAGNAME =		v${VERSION}
 DISTNAME =		${GH_PROJECT}-${VERSION}
 CATEGORIES =		mail
+REVISION =		0
 
 MAINTAINER =		James Turner <james@calminferno.net>
 
diff --git a/mail/pop3d/pkg/pop3d.rc b/mail/pop3d/pkg/pop3d.rc
index 7cad31eb64f..29b5e58fcea 100644
--- a/mail/pop3d/pkg/pop3d.rc
+++ b/mail/pop3d/pkg/pop3d.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pop3d.rc,v 1.1.1.1 2014/06/01 00:08:57 jturner Exp $
+# $OpenBSD: pop3d.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pop3d"
 
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index aa3371a0d72..4e716af30e1 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2017/12/08 00:16:59 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =	tiny pop3 daemon
 
 DISTNAME =	popa3d-1.0.3
-REVISION =	0
+REVISION =	1
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES =	mail
diff --git a/mail/popa3d/pkg/popa3d.rc b/mail/popa3d/pkg/popa3d.rc
index 4276ce02b95..bf56be808f0 100644
--- a/mail/popa3d/pkg/popa3d.rc
+++ b/mail/popa3d/pkg/popa3d.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: popa3d.rc,v 1.1.1.1 2014/07/16 12:02:30 jca Exp $
+# $OpenBSD: popa3d.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${PREFIX}/libexec/popa3d -D"
 
diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile
index 027e2511f5d..f0e73b5a3ce 100644
--- a/mail/postfix/snapshot/Makefile
+++ b/mail/postfix/snapshot/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.308 2017/12/07 22:03:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.309 2018/01/11 19:27:03 rpe Exp $
 
 VERSION=	3.3-20171028
+REVISION=	0
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=experimental/}
 
diff --git a/mail/postfix/snapshot/pkg/postfix.rc b/mail/postfix/snapshot/pkg/postfix.rc
index 8ec8e166002..6ee0997659b 100755
--- a/mail/postfix/snapshot/pkg/postfix.rc
+++ b/mail/postfix/snapshot/pkg/postfix.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: postfix.rc,v 1.6 2015/07/15 16:18:45 sthen Exp $
+# $OpenBSD: postfix.rc,v 1.7 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/postfix/master"
 
diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile
index 27039b9770b..0e6d74cf321 100644
--- a/mail/postfix/stable/Makefile
+++ b/mail/postfix/stable/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.197 2017/11/09 21:52:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.198 2018/01/11 19:27:03 rpe Exp $
 
 VERSION=	3.2.4
+REVISION=	0
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=official/}
 
diff --git a/mail/postfix/stable/pkg/postfix.rc b/mail/postfix/stable/pkg/postfix.rc
index 1579bb1c2f4..702339f19cf 100755
--- a/mail/postfix/stable/pkg/postfix.rc
+++ b/mail/postfix/stable/pkg/postfix.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: postfix.rc,v 1.4 2015/07/15 16:18:45 sthen Exp $
+# $OpenBSD: postfix.rc,v 1.5 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/postfix/master"
 
diff --git a/mail/postfwd/Makefile b/mail/postfwd/Makefile
index 4cb999801b2..bc62c99ba9a 100644
--- a/mail/postfwd/Makefile
+++ b/mail/postfwd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2015/07/15 20:33:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT =	Postfix policy server
 
 DISTNAME =	postfwd-1.35
-REVISION =	4
+REVISION =	5
 CATEGORIES =	mail
 
 HOMEPAGE =	http://www.postfwd.org/
diff --git a/mail/postfwd/pkg/postfwd2.rc b/mail/postfwd/pkg/postfwd2.rc
index 88e6402eae5..c72d5d8a648 100644
--- a/mail/postfwd/pkg/postfwd2.rc
+++ b/mail/postfwd/pkg/postfwd2.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: postfwd2.rc,v 1.5 2015/07/15 20:33:57 ajacoutot Exp $
+# $OpenBSD: postfwd2.rc,v 1.6 2018/01/11 19:27:03 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/postfwd2"
 daemon_flags="-u _postfwd -g _postfwd -f ${SYSCONFDIR}/postfix/postfwd2.cf"
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index ab47c2c042d..c4f47385e16 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2015/07/15 17:38:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:03 rpe Exp $
 
 COMMENT=	postfix greylist daemon
 
 DISTNAME=	postgrey-1.35
 CATEGORIES=	mail
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://postgrey.schweikert.ch/
 
diff --git a/mail/postgrey/pkg/postgrey.rc b/mail/postgrey/pkg/postgrey.rc
index 8bc6d832e42..c5f02cf9240 100644
--- a/mail/postgrey/pkg/postgrey.rc
+++ b/mail/postgrey/pkg/postgrey.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: postgrey.rc,v 1.3 2015/07/15 17:38:05 ajacoutot Exp $
+# $OpenBSD: postgrey.rc,v 1.4 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/postgrey -d"
 daemon_flags="--inet=10023"
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index bed69564e6f..1919e2b56bd 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	milter for rspamd (also supports clamav, rate-limiting, etc)
 
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rmilter
 GH_TAGNAME=	1.10.0
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	mail
 
diff --git a/mail/rmilter/pkg/rmilter.rc b/mail/rmilter/pkg/rmilter.rc
index 3a1209d8fa2..5d55fd9165e 100644
--- a/mail/rmilter/pkg/rmilter.rc
+++ b/mail/rmilter/pkg/rmilter.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rmilter.rc,v 1.1.1.1 2016/12/02 14:57:41 sthen Exp $
+# $OpenBSD: rmilter.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/rmilter"
 daemon_flags="-c ${SYSCONFDIR}/rmilter/rmilter.conf"
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index fcf41627f92..dad034bda46 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2017/11/09 21:51:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	event-driven spam filtering system in C/Lua
 
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rspamd
 GH_TAGNAME=	1.6.5
+REVISION=	0
 
 CATEGORIES=	mail
 
diff --git a/mail/rspamd/pkg/rspamd.rc b/mail/rspamd/pkg/rspamd.rc
index 20c6b8181d2..a439374d0a4 100644
--- a/mail/rspamd/pkg/rspamd.rc
+++ b/mail/rspamd/pkg/rspamd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rspamd.rc,v 1.2 2016/01/16 10:39:59 ajacoutot Exp $
+# $OpenBSD: rspamd.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/rspamd"
 daemon_flags="-u _rspamd -g _rspamd"
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index d69465678b6..7bf71cbd535 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/01/11 07:56:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT-main =		mother of Mail Transfer Agents
 COMMENT-libmilter =	mail filter support library for sendmail
@@ -10,7 +10,7 @@ PKGNAME-libmilter =	libmilter-${V}
 FULLPKGNAME-libmilter =	libmilter-${V}
 FULLPKGPATH-libmilter =	mail/sendmail,-libmilter
 
-REVISION-main=		1
+REVISION-main=		2
 REVISION-libmilter=	1
 
 SHARED_LIBS =		milter	4.0
diff --git a/mail/sendmail/pkg/sendmail.rc b/mail/sendmail/pkg/sendmail.rc
index 1450c26e827..07455742fa6 100644
--- a/mail/sendmail/pkg/sendmail.rc
+++ b/mail/sendmail/pkg/sendmail.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sendmail.rc,v 1.3 2015/03/16 12:56:46 ajacoutot Exp $
+# $OpenBSD: sendmail.rc,v 1.4 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/sendmail/sendmail"
 daemon_flags="-L sm-mta -C${SYSCONFDIR}/mail/localhost.cf -bd -q30m"
diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile
index bb238b32997..1fdd851deed 100644
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.63 2016/03/16 16:46:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.64 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	sendmail milter to scan messages for viruses and spam
 
 DISTNAME=	smtp-vilter-1.3.6
 EPOCH=		0
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	mail
 
diff --git a/mail/smtp-vilter/pkg/smtp_vilter.rc b/mail/smtp-vilter/pkg/smtp_vilter.rc
index 2e5711f7ad2..f2a8762a6bb 100755
--- a/mail/smtp-vilter/pkg/smtp_vilter.rc
+++ b/mail/smtp-vilter/pkg/smtp_vilter.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smtp_vilter.rc,v 1.6 2015/07/15 16:15:35 ajacoutot Exp $
+# $OpenBSD: smtp_vilter.rc,v 1.7 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/smtp-vilter"
 
diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile
index fd75c9edb4f..e507b94e5f5 100644
--- a/mail/spampd/Makefile
+++ b/mail/spampd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2015/05/22 20:47:51 bluhm Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		SMTP/LMTP proxy for Spamassassin
 
 DISTNAME=		spampd-2.30
-REVISION=		3
+REVISION=		4
 
 CATEGORIES=		mail
 
diff --git a/mail/spampd/pkg/spampd.rc b/mail/spampd/pkg/spampd.rc
index 9afc6c315cb..6b612423e32 100644
--- a/mail/spampd/pkg/spampd.rc
+++ b/mail/spampd/pkg/spampd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: spampd.rc,v 1.2 2014/11/27 12:37:29 ajacoutot Exp $
+# $OpenBSD: spampd.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/spampd"
 daemon_flags="--a --aw --p=/var/spampd/spampd.pid"
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 44d63fd781a..ea8eb648085 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2014/07/11 05:59:24 giovanni Exp $
+# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	postfix greylist daemon
 
 DISTNAME =	sqlgrey-1.8.0
 CATEGORIES =	mail
+REVISION =	0
 
 HOMEPAGE =	http://sqlgrey.sf.net/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=sqlgrey/}
diff --git a/mail/sqlgrey/pkg/sqlgrey.rc b/mail/sqlgrey/pkg/sqlgrey.rc
index e16dede0847..6c06272d2c2 100644
--- a/mail/sqlgrey/pkg/sqlgrey.rc
+++ b/mail/sqlgrey/pkg/sqlgrey.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sqlgrey.rc,v 1.1 2014/05/30 13:22:57 giovanni Exp $
+# $OpenBSD: sqlgrey.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sqlgrey -d"
 
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 0c3e47f3a07..4ed155b82bd 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2016/11/04 10:22:25 landry Exp $
+# $OpenBSD: Makefile,v 1.37 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	mailing list manager with web interface
 
 VERSION =	6.2.16
 DISTNAME =	sympa-${VERSION}
+REVISION =	0
 
 CATEGORIES =	mail www
 
diff --git a/mail/sympa/pkg/sympa.rc b/mail/sympa/pkg/sympa.rc
index e7d0e9fae70..483fd4fa704 100644
--- a/mail/sympa/pkg/sympa.rc
+++ b/mail/sympa/pkg/sympa.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sympa.rc,v 1.6 2012/08/26 20:35:22 landry Exp $
+# $OpenBSD: sympa.rc,v 1.7 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sympa"
 
diff --git a/mail/sympa/pkg/wwsympa.rc b/mail/sympa/pkg/wwsympa.rc
index ecfd608442a..21772c19222 100644
--- a/mail/sympa/pkg/wwsympa.rc
+++ b/mail/sympa/pkg/wwsympa.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: wwsympa.rc,v 1.2 2015/07/15 23:19:45 ajacoutot Exp $
+# $OpenBSD: wwsympa.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${LOCALBASE}/bin/spawn-fcgi"
 daemon_flags="-u_sympa -g_sympa -p1026 ${TRUEPREFIX}/libexec/sympa/wwsympa.fcgi"
diff --git a/misc/memcached/Makefile b/misc/memcached/Makefile
index 89beca920c2..17125e9c740 100644
--- a/misc/memcached/Makefile
+++ b/misc/memcached/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2017/12/21 14:56:43 giovanni Exp $
+# $OpenBSD: Makefile,v 1.41 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	distributed memory object caching system
 
 DISTNAME=	memcached-1.5.3
 CATEGORIES=	misc
+REVISION=	0
 
 HOMEPAGE=	https://www.memcached.org/
 
diff --git a/misc/memcached/pkg/memcached.rc b/misc/memcached/pkg/memcached.rc
index d97f80c69e1..1263e677e54 100644
--- a/misc/memcached/pkg/memcached.rc
+++ b/misc/memcached/pkg/memcached.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: memcached.rc,v 1.3 2017/07/17 08:35:08 landry Exp $
+# $OpenBSD: memcached.rc,v 1.4 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/memcached -d"
 daemon_flags="-u _memcached"
diff --git a/misc/rocrail/Makefile b/misc/rocrail/Makefile
index 49ee0ee1004..bb805d58286 100644
--- a/misc/rocrail/Makefile
+++ b/misc/rocrail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT-main =		model railroad control daemon
 COMMENT-gui =		model railroad control daemon client
@@ -10,7 +10,7 @@ PKGNAME-main =		rocrail-${VERSION}.${REV}
 PKGNAME-gui =		rocview-${VERSION}.${REV}
 CATEGORIES =		misc x11
 
-REVISION-main =		5
+REVISION-main =		6
 REVISION-gui =		4
 
 HOMEPAGE =		http://www.rocrail.net/
diff --git a/misc/rocrail/pkg/rocrail.rc b/misc/rocrail/pkg/rocrail.rc
index 9f15f45f2ff..c4f9ee291e1 100644
--- a/misc/rocrail/pkg/rocrail.rc
+++ b/misc/rocrail/pkg/rocrail.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rocrail.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: rocrail.rc,v 1.5 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/rocrail"
 daemon_user="_rocrail"
diff --git a/misc/srcpd/Makefile b/misc/srcpd/Makefile
index d268dc90942..66fdc46623c 100644
--- a/misc/srcpd/Makefile
+++ b/misc/srcpd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2016/11/08 14:23:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	daemon to control digital model railroad systems
 
 DISTNAME =	srcpd-2.1.3
 CATEGORIES =	misc net
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://srcpd.sourceforge.net/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=srcpd/}
diff --git a/misc/srcpd/pkg/srcpd.rc b/misc/srcpd/pkg/srcpd.rc
index 9ae14cba95e..d2275872c6e 100644
--- a/misc/srcpd/pkg/srcpd.rc
+++ b/misc/srcpd/pkg/srcpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: srcpd.rc,v 1.5 2015/07/15 14:59:15 ajacoutot Exp $
+# $OpenBSD: srcpd.rc,v 1.6 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/srcpd"
 
diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index 3da8ad7f781..6a8bff51237 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	UPnP media server
 
 VER =		0.12.1
 DISTNAME =	mediatomb-${VER}
-REVISION =	17
+REVISION =	18
 
 CATEGORIES =	multimedia
 
diff --git a/multimedia/mediatomb/pkg/mediatomb.rc b/multimedia/mediatomb/pkg/mediatomb.rc
index 29dd455278e..5dd719e4292 100644
--- a/multimedia/mediatomb/pkg/mediatomb.rc
+++ b/multimedia/mediatomb/pkg/mediatomb.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mediatomb.rc,v 1.1 2013/01/27 10:06:50 sthen Exp $
+# $OpenBSD: mediatomb.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mediatomb -d"
 daemon_flags="-c ${SYSCONFDIR}/mediatomb/config.xml -u _mediatomb -g _mediatomb -l /var/log/mediatomb"
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index 7ba689bcd20..1ff075ad16d 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	lightweight DLNA/UPnP-AV media server (aka ReadyMedia)
 
 V=		1.2.1
 DISTNAME=	minidlna-$V
 PKGNAME=	minidlna-$V
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	multimedia
 
diff --git a/multimedia/minidlna/pkg/minidlna.rc b/multimedia/minidlna/pkg/minidlna.rc
index d6585bdc618..a8c5501b7a7 100644
--- a/multimedia/minidlna/pkg/minidlna.rc
+++ b/multimedia/minidlna/pkg/minidlna.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: minidlna.rc,v 1.2 2013/05/07 20:37:24 sthen Exp $
+# $OpenBSD: minidlna.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/minidlnad"
 daemon_user="_minidlna"
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index baedf8c8350..d8fe73e8e9d 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/01/05 05:12:27 bentley Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	motion detection software for video
 
@@ -6,7 +6,7 @@ GH_ACCOUNT=	Motion-Project
 GH_PROJECT=	motion
 GH_COMMIT=	9b4c16cae0ea77950cc156a9c82947ac51825f68
 V=		3.4.1
-REVISION=	4
+REVISION=	5
 DISTNAME=	motion-$V
 
 CATEGORIES=	multimedia
diff --git a/multimedia/motion/pkg/motion.rc b/multimedia/motion/pkg/motion.rc
index fea83e7854c..0ef2182fa81 100644
--- a/multimedia/motion/pkg/motion.rc
+++ b/multimedia/motion/pkg/motion.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: motion.rc,v 1.2 2014/10/11 11:04:20 sthen Exp $
+# $OpenBSD: motion.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/motion -b"
 daemon_user="_motion"
diff --git a/net/adsuck/Makefile b/net/adsuck/Makefile
index 67e8a969ea6..8446387ae7c 100644
--- a/net/adsuck/Makefile
+++ b/net/adsuck/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2016/03/11 19:46:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		DNS relay for ad blocking
 
 V=			2.5.0
-REVISION=		4
+REVISION=		5
 GH_TAGNAME=		ADSUCK_${V:S/./_/g}
 GH_ACCOUNT=		conformal
 GH_PROJECT=		adsuck
diff --git a/net/adsuck/pkg/adsuck.rc b/net/adsuck/pkg/adsuck.rc
index dbef8584fef..e2d362479a2 100644
--- a/net/adsuck/pkg/adsuck.rc
+++ b/net/adsuck/pkg/adsuck.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: adsuck.rc,v 1.4 2015/07/15 14:59:15 ajacoutot Exp $
+# $OpenBSD: adsuck.rc,v 1.5 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/adsuck"
 daemon_flags="-c /var/adsuck -f /files/resolv.conf -r /files/regex /files/hosts.small"
diff --git a/net/aircontrol/Makefile b/net/aircontrol/Makefile
index d89a919134a..22091962690 100644
--- a/net/aircontrol/Makefile
+++ b/net/aircontrol/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	management tool for Ubiquiti wireless devices
 
 DISTNAME =	aircontrol-1.4.2-beta
 PKGNAME =	${DISTNAME:S/-beta/beta/}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	net
 
diff --git a/net/aircontrol/pkg/aircontrol.rc b/net/aircontrol/pkg/aircontrol.rc
index f2ed759ffa8..da5fcd24335 100644
--- a/net/aircontrol/pkg/aircontrol.rc
+++ b/net/aircontrol/pkg/aircontrol.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: aircontrol.rc,v 1.7 2015/07/15 19:49:41 ajacoutot Exp $
+# $OpenBSD: aircontrol.rc,v 1.8 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/catalina.sh"
 daemon_flags="-Xmx768M -server"
diff --git a/net/apache-activemq/Makefile b/net/apache-activemq/Makefile
index d511d5130a4..a019a86b2e1 100644
--- a/net/apache-activemq/Makefile
+++ b/net/apache-activemq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/04/21 13:27:47 kurt Exp $
+# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:04 rpe Exp $
 
 PKG_ARCH=	*
 
@@ -6,7 +6,7 @@ COMMENT=	open source message broker implementing JMS 1.1
 
 V=		5.14.5
 DISTNAME=	apache-activemq-$V
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
diff --git a/net/apache-activemq/pkg/activemq.rc b/net/apache-activemq/pkg/activemq.rc
index 392ea3d2ed4..4b7363e64e9 100644
--- a/net/apache-activemq/pkg/activemq.rc
+++ b/net/apache-activemq/pkg/activemq.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: activemq.rc,v 1.3 2013/03/13 16:30:11 ajacoutot Exp $
+# $OpenBSD: activemq.rc,v 1.4 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/activemq/bin/activemq"
 daemon_user="_activemq"
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 74af69e3ee4..d9e48ec3c04 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2017/07/31 19:18:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT =	Audit Record Generation and Utilization System
 
 DISTNAME =	argus-3.0.8.2
-REVISION =	0
+REVISION =	1
 CATEGORIES =	net
 
 HOMEPAGE =	http://qosient.com/argus/
diff --git a/net/argus/pkg/argus.rc b/net/argus/pkg/argus.rc
index 994121f805b..951ed9d5711 100755
--- a/net/argus/pkg/argus.rc
+++ b/net/argus/pkg/argus.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: argus.rc,v 1.5 2010/12/27 14:50:22 ajacoutot Exp $
+# $OpenBSD: argus.rc,v 1.6 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/argus"
 
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 3848e54b732..f6bfa0cc2d4 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2017/05/08 18:10:25 schwarze Exp $
+# $OpenBSD: Makefile,v 1.44 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	monitor arp & rarp requests
 
 DISTNAME=	arpwatch-2.1a15
-REVISION=	14
+REVISION=	15
 CATEGORIES=	net
 
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/
diff --git a/net/arpwatch/pkg/arpwatch.rc b/net/arpwatch/pkg/arpwatch.rc
index 14c6fb81aea..2012d360114 100644
--- a/net/arpwatch/pkg/arpwatch.rc
+++ b/net/arpwatch/pkg/arpwatch.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: arpwatch.rc,v 1.1 2011/03/14 20:42:11 sthen Exp $
+# $OpenBSD: arpwatch.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/arpwatch"
 
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 5bb559c5acf..2681a9a92f7 100755
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.128 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT-main=		framework for Multicast DNS Service Discovery
 COMMENT-gtk=		gtk+2 avahi-ui libraries
@@ -19,7 +19,7 @@ PKGNAME-gui=		avahi-gui-${V}
 PKGNAME-python=		py-avahi-${V}
 PKGNAME-ui=		avahi-ui-${V}
 
-REVISION-main=		0
+REVISION-main=		1
 REVISION-gtk=		1
 REVISION-gtk3=		1
 REVISION-gui=		1
diff --git a/net/avahi/pkg/avahi_daemon.rc b/net/avahi/pkg/avahi_daemon.rc
index 9bded4d5535..05f359029a8 100644
--- a/net/avahi/pkg/avahi_daemon.rc
+++ b/net/avahi/pkg/avahi_daemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: avahi_daemon.rc,v 1.7 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: avahi_daemon.rc,v 1.8 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/avahi-daemon -D"
 
diff --git a/net/avahi/pkg/avahi_dnsconfd.rc b/net/avahi/pkg/avahi_dnsconfd.rc
index f57a8c506c1..95edc53a40b 100644
--- a/net/avahi/pkg/avahi_dnsconfd.rc
+++ b/net/avahi/pkg/avahi_dnsconfd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: avahi_dnsconfd.rc,v 1.7 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: avahi_dnsconfd.rc,v 1.8 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/avahi-dnsconfd -D"
 
diff --git a/net/bird/Makefile b/net/bird/Makefile
index 6ccaf5785fd..96c9f557e70 100644
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2017/04/18 09:31:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT-main=	BIRD internet routing daemon
 COMMENT-doc=	BIRD internet routing daemon (documentation)
 
 V=		1.6.3
-REVISION-main=	0
+REVISION-main=	1
 DISTNAME=	bird-$V
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME:S/-/-doc-/}${EXTRACT_SUFX}
diff --git a/net/bird/pkg/bird.rc b/net/bird/pkg/bird.rc
index aa7e4f5ad2c..a01c64b93ae 100644
--- a/net/bird/pkg/bird.rc
+++ b/net/bird/pkg/bird.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bird.rc,v 1.5 2015/07/15 14:35:48 ajacoutot Exp $
+# $OpenBSD: bird.rc,v 1.6 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/bird"
 
diff --git a/net/bird/pkg/bird6.rc b/net/bird/pkg/bird6.rc
index 997dc587b49..e7752021b6f 100644
--- a/net/bird/pkg/bird6.rc
+++ b/net/bird/pkg/bird6.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bird6.rc,v 1.5 2015/07/15 14:35:48 ajacoutot Exp $
+# $OpenBSD: bird6.rc,v 1.6 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/bird6"
 
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index d5303934fbe..b31a6f5efbd 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.64 2017/09/23 23:11:35 kili Exp $
+# $OpenBSD: Makefile,v 1.65 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		IRC proxy to connect to AIM, ICQ, Jabber and Yahoo
 
 V=			3.5.1
 DISTNAME=		bitlbee-$V
 PKGSPEC=		bitlbee-=$V
-REVISION=		2
+REVISION=		3
 CATEGORIES=		net
 
 HOMEPAGE=		http://bitlbee.org/
diff --git a/net/bitlbee/pkg/bitlbee.rc b/net/bitlbee/pkg/bitlbee.rc
index c1e104a9626..6c72f208f25 100644
--- a/net/bitlbee/pkg/bitlbee.rc
+++ b/net/bitlbee/pkg/bitlbee.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bitlbee.rc,v 1.1 2017/05/29 12:11:07 sthen Exp $
+# $OpenBSD: bitlbee.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/bitlbee -F"
 daemon_user="_bitlbee"
diff --git a/net/bro/Makefile b/net/bro/Makefile
index dff2d1a6acb..1d8e7f18b37 100644
--- a/net/bro/Makefile
+++ b/net/bro/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.43 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		network analysis and security monitoring framework
 
 DISTNAME=		bro-2.5.2
+REVISION=		0
 
 SHARED_LIBS +=  broccoli                  5.1 # 5.1
 
diff --git a/net/bro/pkg/bro.rc b/net/bro/pkg/bro.rc
index 2cf31fe24f7..4f692412ff8 100644
--- a/net/bro/pkg/bro.rc
+++ b/net/bro/pkg/bro.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bro.rc,v 1.2 2016/10/07 10:05:16 ajacoutot Exp $
+# $OpenBSD: bro.rc,v 1.3 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/broctl"
 daemon_flags="start"
diff --git a/net/cnupm/Makefile b/net/cnupm/Makefile
index 4d77b2ef3ff..21dbc15e09a 100644
--- a/net/cnupm/Makefile
+++ b/net/cnupm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2017/12/16 17:45:43 zhuk Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		IPv4/IPv6 traffic collector
 
 DISTNAME=		cnupm-3.12
 CATEGORIES=		net
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://pdp-11.org.ru/~form/cnupm
 
diff --git a/net/cnupm/pkg/cnupm.rc b/net/cnupm/pkg/cnupm.rc
index 004524f69ea..6022516472b 100644
--- a/net/cnupm/pkg/cnupm.rc
+++ b/net/cnupm/pkg/cnupm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cnupm.rc,v 1.1 2015/08/14 13:06:52 zhuk Exp $
+# $OpenBSD: cnupm.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cnupm"
 
diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile
index aa2e00966ea..556bc53a7ae 100644
--- a/net/cvsync/Makefile
+++ b/net/cvsync/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2016/05/13 14:24:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.54 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=	CVS repository synchronization utility
 
 PKGNAME=	cvsync-0.25.0pre0
 DISTNAME=	cvsync-0.24.19
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 HOMEPAGE=	http://www.cvsync.org/
 
diff --git a/net/cvsync/pkg/cvsyncd.rc b/net/cvsync/pkg/cvsyncd.rc
index 7fd7e276830..9e9d19c29f3 100644
--- a/net/cvsync/pkg/cvsyncd.rc
+++ b/net/cvsync/pkg/cvsyncd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cvsyncd.rc,v 1.1 2012/04/10 19:52:44 phessler Exp $
+# $OpenBSD: cvsyncd.rc,v 1.2 2018/01/11 19:27:04 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/cvsyncd"
 daemon_user="_cvsyncd"
diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index 21641db83d6..57efb08fd27 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2015/05/25 06:01:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2018/01/11 19:27:04 rpe Exp $
 
 COMMENT=		network statistics gatherer with graphs
 
@@ -6,6 +6,7 @@ DISTNAME=		darkstat-3.0.719
 CATEGORIES=		net www
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.tar.bz2
+REVISION=		0
 
 HOMEPAGE=		http://unix4lyfe.org/darkstat/
 
diff --git a/net/darkstat/pkg/darkstat.rc b/net/darkstat/pkg/darkstat.rc
index 1e68f6d1b7b..a7d1b9ffd25 100644
--- a/net/darkstat/pkg/darkstat.rc
+++ b/net/darkstat/pkg/darkstat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: darkstat.rc,v 1.3 2014/02/07 08:56:53 brad Exp $
+# $OpenBSD: darkstat.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 egress_if=$( ifconfig egress 2>/dev/null | head -1 | cut -d : -f 1 )
 
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 2c01877e5d5..8958f302ae9 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2015/09/18 19:35:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		Dynamic DNS service update client
 
 DISTNAME=		ddclient-3.8.3
 CATEGORIES=		net
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://ddclient.sourceforge.net/
 
diff --git a/net/ddclient/pkg/ddclient.rc b/net/ddclient/pkg/ddclient.rc
index dbf4dd1b505..9e8db0565e0 100644
--- a/net/ddclient/pkg/ddclient.rc
+++ b/net/ddclient/pkg/ddclient.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ddclient.rc,v 1.5 2015/07/15 17:24:11 ajacoutot Exp $
+# $OpenBSD: ddclient.rc,v 1.6 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ddclient"
 daemon_user="_ddclient"
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index dbaf3c9438c..c36877c0d11 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2018/01/01 14:58:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
 
 DISTNAME=		dhcpcd-7.0.0
+REVISION=		0
 
 CATEGORIES=		net
 EXTRACT_SUFX=		.tar.xz
diff --git a/net/dhcpcd/pkg/dhcpcd.rc b/net/dhcpcd/pkg/dhcpcd.rc
index 14d4c201d0d..edf3aacc5f3 100644
--- a/net/dhcpcd/pkg/dhcpcd.rc
+++ b/net/dhcpcd/pkg/dhcpcd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dhcpcd.rc,v 1.1.1.1 2014/07/14 15:50:55 sthen Exp $
+# $OpenBSD: dhcpcd.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dhcpcd"
 daemon_flags="-Mq"
diff --git a/net/dnscrypt-proxy/Makefile b/net/dnscrypt-proxy/Makefile
index beb883b03bb..b14afc6f963 100644
--- a/net/dnscrypt-proxy/Makefile
+++ b/net/dnscrypt-proxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2017/11/10 16:35:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT-main=		secure communications between a DNS client and resolver
 COMMENT-plugins=	example plugins for dnscrypt-proxy
@@ -6,7 +6,7 @@ COMMENT-plugins=	example plugins for dnscrypt-proxy
 # if updating, update to a newer resolvers csv file, or comment-out and
 # fall back to the included one
 V=			1.9.5
-REVISION-main=		0
+REVISION-main=		1
 DISTNAME=		dnscrypt-proxy-${V}
 PKGNAME-main=		dnscrypt-proxy-${V}
 PKGNAME-plugins=	dnscrypt-proxy-plugins-${V}
diff --git a/net/dnscrypt-proxy/pkg/dnscrypt_proxy.rc b/net/dnscrypt-proxy/pkg/dnscrypt_proxy.rc
index dd9eed563a5..6be59fc24b9 100644
--- a/net/dnscrypt-proxy/pkg/dnscrypt_proxy.rc
+++ b/net/dnscrypt-proxy/pkg/dnscrypt_proxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dnscrypt_proxy.rc,v 1.3 2016/02/04 14:29:25 sthen Exp $
+# $OpenBSD: dnscrypt_proxy.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dnscrypt-proxy -d --user=_dnscrypt-proxy"
 
diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile
index 7f17741251d..86ba5229556 100644
--- a/net/dnsdist/Makefile
+++ b/net/dnsdist/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		highly DNS-, DoS- and abuse-aware loadbalancer
 
 DISTNAME=		dnsdist-1.2.0
 EXTRACT_SUFX=		.tar.bz2
+REVISION=		0
 
 CATEGORIES=		net
 
diff --git a/net/dnsdist/pkg/dnsdist.rc b/net/dnsdist/pkg/dnsdist.rc
index c75f57b24e1..f21032ee0d1 100644
--- a/net/dnsdist/pkg/dnsdist.rc
+++ b/net/dnsdist/pkg/dnsdist.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dnsdist.rc,v 1.1.1.1 2017/01/15 17:13:33 sthen Exp $
+# $OpenBSD: dnsdist.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/dnsdist -d -u _dnsdist"
 
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index b14bb201451..161b4f82f88 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2017/10/06 21:33:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=	lightweight caching DNS forwarder, DHCP and TFTP server
 
@@ -6,6 +6,7 @@ DISTNAME=	dnsmasq-2.78
 CATEGORIES=	net
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 HOMEPAGE=	http://www.thekelleys.org.uk/dnsmasq/doc.html
 
diff --git a/net/dnsmasq/pkg/dnsmasq.rc b/net/dnsmasq/pkg/dnsmasq.rc
index 9e01576a581..3e85cfbd7a3 100644
--- a/net/dnsmasq/pkg/dnsmasq.rc
+++ b/net/dnsmasq/pkg/dnsmasq.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dnsmasq.rc,v 1.1 2012/04/30 06:02:51 ajacoutot Exp $
+# $OpenBSD: dnsmasq.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dnsmasq"
 
diff --git a/net/dnsreflector/Makefile b/net/dnsreflector/Makefile
index 2b7bf3c89dc..4dcab6dad6b 100644
--- a/net/dnsreflector/Makefile
+++ b/net/dnsreflector/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2014/07/16 12:36:27 jca Exp $
+# $OpenBSD: Makefile,v 1.10 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		DNS queries reflector
 
 DISTNAME=		dnsreflector-1.03
 CATEGORIES=		net sysutils
+REVISION=		0
 
 HOMEPAGE=		http://www.wolfermann.org/dnsreflector.html
 
diff --git a/net/dnsreflector/pkg/dnsreflector.rc b/net/dnsreflector/pkg/dnsreflector.rc
index 4ae56c81ba1..a6c90310db8 100644
--- a/net/dnsreflector/pkg/dnsreflector.rc
+++ b/net/dnsreflector/pkg/dnsreflector.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dnsreflector.rc,v 1.1 2014/07/16 12:36:27 jca Exp $
+# $OpenBSD: dnsreflector.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dnsreflector -d"
 
diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile
index fe838ac45c8..dc7ec051191 100644
--- a/net/ejabberd/Makefile
+++ b/net/ejabberd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.45 2016/09/13 16:12:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.46 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		jabber server written in Erlang
 
 V=			2.1.12
 DISTNAME=		ejabberd-$V
-REVISION=		10
+REVISION=		11
 
 CATEGORIES=		net
 
diff --git a/net/ejabberd/pkg/ejabberd.rc b/net/ejabberd/pkg/ejabberd.rc
index d1bebc186aa..67779e8fab5 100644
--- a/net/ejabberd/pkg/ejabberd.rc
+++ b/net/ejabberd/pkg/ejabberd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ejabberd.rc,v 1.2 2014/12/10 15:30:19 ajacoutot Exp $
+# $OpenBSD: ejabberd.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ejabberdctl"
 
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index cb7a0b537e0..e966917f8d7 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2017/11/25 13:12:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.76 2018/01/11 19:27:05 rpe Exp $
 
 PORTROACH=	limit:^2\.
 
@@ -21,6 +21,7 @@ PKGNAME-iodbc=	freeradius-iodbc-$V
 PKGNAME-mysql=	freeradius-mysql-$V
 PKGNAME-pgsql=	freeradius-pgsql-$V
 PKGNAME-ldap=	freeradius-ldap-$V
+REVISION-main=	0
 
 CATEGORIES=	net security
 
diff --git a/net/freeradius/pkg/freeradius.rc b/net/freeradius/pkg/freeradius.rc
index 2f58f794992..ab871390990 100644
--- a/net/freeradius/pkg/freeradius.rc
+++ b/net/freeradius/pkg/freeradius.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: freeradius.rc,v 1.1 2015/07/21 02:25:06 sthen Exp $
+# $OpenBSD: freeradius.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/radiusd"
 
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 4d963d4ba6e..fd41b9acbe4 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2018/01/11 19:27:05 rpe Exp $
 
 PORTROACH=	limit:^3\.
 
@@ -23,6 +23,7 @@ PKGNAME-memcached= freeradius-memcached-$V
 PKGNAME-mysql=	freeradius-mysql-$V
 PKGNAME-pgsql=	freeradius-pgsql-$V
 PKGNAME-python=	freeradius-python-$V
+REVISION-main=	0
 
 CATEGORIES=	net security
 
diff --git a/net/freeradius3/pkg/freeradius.rc b/net/freeradius3/pkg/freeradius.rc
index 6fefec1af97..ab871390990 100644
--- a/net/freeradius3/pkg/freeradius.rc
+++ b/net/freeradius3/pkg/freeradius.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: freeradius.rc,v 1.1.1.1 2015/11/12 12:59:38 sthen Exp $
+# $OpenBSD: freeradius.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/radiusd"
 
diff --git a/net/gdnsd/Makefile b/net/gdnsd/Makefile
index bb2b7ee92ee..eff6a787cfd 100644
--- a/net/gdnsd/Makefile
+++ b/net/gdnsd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2018/01/09 19:56:56 jung Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		geographically-aware, authoritative-only DNS server
 
 V=			2.3.0
 DISTNAME=		gdnsd-$V
 EXTRACT_SUFX=		.tar.xz
+REVISION=		0
 
 CATEGORIES=		net
 
diff --git a/net/gdnsd/pkg/gdnsd.rc b/net/gdnsd/pkg/gdnsd.rc
index b38ce645cde..426e1f24792 100644
--- a/net/gdnsd/pkg/gdnsd.rc
+++ b/net/gdnsd/pkg/gdnsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gdnsd.rc,v 1.4 2017/08/10 20:14:56 jung Exp $
+# $OpenBSD: gdnsd.rc,v 1.5 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${PREFIX}/sbin/gdnsd"
 daemon_flags="start"
diff --git a/net/geomyidae/Makefile b/net/geomyidae/Makefile
index 41d7d4d2c67..9e67872684f 100644
--- a/net/geomyidae/Makefile
+++ b/net/geomyidae/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2015/07/15 19:27:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =		Gopher protocol daemon
 
 DISTNAME =		geomyidae-0.26.3
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
diff --git a/net/geomyidae/pkg/geomyidae.rc b/net/geomyidae/pkg/geomyidae.rc
index 7dbd46c28b0..97cab6a158d 100644
--- a/net/geomyidae/pkg/geomyidae.rc
+++ b/net/geomyidae/pkg/geomyidae.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: geomyidae.rc,v 1.2 2015/07/15 19:27:52 ajacoutot Exp $
+# $OpenBSD: geomyidae.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/geomyidae"
 daemon_flags="-4 -l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 66ac8c78227..7a3ea55cf9e 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2017/10/13 15:46:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.75 2018/01/11 19:27:05 rpe Exp $
 
 BROKEN-hppa=		libpt.so.7.0: undefined reference to __sync_fetch_and_or_4
 
@@ -8,6 +8,7 @@ DISTNAME=		gnugk-4.7.20171013
 GH_ACCOUNT=		willamowius
 GH_PROJECT=		gnugk
 GH_COMMIT=		240e0cc08d1cfe42a30a9b6f77e193e834dcd15b
+REVISION=		0
 
 CATEGORIES=		net telephony
 
diff --git a/net/gnugk/pkg/gnugk.rc b/net/gnugk/pkg/gnugk.rc
index 310240dc5a6..f997570eab1 100755
--- a/net/gnugk/pkg/gnugk.rc
+++ b/net/gnugk/pkg/gnugk.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gnugk.rc,v 1.5 2017/10/07 15:04:36 ajacoutot Exp $
+# $OpenBSD: gnugk.rc,v 1.6 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/gnugk"
 daemon_flags="-t -c ${SYSCONFDIR}/gatekeeper.ini -u _gnugk -o /var/log/gnugk/gnugk.log"
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index a2128aae79d..242a7dece11 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2017/08/21 01:32:19 danj Exp $
+# $OpenBSD: Makefile,v 1.45 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =	reliable, high performance TCP/HTTP load balancer
 
@@ -6,6 +6,7 @@ DISTNAME =	haproxy-1.7.9
 CATEGORIES =	net www
 HOMEPAGE =	http://www.haproxy.org/
 MAINTAINER =	Daniel Jakots <obsd@chown.me>
+REVISION =	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =		Yes
diff --git a/net/haproxy/pkg/haproxy.rc b/net/haproxy/pkg/haproxy.rc
index 2e96933d050..b6abc438968 100644
--- a/net/haproxy/pkg/haproxy.rc
+++ b/net/haproxy/pkg/haproxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: haproxy.rc,v 1.3 2015/10/24 14:31:26 ajacoutot Exp $
+# $OpenBSD: haproxy.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/haproxy"
 daemon_flags="-f ${HAPROXYCONF}/haproxy.cfg"
diff --git a/net/icbd/Makefile b/net/icbd/Makefile
index f79eff72597..238321d6e80 100644
--- a/net/icbd/Makefile
+++ b/net/icbd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2017/08/30 20:56:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =		Internet Citizens Band Server
 
 GH_ACCOUNT =		mbelop
 GH_PROJECT =		icbd
 GH_TAGNAME =		1.9
+REVISION =		0
 
 CATEGORIES =		net
 
diff --git a/net/icbd/pkg/icbd.rc b/net/icbd/pkg/icbd.rc
index 9dd8c833b18..fd7a49d69b1 100644
--- a/net/icbd/pkg/icbd.rc
+++ b/net/icbd/pkg/icbd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: icbd.rc,v 1.2 2015/07/15 16:22:45 ajacoutot Exp $
+# $OpenBSD: icbd.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/icbd"
 
diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 1a9efa153aa..9ef8bf7b3f5 100644
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.61 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.62 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=	server for streaming various media formats
 CATEGORIES=	net audio
 
 DISTNAME=	icecast-2.4.3
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://www.icecast.org/
 
diff --git a/net/icecast/pkg/icecast.rc b/net/icecast/pkg/icecast.rc
index 710c2816d83..e4aa2e5732e 100644
--- a/net/icecast/pkg/icecast.rc
+++ b/net/icecast/pkg/icecast.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: icecast.rc,v 1.4 2010/12/27 14:50:22 ajacoutot Exp $
+# $OpenBSD: icecast.rc,v 1.5 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/icecast"
 daemon_flags="-b -c /var/icecast/icecast.xml"
diff --git a/net/ices2/Makefile b/net/ices2/Makefile
index 994d6636b73..e7b94ee1a60 100644
--- a/net/ices2/Makefile
+++ b/net/ices2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=	icecast source for streaming Ogg Vorbis
 
 DISTNAME=	ices-2.0.2
 CATEGORIES=	net audio
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://www.icecast.org/ices.php
 
diff --git a/net/ices2/pkg/ices2.rc b/net/ices2/pkg/ices2.rc
index e2e69858476..b9a7a13f35b 100644
--- a/net/ices2/pkg/ices2.rc
+++ b/net/ices2/pkg/ices2.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ices2.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: ices2.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ices2"
 daemon_flags="${SYSCONFDIR}/ices2.xml"
diff --git a/net/icinga/core/Makefile b/net/icinga/core/Makefile
index a00b93560c9..5da13c1fc3d 100644
--- a/net/icinga/core/Makefile
+++ b/net/icinga/core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2017/12/20 15:11:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.96 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT-main =		network monitoring system (improved fork of Nagios)
 COMMENT-cgi =		cgi scripts for Icinga (classic Nagios-style UI)
@@ -10,6 +10,8 @@ GH_TAGNAME =		v1.14.2
 PKGNAME-main =		icinga-${GH_TAGNAME:S/v//}
 PKGNAME-cgi =		icinga-cgi-${GH_TAGNAME:S/v//}
 PKGNAME-ido =		icinga-idoutils-${GH_TAGNAME:S/v//}
+REVISION-ido =		0
+REVISION-main =		0
 
 WANTLIB =		c crypto m pthread ssl z
 
diff --git a/net/icinga/core/pkg/icinga.rc b/net/icinga/core/pkg/icinga.rc
index f63a8eef29c..6975ec23fe3 100644
--- a/net/icinga/core/pkg/icinga.rc
+++ b/net/icinga/core/pkg/icinga.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: icinga.rc,v 1.3 2012/05/27 19:39:28 sthen Exp $
+# $OpenBSD: icinga.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/icinga -d"
 daemon_flags="${SYSCONFDIR}/icinga.cfg"
diff --git a/net/icinga/core/pkg/ido2db.rc b/net/icinga/core/pkg/ido2db.rc
index 4397d5219ff..0538441893b 100644
--- a/net/icinga/core/pkg/ido2db.rc
+++ b/net/icinga/core/pkg/ido2db.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ido2db.rc,v 1.2 2012/05/27 19:39:28 sthen Exp $
+# $OpenBSD: ido2db.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ido2db"
 daemon_flags="-c ${SYSCONFDIR}/ido2db.cfg"
diff --git a/net/icinga/core2/Makefile b/net/icinga/core2/Makefile
index 23ef99321f2..ca57901a9cd 100644
--- a/net/icinga/core2/Makefile
+++ b/net/icinga/core2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2017/12/30 21:59:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2018/01/11 19:27:05 rpe Exp $
 
 BROKEN-arm =	needs atomic ops; __sync_add_and_fetch_4
 BROKEN-hppa =	needs atomic ops; __sync_add_and_fetch_4
@@ -16,6 +16,7 @@ GH_TAGNAME =	v$V
 PKGNAME-main =	icinga2-$V
 PKGNAME-mysql =	icinga2-ido-mysql-$V
 PKGNAME-pgsql =	icinga2-ido-pgsql-$V
+REVISION-main =	0
 
 SHARED_LIBS +=	base                      0.0 # 2.6
 SHARED_LIBS +=	checker                   0.0 # 2.6
diff --git a/net/icinga/core2/pkg/icinga2.rc b/net/icinga/core2/pkg/icinga2.rc
index 0cca8af545b..bed90ff9827 100644
--- a/net/icinga/core2/pkg/icinga2.rc
+++ b/net/icinga/core2/pkg/icinga2.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: icinga2.rc,v 1.10 2015/11/16 20:29:55 sthen Exp $
+# $OpenBSD: icinga2.rc,v 1.11 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/icinga2 daemon -d"
 daemon_user="_icinga"
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 78f333a5eb8..30b1570e931 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2016/12/23 13:44:31 rzalamena Exp $
+# $OpenBSD: Makefile,v 1.16 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =	multicast router utilizing IGMP forwarding
 
 VERSION =	0.1-beta2
 DISTNAME =	igmpproxy-src-${VERSION}
 PKGNAME =	igmpproxy-${VERSION:S/-beta/b/}
-REVISION =	9
+REVISION =	10
 CATEGORIES =	net
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
 
diff --git a/net/igmpproxy/pkg/igmpproxy.rc b/net/igmpproxy/pkg/igmpproxy.rc
index 127fbdc9d58..f4366b88351 100644
--- a/net/igmpproxy/pkg/igmpproxy.rc
+++ b/net/igmpproxy/pkg/igmpproxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: igmpproxy.rc,v 1.1 2011/04/28 09:45:39 sthen Exp $
+# $OpenBSD: igmpproxy.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/igmpproxy"
 
diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile
index 77816296423..0d552e09917 100644
--- a/net/inadyn/Makefile
+++ b/net/inadyn/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2015/06/23 10:38:06 jca Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =		small memory footprint dynamic dns updater
 
 DISTNAME =		inadyn-1.98.0
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net
 
diff --git a/net/inadyn/pkg/inadyn.rc b/net/inadyn/pkg/inadyn.rc
index 50ede99e784..313f2a57811 100644
--- a/net/inadyn/pkg/inadyn.rc
+++ b/net/inadyn/pkg/inadyn.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: inadyn.rc,v 1.2 2015/06/23 10:38:06 jca Exp $
+# $OpenBSD: inadyn.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/inadyn -b"
 daemon_flags="-F ${SYSCONFDIR}/inadyn.conf -s -d _inadyn:_inadyn"
diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index ea25454727f..e3d1f9da0d0 100644
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2016/02/27 22:58:34 jca Exp $
+# $OpenBSD: Makefile,v 1.18 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=		tunnel IPv4 data through DNS
 
 DISTNAME=		iodine-0.7.0
 CATEGORIES=		net
-REVISION=		2
+REVISION=		3
 
 HOMEPAGE=		http://code.kryo.se/iodine/
 
diff --git a/net/iodine/pkg/iodined.rc b/net/iodine/pkg/iodined.rc
index a838aee5bf1..4e338b2b1dd 100644
--- a/net/iodine/pkg/iodined.rc
+++ b/net/iodine/pkg/iodined.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: iodined.rc,v 1.1 2015/10/21 21:24:42 ajacoutot Exp $
+# $OpenBSD: iodined.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/iodined"
 
diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile
index e82b51ed233..199e4455a3b 100644
--- a/net/ipcad/Makefile
+++ b/net/ipcad/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2015/10/08 21:19:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/01/11 19:27:05 rpe Exp $
 # $RuOBSD: Makefile,v 1.1.1.1 2002/04/08 02:46:36 form Exp $
 
 COMMENT=		IP accounting daemon simulating Cisco ip accounting
 
 DISTNAME=		ipcad-3.7.3
-REVISION=		2
+REVISION=		3
 CATEGORIES=		net
 HOMEPAGE=		http://sourceforge.net/projects/ipcad/
 
diff --git a/net/ipcad/pkg/ipcad.rc b/net/ipcad/pkg/ipcad.rc
index c2e0636de17..d614223cccc 100644
--- a/net/ipcad/pkg/ipcad.rc
+++ b/net/ipcad/pkg/ipcad.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ipcad.rc,v 1.2 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: ipcad.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ipcad -d"
 
diff --git a/net/ircd-hybrid/Makefile b/net/ircd-hybrid/Makefile
index 133e84f202c..855db565731 100644
--- a/net/ircd-hybrid/Makefile
+++ b/net/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2017/04/25 08:07:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =	Internet Relay Chat server
 
@@ -6,6 +6,7 @@ DISTNAME =	ircd-hybrid-8.2.22
 CATEGORIES =	net
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
 EXTRACT_SUFX =	.tgz
+REVISION =	0
 
 HOMEPAGE =	http://ircd-hybrid.com/
 
diff --git a/net/ircd-hybrid/pkg/ircd_hybrid.rc b/net/ircd-hybrid/pkg/ircd_hybrid.rc
index 84775340450..fdb769f0bc1 100644
--- a/net/ircd-hybrid/pkg/ircd_hybrid.rc
+++ b/net/ircd-hybrid/pkg/ircd_hybrid.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ircd_hybrid.rc,v 1.5 2014/05/08 14:36:49 brad Exp $
+# $OpenBSD: ircd_hybrid.rc,v 1.6 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ircd"
 
diff --git a/net/ircd-ratbox/Makefile b/net/ircd-ratbox/Makefile
index 9f08216debb..dd933d98b46 100644
--- a/net/ircd-ratbox/Makefile
+++ b/net/ircd-ratbox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/09/22 21:37:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT =	advanced, stable and fast irc server
 
@@ -6,7 +6,7 @@ DISTNAME =	ircd-ratbox-3.0.10
 CATEGORIES =	net
 MASTER_SITES =	${HOMEPAGE}download/
 EXTRACT_SUFX =	.tar.bz2
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	http://www.ratbox.org/
 
diff --git a/net/ircd-ratbox/pkg/ircd_ratbox.rc b/net/ircd-ratbox/pkg/ircd_ratbox.rc
index 7528124338b..5c597b46b7b 100644
--- a/net/ircd-ratbox/pkg/ircd_ratbox.rc
+++ b/net/ircd-ratbox/pkg/ircd_ratbox.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ircd_ratbox.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: ircd_ratbox.rc,v 1.4 2018/01/11 19:27:05 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ircd"
 
diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile
index 3d828a9eb84..bb0544d7eec 100644
--- a/net/isc-bind/Makefile
+++ b/net/isc-bind/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.73 2017/10/30 22:19:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2018/01/11 19:27:05 rpe Exp $
 
 COMMENT=	Berkeley Internet Name Daemon: DNS server and tools
 
 V=		9.10.6
-REVISION=	0
+REVISION=	1
 
 DISTNAME=	bind-$V
 PKGNAME=	isc-bind-${V:S/-P/pl/}
diff --git a/net/isc-bind/pkg/isc_named.rc b/net/isc-bind/pkg/isc_named.rc
index 359307ae461..c4caa19b8ad 100644
--- a/net/isc-bind/pkg/isc_named.rc
+++ b/net/isc-bind/pkg/isc_named.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: isc_named.rc,v 1.3 2014/08/22 20:32:13 sthen Exp $
+# $OpenBSD: isc_named.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/named"
 daemon_flags="-t ${LOCALSTATEDIR}/named -u _bind -U 4"
diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index 2ca09b92398..42bff99be86 100644
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2017/09/04 17:24:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT-main=	ISC DHCP Server
 COMMENT-client=	ISC DHCP Client
@@ -11,6 +11,7 @@ PKGNAME-main=	isc-dhcp-server-${VERSION:S/-P/./}
 PKGNAME-client=	isc-dhcp-client-${VERSION:S/-P/./}
 PKGNAME-omapi=	isc-dhcp-omapi-${VERSION:S/-P/./}
 CATEGORIES=	net
+REVISION-main=	0
 
 DISTFILES=	dhcp-${VERSION}.tar.gz
 WRKDIST=	${WRKDIR}/dhcp-${VERSION}
diff --git a/net/isc-dhcp/pkg/isc_dhcpd.rc b/net/isc-dhcp/pkg/isc_dhcpd.rc
index acc51e28f56..fe8bd978c85 100644
--- a/net/isc-dhcp/pkg/isc_dhcpd.rc
+++ b/net/isc-dhcp/pkg/isc_dhcpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: isc_dhcpd.rc,v 1.2 2015/05/29 07:29:10 giovanni Exp $
+# $OpenBSD: isc_dhcpd.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dhcpd"
 daemon_flags="-user _isc-dhcp -group _isc-dhcp"
diff --git a/net/isc-dhcp/pkg/isc_dhcrelay.rc b/net/isc-dhcp/pkg/isc_dhcrelay.rc
index 309cf70017d..3c5408d7f4c 100644
--- a/net/isc-dhcp/pkg/isc_dhcrelay.rc
+++ b/net/isc-dhcp/pkg/isc_dhcrelay.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: isc_dhcrelay.rc,v 1.1 2014/10/12 20:10:16 sthen Exp $
+# $OpenBSD: isc_dhcrelay.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dhcrelay"
 
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 26913b1702a..33bbf379e3c 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/08/27 11:14:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	high-performance and extensible DHCP server engine from ISC
 
@@ -6,6 +6,7 @@ VERSION=	1.2.0
 
 DISTNAME=	kea-${VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
+REVISION=	0
 
 SHARED_LIBS +=  kea-asiodns               0.0 # 0.0
 SHARED_LIBS +=  kea-asiolink              2.0 # 4.0
diff --git a/net/kea/pkg/kea.rc b/net/kea/pkg/kea.rc
index 83a9a266920..fed391d5016 100644
--- a/net/kea/pkg/kea.rc
+++ b/net/kea/pkg/kea.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kea.rc,v 1.2 2015/12/23 15:58:55 ajacoutot Exp $
+# $OpenBSD: kea.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/keactrl"
 
diff --git a/net/knot/Makefile b/net/knot/Makefile
index f25f45b19c9..4b4147b24b5 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/12/17 11:08:16 jca Exp $
+# $OpenBSD: Makefile,v 1.25 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =		authoritative DNS server
 
 DISTNAME =		knot-2.6.3
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS +=	zscanner             1.0      # .1.0
 SHARED_LIBS +=	knot                 2.0      # .7.0
diff --git a/net/knot/pkg/knot.rc b/net/knot/pkg/knot.rc
index f945657b4bd..adf40aefb3a 100644
--- a/net/knot/pkg/knot.rc
+++ b/net/knot/pkg/knot.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: knot.rc,v 1.5 2017/06/01 13:42:01 jca Exp $
+# $OpenBSD: knot.rc,v 1.6 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${PREFIX}/sbin/knotd -d"
 knotc="${PREFIX}/sbin/knotc"
diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index 8d34b04bdb0..3c77d65624c 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/06/30 08:12:58 jca Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =		link advertisement (LLDP/CDP etc) daemon
 
@@ -7,7 +7,7 @@ CATEGORIES =		net
 DISTNAME =		ladvd-1.1.1
 MASTER_SITES =		https://github.com/sspans/ladvd/files/1065794/
 HOMEPAGE =		http://blinkenlights.nl/software/ladvd/
-REVISION =		0
+REVISION =		1
 
 MAINTAINER =		Paul de Weerd <weerd@weirdnet.nl>
 
diff --git a/net/ladvd/pkg/ladvd.rc b/net/ladvd/pkg/ladvd.rc
index 185304d574c..9baff038d35 100644
--- a/net/ladvd/pkg/ladvd.rc
+++ b/net/ladvd/pkg/ladvd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ladvd.rc,v 1.3 2017/06/30 08:12:58 jca Exp $
+# $OpenBSD: ladvd.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ladvd"
 daemon_flags="-a -z"
diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index 229c2074c49..d1d066ce2cf 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/11/25 13:11:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
 
@@ -6,6 +6,7 @@ DISTNAME=	lldpd-0.9.9
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		LLDP-MIB-200505060000Z.txt:0
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+REVISION=	0
 
 SHARED_LIBS +=	lldpctl                   2.2 # 11.0
 
diff --git a/net/lldpd/pkg/lldpd.rc b/net/lldpd/pkg/lldpd.rc
index 6fbba8c91ce..b53bc24e1a6 100644
--- a/net/lldpd/pkg/lldpd.rc
+++ b/net/lldpd/pkg/lldpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: lldpd.rc,v 1.4 2016/06/28 17:03:27 ajacoutot Exp $
+# $OpenBSD: lldpd.rc,v 1.5 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/lldpd"
 
diff --git a/net/maradns-deadwood/Makefile b/net/maradns-deadwood/Makefile
index 8247b179e89..d23339856e8 100644
--- a/net/maradns-deadwood/Makefile
+++ b/net/maradns-deadwood/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/04 11:59:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	recursive DNS resolver
 
@@ -6,6 +6,7 @@ DISTNAME=	deadwood-3.2.10
 PKGNAME=	${DISTNAME:S/^/maradns-/}
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	net
+REVISION=	0
 
 HOMEPAGE=	http://maradns.samiam.org/deadwood
 
diff --git a/net/maradns-deadwood/pkg/deadwood.rc b/net/maradns-deadwood/pkg/deadwood.rc
index f580530125a..bc9dc416e65 100644
--- a/net/maradns-deadwood/pkg/deadwood.rc
+++ b/net/maradns-deadwood/pkg/deadwood.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: deadwood.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: deadwood.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/Deadwood"
 
diff --git a/net/mcast-proxy/Makefile b/net/mcast-proxy/Makefile
index 1f548e3e53d..7703619f52a 100644
--- a/net/mcast-proxy/Makefile
+++ b/net/mcast-proxy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2017/08/07 12:34:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =		multicast proxy daemon
 
 DISTNAME =		mcast-proxy-1.0
 CATEGORIES =		net
-REVISION =		2
+REVISION =		3
 
 MASTER_SITES =		http://www.weirdnet.nl/openbsd/code/mcast-proxy/
 
diff --git a/net/mcast-proxy/pkg/mcastproxy.rc b/net/mcast-proxy/pkg/mcastproxy.rc
index 33bad177c1b..86cb0fdfa16 100644
--- a/net/mcast-proxy/pkg/mcastproxy.rc
+++ b/net/mcast-proxy/pkg/mcastproxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mcastproxy.rc,v 1.1.1.1 2017/07/30 21:12:36 jca Exp $
+# $OpenBSD: mcastproxy.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/mcast-proxy"
 
diff --git a/net/mfi/Makefile b/net/mfi/Makefile
index 7528a953b2c..ebaac7fb961 100644
--- a/net/mfi/Makefile
+++ b/net/mfi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	Ubiquiti mfi wireless controller
 
@@ -6,7 +6,7 @@ DISTFILES=	mFi-$V{mFi.unix}.zip
 V=		2.1.2
 FW_VER=		2.1.2.1297
 PKGNAME=	mfi-$V
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	net
 
diff --git a/net/mfi/pkg/mfi.rc b/net/mfi/pkg/mfi.rc
index ac01fcb9576..eb4502b7c95 100644
--- a/net/mfi/pkg/mfi.rc
+++ b/net/mfi/pkg/mfi.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mfi.rc,v 1.5 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: mfi.rc,v 1.6 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/share/mfi/lib/ace.jar"
 daemon_user="_mfi"
diff --git a/net/minbif/Makefile b/net/minbif/Makefile
index f7729189ce2..ff0ef243186 100644
--- a/net/minbif/Makefile
+++ b/net/minbif/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/16 18:39:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =	IRC-friendly instant messaging client
 
 DISTNAME=	minbif-1.0.5
 CATEGORIES=	net
-REVISION=	2
+REVISION=	3
 
 HOMEPAGE =	http://minbif.im/
 MASTER_SITES=	${HOMEPAGE}attachments/download/148/
diff --git a/net/minbif/pkg/minbif.rc b/net/minbif/pkg/minbif.rc
index 61bd86c00d4..c3e0a0d7d8b 100644
--- a/net/minbif/pkg/minbif.rc
+++ b/net/minbif/pkg/minbif.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: minbif.rc,v 1.1 2013/09/24 15:34:49 landry Exp $
+# $OpenBSD: minbif.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/minbif -m 2"
 daemon_flags="${SYSCONFDIR}/minbif.conf"
diff --git a/net/minio/server/Makefile b/net/minio/server/Makefile
index 46694be1755..de6d5aaa329 100644
--- a/net/minio/server/Makefile
+++ b/net/minio/server/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2018/01/03 20:59:33 landry Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =	object storage server compatible with Amazon S3 APIs
 GH_PROJECT =	minio
 GH_TAGNAME =	RELEASE.2018-01-02T23-07-00Z
 PKGNAME =	minio-0.20180102
 SUBST_VARS =	VARBASE
+REVISION =	0
 
 .include <bsd.port.mk>
diff --git a/net/minio/server/pkg/minio.rc b/net/minio/server/pkg/minio.rc
index 999a8960edf..55227f4c146 100644
--- a/net/minio/server/pkg/minio.rc
+++ b/net/minio/server/pkg/minio.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: minio.rc,v 1.1.1.1 2017/12/23 21:19:39 landry Exp $
+# $OpenBSD: minio.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/minio server"
 daemon_flags="${VARBASE}/minio/export"
diff --git a/net/miniupnp/minissdpd/Makefile b/net/miniupnp/minissdpd/Makefile
index 23d59a2fd63..67399e61c6d 100755
--- a/net/miniupnp/minissdpd/Makefile
+++ b/net/miniupnp/minissdpd/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2015/06/17 09:41:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	daemon keeping track of UPnP devices up
 
 DISTNAME=	minissdpd-1.3
+REVISION=	0
 
 WANTLIB += c
 
diff --git a/net/miniupnp/minissdpd/pkg/minissdpd.rc b/net/miniupnp/minissdpd/pkg/minissdpd.rc
index e17ac5d49cf..1fc0d71ba92 100644
--- a/net/miniupnp/minissdpd/pkg/minissdpd.rc
+++ b/net/miniupnp/minissdpd/pkg/minissdpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: minissdpd.rc,v 1.2 2013/08/09 14:31:54 ajacoutot Exp $
+# $OpenBSD: minissdpd.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/minissdpd"
 daemon_flags="-i 127.0.0.1"
diff --git a/net/miniupnp/miniupnpd/Makefile b/net/miniupnp/miniupnpd/Makefile
index 59ca3dd4aba..39aec57d700 100755
--- a/net/miniupnp/miniupnpd/Makefile
+++ b/net/miniupnp/miniupnpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2016/09/10 13:03:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	UPnP IGD daemon
 
 DISTNAME=	miniupnpd-1.9
-REVISION=	1
+REVISION=	2
 
 WANTLIB += c crypto kvm ssl
 
diff --git a/net/miniupnp/miniupnpd/pkg/miniupnpd.rc b/net/miniupnp/miniupnpd/pkg/miniupnpd.rc
index b18c22f5306..7d105e9b31a 100644
--- a/net/miniupnp/miniupnpd/pkg/miniupnpd.rc
+++ b/net/miniupnp/miniupnpd/pkg/miniupnpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: miniupnpd.rc,v 1.1.1.1 2012/01/13 09:22:50 ajacoutot Exp $
+# $OpenBSD: miniupnpd.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/miniupnpd"
 
diff --git a/net/mlvpn/Makefile b/net/mlvpn/Makefile
index aff4b6a5c90..36f450acd09 100644
--- a/net/mlvpn/Makefile
+++ b/net/mlvpn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/05 10:22:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =		link-aggregation VPN software
 
@@ -6,7 +6,7 @@ V =			2.2.2
 DISTNAME =		mlvpn-$V
 DISTFILES =		${DISTNAME}{$V}.tar.gz
 WRKDIST =		${WRKDIR}/MLVPN-$V
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
diff --git a/net/mlvpn/pkg/mlvpn.rc b/net/mlvpn/pkg/mlvpn.rc
index 80e65d1bc04..bd92702b3a9 100644
--- a/net/mlvpn/pkg/mlvpn.rc
+++ b/net/mlvpn/pkg/mlvpn.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mlvpn.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: mlvpn.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/mlvpn"
 daemon_flags="-c ${SYSCONFDIR}/mlvpn/mlvpn.conf --user _mlvpn"
diff --git a/net/mon/server/Makefile b/net/mon/server/Makefile
index d48132962cd..1bed82abf97 100644
--- a/net/mon/server/Makefile
+++ b/net/mon/server/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2014/01/01 20:46:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =	service monitoring daemon
 
 DISTNAME = 	mon-${V}
-REVISION =	9
+REVISION =	10
 
 WANTLIB = 	c
 
diff --git a/net/mon/server/pkg/mon.rc b/net/mon/server/pkg/mon.rc
index ea9de646e9c..d60e473b15a 100644
--- a/net/mon/server/pkg/mon.rc
+++ b/net/mon/server/pkg/mon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mon.rc,v 1.6 2011/03/20 06:36:55 ajacoutot Exp $
+# $OpenBSD: mon.rc,v 1.7 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mon"
 daemon_flags="-c ${SYSCONFDIR}/mon/mon.cf -f -P /var/run/mon/mon.pid"
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 5a1f929cda3..db86664653c 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/11/09 16:50:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT =		opensource MQTT broker
 
 DISTNAME =		mosquitto-1.4.11
-REVISION =		2
+REVISION =		3
 
 SHARED_LIBS +=  mosquitto                 0.0 # 1.4
 SHARED_LIBS +=  mosquittopp               0.0 # 1.4
diff --git a/net/mosquitto/pkg/mosquitto.rc b/net/mosquitto/pkg/mosquitto.rc
index 8eead21ecfd..0adb65cef99 100644
--- a/net/mosquitto/pkg/mosquitto.rc
+++ b/net/mosquitto/pkg/mosquitto.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mosquitto.rc,v 1.1.1.1 2015/05/19 19:13:39 edd Exp $
+# $OpenBSD: mosquitto.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/mosquitto -d"
 daemon_flags="-c ${SYSCONFDIR}/mosquitto/mosquitto.conf"
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 25a2635aec8..9ed45f3694b 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.89 2017/07/05 10:22:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.90 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	multi-router traffic grapher
 
 DISTNAME=	mrtg-2.17.4
-REVISION=	4
+REVISION=	5
 CATEGORIES=	net
 
 HOMEPAGE=	http://oss.oetiker.ch/mrtg/
diff --git a/net/mrtg/pkg/mrtg.rc b/net/mrtg/pkg/mrtg.rc
index 9b8eca5a5a3..97eb20bdfe1 100644
--- a/net/mrtg/pkg/mrtg.rc
+++ b/net/mrtg/pkg/mrtg.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mrtg.rc,v 1.5 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: mrtg.rc,v 1.6 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mrtg --daemon"
 daemon_flags="--user _mrtg --group _mrtg --confcache-file /tmp/mrtg.ok --lock-file /tmp/mrtg_lock --pid-file /var/run/mrtg.pid"
diff --git a/net/munin/Makefile b/net/munin/Makefile
index 3187b4c0e33..e783dba4679 100644
--- a/net/munin/Makefile
+++ b/net/munin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2017/10/23 07:44:31 kirby Exp $
+# $OpenBSD: Makefile,v 1.66 2018/01/11 19:27:06 rpe Exp $
 
 PORTROACH = 	limitw:1,even
 
@@ -10,6 +10,7 @@ DISTNAME =	munin-$V
 PKGNAME-main =	munin-node-$V
 PKGNAME-server =munin-server-$V
 CATEGORIES =	net
+REVISION-main =	0
 
 HOMEPAGE =	http://munin-monitoring.org/
 MASTER_SITES =	http://downloads.munin-monitoring.org/munin/stable/$V/
diff --git a/net/munin/pkg/munin_asyncd.rc b/net/munin/pkg/munin_asyncd.rc
index 7ed1a99f32c..89f43df087c 100644
--- a/net/munin/pkg/munin_asyncd.rc
+++ b/net/munin/pkg/munin_asyncd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: munin_asyncd.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: munin_asyncd.rc,v 1.5 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/munin/munin-asyncd --fork"
 daemon_user="_munin"
diff --git a/net/munin/pkg/munin_node.rc b/net/munin/pkg/munin_node.rc
index bfb94b9fc38..2ad11551592 100644
--- a/net/munin/pkg/munin_node.rc
+++ b/net/munin/pkg/munin_node.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: munin_node.rc,v 1.7 2015/07/15 19:40:58 ajacoutot Exp $
+# $OpenBSD: munin_node.rc,v 1.8 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/munin-node"
 
diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile
index 4df62a893d9..4c69290b2a5 100644
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2017/04/17 17:29:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.81 2018/01/11 19:27:06 rpe Exp $
 
 ONLY_FOR_ARCHS=	${LP64_ARCHS} # time_t format string issues
 
@@ -10,6 +10,7 @@ DISTNAME=	nagios-$V
 PKGNAME-main=	nagios-$V
 PKGNAME-web=	nagios-web-$V
 CATEGORIES=	net
+REVISION-main=	0
 
 HOMEPAGE=	http://www.nagios.org/
 
diff --git a/net/nagios/nagios/pkg/nagios.rc b/net/nagios/nagios/pkg/nagios.rc
index 23e1af03ef3..63e8d8fb4c7 100644
--- a/net/nagios/nagios/pkg/nagios.rc
+++ b/net/nagios/nagios/pkg/nagios.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nagios.rc,v 1.2 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: nagios.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/nagios -d"
 daemon_flags="${SYSCONFDIR}/nagios/nagios.cfg"
diff --git a/net/nagios/nrpe/Makefile b/net/nagios/nrpe/Makefile
index 7cd4901f1e2..80ae1488617 100644
--- a/net/nagios/nrpe/Makefile
+++ b/net/nagios/nrpe/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2017/08/22 10:25:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=	Nagios Remote Plugin Executor
 
 DISTNAME=	nrpe-2.15
-REVISION=	7
+REVISION=	8
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.nagios.org/
diff --git a/net/nagios/nrpe/pkg/nrpe.rc b/net/nagios/nrpe/pkg/nrpe.rc
index 1d139066b75..cd1681ca758 100644
--- a/net/nagios/nrpe/pkg/nrpe.rc
+++ b/net/nagios/nrpe/pkg/nrpe.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nrpe.rc,v 1.3 2012/09/05 19:55:57 sthen Exp $
+# $OpenBSD: nrpe.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/nrpe -d"
 
diff --git a/net/nagios/nsca-ng/Makefile b/net/nagios/nsca-ng/Makefile
index d1766f433d4..77495a62085 100644
--- a/net/nagios/nsca-ng/Makefile
+++ b/net/nagios/nsca-ng/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/08 07:02:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT-main=	server to accept passive check results for Nagios/Icinga
 COMMENT-client=	client to send passive check results to Nagios/Icinga
@@ -9,7 +9,7 @@ PKGNAME-main=	nsca-ng-$V
 PKGNAME-client=	nsca-ng-client-$V
 CATEGORIES=	net
 
-REVISION-main=	0
+REVISION-main=	1
 
 HOMEPAGE=	https://www.nsca-ng.org/
 
diff --git a/net/nagios/nsca-ng/pkg/nsca_ng.rc b/net/nagios/nsca-ng/pkg/nsca_ng.rc
index 1d447310b21..fe8e64f8edf 100644
--- a/net/nagios/nsca-ng/pkg/nsca_ng.rc
+++ b/net/nagios/nsca-ng/pkg/nsca_ng.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nsca_ng.rc,v 1.1.1.1 2013/03/11 19:27:31 sthen Exp $
+# $OpenBSD: nsca_ng.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/nsca-ng"
 daemon_flags="-c ${SYSCONFDIR}/nsca-ng.cfg"
diff --git a/net/nagios/nsca/Makefile b/net/nagios/nsca/Makefile
index eef79808e55..d919bdd6dda 100644
--- a/net/nagios/nsca/Makefile
+++ b/net/nagios/nsca/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2014/08/14 15:38:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT-main=	nagios service check acceptor
 COMMENT-client=	nagios service check acceptor - client
@@ -9,6 +9,7 @@ DISTNAME=	nsca-${VERSION}
 PKGNAME-main=	nsca-${VERSION}
 PKGNAME-client=	nsca-client-${VERSION}
 CATEGORIES=	net
+REVISION-main=	0
 
 HOMEPAGE=	http://www.nagios.org/
 
diff --git a/net/nagios/nsca/pkg/nsca.rc b/net/nagios/nsca/pkg/nsca.rc
index 0008fdb96af..a97b3374f04 100644
--- a/net/nagios/nsca/pkg/nsca.rc
+++ b/net/nagios/nsca/pkg/nsca.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nsca.rc,v 1.1 2011/11/12 00:49:49 sthen Exp $
+# $OpenBSD: nsca.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/nsca"
 daemon_flags="-c ${SYSCONFDIR}/nsca.cfg"
diff --git a/net/natpmpd/Makefile b/net/natpmpd/Makefile
index 597e9cf739e..dd32418e056 100644
--- a/net/natpmpd/Makefile
+++ b/net/natpmpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2015/06/10 10:43:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=		daemon implementing NAT-PMP protocol for pf(4)
 
 DISTNAME=		natpmpd-1.4
-REVISION=		3
+REVISION=		4
 CATEGORIES=		net
 
 HOMEPAGE=		http://bodgitandscarper.co.uk/natpmpd/
diff --git a/net/natpmpd/pkg/natpmpd.rc b/net/natpmpd/pkg/natpmpd.rc
index 8388ef99723..c89502b7c02 100644
--- a/net/natpmpd/pkg/natpmpd.rc
+++ b/net/natpmpd/pkg/natpmpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: natpmpd.rc,v 1.1.1.1 2011/12/23 15:15:30 sthen Exp $
+# $OpenBSD: natpmpd.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/natpmpd"
 
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 8c5485bd4ba..eb34796ed9a 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.96 2017/10/18 13:13:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.97 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT-main=	extendable SNMP implementation
 COMMENT-tkmib=	graphical SNMP MIB browser
 
 V=		5.7.3
-REVISION-main=	13
+REVISION-main=	14
 
 DISTNAME=	net-snmp-$V
 MULTI_PACKAGES=	-main -tkmib
diff --git a/net/net-snmp/pkg/netsnmpd.rc b/net/net-snmp/pkg/netsnmpd.rc
index 79a955d4f16..f574493185b 100644
--- a/net/net-snmp/pkg/netsnmpd.rc
+++ b/net/net-snmp/pkg/netsnmpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: netsnmpd.rc,v 1.4 2016/10/11 20:47:43 sthen Exp $
+# $OpenBSD: netsnmpd.rc,v 1.5 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/snmpd"
 
diff --git a/net/net-snmp/pkg/netsnmptrapd.rc b/net/net-snmp/pkg/netsnmptrapd.rc
index 52829a097d0..940958f7175 100644
--- a/net/net-snmp/pkg/netsnmptrapd.rc
+++ b/net/net-snmp/pkg/netsnmptrapd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: netsnmptrapd.rc,v 1.3 2016/01/07 12:35:53 sthen Exp $
+# $OpenBSD: netsnmptrapd.rc,v 1.4 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/snmptrapd"
 daemon_flags="-u _netsnmp"
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index d0de466c87f..3642a52a742 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.63 2017/11/16 18:39:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.64 2018/01/11 19:27:06 rpe Exp $
 
 PORTROACH=	limit:^2
 
 COMMENT=	AFP file and print services for IP networks
 
 DISTNAME=	netatalk-2.2.5
-REVISION=	9
+REVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/netatalk/pkg/afpd.rc b/net/netatalk/pkg/afpd.rc
index 2f851cf0aa5..dbfff425874 100644
--- a/net/netatalk/pkg/afpd.rc
+++ b/net/netatalk/pkg/afpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: afpd.rc,v 1.1 2012/04/11 18:39:13 sthen Exp $
+# $OpenBSD: afpd.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/afpd"
 
diff --git a/net/netatalk/pkg/cnid_metad.rc b/net/netatalk/pkg/cnid_metad.rc
index ded322a62be..5dbcc0a3b64 100644
--- a/net/netatalk/pkg/cnid_metad.rc
+++ b/net/netatalk/pkg/cnid_metad.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cnid_metad.rc,v 1.1 2012/04/11 18:39:13 sthen Exp $
+# $OpenBSD: cnid_metad.rc,v 1.2 2018/01/11 19:27:06 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cnid_metad"
 
diff --git a/net/netatalk/pkg/netatalk.rc b/net/netatalk/pkg/netatalk.rc
index b7fe939a6ab..e5483ab9112 100644
--- a/net/netatalk/pkg/netatalk.rc
+++ b/net/netatalk/pkg/netatalk.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: netatalk.rc,v 1.7 2015/11/29 15:50:20 ajacoutot Exp $
+# $OpenBSD: netatalk.rc,v 1.8 2018/01/11 19:27:06 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 17e10654cf6..fb322bdb1ef 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/03/16 16:02:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2018/01/11 19:27:06 rpe Exp $
 
 COMMENT=		AFP file and print services for IP networks
 
@@ -6,6 +6,7 @@ V=			3.1.11
 DISTNAME=		netatalk-${V}
 EXTRACT_SUFX=		.tar.bz2
 PKGSPEC=		netatalk->=3,<4
+REVISION=		0
 
 SHARED_LIBS +=  atalk                16.0     # 16.0
 
diff --git a/net/netatalk3/pkg/netatalk.rc b/net/netatalk3/pkg/netatalk.rc
index 71fe8a84eed..26c6aaf87b9 100644
--- a/net/netatalk3/pkg/netatalk.rc
+++ b/net/netatalk3/pkg/netatalk.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: netatalk.rc,v 1.1.1.1 2015/01/25 09:33:53 ajacoutot Exp $
+# $OpenBSD: netatalk.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/netatalk"
 
diff --git a/net/netbsd-iscsi-target/Makefile b/net/netbsd-iscsi-target/Makefile
index eeafec35306..2ea348d957c 100644
--- a/net/netbsd-iscsi-target/Makefile
+++ b/net/netbsd-iscsi-target/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2016/01/26 13:40:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	iSCSI (RFC 3720) target from NetBSD
 
 DISTNAME=	netbsd-iscsi-20111006
 PKGNAME=	${DISTNAME:S/-iscsi/-iscsi-target/}
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	net sysutils
 
diff --git a/net/netbsd-iscsi-target/pkg/iscsi_target.rc b/net/netbsd-iscsi-target/pkg/iscsi_target.rc
index b248b13d7fe..d82b0cd84c9 100644
--- a/net/netbsd-iscsi-target/pkg/iscsi_target.rc
+++ b/net/netbsd-iscsi-target/pkg/iscsi_target.rc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ksh
 
 daemon="${TRUEPREFIX}/bin/iscsi-target"
 
diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile
index 16aa294a49a..9717466ccf6 100644
--- a/net/nfsen/Makefile
+++ b/net/nfsen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2017/05/18 19:23:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=		web-based front end for the nfdump netflow tools
 
 V=			1.3.8
-REVISION=		0
+REVISION=		1
 DISTNAME=		nfsen-$V
 CATEGORIES=		net www
 HOMEPAGE=		http://nfsen.sourceforge.net/
diff --git a/net/nfsen/pkg/nfsen.rc b/net/nfsen/pkg/nfsen.rc
index 9d13ace9b5d..109d63e67cc 100644
--- a/net/nfsen/pkg/nfsen.rc
+++ b/net/nfsen/pkg/nfsen.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nfsen.rc,v 1.2 2011/05/06 13:04:08 sthen Exp $
+# $OpenBSD: nfsen.rc,v 1.3 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/nfsend"
 
diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile
index 80aa6f7c735..c13e7fb46b2 100644
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2017/03/19 18:20:00 tsg Exp $
+# $OpenBSD: Makefile,v 1.16 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT =	lightweight irc server
 
 DISTNAME =	ngircd-24
+REVISION =	0
 
 CATEGORIES =	net
 
diff --git a/net/ngircd/pkg/ngircd.rc b/net/ngircd/pkg/ngircd.rc
index 0dbf23e402a..70d69923bcf 100644
--- a/net/ngircd/pkg/ngircd.rc
+++ b/net/ngircd/pkg/ngircd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ngircd.rc,v 1.1.1.1 2012/09/29 12:32:01 fgsch Exp $
+# $OpenBSD: ngircd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ngircd"
 
diff --git a/net/no-ip/Makefile b/net/no-ip/Makefile
index 0d898f30e5e..84630b9ec32 100644
--- a/net/no-ip/Makefile
+++ b/net/no-ip/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2015/10/05 16:29:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=		No-IP.com Dynamic DNS client
 
 V=			2.1.9
 DISTNAME=		noip-${V}
 PKGNAME=		no-ip-${V}
-REVISION=		4
+REVISION=		5
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.no-ip.com/
diff --git a/net/no-ip/pkg/noip2.rc b/net/no-ip/pkg/noip2.rc
index 290f8f90ecb..89f9f541c21 100644
--- a/net/no-ip/pkg/noip2.rc
+++ b/net/no-ip/pkg/noip2.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: noip2.rc,v 1.1 2011/11/28 08:37:52 sthen Exp $
+# $OpenBSD: noip2.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/noip2"
 
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index c486a12cb7f..54fd1c35e23 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2017/10/17 10:39:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	network traffic probe with web ui and deep packet inspection
 
@@ -7,6 +7,7 @@ GH_PROJECT=	ntopng
 GH_TAGNAME=	3.0
 NDPI_V=		2.0
 DISTFILES=	ntopng-${GH_TAGNAME}.tar.gz ndpi-${NDPI_V}.tar.gz:0
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/net/ntopng/pkg/ntopng.rc b/net/ntopng/pkg/ntopng.rc
index 3227d4fea02..796c8d96e10 100644
--- a/net/ntopng/pkg/ntopng.rc
+++ b/net/ntopng/pkg/ntopng.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ntopng.rc,v 1.1.1.1 2016/04/26 20:56:01 sthen Exp $
+# $OpenBSD: ntopng.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ntopng --daemon"
 
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index e13267df3ba..be9bb9387a2 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2017/09/25 12:41:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	Network Time Protocol reference implementation
 
@@ -7,7 +7,7 @@ COMMENT=	Network Time Protocol reference implementation
 # 'pl' for local use.
 
 VERSION=	4.2.8p10
-REVISION=	0
+REVISION=	1
 DISTNAME=	ntp-${VERSION}
 PKGNAME=	ntp-${VERSION:S/p/pl/}
 CATEGORIES=	net
diff --git a/net/ntp/pkg/xntpd.rc b/net/ntp/pkg/xntpd.rc
index 639db2911c8..456d6d11ae8 100644
--- a/net/ntp/pkg/xntpd.rc
+++ b/net/ntp/pkg/xntpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: xntpd.rc,v 1.1 2011/07/11 17:43:14 landry Exp $
+# $OpenBSD: xntpd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ntpd"
 
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 71c4026e9ee..6d9a3ea0305 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2017/10/10 09:20:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	server implementing the AnyConnect SSL VPN protocol
 
 DISTNAME=	ocserv-0.11.9
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/net/ocserv/pkg/ocserv.rc b/net/ocserv/pkg/ocserv.rc
index 381539d4557..a5873f867a3 100644
--- a/net/ocserv/pkg/ocserv.rc
+++ b/net/ocserv/pkg/ocserv.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ocserv.rc,v 1.1.1.1 2015/03/26 02:07:59 sthen Exp $
+# $OpenBSD: ocserv.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ocserv"
 daemon_flags="-c ${SYSCONFDIR}/ocserv/ocserv.conf"
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 82882e76278..b15154ed900 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2017/06/23 14:54:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT-main=		OLSR routing daemon
 COMMENT-gui=		OLSR routing daemon GUI
@@ -8,7 +8,7 @@ DISTNAME=		olsrd-${VERSION}
 PKGNAME-main=		olsrd-${VERSION}
 PKGNAME-gui=		olsrd-gui-${VERSION}
 
-REVISION-main=		1
+REVISION-main=		2
 REVISION-gui=		1
 
 CATEGORIES=	net
diff --git a/net/olsrd/pkg/olsrd.rc b/net/olsrd/pkg/olsrd.rc
index 63c007c8ceb..aeb02251acc 100644
--- a/net/olsrd/pkg/olsrd.rc
+++ b/net/olsrd/pkg/olsrd.rc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ksh
 
 daemon="${TRUEPREFIX}/sbin/olsrd"
 
diff --git a/net/openfire/Makefile b/net/openfire/Makefile
index ac6041e3fce..13a24642807 100644
--- a/net/openfire/Makefile
+++ b/net/openfire/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.48 2017/08/14 16:56:40 ian Exp $
+# $OpenBSD: Makefile,v 1.49 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	XMPP real time collaboration server
 V =		4.1.5
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
+REVISION=	0
 
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
 
diff --git a/net/openfire/pkg/openfire.rc b/net/openfire/pkg/openfire.rc
index 0dfbb5c9244..9db848e9116 100755
--- a/net/openfire/pkg/openfire.rc
+++ b/net/openfire/pkg/openfire.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: openfire.rc,v 1.5 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: openfire.rc,v 1.6 2018/01/11 19:27:07 rpe Exp $
 
 OPENFIRE_HOME="${TRUEPREFIX}/openfire"
 OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
diff --git a/net/openmdns/Makefile b/net/openmdns/Makefile
index fbeaf1db5c5..74a20577948 100644
--- a/net/openmdns/Makefile
+++ b/net/openmdns/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2017/03/11 13:00:35 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.18 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT =		MDNS/DNS-SD daemon
 
 DISTNAME =		openmdns-0.7
 CATEGORIES =		net
+REVISION =		0
 
 MAINTAINER =		Gonzalo L. R. <gonzalo@openbsd.org>
 
diff --git a/net/openmdns/pkg/mdnsd.rc b/net/openmdns/pkg/mdnsd.rc
index 52c16d48505..b8746fa8b8b 100644
--- a/net/openmdns/pkg/mdnsd.rc
+++ b/net/openmdns/pkg/mdnsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mdnsd.rc,v 1.1 2011/03/15 06:54:26 ajacoutot Exp $
+# $OpenBSD: mdnsd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/mdnsd"
 daemon_flags="em0"
diff --git a/net/openvmps/Makefile b/net/openvmps/Makefile
index f86313b6586..c661929e7ed 100644
--- a/net/openvmps/Makefile
+++ b/net/openvmps/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2015/07/21 17:59:03 jca Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	free implementation of Cisco VMPS
 
 V=		1.4.06
-REVISION=	0
+REVISION=	1
 DISTNAME=	vmpsd-${V}
 PKGNAME=	openvmps-${V}
 CATEGORIES=	net
diff --git a/net/openvmps/pkg/vmpsd.rc b/net/openvmps/pkg/vmpsd.rc
index 2b6c7c6abe2..e8a37ad118f 100644
--- a/net/openvmps/pkg/vmpsd.rc
+++ b/net/openvmps/pkg/vmpsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: vmpsd.rc,v 1.1 2011/06/14 05:52:03 ajacoutot Exp $
+# $OpenBSD: vmpsd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/vmpsd"
 
diff --git a/net/owamp/Makefile b/net/owamp/Makefile
index a1c19888602..dfc64f1d7d5 100644
--- a/net/owamp/Makefile
+++ b/net/owamp/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2013/03/11 11:35:50 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT =	rfc4656 one-way active measurement protocol
 
 DISTNAME =	owamp-3.1
+REVISION =	0
 
 CATEGORIES =	net
 
diff --git a/net/owamp/pkg/owampd.rc b/net/owamp/pkg/owampd.rc
index ac30886ab34..95bc0aafbef 100644
--- a/net/owamp/pkg/owampd.rc
+++ b/net/owamp/pkg/owampd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: owampd.rc,v 1.1.1.1 2011/07/08 09:31:06 sthen Exp $
+# $OpenBSD: owampd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/owampd"
 daemon_flags="-c ${SYSCONFDIR}/owampd -d /var/db/owampd -U _owampd -G _owampd -R /var/run"
diff --git a/net/pdnsd/Makefile b/net/pdnsd/Makefile
index d4306b409f5..9cf89fd7aa3 100644
--- a/net/pdnsd/Makefile
+++ b/net/pdnsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/11 11:35:54 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=		threaded DNS daemon, optimized for caching
 
@@ -6,6 +6,7 @@ DISTNAME=		pdnsd-1.2.9a-par
 PKGNAME=		${DISTNAME:S/-par//}
 CATEGORIES=		net
 MASTER_SITES=		${HOMEPAGE}/releases/
+REVISION=		0
 
 HOMEPAGE=		http://members.home.nl/p.a.rombouts/pdnsd/
 
diff --git a/net/pdnsd/pkg/pdnsd.rc b/net/pdnsd/pkg/pdnsd.rc
index bfc6b8ce3a9..55152a2b527 100644
--- a/net/pdnsd/pkg/pdnsd.rc
+++ b/net/pdnsd/pkg/pdnsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pdnsd.rc,v 1.2 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: pdnsd.rc,v 1.3 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pdnsd -d"
 
diff --git a/net/pfstat/Makefile b/net/pfstat/Makefile
index 1f1cd6296b2..56da564a6e1 100644
--- a/net/pfstat/Makefile
+++ b/net/pfstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2016/09/12 11:45:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.38 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT-main=	packet filter statistics visualization
 COMMENT-daemon=	pfstat daemon
@@ -9,7 +9,7 @@ PKGNAME-main=	${DISTNAME}
 PKGNAME-daemon=	${DISTNAME:S/-/d-/}
 CATEGORIES=	net
 MASTER_SITES=	http://www.benzedrine.ch/
-REVISION-daemon=1
+REVISION-daemon=2
 REVISION-main=	1
 
 HOMEPAGE=	http://www.benzedrine.ch/pfstat.html
diff --git a/net/pfstat/pkg/pfstatd.rc b/net/pfstat/pkg/pfstatd.rc
index cdbabd77e12..5dd56f01e7e 100644
--- a/net/pfstat/pkg/pfstatd.rc
+++ b/net/pfstat/pkg/pfstatd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pfstatd.rc,v 1.1 2011/06/07 22:15:38 sthen Exp $
+# $OpenBSD: pfstatd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/pfstatd"
 
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 93cd3a16648..f80a2cc211a 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2014/10/13 19:14:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=		PPTP Server
 
 V=			1.3.4
 DISTNAME=		pptpd-$V
 PKGNAME=		poptop-$V
-REVISION=		6
+REVISION=		7
 CATEGORIES=		net
 
 HOMEPAGE=		http://poptop.sourceforge.net/
diff --git a/net/poptop/pkg/pptpd.rc b/net/poptop/pkg/pptpd.rc
index 13c97349fba..5d8f4c8923e 100644
--- a/net/poptop/pkg/pptpd.rc
+++ b/net/poptop/pkg/pptpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pptpd.rc,v 1.1 2011/04/04 16:44:54 giovanni Exp $
+# $OpenBSD: pptpd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pptpd"
 
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 6157bd4c4dc..d6f10683f5f 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2017/12/29 07:24:49 florian Exp $
+# $OpenBSD: Makefile,v 1.59 2018/01/11 19:27:07 rpe Exp $
 
 BROKEN-hppa =		undefined reference to '__sync_fetch_and_add_4'
 
@@ -18,7 +18,7 @@ PKGNAME-ldap=		powerdns-ldap-${V}
 CATEGORIES=		net
 HOMEPAGE=		http://www.powerdns.com/
 REVISION-ldap=		1
-REVISION-main=		1
+REVISION-main=		2
 REVISION-mysql=		1
 REVISION-pgsql=		1
 
diff --git a/net/powerdns/pkg/pdns_server.rc b/net/powerdns/pkg/pdns_server.rc
index 146111dafec..e591a1d7eea 100644
--- a/net/powerdns/pkg/pdns_server.rc
+++ b/net/powerdns/pkg/pdns_server.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pdns_server.rc,v 1.3 2015/05/08 13:13:14 florian Exp $
+# $OpenBSD: pdns_server.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pdns_server --daemon=yes"
 
diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index c7c2dbedd0d..a5c9c65b056 100644
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.46 2017/11/14 22:08:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	communications server for Jabber/XMPP written in Lua
 DISTNAME=	prosody-0.10.0
-REVISION=	0
+REVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://prosody.im/downloads/source/
 
diff --git a/net/prosody/pkg/prosody.rc b/net/prosody/pkg/prosody.rc
index 07c79a2a5ae..2441887fc98 100644
--- a/net/prosody/pkg/prosody.rc
+++ b/net/prosody/pkg/prosody.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: prosody.rc,v 1.3 2012/08/04 15:28:14 ajacoutot Exp $
+# $OpenBSD: prosody.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/prosodyctl"
 daemon_flags="start"
diff --git a/net/ptpd/Makefile b/net/ptpd/Makefile
index f100ca8f63c..1384fdf64f9 100644
--- a/net/ptpd/Makefile
+++ b/net/ptpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/09/09 21:22:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:07 rpe Exp $
 
 # ptpd-1.x implements PTPv1 (IEEE 1588-2002)
 # ptpd-2.x implements PTPv2 (IEEE 1588-2008)
@@ -10,6 +10,7 @@ COMMENT=	Precision Time Protocol daemon (IEEE 1588-2002)
 DISTNAME=	ptpd-1.1.0
 CATEGORIES=	net
 HOMEPAGE=	http://ptpd.sourceforge.net/
+REVISION=	0
 
 # ISC
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/net/ptpd/pkg/ptpd.rc b/net/ptpd/pkg/ptpd.rc
index 3074dde9e16..187dbfeb2a8 100644
--- a/net/ptpd/pkg/ptpd.rc
+++ b/net/ptpd/pkg/ptpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ptpd.rc,v 1.1 2017/09/09 21:22:49 naddy Exp $
+# $OpenBSD: ptpd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ptpd"
 
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 99b3ad708e7..804cd05b778 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2017/12/10 16:01:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.76 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	small, easy to set up, fast and very secure FTP server
 
@@ -10,6 +10,7 @@ MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/ \
 		ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/ \
 		${MASTER_SITE_SOURCEFORGE:=pureftpd/}
+REVISION=	0
 
 HOMEPAGE=	http://www.pureftpd.org/
 
diff --git a/net/pure-ftpd/pkg/pure_ftpd.rc b/net/pure-ftpd/pkg/pure_ftpd.rc
index de8e701c345..625f699b2c8 100644
--- a/net/pure-ftpd/pkg/pure_ftpd.rc
+++ b/net/pure-ftpd/pkg/pure_ftpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pure_ftpd.rc,v 1.1 2011/04/25 09:26:47 sthen Exp $
+# $OpenBSD: pure_ftpd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pure-ftpd"
 daemon_flags="-A -B -H -u1000"
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 1a0b02ad328..af6b3172d92 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2017/11/25 12:40:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	multi-threaded routing daemon
 
 DISTNAME=	quagga-1.2.2
-REVISION=	0
+REVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.savannah.gnu.org/releases/quagga/
 
diff --git a/net/quagga/pkg/quagga_babeld.rc b/net/quagga/pkg/quagga_babeld.rc
index 1cfee517328..56a2a45596e 100644
--- a/net/quagga/pkg/quagga_babeld.rc
+++ b/net/quagga/pkg/quagga_babeld.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_babeld.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_babeld.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/babeld -d"
 
diff --git a/net/quagga/pkg/quagga_bgpd.rc b/net/quagga/pkg/quagga_bgpd.rc
index 12f841dbe0a..cea0582bd8a 100644
--- a/net/quagga/pkg/quagga_bgpd.rc
+++ b/net/quagga/pkg/quagga_bgpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_bgpd.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_bgpd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/bgpd -d"
 
diff --git a/net/quagga/pkg/quagga_isisd.rc b/net/quagga/pkg/quagga_isisd.rc
index 35ed4cb3216..9545b801cc4 100644
--- a/net/quagga/pkg/quagga_isisd.rc
+++ b/net/quagga/pkg/quagga_isisd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_isisd.rc,v 1.1 2015/01/19 15:44:12 sthen Exp $
+# $OpenBSD: quagga_isisd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/isisd -d"
 
diff --git a/net/quagga/pkg/quagga_ospf6d.rc b/net/quagga/pkg/quagga_ospf6d.rc
index 6ad5a7adfea..f0e6189b549 100644
--- a/net/quagga/pkg/quagga_ospf6d.rc
+++ b/net/quagga/pkg/quagga_ospf6d.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_ospf6d.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_ospf6d.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ospf6d -d"
 
diff --git a/net/quagga/pkg/quagga_ospfd.rc b/net/quagga/pkg/quagga_ospfd.rc
index a7ea089c270..2cf891e4d7b 100644
--- a/net/quagga/pkg/quagga_ospfd.rc
+++ b/net/quagga/pkg/quagga_ospfd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_ospfd.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_ospfd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ospfd -d"
 
diff --git a/net/quagga/pkg/quagga_pimd.rc b/net/quagga/pkg/quagga_pimd.rc
index 312566eee00..f37187c07c6 100644
--- a/net/quagga/pkg/quagga_pimd.rc
+++ b/net/quagga/pkg/quagga_pimd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_pimd.rc,v 1.1 2016/03/22 12:57:54 jca Exp $
+# $OpenBSD: quagga_pimd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pimd -d"
 
diff --git a/net/quagga/pkg/quagga_ripd.rc b/net/quagga/pkg/quagga_ripd.rc
index c9a2e30c50e..3a4bf3cefd6 100644
--- a/net/quagga/pkg/quagga_ripd.rc
+++ b/net/quagga/pkg/quagga_ripd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_ripd.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_ripd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ripd -d"
 
diff --git a/net/quagga/pkg/quagga_ripngd.rc b/net/quagga/pkg/quagga_ripngd.rc
index f8679bc1bd7..d002c194a9b 100644
--- a/net/quagga/pkg/quagga_ripngd.rc
+++ b/net/quagga/pkg/quagga_ripngd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_ripngd.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_ripngd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ripngd -d"
 
diff --git a/net/quagga/pkg/quagga_zebra.rc b/net/quagga/pkg/quagga_zebra.rc
index 7f5b7e7ef43..13b848d2734 100644
--- a/net/quagga/pkg/quagga_zebra.rc
+++ b/net/quagga/pkg/quagga_zebra.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: quagga_zebra.rc,v 1.1 2013/04/18 20:29:08 sthen Exp $
+# $OpenBSD: quagga_zebra.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/zebra -d"
 
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 30229664fdb..d6bdadc5a35 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2015/11/10 15:41:47 sebastia Exp $
+# $OpenBSD: Makefile,v 1.30 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT =	highly reliable Enterprise Messaging System
 
 V =		3.5.6
-REVISION =	0
+REVISION =	1
 DISTNAME =	rabbitmq-server-$V
 PKGNAME =	rabbitmq-$V
 CATEGORIES =	net
diff --git a/net/rabbitmq/pkg/rabbitmq.rc b/net/rabbitmq/pkg/rabbitmq.rc
index 200e23bb1f9..eccdd2191a4 100644
--- a/net/rabbitmq/pkg/rabbitmq.rc
+++ b/net/rabbitmq/pkg/rabbitmq.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rabbitmq.rc,v 1.5 2012/08/04 15:28:14 ajacoutot Exp $
+# $OpenBSD: rabbitmq.rc,v 1.6 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/rabbitmq-server -detached"
 daemon_user="_rabbitmq"
diff --git a/net/rbldnsd/Makefile b/net/rbldnsd/Makefile
index 14b49768aa1..7506128dcc8 100644
--- a/net/rbldnsd/Makefile
+++ b/net/rbldnsd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/15 21:28:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT=	small daemon for DNSBLs
 
 DISTNAME=	rbldnsd-0.997a
 CATEGORIES=	net
-REVISION=	2
+REVISION=	3
 
 HOMEPAGE=	http://www.corpit.ru/mjt/rbldnsd.html
 
diff --git a/net/rbldnsd/pkg/rbldnsd.rc b/net/rbldnsd/pkg/rbldnsd.rc
index a6b64cc23da..abdfce657a7 100644
--- a/net/rbldnsd/pkg/rbldnsd.rc
+++ b/net/rbldnsd/pkg/rbldnsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rbldnsd.rc,v 1.1 2013/10/15 01:18:01 william Exp $
+# $OpenBSD: rbldnsd.rc,v 1.2 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/rbldnsd -r ${RBLDNSD_BASE} -w var"
 
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index c53933f50aa..792718a8643 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.108 2017/12/05 16:50:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.109 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT-main=	system to store and display time-series data
 COMMENT-update=	lightweight update-only tool for rrdtool
@@ -13,6 +13,7 @@ PKGNAME-update=	rrdupdate-${VERSION}
 PKGNAME-python= py-rrd-${VERSION}
 PKGNAME-ruby=	ruby${MODRUBY_BINREV}-rrd-${VERSION}
 REVISION=	4
+REVISION-main=	0
 
 SHARED_LIBS +=	rrd                  5.2      # 9.0
 
diff --git a/net/rrdtool/pkg/rrdcached.rc b/net/rrdtool/pkg/rrdcached.rc
index c8e0ada9d86..d8ce22018e6 100644
--- a/net/rrdtool/pkg/rrdcached.rc
+++ b/net/rrdtool/pkg/rrdcached.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rrdcached.rc,v 1.3 2017/07/12 23:46:30 sthen Exp $
+# $OpenBSD: rrdcached.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/rrdcached"
 daemon_flags="-b /var/db/rrd -m 770 -l unix:/var/run/rrd/rrdcached.sock -j /var/db/rrd/journal -p /var/run/rrd/rrdcached.pid"
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index a3e334febaa..d300b58a3c6 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.78 2017/12/19 19:58:39 danj Exp $
+# $OpenBSD: Makefile,v 1.79 2018/01/11 19:27:07 rpe Exp $
 
 COMMENT =	mirroring/synchronization over low bandwidth links
 
 DISTNAME =	rsync-3.1.2
-REVISION =	1
+REVISION =	2
 CATEGORIES =	net
 HOMEPAGE =	https://rsync.samba.org/
 
diff --git a/net/rsync/pkg/rsyncd.rc b/net/rsync/pkg/rsyncd.rc
index a602571a61b..d2e360ff3ac 100755
--- a/net/rsync/pkg/rsyncd.rc
+++ b/net/rsync/pkg/rsyncd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rsyncd.rc,v 1.2 2016/04/06 21:17:29 sthen Exp $
+# $OpenBSD: rsyncd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/rsync --daemon"
 
diff --git a/net/samba/Makefile b/net/samba/Makefile
index b6ad5ba2fdc..328af89565a 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.246 2017/11/22 16:15:44 jca Exp $
+# $OpenBSD: Makefile,v 1.247 2018/01/11 19:27:08 rpe Exp $
 
 VERSION =		4.6.11
 DISTNAME =		samba-${VERSION}
@@ -14,6 +14,7 @@ PKGNAME-ldb =		ldb-${LDB_V}
 PKGNAME-tevent =	tevent-${TEVENT_V}
 PKGNAME-util =		samba-util-${VERSION}
 PKGNAME-docs =		samba-docs-${VERSION}
+REVISION-main =		0
 
 PKG_ARCH-docs =		*
 
diff --git a/net/samba/pkg/nmbd.rc b/net/samba/pkg/nmbd.rc
index 405d9dfa6ef..389b89f39b2 100644
--- a/net/samba/pkg/nmbd.rc
+++ b/net/samba/pkg/nmbd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nmbd.rc,v 1.7 2015/08/25 11:07:45 jca Exp $
+# $OpenBSD: nmbd.rc,v 1.8 2018/01/11 19:27:08 rpe Exp $
 
 smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
 
diff --git a/net/samba/pkg/samba.rc b/net/samba/pkg/samba.rc
index b1f46c5c1e6..b9c40c58224 100644
--- a/net/samba/pkg/samba.rc
+++ b/net/samba/pkg/samba.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: samba.rc,v 1.10 2015/11/29 15:50:20 ajacoutot Exp $
+# $OpenBSD: samba.rc,v 1.11 2018/01/11 19:27:08 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/net/samba/pkg/samba_ad_dc.rc b/net/samba/pkg/samba_ad_dc.rc
index 73fa12e9193..4723bbfb4bf 100644
--- a/net/samba/pkg/samba_ad_dc.rc
+++ b/net/samba/pkg/samba_ad_dc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: samba_ad_dc.rc,v 1.2 2016/04/12 17:42:09 jca Exp $
+# $OpenBSD: samba_ad_dc.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
 
diff --git a/net/samba/pkg/smbd.rc b/net/samba/pkg/smbd.rc
index f1d2b7b6b85..c2cf975abad 100644
--- a/net/samba/pkg/smbd.rc
+++ b/net/samba/pkg/smbd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smbd.rc,v 1.7 2015/08/25 11:07:45 jca Exp $
+# $OpenBSD: smbd.rc,v 1.8 2018/01/11 19:27:08 rpe Exp $
 
 smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
 
diff --git a/net/samba/pkg/winbindd.rc b/net/samba/pkg/winbindd.rc
index 4b8aa8f72af..534fcb83dce 100644
--- a/net/samba/pkg/winbindd.rc
+++ b/net/samba/pkg/winbindd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: winbindd.rc,v 1.7 2015/08/25 11:07:45 jca Exp $
+# $OpenBSD: winbindd.rc,v 1.8 2018/01/11 19:27:08 rpe Exp $
 
 smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
 
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index afac8cacc5a..67503b4c2a5 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.49 2017/03/29 08:24:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	latency logging and graphing system
 
 DISTNAME=	smokeping-2.6.11
-REVISION=	10
+REVISION=	11
 
 CATEGORIES=	net
 
diff --git a/net/smokeping/pkg/smokeping.rc b/net/smokeping/pkg/smokeping.rc
index e057d66f16b..37cb4a31e2a 100644
--- a/net/smokeping/pkg/smokeping.rc
+++ b/net/smokeping/pkg/smokeping.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smokeping.rc,v 1.5 2015/07/15 23:17:11 sthen Exp $
+# $OpenBSD: smokeping.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/smokeping"
 daemon_user="_smokeping"
diff --git a/net/smokeping/pkg/smokeping_fcgi.rc b/net/smokeping/pkg/smokeping_fcgi.rc
index dad8d3d11a4..9f63fa3f0a6 100644
--- a/net/smokeping/pkg/smokeping_fcgi.rc
+++ b/net/smokeping/pkg/smokeping_fcgi.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smokeping_fcgi.rc,v 1.1 2014/11/05 15:42:09 sthen Exp $
+# $OpenBSD: smokeping_fcgi.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/smokeping_cgi"
 daemon_flags="${SYSCONFDIR}/config"
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 1491d5398e4..bf3400e4580 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.97 2017/01/23 11:22:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.98 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =		highly flexible sniffer/NIDS
 
 VERSION =		2.9.9.0
 DISTNAME =		snort-${VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		net security
 
diff --git a/net/snort/pkg/snort.rc b/net/snort/pkg/snort.rc
index 41527663a0d..50109769256 100644
--- a/net/snort/pkg/snort.rc
+++ b/net/snort/pkg/snort.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: snort.rc,v 1.2 2016/05/02 02:29:58 lteo Exp $
+# $OpenBSD: snort.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/snort -D"
 daemon_flags="-c ${SYSCONFDIR}/snort/snort.conf -u _snort -g _snort -t ${LOCALSTATEDIR}/snort -l ${LOCALSTATEDIR}/snort/log"
diff --git a/net/softflowd/Makefile b/net/softflowd/Makefile
index 3477e1c6e99..d10e65e8903 100644
--- a/net/softflowd/Makefile
+++ b/net/softflowd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	flow-based network traffic analyser
 
 DISTNAME=	softflowd-0.9.9
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net
 
 HOMEPAGE=	https://code.google.com/p/softflowd/
diff --git a/net/softflowd/pkg/softflowd.rc b/net/softflowd/pkg/softflowd.rc
index daac8c5fd1a..80a95b42e18 100644
--- a/net/softflowd/pkg/softflowd.rc
+++ b/net/softflowd/pkg/softflowd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: softflowd.rc,v 1.1 2013/06/17 13:25:31 sthen Exp $
+# $OpenBSD: softflowd.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/softflowd"
 
diff --git a/net/spectrum/Makefile b/net/spectrum/Makefile
index 45299c4bba5..75a199e5a05 100644
--- a/net/spectrum/Makefile
+++ b/net/spectrum/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.30 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =	XMPP transport/gateway
 
 DISTNAME =	spectrum-1.4.8
 CATEGORIES =	net
-REVISION =	7
+REVISION =	8
 
 HOMEPAGE =	http://spectrum.im/
 MASTER_SITES =	https://github.com/downloads/hanzz/libtransport/
diff --git a/net/spectrum/pkg/spectrum.rc b/net/spectrum/pkg/spectrum.rc
index d56bf6e742c..d7ca50fcba1 100644
--- a/net/spectrum/pkg/spectrum.rc
+++ b/net/spectrum/pkg/spectrum.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: spectrum.rc,v 1.5 2015/07/15 17:49:24 ajacoutot Exp $
+# $OpenBSD: spectrum.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/spectrumctl"
 daemon_flags="--config-dir=${SYSCONFDIR}/spectrum"
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 0dc32b5477e..5196ad1f3f6 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/04/17 09:14:26 landry Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =	SSL/SSH multiplexer
 
@@ -7,6 +7,7 @@ GH_PROJECT =	sslh
 V =		1.18
 GH_TAGNAME =	v$V
 CATEGORIES =	security net
+REVISION =	0
 
 HOMEPAGE =	http://www.rutschle.net/tech/sslh.shtml
 
diff --git a/net/sslh/pkg/sslh_fork.rc b/net/sslh/pkg/sslh_fork.rc
index 8f373822a61..9fe98abb15f 100644
--- a/net/sslh/pkg/sslh_fork.rc
+++ b/net/sslh/pkg/sslh_fork.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sslh_fork.rc,v 1.4 2015/07/15 19:14:04 ajacoutot Exp $
+# $OpenBSD: sslh_fork.rc,v 1.5 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sslh-fork"
 daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443"
diff --git a/net/sslh/pkg/sslh_select.rc b/net/sslh/pkg/sslh_select.rc
index 60581d71978..91da71e2ea6 100644
--- a/net/sslh/pkg/sslh_select.rc
+++ b/net/sslh/pkg/sslh_select.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sslh_select.rc,v 1.4 2015/07/15 19:14:04 ajacoutot Exp $
+# $OpenBSD: sslh_select.rc,v 1.5 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sslh-select"
 daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443"
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index aeab68c8256..e762c355b16 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2017/06/17 07:26:50 feinerer Exp $
+# $OpenBSD: Makefile,v 1.18 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =	open decentralized synchronization utility
 
 V =		0.14.30
 DISTNAME =	syncthing-${V}
 DISTFILES =	syncthing-source-v${V}${EXTRACT_SUFX}
+REVISION =	0
 
 CATEGORIES =	net
 HOMEPAGE =	https://syncthing.net/
diff --git a/net/syncthing/pkg/syncthing.rc b/net/syncthing/pkg/syncthing.rc
index e03d4460542..f4691134829 100644
--- a/net/syncthing/pkg/syncthing.rc
+++ b/net/syncthing/pkg/syncthing.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: syncthing.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: syncthing.rc,v 1.5 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/syncthing"
 daemon_flags="-no-browser"
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 87bfbd2a1d3..fa49f8e5080 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2017/12/26 22:03:07 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =		Virtual Private Network (VPN) daemon
 DISTNAME =		tinc-1.0.33
 CATEGORIES =		net security
+REVISION =		0
 
 HOMEPAGE =		https://www.tinc-vpn.org/
 
diff --git a/net/tinc/pkg/tincd.rc b/net/tinc/pkg/tincd.rc
index 6d6ba1c93ef..ee5e4f7f327 100644
--- a/net/tinc/pkg/tincd.rc
+++ b/net/tinc/pkg/tincd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tincd.rc,v 1.1.1.1 2015/11/03 20:07:47 sthen Exp $
+# $OpenBSD: tincd.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/tincd"
 daemon_flags="-U _tinc --chroot --net=example"
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 929046d32aa..4b09d14233b 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.109 2018/01/10 14:35:49 pascal Exp $
+# $OpenBSD: Makefile,v 1.110 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	anonymity service using onion routing
 
 DISTNAME=	tor-0.3.2.9
 CATEGORIES=	net
 HOMEPAGE=	https://www.torproject.org/
+REVISION=	0
 
 MAINTAINER=	Pascal Stumpf <pascal@stumpf.co>
 
diff --git a/net/tor/pkg/tor.rc b/net/tor/pkg/tor.rc
index 278620f3bfb..3ceef68ab12 100644
--- a/net/tor/pkg/tor.rc
+++ b/net/tor/pkg/tor.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tor.rc,v 1.5 2015/07/20 19:55:58 ajacoutot Exp $
+# $OpenBSD: tor.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/tor"
 daemon_timeout=60
diff --git a/net/totd/Makefile b/net/totd/Makefile
index 7aaec1f7e03..a34b647dddb 100644
--- a/net/totd/Makefile
+++ b/net/totd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2014/08/10 10:20:34 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	DNS proxy that supports IPv6 <==> IPv4 record translation
 
 DISTNAME=	totd-1.5.1
-REVISION=	3
+REVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.dillema.net/software/totd/
 
diff --git a/net/totd/pkg/totd.rc b/net/totd/pkg/totd.rc
index 3b0bc691163..724517d5d2f 100644
--- a/net/totd/pkg/totd.rc
+++ b/net/totd/pkg/totd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: totd.rc,v 1.1 2012/03/03 15:56:18 sthen Exp $
+# $OpenBSD: totd.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/totd"
 
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 94c8882884a..48a66476a68 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.120 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.121 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT-main=	BitTorrent command line and daemon client
 COMMENT-gtk=	BitTorrent client with GTK+ interface
@@ -13,6 +13,7 @@ REVISION=	5
 CATEGORIES=	net
 HOMEPAGE=	http://www.transmissionbt.com/
 MAINTAINER=	Josh Grosse <josh@jggimi.net>
+REVISION-main=	0
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/net/transmission/pkg/transmission_daemon.rc b/net/transmission/pkg/transmission_daemon.rc
index ac0e9f3b34a..c37310f219c 100644
--- a/net/transmission/pkg/transmission_daemon.rc
+++ b/net/transmission/pkg/transmission_daemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: transmission_daemon.rc,v 1.1 2011/01/10 08:35:16 fgsch Exp $
+# $OpenBSD: transmission_daemon.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/transmission-daemon"
 daemon_user="_transmission"
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 0696b392f4d..1e6a4714458 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2017/05/25 14:39:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	lightweight userspace bandwidth shaper
 DISTNAME=	trickle-1.07
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	net
 
diff --git a/net/trickle/pkg/trickled.rc b/net/trickle/pkg/trickled.rc
index 220757decc5..7fc78f50a48 100644
--- a/net/trickle/pkg/trickled.rc
+++ b/net/trickle/pkg/trickled.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: trickled.rc,v 1.1 2012/05/24 18:41:34 gonzalo Exp $
+# $OpenBSD: trickled.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/trickled"
 
diff --git a/net/unifi/Makefile b/net/unifi/Makefile
index 5d8eb581622..5cdcd1a4eed 100644
--- a/net/unifi/Makefile
+++ b/net/unifi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2018/01/03 11:46:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.55 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	controller for Ubiquiti uniFi (wifi/routing/switching/voip)
 
@@ -12,6 +12,7 @@ S=		1.1.2.6
 DISTFILES=	unifi-$V{UniFi.unix}.zip unifi_sh_api-$V{unifi_sh_api}
 EXTRACT_ONLY=	unifi-$V.zip
 PKGNAME=	unifi-$V
+REVISION=	0
 
 # newer unifi uses newer snappy-java, but upstream stopped distributing
 # openbsd .so's. use a locally built one to replace.
diff --git a/net/unifi/pkg/unifi.rc b/net/unifi/pkg/unifi.rc
index 7feb8e52840..6535e695fa6 100644
--- a/net/unifi/pkg/unifi.rc
+++ b/net/unifi/pkg/unifi.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: unifi.rc,v 1.6 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: unifi.rc,v 1.7 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar"
 daemon_user="_unifi"
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
index 1cfdb38418b..c583f2de29a 100755
--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:08 rpe Exp $
 
 PORTROACH=	skipv:1.1
 
 COMMENT=	UPnP A/V media server
 
 DISTNAME=	ushare-1.1a
-REVISION=	12
+REVISION=	13
 EXTRACT_SUFX=	.tar.bz2
 
 CATEGORIES=	net multimedia
diff --git a/net/ushare/pkg/ushare.rc b/net/ushare/pkg/ushare.rc
index 1b68dcfa942..fb0d7ccbf19 100644
--- a/net/ushare/pkg/ushare.rc
+++ b/net/ushare/pkg/ushare.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ushare.rc,v 1.5 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: ushare.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ushare -D"
 
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 16fa582a4b5..e389e59c799 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2015/10/05 16:29:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT-main =		network traffic monitor
 COMMENT-vnstati =	image output support for vnstat
 
 V = 			1.14
-REVISION-main = 	4
+REVISION-main = 	5
 REVISION-vnstati = 	1
 DISTNAME =		vnstat-${V}
 PKGNAME-main = 		${DISTNAME}
diff --git a/net/vnstat/pkg/vnstatd.rc b/net/vnstat/pkg/vnstatd.rc
index 9618f1aaf15..c9f4a3bbcdd 100644
--- a/net/vnstat/pkg/vnstatd.rc
+++ b/net/vnstat/pkg/vnstatd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: vnstatd.rc,v 1.5 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: vnstatd.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/vnstatd -d"
 daemon_user="_vnstat"
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 10cca3f438b..bbad614c1a4 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2017/07/04 11:16:38 benoit Exp $
+# $OpenBSD: Makefile,v 1.40 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=		FTP daemon which aims to be secure
 
 DISTNAME=		vsftpd-3.0.3
-REVISION =		1
+REVISION =		2
 CATEGORIES=		net
 
 HOMEPAGE=		http://vsftpd.beasts.org/
diff --git a/net/vsftpd/pkg/vsftpd.rc b/net/vsftpd/pkg/vsftpd.rc
index 4c1e1b0e870..001295c1b9e 100644
--- a/net/vsftpd/pkg/vsftpd.rc
+++ b/net/vsftpd/pkg/vsftpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: vsftpd.rc,v 1.2 2014/01/30 14:01:50 ajacoutot Exp $
+# $OpenBSD: vsftpd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/vsftpd -obackground=yes"
 daemon_flags="${SYSCONFDIR}/vsftpd.conf"
diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index 71f4d86cc60..877a0757f90 100644
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2017/11/23 16:41:06 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT=	l2tp client/server
 
 GH_ACCOUNT=	xelerance
 GH_PROJECT=	xl2tpd
 GH_TAGNAME=	v1.3.10.1
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/net/xl2tpd/pkg/xl2tpd.rc b/net/xl2tpd/pkg/xl2tpd.rc
index ca85e7d0193..f44380badef 100644
--- a/net/xl2tpd/pkg/xl2tpd.rc
+++ b/net/xl2tpd/pkg/xl2tpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: xl2tpd.rc,v 1.2 2014/10/11 21:11:20 sthen Exp $
+# $OpenBSD: xl2tpd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/xl2tpd"
 daemon_user="_xl2tpd"
diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index e49eb71fad4..48b2b68f581 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.131 2017/11/16 21:09:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.132 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -12,6 +12,7 @@ PKGNAME-server =	zabbix-server-${VERSION}
 FULLPKGNAME-web =	zabbix-web-${VERSION}
 FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
+REVISION-main =		0
 
 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
diff --git a/net/zabbix/pkg/zabbix_agentd.rc b/net/zabbix/pkg/zabbix_agentd.rc
index c96cf5c895b..37ae4e89685 100644
--- a/net/zabbix/pkg/zabbix_agentd.rc
+++ b/net/zabbix/pkg/zabbix_agentd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: zabbix_agentd.rc,v 1.5 2014/04/09 06:27:56 robert Exp $
+# $OpenBSD: zabbix_agentd.rc,v 1.6 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/zabbix_agentd"
 
diff --git a/net/zabbix/pkg/zabbix_proxy.rc b/net/zabbix/pkg/zabbix_proxy.rc
index 6425c84dbd1..fc2021124dd 100644
--- a/net/zabbix/pkg/zabbix_proxy.rc
+++ b/net/zabbix/pkg/zabbix_proxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: zabbix_proxy.rc,v 1.7 2015/07/15 17:30:08 ajacoutot Exp $
+# $OpenBSD: zabbix_proxy.rc,v 1.8 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/zabbix_proxy"
 
diff --git a/net/zabbix/pkg/zabbix_server.rc b/net/zabbix/pkg/zabbix_server.rc
index ae7ef75424c..77e28758021 100644
--- a/net/zabbix/pkg/zabbix_server.rc
+++ b/net/zabbix/pkg/zabbix_server.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: zabbix_server.rc,v 1.7 2015/07/15 17:30:08 ajacoutot Exp $
+# $OpenBSD: zabbix_server.rc,v 1.8 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/zabbix_server"
 
diff --git a/net/ziproxy/Makefile b/net/ziproxy/Makefile
index 8381fed00e4..643596ec4ef 100644
--- a/net/ziproxy/Makefile
+++ b/net/ziproxy/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2014/12/05 16:07:56 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =		compressing non-caching HTTP proxy
 
 DISTNAME =		ziproxy-3.3.1
 EXTRACT_SUFX =		.tar.bz2
+REVISION =		0
 
 CATEGORIES =		net www
 
diff --git a/net/ziproxy/pkg/ziproxy.rc b/net/ziproxy/pkg/ziproxy.rc
index 4a88070453b..58d84a4db90 100644
--- a/net/ziproxy/pkg/ziproxy.rc
+++ b/net/ziproxy/pkg/ziproxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ziproxy.rc,v 1.1 2012/09/27 13:17:12 gonzalo Exp $
+# $OpenBSD: ziproxy.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ziproxy"
 daemon_flags="-d > /var/run/ziproxy.pid"
diff --git a/news/sabnzbd/Makefile b/news/sabnzbd/Makefile
index adff0e22221..2f6cc848b42 100644
--- a/news/sabnzbd/Makefile
+++ b/news/sabnzbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/02/25 20:11:33 mglocker Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =			retrieve and process nzb-files via web interface
 VERSION =			1.2.1
@@ -7,6 +7,7 @@ PKGNAME =			sabnzbd-${VERSION}
 CATEGORIES =			news
 HOMEPAGE =			http://sabnzbd.org/
 MAINTAINER =			Marcus Glocker <marcus@nazgul.ch>
+REVISION =			0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =		Yes
diff --git a/news/sabnzbd/pkg/sabnzbd.rc b/news/sabnzbd/pkg/sabnzbd.rc
index ae9938a26bd..d38e408739c 100644
--- a/news/sabnzbd/pkg/sabnzbd.rc
+++ b/news/sabnzbd/pkg/sabnzbd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sabnzbd.rc,v 1.2 2015/07/16 00:12:02 ajacoutot Exp $
+# $OpenBSD: sabnzbd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 datadir="/var/sabnzbd"
 
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 05de6adf80d..b2f0060fb74 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.131 2017/12/20 08:40:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.132 2018/01/11 19:27:08 rpe Exp $
 
 BROKEN-alpha=	ICE in cupsfilters/image-jpeg.c:316
 BROKEN-hppa=	ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147
@@ -6,6 +6,7 @@ BROKEN-hppa=	ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147
 COMMENT=	OpenPrinting CUPS filters
 
 DISTNAME=	cups-filters-1.18.0
+REVISION=	0
 
 CATEGORIES=	print
 
diff --git a/print/cups-filters/pkg/cups_browsed.rc b/print/cups-filters/pkg/cups_browsed.rc
index cdf7f99b5e1..1cc7cf20b2c 100644
--- a/print/cups-filters/pkg/cups_browsed.rc
+++ b/print/cups-filters/pkg/cups_browsed.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cups_browsed.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: cups_browsed.rc,v 1.4 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cups-browsed"
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 7a6f159e683..78f975855ce 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.231 2017/11/10 16:08:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.232 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT-main=		Common Unix Printing System
 COMMENT-libs=		CUPS libraries and headers
@@ -11,7 +11,7 @@ GH_TAGNAME=		v${VERSION}
 PKGNAME-main=		cups-${VERSION}
 PKGNAME-libs=		cups-libs-${VERSION}
 
-REVISION-main=		1
+REVISION-main=		2
 
 CATEGORIES=		print sysutils
 
diff --git a/print/cups/pkg/cupsd.rc b/print/cups/pkg/cupsd.rc
index 8990da6a4a1..bb3ca9ee2ce 100755
--- a/print/cups/pkg/cupsd.rc
+++ b/print/cups/pkg/cupsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cupsd.rc,v 1.26 2017/10/31 15:55:15 ajacoutot Exp $
+# $OpenBSD: cupsd.rc,v 1.27 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cupsd"
 
diff --git a/productivity/radicale/Makefile b/productivity/radicale/Makefile
index d01f35ab625..d91aec58bf3 100644
--- a/productivity/radicale/Makefile
+++ b/productivity/radicale/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/05/29 14:44:40 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =	simple CalDAV calendar server
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION = 1.1.3
 DISTNAME =	Radicale-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:L}
 CATEGORIES =	productivity net
+REVISION =	0
 
 HOMEPAGE =	http://radicale.org/
 
diff --git a/productivity/radicale/pkg/radicale.rc b/productivity/radicale/pkg/radicale.rc
index 68c82f63c96..08327a90711 100644
--- a/productivity/radicale/pkg/radicale.rc
+++ b/productivity/radicale/pkg/radicale.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: radicale.rc,v 1.2 2012/01/12 00:19:54 sthen Exp $
+# $OpenBSD: radicale.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/radicale -d"
 daemon_user="_radicale"
diff --git a/productivity/taskd/Makefile b/productivity/taskd/Makefile
index c186afdcaee..908f1bafa31 100644
--- a/productivity/taskd/Makefile
+++ b/productivity/taskd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2018/01/11 19:27:08 rpe Exp $
 
 COMMENT =	lightweight server providing access to task data
 
 DISTNAME =	taskd-1.1.0
 CATEGORIES =	productivity net
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.taskwarrior.org/
 
diff --git a/productivity/taskd/pkg/taskd.rc b/productivity/taskd/pkg/taskd.rc
index 136f49e6f49..01e6772cf00 100644
--- a/productivity/taskd/pkg/taskd.rc
+++ b/productivity/taskd/pkg/taskd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: taskd.rc,v 1.2 2016/01/28 17:15:05 kspillner Exp $
+# $OpenBSD: taskd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/taskd server --daemon --data /var/taskd"
 daemon_user="_taskd"
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 4d24a1e35de..d5f7c185422 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.114 2017/05/28 20:12:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.115 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	virus scanner
 DISTNAME=	clamav-0.99.2
-REVISION=	5
+REVISION=	6
 
 CATEGORIES=	security
 
diff --git a/security/clamav/pkg/clamav_milter.rc b/security/clamav/pkg/clamav_milter.rc
index f7278850003..1a78a7d786c 100644
--- a/security/clamav/pkg/clamav_milter.rc
+++ b/security/clamav/pkg/clamav_milter.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: clamav_milter.rc,v 1.2 2012/01/21 23:13:59 ajacoutot Exp $
+# $OpenBSD: clamav_milter.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/clamav-milter"
 
diff --git a/security/clamav/pkg/clamd.rc b/security/clamav/pkg/clamd.rc
index 4c9cd808795..4a624e99b97 100644
--- a/security/clamav/pkg/clamd.rc
+++ b/security/clamav/pkg/clamd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: clamd.rc,v 1.2 2017/05/28 20:12:51 sthen Exp $
+# $OpenBSD: clamd.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/clamd"
 daemon_timeout="90"
diff --git a/security/clamav/pkg/freshclam.rc b/security/clamav/pkg/freshclam.rc
index b26b25da809..5a11b815350 100644
--- a/security/clamav/pkg/freshclam.rc
+++ b/security/clamav/pkg/freshclam.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: freshclam.rc,v 1.2 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: freshclam.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/freshclam -d"
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index d6dc7b3260d..1075dd13346 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.100 2017/09/22 21:37:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.101 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=		RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=		cyrus-sasl-2.1.26
-REVISION=		24
+REVISION=		25
 
 SHARED_LIBS +=  sasl2                3.0      # 3.0
 
diff --git a/security/cyrus-sasl2/pkg/saslauthd.rc b/security/cyrus-sasl2/pkg/saslauthd.rc
index 163a2dcb23a..86f1a5395c2 100755
--- a/security/cyrus-sasl2/pkg/saslauthd.rc
+++ b/security/cyrus-sasl2/pkg/saslauthd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: saslauthd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: saslauthd.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/saslauthd"
 daemon_flags="-a getpwent"
diff --git a/security/dante/Makefile b/security/dante/Makefile
index c236bebb931..918b49f2343 100644
--- a/security/dante/Makefile
+++ b/security/dante/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.47 2016/11/06 01:39:54 jca Exp $
+# $OpenBSD: Makefile,v 1.48 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	SOCKS client and server
 
 DISTNAME=	dante-1.4.1
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	security
 
diff --git a/security/dante/pkg/sockd.rc b/security/dante/pkg/sockd.rc
index 9d4ebf187f9..bb8635332e9 100644
--- a/security/dante/pkg/sockd.rc
+++ b/security/dante/pkg/sockd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sockd.rc,v 1.1 2013/12/12 14:11:36 dcoppa Exp $
+# $OpenBSD: sockd.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sockd -D"
 
diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index cf93081ed48..c8b5b39410d 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/09/11 15:50:33 feinerer Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	firewall knock operator
 
 DISTNAME =	fwknop-2.6.9
+REVISION =	0
 
 SHARED_LIBS +=	fko	0.0 # 3.0
 
diff --git a/security/fwknop/pkg/fwknopd.rc b/security/fwknop/pkg/fwknopd.rc
index 50f0fd2393b..61cfceabd6f 100644
--- a/security/fwknop/pkg/fwknopd.rc
+++ b/security/fwknop/pkg/fwknopd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: fwknopd.rc,v 1.1.1.1 2017/09/11 15:50:33 feinerer Exp $
+# $OpenBSD: fwknopd.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/fwknopd"
 
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b6b2595e153..730dafacba0 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/12/09 07:56:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT-main=		Kerberos 5 implementation
 COMMENT-devel-docs=	Heimdal C functions documentation
@@ -10,6 +10,7 @@ DISTNAME=		heimdal-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-devel-docs=	heimdal-devel-docs-${V}
 PKGNAME-libs=		heimdal-libs-${V}
+REVISION-main=		0
 
 CATEGORIES=		security net
 
diff --git a/security/heimdal/pkg/ipropd_master.rc b/security/heimdal/pkg/ipropd_master.rc
index 95885b17848..c459a71a8fb 100644
--- a/security/heimdal/pkg/ipropd_master.rc
+++ b/security/heimdal/pkg/ipropd_master.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ipropd_master.rc,v 1.1 2014/07/13 14:10:14 ajacoutot Exp $
+# $OpenBSD: ipropd_master.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/heimdal/libexec/ipropd-master --detach"
 
diff --git a/security/heimdal/pkg/ipropd_slave.rc b/security/heimdal/pkg/ipropd_slave.rc
index d6cbc461f5d..ba84d8f974d 100644
--- a/security/heimdal/pkg/ipropd_slave.rc
+++ b/security/heimdal/pkg/ipropd_slave.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ipropd_slave.rc,v 1.1 2014/07/13 14:10:14 ajacoutot Exp $
+# $OpenBSD: ipropd_slave.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/heimdal/libexec/ipropd-slave --detach"
 
diff --git a/security/heimdal/pkg/kadmind.rc b/security/heimdal/pkg/kadmind.rc
index 4510650a398..9856aa88e33 100644
--- a/security/heimdal/pkg/kadmind.rc
+++ b/security/heimdal/pkg/kadmind.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kadmind.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: kadmind.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/heimdal/libexec/kadmind"
 
diff --git a/security/heimdal/pkg/kdc.rc b/security/heimdal/pkg/kdc.rc
index 36fc323893d..2e8b1de17f3 100644
--- a/security/heimdal/pkg/kdc.rc
+++ b/security/heimdal/pkg/kdc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kdc.rc,v 1.1 2014/07/13 14:10:14 ajacoutot Exp $
+# $OpenBSD: kdc.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/heimdal/libexec/kdc --detach"
 
diff --git a/security/heimdal/pkg/kpasswdd.rc b/security/heimdal/pkg/kpasswdd.rc
index 63355f276ff..4070cc57db2 100644
--- a/security/heimdal/pkg/kpasswdd.rc
+++ b/security/heimdal/pkg/kpasswdd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kpasswdd.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: kpasswdd.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/heimdal/libexec/kpasswdd"
 
diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index 153ec893176..e4c921683e0 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/16 19:19:01 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	open-source turn-key solution for DNSSEC
 
 DISTNAME=	opendnssec-1.4.14
+REVISION=	0
 
 CATEGORIES=	security
 
diff --git a/security/opendnssec/pkg/opendnssec.rc b/security/opendnssec/pkg/opendnssec.rc
index 667a05590f8..112425dd9f1 100644
--- a/security/opendnssec/pkg/opendnssec.rc
+++ b/security/opendnssec/pkg/opendnssec.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: opendnssec.rc,v 1.1.1.1 2015/10/13 17:03:55 jca Exp $
+# $OpenBSD: opendnssec.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ods-control"
 
diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index 4974077cd6f..dad6de05855 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2017/11/16 23:20:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.42 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	resource manager for PC/SC
 
 V=		1.8.22
 DISTNAME=	pcsc-lite-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	security
 
 SHARED_LIBS+=	pcsclite	1.0 # 1.0.0
diff --git a/security/pcsc-lite/pkg/pcscd.rc b/security/pcsc-lite/pkg/pcscd.rc
index 49ad189c1c5..ec7be9dda71 100644
--- a/security/pcsc-lite/pkg/pcscd.rc
+++ b/security/pcsc-lite/pkg/pcscd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pcscd.rc,v 1.1 2012/08/06 13:03:12 dcoppa Exp $
+# $OpenBSD: pcscd.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pcscd"
 
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index 26f8f8958d1..a965d1151f2 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2017/12/04 21:09:39 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	TCP port scan detection tool
 
 DISTNAME=	scanlogd-2.2.7
-REVISION=	1
+REVISION=	2
 CATEGORIES=	security
 FIX_EXTRACT_PERMISSIONS=Yes
 
diff --git a/security/scanlogd/pkg/scanlogd.rc b/security/scanlogd/pkg/scanlogd.rc
index fb36fa9cb6e..a6b5760dd04 100644
--- a/security/scanlogd/pkg/scanlogd.rc
+++ b/security/scanlogd/pkg/scanlogd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: scanlogd.rc,v 1.1 2014/08/26 15:51:14 kirby Exp $
+# $OpenBSD: scanlogd.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/scanlogd"
 
diff --git a/security/snort2pf/Makefile b/security/snort2pf/Makefile
index 265351fcfde..bb50dd5ec1f 100644
--- a/security/snort2pf/Makefile
+++ b/security/snort2pf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=		block "nasty" hosts with pf(4) based on Snort's rules
 
 DISTNAME=		snort2pf-4.5
 CATEGORIES=		security net
-REVISION=		4
+REVISION=		5
 
 HOMEPAGE=		http://sourceforge.net/projects/snort2pf/
 
diff --git a/security/snort2pf/pkg/snort2pf.rc b/security/snort2pf/pkg/snort2pf.rc
index c91284805ba..27018141ba4 100644
--- a/security/snort2pf/pkg/snort2pf.rc
+++ b/security/snort2pf/pkg/snort2pf.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: snort2pf.rc,v 1.4 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: snort2pf.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/snort2pf"
 
diff --git a/security/spiped/Makefile b/security/spiped/Makefile
index d3ec579501b..8aeb92903f4 100644
--- a/security/spiped/Makefile
+++ b/security/spiped/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/04/30 02:15:24 jturner Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =		utility for creating secure pipes between socket addresses
 
 DISTNAME =		spiped-1.6.0
 CATEGORIES =		security sysutils
+REVISION =		0
 
 MAINTAINER =		James Turner <james@calminferno.net>
 
diff --git a/security/spiped/pkg/spiped.rc b/security/spiped/pkg/spiped.rc
index 38e8a98db17..12dffe61fd5 100644
--- a/security/spiped/pkg/spiped.rc
+++ b/security/spiped/pkg/spiped.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: spiped.rc,v 1.2 2015/07/15 21:03:23 ajacoutot Exp $
+# $OpenBSD: spiped.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/spiped"
 daemon_flags="-D -d -s '[0.0.0.0]:8022' -t '[127.0.0.1]:22' -k ${SYSCONFDIR}/spiped/spiped.key -p /var/run/spiped/spiped.pid"
diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 45e923420ad..a23a6f82c4b 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/05/27 19:57:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	protect against brute force attacks on sshd and others
 
 DISTNAME=	sshguard-1.5
-REVISION=	3
+REVISION=	4
 CATEGORIES=	security
 
 # BSD
diff --git a/security/sshguard/pkg/sshguard.rc b/security/sshguard/pkg/sshguard.rc
index 40591caffdc..61c8779c0da 100644
--- a/security/sshguard/pkg/sshguard.rc
+++ b/security/sshguard/pkg/sshguard.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sshguard.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: sshguard.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sshguard"
 daemon_flags="-l /var/log/authlog"
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index a23b9342980..903bfba185a 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.89 2017/12/01 00:08:44 gsoares Exp $
+# $OpenBSD: Makefile,v 1.90 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	SSL encryption wrapper for standard network daemons
 
 DISTNAME=	stunnel-5.44
 CATEGORIES=	security
+REVISION=	0
 
 MAINTAINER=	Gleydson Soares <gsoares@openbsd.org>
 
diff --git a/security/stunnel/pkg/stunnel.rc b/security/stunnel/pkg/stunnel.rc
index 6fb4ae5572b..594b46f5566 100644
--- a/security/stunnel/pkg/stunnel.rc
+++ b/security/stunnel/pkg/stunnel.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: stunnel.rc,v 1.1 2011/09/14 01:45:31 william Exp $
+# $OpenBSD: stunnel.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/stunnel"
 
diff --git a/security/vault/Makefile b/security/vault/Makefile
index cece1fab72d..5b0e803b81f 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2017/12/03 15:15:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=		secure secret storage
 
 GH_TAGNAME=		v0.9.0
 GH_ACCOUNT=		hashicorp
 GH_PROJECT=		vault
+REVISION=		0
 
 CATEGORIES=		security net
 
diff --git a/security/vault/pkg/vault.rc b/security/vault/pkg/vault.rc
index 1bd0c7340f3..5fb616bb4a4 100644
--- a/security/vault/pkg/vault.rc
+++ b/security/vault/pkg/vault.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: vault.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: vault.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/vault server"
 daemon_flags="-config=${SYSCONFDIR}/vault.hcl"
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index a715ebd90a4..8486f7c1c71 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=		client for Cisco 3000 VPN concentrators
 
 DISTNAME=		vpnc-0.5.3
-REVISION=		5
+REVISION=		6
 CATEGORIES=		security net
 
 HOMEPAGE=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
diff --git a/security/vpnc/pkg/vpnc.rc b/security/vpnc/pkg/vpnc.rc
index 47740beba3e..998c1b30f6d 100644
--- a/security/vpnc/pkg/vpnc.rc
+++ b/security/vpnc/pkg/vpnc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: vpnc.rc,v 1.1 2013/05/20 16:26:51 gonzalo Exp $
+# $OpenBSD: vpnc.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/vpnc"
 
diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index df3711747ce..f8d4aff4b5e 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2017/10/16 21:27:36 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.37 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	IEEE 802.1X supplicant
 
 DISTNAME=	wpa_supplicant-2.6
-REVISION=	1
+REVISION=	2
 CATEGORIES=	security net
 
 HOMEPAGE=	http://w1.fi/wpa_supplicant/
diff --git a/security/wpa_supplicant/pkg/wpa_supplicant.rc b/security/wpa_supplicant/pkg/wpa_supplicant.rc
index 5ed74074ead..6e3dbcb7639 100644
--- a/security/wpa_supplicant/pkg/wpa_supplicant.rc
+++ b/security/wpa_supplicant/pkg/wpa_supplicant.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: wpa_supplicant.rc,v 1.1 2013/02/06 17:27:13 sthen Exp $
+# $OpenBSD: wpa_supplicant.rc,v 1.2 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/wpa_supplicant -B"
 daemon_flags="-c ${SYSCONFDIR}/wpa_supplicant.conf -D openbsd -i athn0"
diff --git a/security/yubiserve/Makefile b/security/yubiserve/Makefile
index 7f48c9919eb..cf27204bebe 100644
--- a/security/yubiserve/Makefile
+++ b/security/yubiserve/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=	standalone Yubikey and OATH/HOTP validation server
 DISTNAME=	yubico-yubiserve-3.1
-REVISION=	8
+REVISION=	9
 EXTRACT_SUFX=	.zip
 UNZIP=		unzip -a
 PKGNAME=	${DISTNAME:S/yubico-//}
diff --git a/security/yubiserve/pkg/yubiserve.rc b/security/yubiserve/pkg/yubiserve.rc
index a19b6c67add..cd953655945 100644
--- a/security/yubiserve/pkg/yubiserve.rc
+++ b/security/yubiserve/pkg/yubiserve.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: yubiserve.rc,v 1.4 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: yubiserve.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/yubiserve"
 daemon_user="_yubiserve"
diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index e1b79066ff0..b9defae7f60 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2017/12/09 07:40:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT=		AWS SSM agent
 
 GH_TAGNAME=		2.2.103.0
 GH_ACCOUNT=		aws
 GH_PROJECT=		amazon-ssm-agent
+REVISION=		0
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/amazon-ssm-agent/pkg/amazon_ssm_agent.rc b/sysutils/amazon-ssm-agent/pkg/amazon_ssm_agent.rc
index 0aec4ccc7a5..bc41c58720a 100644
--- a/sysutils/amazon-ssm-agent/pkg/amazon_ssm_agent.rc
+++ b/sysutils/amazon-ssm-agent/pkg/amazon_ssm_agent.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: amazon_ssm_agent.rc,v 1.4 2017/05/28 09:25:31 ajacoutot Exp $
+# $OpenBSD: amazon_ssm_agent.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/amazon-ssm-agent"
 
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 5c4ab6faedc..bb5f14585d2 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT-main =		daemon for controlling APC UPSes
 COMMENT-cgi =		CGI scripts for web monitoring
@@ -9,6 +9,7 @@ PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
 REVISION =		1
+REVISION-main =		0
 
 CATEGORIES =		sysutils
 
diff --git a/sysutils/apcupsd/pkg/apcupsd.rc b/sysutils/apcupsd/pkg/apcupsd.rc
index eb3bba9979e..fdde41640ef 100644
--- a/sysutils/apcupsd/pkg/apcupsd.rc
+++ b/sysutils/apcupsd/pkg/apcupsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: apcupsd.rc,v 1.3 2012/08/27 13:39:59 sthen Exp $
+# $OpenBSD: apcupsd.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/apcupsd"
 daemon_flags="--kill-on-powerfail"
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index d503ea04752..6a5783e6438 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/12 08:00:17 zhuk Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	remote backup software system
 
 DISTNAME =	BackupPC-3.3.2
 PKGNAME =	${DISTNAME:L}
+REVISION =	0
 
 CATEGORIES =	sysutils
 
diff --git a/sysutils/backuppc/pkg/backuppc.rc b/sysutils/backuppc/pkg/backuppc.rc
index bb476f97f7a..ec45b564248 100644
--- a/sysutils/backuppc/pkg/backuppc.rc
+++ b/sysutils/backuppc/pkg/backuppc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: backuppc.rc,v 1.3 2015/07/15 22:40:09 ajacoutot Exp $
+# $OpenBSD: backuppc.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/BackupPC -d"
 daemon_user="_backuppc"
diff --git a/sysutils/backuppc/pkg/wwbackuppc.rc b/sysutils/backuppc/pkg/wwbackuppc.rc
index fce97e4c487..0b1a7a5981b 100644
--- a/sysutils/backuppc/pkg/wwbackuppc.rc
+++ b/sysutils/backuppc/pkg/wwbackuppc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: wwbackuppc.rc,v 1.2 2015/07/15 22:40:09 ajacoutot Exp $
+# $OpenBSD: wwbackuppc.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${LOCALBASE}/bin/spawn-fcgi"
 daemon_flags="-u_backuppc -g_backuppc -p1028 ${TRUEPREFIX}/bin/BackupPC_Admin.fcgi"
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 173381c5122..17c1f86e7a4 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.119 2017/11/22 22:35:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.120 2018/01/11 19:27:09 rpe Exp $
 
 # XXX building this port while a version is already installed on the
 # system will lead to unexpected hidden dependencies!!!
@@ -18,6 +18,8 @@ PKGNAME-bat=		bacula-bat-$V
 PKGNAME-mysql=		bacula-mysql-$V
 PKGNAME-pgsql=		bacula-pgsql-$V
 PKGNAME-sqlite3=	bacula-sqlite3-$V
+REVISION-main=		0
+REVISION-server=	0
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/bacula/pkg/bacula.rc b/sysutils/bacula/pkg/bacula.rc
index 445f71518ef..44c7aa597f7 100644
--- a/sysutils/bacula/pkg/bacula.rc
+++ b/sysutils/bacula/pkg/bacula.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bacula.rc,v 1.4 2015/11/29 15:50:20 ajacoutot Exp $
+# $OpenBSD: bacula.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/sysutils/bacula/pkg/bacula_dir.rc b/sysutils/bacula/pkg/bacula_dir.rc
index 54a4a72df64..c39800327b3 100644
--- a/sysutils/bacula/pkg/bacula_dir.rc
+++ b/sysutils/bacula/pkg/bacula_dir.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bacula_dir.rc,v 1.2 2015/07/15 15:53:48 sthen Exp $
+# $OpenBSD: bacula_dir.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-dir"
 daemon_flags="start"
diff --git a/sysutils/bacula/pkg/bacula_fd.rc b/sysutils/bacula/pkg/bacula_fd.rc
index 73763bf0136..1485a17d4d9 100644
--- a/sysutils/bacula/pkg/bacula_fd.rc
+++ b/sysutils/bacula/pkg/bacula_fd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bacula_fd.rc,v 1.2 2015/07/15 15:53:48 sthen Exp $
+# $OpenBSD: bacula_fd.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-fd"
 daemon_flags="start"
diff --git a/sysutils/bacula/pkg/bacula_sd.rc b/sysutils/bacula/pkg/bacula_sd.rc
index ab4c7870c83..bd5fb989ddb 100644
--- a/sysutils/bacula/pkg/bacula_sd.rc
+++ b/sysutils/bacula/pkg/bacula_sd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: bacula_sd.rc,v 1.2 2015/07/15 15:53:48 sthen Exp $
+# $OpenBSD: bacula_sd.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-sd"
 daemon_flags="start"
diff --git a/sysutils/beats/filebeat/Makefile b/sysutils/beats/filebeat/Makefile
index 0594b1c2fa2..fe969880a19 100644
--- a/sysutils/beats/filebeat/Makefile
+++ b/sysutils/beats/filebeat/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/12/02 09:30:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	lightweight shipper for log file data
 
 BEAT =		filebeat
 VERSION =	5.6.4
+REVISION =	0
 
 GH_ACCOUNT =	elastic
 GH_PROJECT =	beats
diff --git a/sysutils/beats/filebeat/pkg/filebeat.rc b/sysutils/beats/filebeat/pkg/filebeat.rc
index af44e7e74c5..755bf43a595 100644
--- a/sysutils/beats/filebeat/pkg/filebeat.rc
+++ b/sysutils/beats/filebeat/pkg/filebeat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: filebeat.rc,v 1.4 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: filebeat.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${PREFIX}/bin/filebeat"
 daemon_flags="-path.config ${SYSCONFDIR}/filebeat"
diff --git a/sysutils/beats/heartbeat/Makefile b/sysutils/beats/heartbeat/Makefile
index 91eaf4f1c03..03fcd0d558f 100644
--- a/sysutils/beats/heartbeat/Makefile
+++ b/sysutils/beats/heartbeat/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2017/12/02 09:30:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	lightweight shipper for real-time network analytics
 
 BEAT =		heartbeat
 VERSION =	5.6.4
+REVISION =	0
 
 GH_ACCOUNT =	elastic
 GH_PROJECT =	beats
diff --git a/sysutils/beats/heartbeat/pkg/heartbeat.rc b/sysutils/beats/heartbeat/pkg/heartbeat.rc
index d30921ee7aa..d4fd0683b21 100644
--- a/sysutils/beats/heartbeat/pkg/heartbeat.rc
+++ b/sysutils/beats/heartbeat/pkg/heartbeat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: heartbeat.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: heartbeat.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${PREFIX}/bin/heartbeat"
 daemon_flags="-path.config ${SYSCONFDIR}/heartbeat/"
diff --git a/sysutils/beats/hwsensorsbeat/Makefile b/sysutils/beats/hwsensorsbeat/Makefile
index 4bfbefbb02d..c6df7c1ac5f 100644
--- a/sysutils/beats/hwsensorsbeat/Makefile
+++ b/sysutils/beats/hwsensorsbeat/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	lightweight shipper for hw.sensors data
 
 BEAT =		hwsensorsbeat
 VERSION =	0.1.2
-REVISION =	3
+REVISION =	4
 
 GH_ACCOUNT =	jasperla
 GH_PROJECT =	${BEAT}
diff --git a/sysutils/beats/hwsensorsbeat/pkg/hwsensorsbeat.rc b/sysutils/beats/hwsensorsbeat/pkg/hwsensorsbeat.rc
index fe84cfa8b22..67f827cff6e 100644
--- a/sysutils/beats/hwsensorsbeat/pkg/hwsensorsbeat.rc
+++ b/sysutils/beats/hwsensorsbeat/pkg/hwsensorsbeat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: hwsensorsbeat.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: hwsensorsbeat.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${PREFIX}/bin/hwsensorsbeat"
 daemon_flags="-c ${SYSCONFDIR}/hwsensorsbeat/hwsensorsbeat.yml"
diff --git a/sysutils/beats/metricbeat/Makefile b/sysutils/beats/metricbeat/Makefile
index f2042399778..a9f1707d40d 100644
--- a/sysutils/beats/metricbeat/Makefile
+++ b/sysutils/beats/metricbeat/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2017/11/08 11:49:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	lightweight shipper for system metrics
 
 BEAT =		metricbeat
 VERSION =	5.6.4
+REVISION =	0
 
 GH_ACCOUNT =	elastic
 GH_PROJECT =	beats
diff --git a/sysutils/beats/metricbeat/pkg/metricbeat.rc b/sysutils/beats/metricbeat/pkg/metricbeat.rc
index 377c3507064..db09b416330 100644
--- a/sysutils/beats/metricbeat/pkg/metricbeat.rc
+++ b/sysutils/beats/metricbeat/pkg/metricbeat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: metricbeat.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: metricbeat.rc,v 1.4 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${PREFIX}/bin/metricbeat"
 daemon_flags="-path.config ${SYSCONFDIR}/metricbeat/"
diff --git a/sysutils/beats/packetbeat/Makefile b/sysutils/beats/packetbeat/Makefile
index 4a5b36b7a93..2bfa4a5c174 100644
--- a/sysutils/beats/packetbeat/Makefile
+++ b/sysutils/beats/packetbeat/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/12/02 09:30:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:09 rpe Exp $
 
 COMMENT =	lightweight shipper for real-time network analytics
 
 BEAT =		packetbeat
 VERSION =	5.6.4
+REVISION =	0
 
 GH_ACCOUNT =	elastic
 GH_PROJECT =	beats
diff --git a/sysutils/beats/packetbeat/pkg/packetbeat.rc b/sysutils/beats/packetbeat/pkg/packetbeat.rc
index 80909dc285b..e5e06aea295 100644
--- a/sysutils/beats/packetbeat/pkg/packetbeat.rc
+++ b/sysutils/beats/packetbeat/pkg/packetbeat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: packetbeat.rc,v 1.4 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: packetbeat.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
 
 daemon="${PREFIX}/bin/packetbeat"
 daemon_flags="-path.config ${SYSCONFDIR}/packetbeat/"
diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 4a16e8dcd83..c1d072258be 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =	BackUp and Restore Program
 DISTNAME =	burp-2.0.54
+REVISION =	0
 
 CATEGORIES =	sysutils
 HOMEPAGE =	http://burp.grke.org/
diff --git a/sysutils/burp/pkg/burp.rc b/sysutils/burp/pkg/burp.rc
index da04e408234..98d0505c4ac 100644
--- a/sysutils/burp/pkg/burp.rc
+++ b/sysutils/burp/pkg/burp.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: burp.rc,v 1.2 2017/11/03 12:18:07 landry Exp $
+# $OpenBSD: burp.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/burp"
 daemon_flags="-c ${SYSCONFDIR}/burp/burp-server.conf"
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 7b87c3fc1e6..3f624feeb45 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.56 2016/11/19 15:28:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2018/01/11 19:27:10 rpe Exp $
 
 BROKEN =	pkg_add fails: problem with symlinks
 
 COMMENT =	GNU system administration tool for networks
 
 DISTNAME =	cfengine-3.7.2
+REVISION =	0
 
 SHARED_LIBS +=  promises	0.0 # 1.0
 CATEGORIES =	sysutils
diff --git a/sysutils/cfengine/pkg/cf_execd.rc b/sysutils/cfengine/pkg/cf_execd.rc
index d9875e432cb..985077389f0 100644
--- a/sysutils/cfengine/pkg/cf_execd.rc
+++ b/sysutils/cfengine/pkg/cf_execd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cf_execd.rc,v 1.1 2013/05/01 21:09:23 sthen Exp $
+# $OpenBSD: cf_execd.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="/var/cfengine/bin/cf-execd"
 
diff --git a/sysutils/cfengine/pkg/cf_monitord.rc b/sysutils/cfengine/pkg/cf_monitord.rc
index 0e3ea3fdef3..b657660370c 100644
--- a/sysutils/cfengine/pkg/cf_monitord.rc
+++ b/sysutils/cfengine/pkg/cf_monitord.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cf_monitord.rc,v 1.1 2013/05/01 21:09:23 sthen Exp $
+# $OpenBSD: cf_monitord.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="/var/cfengine/bin/cf-monitord"
 
diff --git a/sysutils/cfengine/pkg/cf_serverd.rc b/sysutils/cfengine/pkg/cf_serverd.rc
index 676f0d482fc..cf5f6efcbc2 100644
--- a/sysutils/cfengine/pkg/cf_serverd.rc
+++ b/sysutils/cfengine/pkg/cf_serverd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cf_serverd.rc,v 1.1 2013/05/01 21:09:23 sthen Exp $
+# $OpenBSD: cf_serverd.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="/var/cfengine/bin/cf-serverd"
 
diff --git a/sysutils/cfengine/pkg/cfengine.rc b/sysutils/cfengine/pkg/cfengine.rc
index 149872a7a71..3b05b8e7c71 100644
--- a/sysutils/cfengine/pkg/cfengine.rc
+++ b/sysutils/cfengine/pkg/cfengine.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cfengine.rc,v 1.4 2015/11/29 15:50:20 ajacoutot Exp $
+# $OpenBSD: cfengine.rc,v 1.5 2018/01/11 19:27:10 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index a574999d570..478d28ff22d 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT-main =		system metrics collection engine
 COMMENT-mysql =		collectd mysql plugin
@@ -24,6 +24,7 @@ PKGNAME-memcachec =	collectd-memcachec-$V
 PKGNAME-nut =		collectd-nut-$V
 PKGNAME-riemann =	collectd-riemann-$V
 CATEGORIES =		sysutils
+REVISION-main =		0
 
 REVISION =		1
 
diff --git a/sysutils/collectd/pkg/collectd.rc b/sysutils/collectd/pkg/collectd.rc
index c3c576c10a6..5abc7613489 100644
--- a/sysutils/collectd/pkg/collectd.rc
+++ b/sysutils/collectd/pkg/collectd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: collectd.rc,v 1.3 2017/07/08 17:37:36 ajacoutot Exp $
+# $OpenBSD: collectd.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/collectd"
 
diff --git a/sysutils/consul-template/Makefile b/sysutils/consul-template/Makefile
index 124577bebad..090a8ea7707 100644
--- a/sysutils/consul-template/Makefile
+++ b/sysutils/consul-template/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2017/11/02 17:43:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		template rendering and notifications with Consul
 
 GH_TAGNAME=		v0.19.4
 GH_ACCOUNT=		hashicorp
 GH_PROJECT=		consul-template
+REVISION=		0
 
 CATEGORIES=		sysutils net
 
diff --git a/sysutils/consul-template/pkg/consul_template.rc b/sysutils/consul-template/pkg/consul_template.rc
index 48f371f032a..06a93e1fabc 100755
--- a/sysutils/consul-template/pkg/consul_template.rc
+++ b/sysutils/consul-template/pkg/consul_template.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: consul_template.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: consul_template.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${PREFIX}/bin/consul-template"
 daemon_flags="-config ${SYSCONFDIR}/consul-template.d/default.conf"
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 31f4886cd5f..15a98cdb670 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/12/03 15:14:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:10 rpe Exp $
 
 # XXX no i386 equivalent to mem_openbsd_amd64.go
 ONLY_FOR_ARCHS=		amd64
@@ -8,6 +8,7 @@ COMMENT=		service discovery and configuration tool
 GH_TAGNAME=		v1.0.1
 GH_ACCOUNT=		hashicorp
 GH_PROJECT=		consul
+REVISION=		0
 
 CATEGORIES=		sysutils net
 
diff --git a/sysutils/consul/pkg/consul.rc b/sysutils/consul/pkg/consul.rc
index 0ac0a47af96..2c554d6c725 100644
--- a/sysutils/consul/pkg/consul.rc
+++ b/sysutils/consul/pkg/consul.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: consul.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: consul.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/consul agent"
 daemon_flags="-config-dir ${SYSCONFDIR}/consul.d"
diff --git a/sysutils/downtimed/Makefile b/sysutils/downtimed/Makefile
index 7349fa82819..79a8faf75d0 100644
--- a/sysutils/downtimed/Makefile
+++ b/sysutils/downtimed/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2017/06/14 14:04:21 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =		system downtime monitoring
 DISTNAME =		downtimed-1.0
-REVISION =		0
+REVISION =		1
 CATEGORIES =		sysutils
 
 HOMEPAGE =		http://dist.epipe.com/downtimed/
diff --git a/sysutils/downtimed/pkg/downtimed.rc b/sysutils/downtimed/pkg/downtimed.rc
index 2fa2886855e..b581dd28996 100644
--- a/sysutils/downtimed/pkg/downtimed.rc
+++ b/sysutils/downtimed/pkg/downtimed.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: downtimed.rc,v 1.1.1.1 2011/01/04 17:40:42 rpointel Exp $
+# $OpenBSD: downtimed.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/downtimed"
 
diff --git a/sysutils/facette/Makefile b/sysutils/facette/Makefile
index 268f8daec87..10e71d2fbb7 100644
--- a/sysutils/facette/Makefile
+++ b/sysutils/facette/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =	time series data visualization and graphing software
 
@@ -7,7 +7,7 @@ DISTNAME =	facette-0.3.1pre0
 GH_ACCOUNT =	facette
 GH_PROJECT =	facette
 GH_COMMIT =	62f4bd9058f26e7f8ee800b925e4c76731b5b955
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	sysutils
 
diff --git a/sysutils/facette/pkg/facette.rc b/sysutils/facette/pkg/facette.rc
index f14261261a7..e0e724058a4 100644
--- a/sysutils/facette/pkg/facette.rc
+++ b/sysutils/facette/pkg/facette.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: facette.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: facette.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/facette"
 daemon_user="_facette"
diff --git a/sysutils/freedt/Makefile b/sysutils/freedt/Makefile
index 4e064c3ed46..cbf22ed0c04 100644
--- a/sysutils/freedt/Makefile
+++ b/sysutils/freedt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		reimplementation of Dan Bernstein's daemontools#'
 
 DISTNAME=		freedt-23
 CATEGORIES=		sysutils
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://offog.org/code/freedt.html
 
diff --git a/sysutils/freedt/pkg/svscan.rc b/sysutils/freedt/pkg/svscan.rc
index 137784441a5..92f38d68e0a 100755
--- a/sysutils/freedt/pkg/svscan.rc
+++ b/sysutils/freedt/pkg/svscan.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: svscan.rc,v 1.5 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: svscan.rc,v 1.6 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/svscan"
 daemon_flags="/service/"
diff --git a/sysutils/google-compute-engine/Makefile b/sysutils/google-compute-engine/Makefile
index 93395aabbac..acfa07228f1 100644
--- a/sysutils/google-compute-engine/Makefile
+++ b/sysutils/google-compute-engine/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/06/29 14:35:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =		Google Cloud Platform (GCP) Compute Engine daemon
 
 MODPY_EGG_VERSION =	2.4.0
 DISTNAME =		google-compute-engine-${MODPY_EGG_VERSION}
+REVISION =		0
 
 GH_ACCOUNT =		GoogleCloudPlatform
 GH_PROJECT =		compute-image-packages
diff --git a/sysutils/google-compute-engine/pkg/google_accounts_daemon.rc b/sysutils/google-compute-engine/pkg/google_accounts_daemon.rc
index aa8b329f4c0..db4c386dcc4 100644
--- a/sysutils/google-compute-engine/pkg/google_accounts_daemon.rc
+++ b/sysutils/google-compute-engine/pkg/google_accounts_daemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: google_accounts_daemon.rc,v 1.1.1.1 2017/06/29 14:35:10 ajacoutot Exp $
+# $OpenBSD: google_accounts_daemon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${MODPY_BIN} ${TRUEPREFIX}/bin/google_accounts_daemon"
 
diff --git a/sysutils/google-compute-engine/pkg/google_clock_skew_daemon.rc b/sysutils/google-compute-engine/pkg/google_clock_skew_daemon.rc
index f310faf3ac2..27af5660afd 100644
--- a/sysutils/google-compute-engine/pkg/google_clock_skew_daemon.rc
+++ b/sysutils/google-compute-engine/pkg/google_clock_skew_daemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: google_clock_skew_daemon.rc,v 1.1.1.1 2017/06/29 14:35:10 ajacoutot Exp $
+# $OpenBSD: google_clock_skew_daemon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${MODPY_BIN} ${TRUEPREFIX}/bin/google_clock_skew_daemon"
 
diff --git a/sysutils/google-compute-engine/pkg/google_compute_engine.rc b/sysutils/google-compute-engine/pkg/google_compute_engine.rc
index d6e37f6863b..58ddca489bf 100644
--- a/sysutils/google-compute-engine/pkg/google_compute_engine.rc
+++ b/sysutils/google-compute-engine/pkg/google_compute_engine.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: google_compute_engine.rc,v 1.1.1.1 2017/06/29 14:35:10 ajacoutot Exp $
+# $OpenBSD: google_compute_engine.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/sysutils/google-compute-engine/pkg/google_ip_forwarding_daemon.rc b/sysutils/google-compute-engine/pkg/google_ip_forwarding_daemon.rc
index d431a4baa46..d4713c3f1ef 100644
--- a/sysutils/google-compute-engine/pkg/google_ip_forwarding_daemon.rc
+++ b/sysutils/google-compute-engine/pkg/google_ip_forwarding_daemon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: google_ip_forwarding_daemon.rc,v 1.1.1.1 2017/06/29 14:35:10 ajacoutot Exp $
+# $OpenBSD: google_ip_forwarding_daemon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${MODPY_BIN} ${TRUEPREFIX}/bin/google_ip_forwarding_daemon"
 
diff --git a/sysutils/gpioflicker/Makefile b/sysutils/gpioflicker/Makefile
index 6108fe86678..63dcd95b8a8 100644
--- a/sysutils/gpioflicker/Makefile
+++ b/sysutils/gpioflicker/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2013/03/11 11:41:30 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		flashes gpio led whenever pf logs to pflog0
 
 DISTNAME=		gpioflicker-0.3
 CATEGORIES=		sysutils
+REVISION=		0
 
 HOMEPAGE=		http://www.pro-bono-publico.de/openbsd/gpio/
 
diff --git a/sysutils/gpioflicker/pkg/gpioflicker.rc b/sysutils/gpioflicker/pkg/gpioflicker.rc
index e0d63158456..986c6e55a68 100644
--- a/sysutils/gpioflicker/pkg/gpioflicker.rc
+++ b/sysutils/gpioflicker/pkg/gpioflicker.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gpioflicker.rc,v 1.1 2012/01/26 19:31:38 sthen Exp $
+# $OpenBSD: gpioflicker.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/gpioflicker"
 
diff --git a/sysutils/grafana/Makefile b/sysutils/grafana/Makefile
index 444f852fe73..984fdd35dcf 100644
--- a/sysutils/grafana/Makefile
+++ b/sysutils/grafana/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/01/04 20:46:00 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =	monitoring and metric analytics dashboards
 
 GH_ACCOUNT =	grafana
 GH_PROJECT =	grafana
 GH_TAGNAME =	v4.6.3
+REVISION =	0
 
 CATEGORIES =	sysutils
 
diff --git a/sysutils/grafana/pkg/grafana.rc b/sysutils/grafana/pkg/grafana.rc
index 2a5b6b82764..b50789cccac 100644
--- a/sysutils/grafana/pkg/grafana.rc
+++ b/sysutils/grafana/pkg/grafana.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: grafana.rc,v 1.1.1.1 2018/01/04 20:46:00 landry Exp $
+# $OpenBSD: grafana.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/grafana-server"
 daemon_user="_grafana"
diff --git a/sysutils/incron/Makefile b/sysutils/incron/Makefile
index 290414d56a4..c7219144776 100644
--- a/sysutils/incron/Makefile
+++ b/sysutils/incron/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT =	cron-like daemon but reacting to filesystem events
 
 DISTNAME =	incron-0.5.10
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	sysutils
 
diff --git a/sysutils/incron/pkg/incrond.rc b/sysutils/incron/pkg/incrond.rc
index fe5f20500db..2b438091f3e 100644
--- a/sysutils/incron/pkg/incrond.rc
+++ b/sysutils/incron/pkg/incrond.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: incrond.rc,v 1.1.1.1 2016/01/23 16:06:05 landry Exp $
+# $OpenBSD: incrond.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/incrond"
 
diff --git a/sysutils/logfmon/Makefile b/sysutils/logfmon/Makefile
index 9d965ffc100..a86e78d8f12 100644
--- a/sysutils/logfmon/Makefile
+++ b/sysutils/logfmon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:41:30 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		log file monitoring daemon
 
 DISTNAME=		logfmon-1.1
-REVISION=		0
+REVISION=		1
 CATEGORIES=		sysutils
 
 HOMEPAGE=		http://sourceforge.net/projects/logfmon/
diff --git a/sysutils/logfmon/pkg/logfmon.rc b/sysutils/logfmon/pkg/logfmon.rc
index 6c9fde134bd..0d0010699ee 100644
--- a/sysutils/logfmon/pkg/logfmon.rc
+++ b/sysutils/logfmon/pkg/logfmon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: logfmon.rc,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
+# $OpenBSD: logfmon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/logfmon"
 
diff --git a/sysutils/logstash/Makefile b/sysutils/logstash/Makefile
index 4f6b87c872b..3dec8e81f88 100644
--- a/sysutils/logstash/Makefile
+++ b/sysutils/logstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		tool for managing events and logs
 
@@ -6,7 +6,7 @@ V=			2.4.0
 DISTNAME=		logstash-$V
 PKGNAME=		logstash-${V:S/-/./}
 EPOCH=			0
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/logstash/pkg/logstash.rc b/sysutils/logstash/pkg/logstash.rc
index 23c5e69c4a7..30b4c4400b5 100644
--- a/sysutils/logstash/pkg/logstash.rc
+++ b/sysutils/logstash/pkg/logstash.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: logstash.rc,v 1.3 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: logstash.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon_user="_logstash"
 daemon="${TRUEPREFIX}/logstash/bin/logstash"
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index e2bfc22c55a..713580198b2 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.49 2017/11/20 13:20:21 sebastia Exp $
+# $OpenBSD: Makefile,v 1.50 2018/01/11 19:27:10 rpe Exp $
 
 BROKEN-alpha=	SIGABRT during make fake
 COMMENT=	framework for server orchestration/parallel job execution
 DISTNAME=	mcollective-2.11.4
+REVISION=	0
 
 CATEGORIES=	sysutils
 
diff --git a/sysutils/mcollective/pkg/mcollectived.rc b/sysutils/mcollective/pkg/mcollectived.rc
index 1150ea67113..8beabc4526b 100644
--- a/sysutils/mcollective/pkg/mcollectived.rc
+++ b/sysutils/mcollective/pkg/mcollectived.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mcollectived.rc,v 1.3 2016/09/21 20:27:40 sebastia Exp $
+# $OpenBSD: mcollectived.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/mcollectived"
 daemon_flags="--pid=/var/run/mcollectived.pid"
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index d93a59ec86b..e86458adec4 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.56 2017/11/19 18:49:26 jca Exp $
+# $OpenBSD: Makefile,v 1.57 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=	monitoring and managing daemons utility
 
 DISTNAME=	monit-5.25.1
+REVISION=	0
 
 CATEGORIES=	sysutils
 
diff --git a/sysutils/monit/pkg/monit.rc b/sysutils/monit/pkg/monit.rc
index 697f349943c..6322a6fb39a 100644
--- a/sysutils/monit/pkg/monit.rc
+++ b/sysutils/monit/pkg/monit.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: monit.rc,v 1.3 2014/09/24 09:30:48 jasper Exp $
+# $OpenBSD: monit.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/monit"
 
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 2127a4a1e2a..ed1987a2e63 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2017/11/02 21:51:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.97 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT-main=		UPS monitoring program supporting many brands
 COMMENT-cgi=		CGIs for monitoring Nut-based UPSs
@@ -12,7 +12,7 @@ PKGNAME-cgi=		${DISTNAME:S/-/-cgi-/}
 PKGNAME-snmp=		${DISTNAME:S/-/-snmp-/}
 PKGNAME-xml=		${DISTNAME:S/-/-xml-/}
 
-REVISION-main=		2
+REVISION-main=		3
 REVISION-snmp=		1
 REVISION-xml=		2
 REVISION-cgi=		1
diff --git a/sysutils/nut/pkg/nut.rc b/sysutils/nut/pkg/nut.rc
index 926b4ee856c..7c7ad29a9b6 100644
--- a/sysutils/nut/pkg/nut.rc
+++ b/sysutils/nut/pkg/nut.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nut.rc,v 1.2 2015/11/29 15:50:20 ajacoutot Exp $
+# $OpenBSD: nut.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
diff --git a/sysutils/nut/pkg/upsd.rc b/sysutils/nut/pkg/upsd.rc
index 74e3c2f5185..cb61a7653a2 100644
--- a/sysutils/nut/pkg/upsd.rc
+++ b/sysutils/nut/pkg/upsd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: upsd.rc,v 1.2 2014/04/21 11:41:11 sthen Exp $
+# $OpenBSD: upsd.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/upsd"
 
diff --git a/sysutils/nut/pkg/upsmon.rc b/sysutils/nut/pkg/upsmon.rc
index e1a634cdc03..1f90d351bd8 100644
--- a/sysutils/nut/pkg/upsmon.rc
+++ b/sysutils/nut/pkg/upsmon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: upsmon.rc,v 1.1 2011/09/19 15:59:57 sthen Exp $
+# $OpenBSD: upsmon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/upsmon"
 
diff --git a/sysutils/openpoppassd/Makefile b/sysutils/openpoppassd/Makefile
index c67b2f2a9a8..a48d5da8a59 100644
--- a/sysutils/openpoppassd/Makefile
+++ b/sysutils/openpoppassd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/12/05 16:25:45 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		daemon for changing passwords
 
 DISTNAME=		openpoppassd-1.1
-REVISION =		9
+REVISION =		10
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES=		sysutils mail
diff --git a/sysutils/openpoppassd/pkg/openpoppassd.rc b/sysutils/openpoppassd/pkg/openpoppassd.rc
index 717f8548cbb..566a79bf2aa 100644
--- a/sysutils/openpoppassd/pkg/openpoppassd.rc
+++ b/sysutils/openpoppassd/pkg/openpoppassd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: openpoppassd.rc,v 1.1 2011/03/31 12:21:39 ajacoutot Exp $
+# $OpenBSD: openpoppassd.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/openpoppassd"
 
diff --git a/sysutils/riemann/Makefile b/sysutils/riemann/Makefile
index 69ca776c973..fc29424d52f 100644
--- a/sysutils/riemann/Makefile
+++ b/sysutils/riemann/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2017/11/10 22:00:44 pvk Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=	network event stream processing system
 
 V=		0.2.14
 DISTNAME=	riemann-${V}
 CATEGORIES=	sysutils
+REVISION=	0
 
 HOMEPAGE=	http://riemann.io
 
diff --git a/sysutils/riemann/pkg/riemann.rc b/sysutils/riemann/pkg/riemann.rc
index 834fda03161..6fc52bac3e5 100644
--- a/sysutils/riemann/pkg/riemann.rc
+++ b/sysutils/riemann/pkg/riemann.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: riemann.rc,v 1.4 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: riemann.rc,v 1.5 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/riemann"
 daemon_user="_riemann"
diff --git a/sysutils/ruby-puppet/pkg/puppet.rc b/sysutils/ruby-puppet/pkg/puppet.rc
index 8c6dd6d7218..2c71e67e2d7 100644
--- a/sysutils/ruby-puppet/pkg/puppet.rc
+++ b/sysutils/ruby-puppet/pkg/puppet.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppet.rc,v 1.2 2015/07/15 14:49:02 ajacoutot Exp $
+# $OpenBSD: puppet.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/puppet agent"
 
diff --git a/sysutils/ruby-puppet/pkg/puppetmaster.rc b/sysutils/ruby-puppet/pkg/puppetmaster.rc
index ff816d8f4e3..ad62e95808d 100644
--- a/sysutils/ruby-puppet/pkg/puppetmaster.rc
+++ b/sysutils/ruby-puppet/pkg/puppetmaster.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppetmaster.rc,v 1.1 2015/04/04 09:28:45 jasper Exp $
+# $OpenBSD: puppetmaster.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/puppet master"
 
diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index d7616ea0bfd..e1906969fab 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		job scheduler and runbook automation
 
 V=			2.6.11
 DISTNAME=		rundeck-launcher-${V}
 PKGNAME=		rundeck-${V}
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/rundeck/pkg/rundeck.rc b/sysutils/rundeck/pkg/rundeck.rc
index baad494616f..245d68380ef 100644
--- a/sysutils/rundeck/pkg/rundeck.rc
+++ b/sysutils/rundeck/pkg/rundeck.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rundeck.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: rundeck.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon=$(${LOCALBASE}/bin/javaPathHelper -c rundeck)
 daemon_flags="-XX:MaxPermSize=256m -Xmx1024m -Djava.io.tmpdir=/var/cache/rundeck -jar ${RDECK_BASE}/rundeck-launcher.jar -b ${RDECK_BASE}"
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 62b4b772e5c..ab88d897ec2 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2018/01/02 19:56:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.115 2018/01/11 19:27:10 rpe Exp $
 
 # optional dependencies
 # https://github.com/saltstack/salt/blob/develop/doc/conf.py#L54
@@ -17,7 +17,7 @@ COMMENT =		remote execution and configuration management system
 
 MODPY_EGG_VERSION =	2017.7.2
 DISTNAME =		salt-${MODPY_EGG_VERSION}
-REVISION =		6
+REVISION =		7
 
 CATEGORIES =		sysutils net devel
 
diff --git a/sysutils/salt/pkg/salt_api.rc b/sysutils/salt/pkg/salt_api.rc
index 106748a7e8e..2366718fb9b 100644
--- a/sysutils/salt/pkg/salt_api.rc
+++ b/sysutils/salt/pkg/salt_api.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: salt_api.rc,v 1.1 2015/11/17 09:40:45 ajacoutot Exp $
+# $OpenBSD: salt_api.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/salt-api -d"
 daemon_user="_salt"
diff --git a/sysutils/salt/pkg/salt_master.rc b/sysutils/salt/pkg/salt_master.rc
index e92599ea0bc..17770a45229 100644
--- a/sysutils/salt/pkg/salt_master.rc
+++ b/sysutils/salt/pkg/salt_master.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: salt_master.rc,v 1.4 2015/11/14 08:30:07 ajacoutot Exp $
+# $OpenBSD: salt_master.rc,v 1.5 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/salt-master -d"
 
diff --git a/sysutils/salt/pkg/salt_minion.rc b/sysutils/salt/pkg/salt_minion.rc
index 403bb185cc0..ed4c166e747 100644
--- a/sysutils/salt/pkg/salt_minion.rc
+++ b/sysutils/salt/pkg/salt_minion.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: salt_minion.rc,v 1.3 2014/06/17 12:30:39 ajacoutot Exp $
+# $OpenBSD: salt_minion.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/salt-minion -d"
 
diff --git a/sysutils/salt/pkg/salt_proxy.rc b/sysutils/salt/pkg/salt_proxy.rc
index 58f349891a5..4f1c8852cb8 100644
--- a/sysutils/salt/pkg/salt_proxy.rc
+++ b/sysutils/salt/pkg/salt_proxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: salt_proxy.rc,v 1.1 2015/11/14 08:30:07 ajacoutot Exp $
+# $OpenBSD: salt_proxy.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/salt-proxy -d"
 
diff --git a/sysutils/salt/pkg/salt_syndic.rc b/sysutils/salt/pkg/salt_syndic.rc
index cacb5bbffcd..cb638e3a229 100644
--- a/sysutils/salt/pkg/salt_syndic.rc
+++ b/sysutils/salt/pkg/salt_syndic.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: salt_syndic.rc,v 1.2 2014/06/17 12:30:39 ajacoutot Exp $
+# $OpenBSD: salt_syndic.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/salt-syndic -d"
 daemon_flags="-u _salt"
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index b9433bd6089..e830bfcce4b 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		decentralized service discovery and orchestration
 
@@ -7,7 +7,7 @@ GH_ACCOUNT=		hashicorp
 GH_PROJECT=		serf
 PKGNAME=		${GH_ACCOUNT}-${DISTNAME}
 DIST_SUBDIR=		${GH_PROJECT}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		sysutils net
 
diff --git a/sysutils/serf/pkg/serf.rc b/sysutils/serf/pkg/serf.rc
index 0ab634bf34a..dcbd8d32bc8 100644
--- a/sysutils/serf/pkg/serf.rc
+++ b/sysutils/serf/pkg/serf.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: serf.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: serf.rc,v 1.4 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/serf agent"
 daemon_flags="-syslog"
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 4f67a9ef394..cadc993020b 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.37 2017/12/14 06:00:17 jca Exp $
+# $OpenBSD: Makefile,v 1.38 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		control and monitor storage systems using SMART
 
 # XXX at update time check whether C++11 is actually needed
 DISTNAME=		smartmontools-6.6
 CATEGORIES=		sysutils
+REVISION=		0
 
 HOMEPAGE=		https://www.smartmontools.org/
 MAINTAINER=		Giovanni Bechis <giovanni@openbsd.org>
diff --git a/sysutils/smartmontools/pkg/smartd.rc b/sysutils/smartmontools/pkg/smartd.rc
index 601a841853d..bb04ff34b9f 100644
--- a/sysutils/smartmontools/pkg/smartd.rc
+++ b/sysutils/smartmontools/pkg/smartd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: smartd.rc,v 1.4 2010/12/27 14:50:24 ajacoutot Exp $
+# $OpenBSD: smartd.rc,v 1.5 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/smartd"
 
diff --git a/sysutils/supervisor/Makefile b/sysutils/supervisor/Makefile
index 15456bd320d..5f9db297fad 100644
--- a/sysutils/supervisor/Makefile
+++ b/sysutils/supervisor/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/15 16:38:14 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT=		system to monitor and control processes
 
 MODPY_EGG_VERSION =	3.3.3
 DISTNAME=		supervisor-${MODPY_EGG_VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/supervisor/pkg/supervisord.rc b/sysutils/supervisor/pkg/supervisord.rc
index c4f382af502..fdc7928cb57 100644
--- a/sysutils/supervisor/pkg/supervisord.rc
+++ b/sysutils/supervisor/pkg/supervisord.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: supervisord.rc,v 1.1.1.1 2014/05/14 09:56:44 jasper Exp $
+# $OpenBSD: supervisord.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/supervisord"
 daemon_flags="-c ${SYSCONFDIR}/supervisord.conf --pidfile /var/run/supervisor/supervisord.pid"
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 40bb09d2f4f..60abc4e4f2e 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2017/07/05 10:22:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2018/01/11 19:27:10 rpe Exp $
 
 COMMENT-main=	active host monitoring tool
 COMMENT-mux=	symon data gatherer
@@ -8,7 +8,7 @@ DISTNAME=	symon-$V
 WRKDIST=	${WRKDIR}/symon
 PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-mux= symux-$V
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	sysutils net
 
diff --git a/sysutils/symon/pkg/symon.rc b/sysutils/symon/pkg/symon.rc
index 711585d4ea7..63d29d68e8d 100644
--- a/sysutils/symon/pkg/symon.rc
+++ b/sysutils/symon/pkg/symon.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: symon.rc,v 1.2 2011/05/19 20:01:27 gsoares Exp $
+# $OpenBSD: symon.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/symon"
 
diff --git a/sysutils/symon/pkg/symux.rc b/sysutils/symon/pkg/symux.rc
index 2c4dc254455..d1f5f662da7 100644
--- a/sysutils/symon/pkg/symux.rc
+++ b/sysutils/symon/pkg/symux.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: symux.rc,v 1.2 2011/05/19 20:01:27 gsoares Exp $
+# $OpenBSD: symux.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
 
 daemon="${TRUEPREFIX}/libexec/symux"
 
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 660df499a4b..c34fa853ce9 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2018/01/09 07:36:06 steven Exp $
+# $OpenBSD: Makefile,v 1.62 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=	log management solution
 
@@ -6,7 +6,7 @@ V =		3.12.1
 REL =		3.12
 DISTNAME =	syslog-ng-$V
 CATEGORIES =	sysutils
-REVISION =	2
+REVISION =	3
 
 MAINTAINER =	Steven Mestdagh <steven@openbsd.org>
 
diff --git a/sysutils/syslog-ng/pkg/syslog_ng.rc b/sysutils/syslog-ng/pkg/syslog_ng.rc
index 065b53119ae..764ad34fdab 100644
--- a/sysutils/syslog-ng/pkg/syslog_ng.rc
+++ b/sysutils/syslog-ng/pkg/syslog_ng.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: syslog_ng.rc,v 1.6 2013/11/27 07:52:54 ajacoutot Exp $
+# $OpenBSD: syslog_ng.rc,v 1.7 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/syslog-ng"
 daemon_flags="-p /var/run/syslog.pid"
diff --git a/sysutils/sysmon/Makefile b/sysutils/sysmon/Makefile
index 62c85329d7b..0665f1d9fb2 100644
--- a/sysutils/sysmon/Makefile
+++ b/sysutils/sysmon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/08/20 16:41:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =	lightweight network monitoring tool
 DISTNAME =	sysmon-0.93
@@ -6,7 +6,7 @@ CATEGORIES =	sysutils
 
 HOMEPAGE =	http://puck.nether.net/sysmon/
 MAINTAINER =	George Rosamond <george@nycbug.org>
-REVISION =	0
+REVISION =	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/sysutils/sysmon/pkg/sysmond.rc b/sysutils/sysmon/pkg/sysmond.rc
index dfe99b4c53c..19c47acb1fd 100644
--- a/sysutils/sysmon/pkg/sysmond.rc
+++ b/sysutils/sysmon/pkg/sysmond.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sysmond.rc,v 1.2 2016/08/20 16:41:47 ajacoutot Exp $
+# $OpenBSD: sysmond.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/sysmond"
 daemon_flags="-f ${SYSCONFDIR}/sysmon.conf"
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 253e8575d0a..91dd82cefa6 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2015/09/16 17:21:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =	keeps a list of uptime records
 DISTNAME =	uptimed-0.3.17
 CATEGORIES =	sysutils
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS +=	uptimed                   0.0 # 0.0
 
diff --git a/sysutils/uptimed/pkg/uptimed.rc b/sysutils/uptimed/pkg/uptimed.rc
index f3c1641e984..878ba6e0835 100644
--- a/sysutils/uptimed/pkg/uptimed.rc
+++ b/sysutils/uptimed/pkg/uptimed.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: uptimed.rc,v 1.1.1.1 2013/06/18 05:47:19 rfreeman Exp $
+# $OpenBSD: uptimed.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/uptimed"
 daemon_flags="-p /var/run/uptimed/uptimed.pid"
diff --git a/sysutils/waagent/Makefile b/sysutils/waagent/Makefile
index 9569073d01d..cd4fc368fbb 100644
--- a/sysutils/waagent/Makefile
+++ b/sysutils/waagent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/06/23 12:37:09 reyk Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=		Microsoft Azure Linux Agent
 
@@ -7,6 +7,7 @@ GH_ACCOUNT=		Azure
 GH_PROJECT=		WALinuxAgent
 GH_TAGNAME=		v${V}
 PKGNAME=		waagent-${V}
+REVISION=		0
 
 CATEGORIES=		sysutils
 
diff --git a/sysutils/waagent/pkg/waagent.rc b/sysutils/waagent/pkg/waagent.rc
index ec42283e90c..98e851d102a 100644
--- a/sysutils/waagent/pkg/waagent.rc
+++ b/sysutils/waagent/pkg/waagent.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: waagent.rc,v 1.1.1.1 2017/06/23 12:37:09 reyk Exp $
+# $OpenBSD: waagent.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/waagent -start"
 
diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index dfae908cc8b..e308787f9aa 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.268 2017/12/24 19:37:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.269 2018/01/11 19:27:11 rpe Exp $
 
 BROKEN-aarch64=	linker problems with BlocksRuntime that only show up at runtime
 
@@ -10,6 +10,7 @@ PORTROACH=	limitw:0,odd
 DISTNAME=	asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pjproject-${PJ_V}.tar.bz2:0
 PKGNAME-main=	asterisk-${VER}
+REVISION-main=	0
 
 CATEGORIES=	telephony
 
diff --git a/telephony/asterisk/pkg/asterisk.rc b/telephony/asterisk/pkg/asterisk.rc
index 6eb4cbf9c4d..9b3bffd2bb8 100644
--- a/telephony/asterisk/pkg/asterisk.rc
+++ b/telephony/asterisk/pkg/asterisk.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: asterisk.rc,v 1.4 2015/09/21 14:10:21 sthen Exp $
+# $OpenBSD: asterisk.rc,v 1.5 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/asterisk"
 
diff --git a/telephony/baresip/restund/Makefile b/telephony/baresip/restund/Makefile
index 4b2469019e2..c999a7ad59e 100644
--- a/telephony/baresip/restund/Makefile
+++ b/telephony/baresip/restund/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2016/03/16 16:46:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =		modular and flexible STUN and TURN Server
 
 V =			0.4.12
 DISTNAME =		restund-${V}
+REVISION =		0
 
 WANTLIB =		c crypto mysqlclient pthread re ssl z
 LIB_DEPENDS =		telephony/baresip/re \
diff --git a/telephony/baresip/restund/pkg/restund.rc b/telephony/baresip/restund/pkg/restund.rc
index 6f781fb8f07..163fc93026d 100644
--- a/telephony/baresip/restund/pkg/restund.rc
+++ b/telephony/baresip/restund/pkg/restund.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: restund.rc,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
+# $OpenBSD: restund.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/restund"
 daemon_user="_restund"
diff --git a/telephony/coturn/Makefile b/telephony/coturn/Makefile
index 0d16df4ab9a..1c636036500 100644
--- a/telephony/coturn/Makefile
+++ b/telephony/coturn/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/23 17:55:38 feinerer Exp $
+# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =	coturn STUN/TURN server
 
 V =		4.5.0.7
 DISTNAME =	turnserver-${V}
+REVISION =	0
 
 CATEGORIES =	telephony
 
diff --git a/telephony/coturn/pkg/turnserver.rc b/telephony/coturn/pkg/turnserver.rc
index c831b79d03e..0678aca063b 100644
--- a/telephony/coturn/pkg/turnserver.rc
+++ b/telephony/coturn/pkg/turnserver.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: turnserver.rc,v 1.1.1.1 2017/12/23 17:55:38 feinerer Exp $
+# $OpenBSD: turnserver.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/turnserver --daemon"
 daemon_user="_turnserver"
diff --git a/telephony/kamailio/Makefile b/telephony/kamailio/Makefile
index d62d72755bd..00a20932a55 100644
--- a/telephony/kamailio/Makefile
+++ b/telephony/kamailio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2017/09/21 09:34:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT-main =		mature and flexible open source SIP server
 
@@ -17,6 +17,7 @@ PKGNAME-snmpstats =	kamailio-snmpstats-${VERSION}
 PKGNAME-perl =		kamailio-perl-${VERSION}
 PKGNAME-presence =	kamailio-presence-${VERSION}
 PKGNAME-radius =	kamailio-radius-${VERSION}
+REVISION-main =		0
 
 CATEGORIES =		telephony
 MAINTAINER =		Roman Kravchuk <kravchuk.kp@gmail.com>
diff --git a/telephony/kamailio/pkg/kamailio.rc b/telephony/kamailio/pkg/kamailio.rc
index fc36c4dd1d9..f4b81a8f743 100644
--- a/telephony/kamailio/pkg/kamailio.rc
+++ b/telephony/kamailio/pkg/kamailio.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kamailio.rc,v 1.3 2017/07/03 22:14:20 sthen Exp $
+# $OpenBSD: kamailio.rc,v 1.4 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/kamailio"
 
diff --git a/telephony/siproxd/Makefile b/telephony/siproxd/Makefile
index 38dd2bd8e39..164f9c66e05 100644
--- a/telephony/siproxd/Makefile
+++ b/telephony/siproxd/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2016/04/21 19:44:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=	proxy/masquerading daemon for the SIP protocol
 
 DISTNAME=	siproxd-0.8.2
 CATEGORIES=	telephony net
+REVISION=	0
 
 HOMEPAGE=	http://siproxd.sourceforge.net/
 
diff --git a/telephony/siproxd/pkg/siproxd.rc b/telephony/siproxd/pkg/siproxd.rc
index 88a1fb70d11..d28773ed43e 100644
--- a/telephony/siproxd/pkg/siproxd.rc
+++ b/telephony/siproxd/pkg/siproxd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: siproxd.rc,v 1.2 2012/01/17 17:32:12 sthen Exp $
+# $OpenBSD: siproxd.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/siproxd"
 
diff --git a/telephony/stuntman/Makefile b/telephony/stuntman/Makefile
index fd333b4f412..620d8052890 100644
--- a/telephony/stuntman/Makefile
+++ b/telephony/stuntman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =	STUN server implementing RFCs 5389, 5769, and 5780
 NOT_FOR_ARCHS = arm hppa # atomic ops
@@ -8,7 +8,7 @@ DISTNAME =	stunserver-${VERSION}
 PKGNAME =	stuntman-${VERSION}
 CATEGORIES =	telephony net
 EXTRACT_SUFX =	.tgz
-REVISION =	0
+REVISION =	1
 
 MAINTAINER =	Roman Kravchuk <kravchuk.kp@gmail.com>
 
diff --git a/telephony/stuntman/pkg/stunserver.rc b/telephony/stuntman/pkg/stunserver.rc
index b0e6de4d202..fb77e930bde 100644
--- a/telephony/stuntman/pkg/stunserver.rc
+++ b/telephony/stuntman/pkg/stunserver.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: stunserver.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: stunserver.rc,v 1.4 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/stunserver"
 daemon_user="_stuntman"
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 40e62736c7a..450adf27a97 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.51 2017/11/08 11:49:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.52 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=		distributed RESTful search and analytics
 
 V=			5.6.4
 DISTNAME=		elasticsearch-$V
 CATEGORIES=		textproc
+REVISION=		0
 
 HOMEPAGE=		https://www.elastic.co/products/elasticsearch
 
diff --git a/textproc/elasticsearch/pkg/elasticsearch.rc b/textproc/elasticsearch/pkg/elasticsearch.rc
index 5bb2fa0dbda..02da5119000 100644
--- a/textproc/elasticsearch/pkg/elasticsearch.rc
+++ b/textproc/elasticsearch/pkg/elasticsearch.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: elasticsearch.rc,v 1.5 2016/12/17 12:11:02 jasper Exp $
+# $OpenBSD: elasticsearch.rc,v 1.6 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/elasticsearch/bin/elasticsearch"
 daemon_flags="-d -Edefault.path.conf=${SYSCONFDIR}/elasticsearch -p /var/run/elasticsearch/elasticsearch.pid"
diff --git a/www/ajaxterm/Makefile b/www/ajaxterm/Makefile
index 4d0b5f36144..923fefa10c0 100644
--- a/www/ajaxterm/Makefile
+++ b/www/ajaxterm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT = 		web-based SSH client
 
 DISTNAME =		Ajaxterm-0.10
 PKGNAME =		ajaxterm-0.10
-REVISION =		10
+REVISION =		11
 
 CATEGORIES =		net security www
 PKG_ARCH =		*
diff --git a/www/ajaxterm/pkg/ajaxterm.rc b/www/ajaxterm/pkg/ajaxterm.rc
index e9e45fc9b92..c4b9ff8f384 100644
--- a/www/ajaxterm/pkg/ajaxterm.rc
+++ b/www/ajaxterm/pkg/ajaxterm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ajaxterm.rc,v 1.4 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: ajaxterm.rc,v 1.5 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/ajaxterm -d"
 daemon_flags="-u _ajaxterm --command=/usr/bin/login"
diff --git a/www/apache-httpd/Makefile b/www/apache-httpd/Makefile
index 0d5cbc52fa8..f15c9082d50 100644
--- a/www/apache-httpd/Makefile
+++ b/www/apache-httpd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.85 2017/09/18 19:25:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.86 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT-main=		apache HTTP server
 COMMENT-common=		/var/www files for Apache HTTPd
 
 V=			2.4.27
-REVISION-main=		0
+REVISION-main=		1
 DISTNAME=		httpd-${V}
 PKGNAME=		apache-httpd-${V}
 
diff --git a/www/apache-httpd/pkg/apache2.rc b/www/apache-httpd/pkg/apache2.rc
index e4fc7809bca..a34608dc7b4 100644
--- a/www/apache-httpd/pkg/apache2.rc
+++ b/www/apache-httpd/pkg/apache2.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: apache2.rc,v 1.4 2016/06/22 08:27:07 ajacoutot Exp $
+# $OpenBSD: apache2.rc,v 1.5 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/httpd2"
 
diff --git a/www/c-icap/c-icap/Makefile b/www/c-icap/c-icap/Makefile
index 3e85aeabecb..162bb5eb210 100644
--- a/www/c-icap/c-icap/Makefile
+++ b/www/c-icap/c-icap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/04 11:06:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/01/11 19:27:11 rpe Exp $
 
 MULTI_PACKAGES=	-main -db -ldap
 COMMENT-main=	ICAP server for use with web proxies
@@ -10,6 +10,7 @@ DISTNAME=	c_icap-$V
 PKGNAME-main=	c-icap-$V
 PKGNAME-db=	c-icap-db-$V
 PKGNAME-ldap=	c-icap-ldap-$V
+REVISION-main=	0
 
 SHARED_LIBS +=	icapapi                   2.0 # 5.2
 
diff --git a/www/c-icap/c-icap/pkg/c_icap.rc b/www/c-icap/c-icap/pkg/c_icap.rc
index 41a37579757..4446678c04a 100644
--- a/www/c-icap/c-icap/pkg/c_icap.rc
+++ b/www/c-icap/c-icap/pkg/c_icap.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: c_icap.rc,v 1.1.1.1 2013/04/16 09:59:35 sthen Exp $
+# $OpenBSD: c_icap.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/c-icap"
 
diff --git a/www/cntlm/Makefile b/www/cntlm/Makefile
index a7cf7aadcf8..5673314c624 100644
--- a/www/cntlm/Makefile
+++ b/www/cntlm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2017/09/07 09:44:22 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =		fast NTLM/NTLMv2 authenticating HTTP proxy
 DISTNAME =		cntlm-0.93beta5
-REVISION =		3
+REVISION =		4
 CATEGORIES =		www
 HOMEPAGE =		http://cntlm.sourceforge.net/
 
diff --git a/www/cntlm/pkg/cntlm.rc b/www/cntlm/pkg/cntlm.rc
index d7153e7217a..93249e7d644 100644
--- a/www/cntlm/pkg/cntlm.rc
+++ b/www/cntlm/pkg/cntlm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: cntlm.rc,v 1.1 2012/01/25 22:00:15 dcoppa Exp $
+# $OpenBSD: cntlm.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/cntlm"
 daemon_flags="-c ${SYSCONFDIR}/cntlm/cntlm.conf"
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index f61a056e510..7be53b04b15 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:11 rpe Exp $
 
 # note, this isn't really maintained upstream any more
 # see e2guardian.org for a maintained fork
 
 COMMENT =	content scanning web filter
 DISTNAME =	dansguardian-2.12.0.3
-REVISION =	1
+REVISION =	2
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	www net
 
diff --git a/www/dansguardian/pkg/dansguardian.rc b/www/dansguardian/pkg/dansguardian.rc
index c5e8184704e..2ef1f91f14b 100644
--- a/www/dansguardian/pkg/dansguardian.rc
+++ b/www/dansguardian/pkg/dansguardian.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: dansguardian.rc,v 1.1 2013/01/18 15:04:09 sthen Exp $
+# $OpenBSD: dansguardian.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/dansguardian"
 
diff --git a/www/fcgi-cgi/Makefile b/www/fcgi-cgi/Makefile
index e12293afee7..2edfc541f44 100644
--- a/www/fcgi-cgi/Makefile
+++ b/www/fcgi-cgi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/12 15:17:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT-main=	wrapper to run CGI applications via FastCGI
 COMMENT-static=	static-linked fcgi-cgi wrapper for chroot use
@@ -9,6 +9,7 @@ PKGNAME-main=	fcgi-cgi-$V
 PKGNAME-static=	fcgi-cgi-static-$V
 REVISION=	0
 CATEGORIES=	www
+REVISION-main=	0
 
 HOMEPAGE=	http://redmine.lighttpd.net/projects/fcgi-cgi/wiki
 
diff --git a/www/fcgi-cgi/pkg/fcgi_cgi.rc b/www/fcgi-cgi/pkg/fcgi_cgi.rc
index f4b36fbd563..6bb65a77dd2 100755
--- a/www/fcgi-cgi/pkg/fcgi_cgi.rc
+++ b/www/fcgi-cgi/pkg/fcgi_cgi.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: fcgi_cgi.rc,v 1.2 2012/03/27 15:35:37 sthen Exp $
+# $OpenBSD: fcgi_cgi.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/spawn-fcgi"
 daemon_flags="-a 127.0.0.1 -p 9001 -u www -U www -- ${TRUEPREFIX}/bin/fcgi-cgi"
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index daf849bb800..6b5d1a31157 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2017/12/02 09:30:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =		compact self-hosted Git service
 
 GH_ACCOUNT =		go-gitea
 GH_PROJECT =		gitea
 GH_TAGNAME =		v1.1.0
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		www devel
 
diff --git a/www/gitea/pkg/gitea.rc b/www/gitea/pkg/gitea.rc
index 8dce643d5d1..9b24ed9611d 100644
--- a/www/gitea/pkg/gitea.rc
+++ b/www/gitea/pkg/gitea.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gitea.rc,v 1.3 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: gitea.rc,v 1.4 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/gitea"
 daemon_user="_gitea"
diff --git a/www/havp/Makefile b/www/havp/Makefile
index 27caeb67a78..d93dbf777a9 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=	web proxy with antivirus filter
 
@@ -6,7 +6,7 @@ DISTNAME=	havp-0.92a
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/download/
 
-REVISION=	4
+REVISION=	5
 
 HOMEPAGE=	http://www.server-side.de/
 
diff --git a/www/havp/pkg/havp.rc b/www/havp/pkg/havp.rc
index 63f929cfeb7..551e306b902 100644
--- a/www/havp/pkg/havp.rc
+++ b/www/havp/pkg/havp.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: havp.rc,v 1.2 2011/11/30 11:00:59 robert Exp $
+# $OpenBSD: havp.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/havp"
 
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 67cb87c7d74..5ffc2863700 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.52 2017/10/24 12:17:45 juanfra Exp $
+# $OpenBSD: Makefile,v 1.53 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =		secure webserver
 DISTNAME =		hiawatha-10.7
-REVISION =		1
+REVISION =		2
 CATEGORIES =		www net
 
 HOMEPAGE =		https://www.hiawatha-webserver.org/
diff --git a/www/hiawatha/pkg/hiawatha.rc b/www/hiawatha/pkg/hiawatha.rc
index 3d6c87ba0da..d94ed26c340 100644
--- a/www/hiawatha/pkg/hiawatha.rc
+++ b/www/hiawatha/pkg/hiawatha.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: hiawatha.rc,v 1.1 2011/04/13 17:44:59 rpointel Exp $
+# $OpenBSD: hiawatha.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/hiawatha"
 
diff --git a/www/kibana/Makefile b/www/kibana/Makefile
index 38b5b302bbd..a5aa78bcb90 100644
--- a/www/kibana/Makefile
+++ b/www/kibana/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2017/11/10 22:10:40 pvk Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=	browser based analytics/search interface to ElasticSearch
 
 V=		5.6.4
 PKGNAME=	kibana-${V}
 DISTNAME=	${PKGNAME}-darwin-x86_64
+REVISION=	0
 
 CATEGORIES=	www
 
diff --git a/www/kibana/pkg/kibana.rc b/www/kibana/pkg/kibana.rc
index 7cce4867da7..13f63ecd236 100644
--- a/www/kibana/pkg/kibana.rc
+++ b/www/kibana/pkg/kibana.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kibana.rc,v 1.4 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: kibana.rc,v 1.5 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/kibana/bin/kibana"
 daemon_user="_kibana"
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 1a58f28cb88..f13cb881ba0 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.149 2017/11/13 07:48:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.150 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT=	secure, fast, compliant, and very flexible web-server
 
@@ -6,6 +6,7 @@ DISTNAME=	lighttpd-1.4.48
 CATEGORIES=	www net
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 HOMEPAGE=	http://www.lighttpd.net/
 
diff --git a/www/lighttpd/pkg/lighttpd.rc b/www/lighttpd/pkg/lighttpd.rc
index 5f349460ea8..34cc083f902 100755
--- a/www/lighttpd/pkg/lighttpd.rc
+++ b/www/lighttpd/pkg/lighttpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: lighttpd.rc,v 1.3 2015/07/15 14:59:15 ajacoutot Exp $
+# $OpenBSD: lighttpd.rc,v 1.4 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/lighttpd"
 daemon_flags="-f ${SYSCONFDIR}/lighttpd.conf"
diff --git a/www/mozilla-sync/full/Makefile b/www/mozilla-sync/full/Makefile
index 4f9300566e9..d202ad65592 100644
--- a/www/mozilla-sync/full/Makefile
+++ b/www/mozilla-sync/full/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2017/06/12 10:57:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT =	Mozilla sync server
 
 PART =	full
 MODPY_EGG_VERSION =	1.0
 PKGNAME =	mozilla-sync-${MODPY_EGG_VERSION}.pre20120901
-REVISION =	3
+REVISION =	4
 
 RUN_DEPENDS +=	www/mozilla-sync/core
 RUN_DEPENDS +=	www/mozilla-sync/reg
diff --git a/www/mozilla-sync/full/pkg/mozilla_sync.rc b/www/mozilla-sync/full/pkg/mozilla_sync.rc
index 962f6cab8bc..20ce7f7f452 100644
--- a/www/mozilla-sync/full/pkg/mozilla_sync.rc
+++ b/www/mozilla-sync/full/pkg/mozilla_sync.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: mozilla_sync.rc,v 1.2 2012/09/01 16:33:26 ajacoutot Exp $
+# $OpenBSD: mozilla_sync.rc,v 1.3 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${LOCALBASE}/bin/paster"
 daemon_flags="serve ${SYSCONFDIR}/mozilla-sync/production.ini --daemon --log-file /var/mozilla-sync/paster.log --pid-file /var/mozilla-sync/paster.pid"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 2966be89dc1..eda9c58d281 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2018/01/05 12:48:01 landry Exp $
+# $OpenBSD: Makefile,v 1.118 2018/01/11 19:27:11 rpe Exp $
 
 BROKEN-arm=	src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
 BROKEN-hppa=	src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
@@ -17,7 +17,7 @@ COMMENT-passenger=	nginx passenger (ruby/python/nodejs) integration module
 
 VERSION=	1.12.1
 REVISION=	1
-REVISION-main=	2
+REVISION-main=	3
 REVISION-lua=	2
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
diff --git a/www/nginx/pkg/nginx.rc b/www/nginx/pkg/nginx.rc
index 9eee1b4f303..b15ed45f263 100755
--- a/www/nginx/pkg/nginx.rc
+++ b/www/nginx/pkg/nginx.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: nginx.rc,v 1.13 2015/12/02 10:21:49 ajacoutot Exp $
+# $OpenBSD: nginx.rc,v 1.14 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/nginx"
 
diff --git a/www/opengroupware/Makefile b/www/opengroupware/Makefile
index 4cbdf21dfd7..a123b4e68ba 100644
--- a/www/opengroupware/Makefile
+++ b/www/opengroupware/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT = 	web based groupware server
 
 VERSION =	5.5rc3
 DISTNAME =	opengroupware-${VERSION}
-REVISION =	3
+REVISION =	4
 
 SHARED_LIBS +=  LSAddress                 0.0 # 5.5
 SHARED_LIBS +=  LSFoundation              0.0 # 5.5
diff --git a/www/opengroupware/pkg/ogo_webui.rc b/www/opengroupware/pkg/ogo_webui.rc
index b504608bfb5..64b6b63d4fd 100644
--- a/www/opengroupware/pkg/ogo_webui.rc
+++ b/www/opengroupware/pkg/ogo_webui.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ogo_webui.rc,v 1.1.1.1 2013/10/29 06:16:26 sebastia Exp $
+# $OpenBSD: ogo_webui.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ogo-webui"
 daemon_user="_opengroupware"
diff --git a/www/opengroupware/pkg/ogo_xmlrpcd.rc b/www/opengroupware/pkg/ogo_xmlrpcd.rc
index 1c5c9e42dea..f1ae642b3bc 100644
--- a/www/opengroupware/pkg/ogo_xmlrpcd.rc
+++ b/www/opengroupware/pkg/ogo_xmlrpcd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ogo_xmlrpcd.rc,v 1.1.1.1 2013/10/29 06:16:37 sebastia Exp $
+# $OpenBSD: ogo_xmlrpcd.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ogo-xmlrpcd"
 daemon_user="_opengroupware"
diff --git a/www/opengroupware/pkg/ogo_zidestore.rc b/www/opengroupware/pkg/ogo_zidestore.rc
index 7a73559ed17..24177c02b63 100644
--- a/www/opengroupware/pkg/ogo_zidestore.rc
+++ b/www/opengroupware/pkg/ogo_zidestore.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: ogo_zidestore.rc,v 1.1.1.1 2013/10/29 06:16:37 sebastia Exp $
+# $OpenBSD: ogo_zidestore.rc,v 1.2 2018/01/11 19:27:11 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/ogo-zidestore"
 daemon_user="_opengroupware"
diff --git a/www/pnp4nagios/Makefile b/www/pnp4nagios/Makefile
index f77b58e09f8..226720cc98b 100644
--- a/www/pnp4nagios/Makefile
+++ b/www/pnp4nagios/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/11/11 11:01:21 kirby Exp $
+# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:11 rpe Exp $
 
 COMMENT-main =	Nagios/Icinga addon which graphs performance data
 COMMENT-cgi =	pnp4nagios CGI scripts
@@ -7,7 +7,7 @@ V = 		0.6.26
 DISTNAME =	pnp4nagios-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-cgi =	pnp4nagios-cgi-${V}
-REVISION-main = 0
+REVISION-main = 1
 
 CATEGORIES =	www
 
diff --git a/www/pnp4nagios/pkg/npcd.rc b/www/pnp4nagios/pkg/npcd.rc
index 4c5aebfb32a..364a3abd6a9 100644
--- a/www/pnp4nagios/pkg/npcd.rc
+++ b/www/pnp4nagios/pkg/npcd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: npcd.rc,v 1.3 2016/07/11 09:17:45 kirby Exp $
+# $OpenBSD: npcd.rc,v 1.4 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/npcd -d"
 daemon_flags="-f ${SYSCONFDIR}/npcd.cfg"
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index 77595497798..04956d949e3 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2014/08/20 21:15:23 kili Exp $
+# $OpenBSD: Makefile,v 1.20 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	HTTP caching proxy
 
 DISTNAME=	polipo-1.1.1
 CATEGORIES=	www
+REVISION=	0
 
 HOMEPAGE=	http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
 
diff --git a/www/polipo/pkg/polipo.rc b/www/polipo/pkg/polipo.rc
index 27093849ba8..ebdb31e9d1e 100644
--- a/www/polipo/pkg/polipo.rc
+++ b/www/polipo/pkg/polipo.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: polipo.rc,v 1.6 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: polipo.rc,v 1.7 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/polipo daemonise=yes"
 
diff --git a/www/pound/Makefile b/www/pound/Makefile
index 0d3e461f299..c361faf0b8b 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2015/05/13 13:30:37 kili Exp $
+# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT =		HTTP reverse proxy/load balancer/SSL offload
 
 DISTNAME =		Pound-2.7
 PKGNAME =		${DISTNAME:L}
+REVISION =		0
 
 CATEGORIES =		www
 
diff --git a/www/pound/pkg/pound.rc b/www/pound/pkg/pound.rc
index 47b4fb7be60..08f7b59101e 100644
--- a/www/pound/pkg/pound.rc
+++ b/www/pound/pkg/pound.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: pound.rc,v 1.1 2011/05/23 14:49:42 gsoares Exp $
+# $OpenBSD: pound.rc,v 1.2 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/pound"
 
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index cdbf27bd3ea..f93099fb223 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/01/21 22:55:01 danj Exp $
+# $OpenBSD: Makefile,v 1.35 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	web proxy with advanced filtering capabilities
 
@@ -6,6 +6,7 @@ V=		3.0.26
 DISTNAME=	privoxy-${V}-stable
 PKGNAME=	privoxy-${V}
 CATEGORIES=	www
+REVISION=	0
 
 HOMEPAGE=	http://www.privoxy.org/
 
diff --git a/www/privoxy/pkg/privoxy.rc b/www/privoxy/pkg/privoxy.rc
index c07b9d109bc..d9ca1577d74 100644
--- a/www/privoxy/pkg/privoxy.rc
+++ b/www/privoxy/pkg/privoxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: privoxy.rc,v 1.4 2014/08/24 09:17:52 ajacoutot Exp $
+# $OpenBSD: privoxy.rc,v 1.5 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/privoxy"
 daemon_flags="--user _privoxy --chroot --pre-chroot-nslookup www.google.com ${SYSCONFDIR}/privoxy/config"
diff --git a/www/puppetboard/Makefile b/www/puppetboard/Makefile
index 2099c7342d3..bd46d9475be 100644
--- a/www/puppetboard/Makefile
+++ b/www/puppetboard/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2017/11/02 09:39:20 sebastia Exp $
+# $OpenBSD: Makefile,v 1.24 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=		web interface to PuppetDB
 
 MODPY_EGG_VERSION=	0.3.0
 DISTNAME=		puppetboard-${MODPY_EGG_VERSION}
 CATEGORIES=		www
+REVISION=		0
 
 MAINTAINER=		Sebastian Reitenbach <sebastia@openbsd.org>
 
diff --git a/www/puppetboard/pkg/puppetboard.rc b/www/puppetboard/pkg/puppetboard.rc
index 79f90d24412..42a2552328b 100644
--- a/www/puppetboard/pkg/puppetboard.rc
+++ b/www/puppetboard/pkg/puppetboard.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: puppetboard.rc,v 1.6 2016/11/02 09:01:13 danj Exp $
+# $OpenBSD: puppetboard.rc,v 1.7 2018/01/11 19:27:12 rpe Exp $
 
 daemon="puppetboard_wsgi"
 daemon_flags="--workers 4"
diff --git a/www/rt/Makefile b/www/rt/Makefile
index c1d772a46e9..55454085f38 100644
--- a/www/rt/Makefile
+++ b/www/rt/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2017/11/23 20:00:05 pirofti Exp $
+# $OpenBSD: Makefile,v 1.40 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=		industrial-grade ticketing system
 
 DISTNAME=		rt-4.4.2
 CATEGORIES=		www
+REVISION=		0
 
 MAINTAINER=		Robert Nagy <robert@openbsd.org>
 
diff --git a/www/rt/pkg/rt.rc b/www/rt/pkg/rt.rc
index 7b7e2d3339b..bf95e9d214e 100755
--- a/www/rt/pkg/rt.rc
+++ b/www/rt/pkg/rt.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: rt.rc,v 1.5 2017/05/27 19:57:07 ajacoutot Exp $
+# $OpenBSD: rt.rc,v 1.6 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/rt-server"
 
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index afcf40178e0..a3d2a0888da 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.73 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT = 	web based groupware server
 
 VERSION =	3.2.10
 DISTNAME =	SOGo-${VERSION}
 PKGNAME =	sogo-${VERSION}
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS +=	GDLContentStore 3.0
 SHARED_LIBS +=	NGCards		3.0
diff --git a/www/sogo/pkg/sogod.rc b/www/sogo/pkg/sogod.rc
index 7c0c3a573e1..5005971cd86 100644
--- a/www/sogo/pkg/sogod.rc
+++ b/www/sogo/pkg/sogod.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: sogod.rc,v 1.6 2016/11/02 10:16:20 giovanni Exp $
+# $OpenBSD: sogod.rc,v 1.7 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sogod"
 daemon_user="_sogo"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 54ad5ca2d54..b49593e3cde 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.203 2017/11/16 23:20:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.204 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT-main=	WWW and FTP proxy cache and accelerator
 COMMENT-ldap=	LDAP authentication/ACL support for Squid
@@ -11,6 +11,7 @@ PKGNAME-main=	squid-$V
 PKGNAME-ldap=	squid-ldap-$V
 PKGNAME-ntlm=	squid-ntlm-$V
 REVISION-ntlm=	0
+REVISION-main=	0
 
 CATEGORIES=	www
 
diff --git a/www/squid/pkg/squid.rc b/www/squid/pkg/squid.rc
index ff65c274fc7..eefa20d596c 100644
--- a/www/squid/pkg/squid.rc
+++ b/www/squid/pkg/squid.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: squid.rc,v 1.7 2015/09/10 13:00:10 sthen Exp $
+# $OpenBSD: squid.rc,v 1.8 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/squid"
 daemon_timeout="35"
diff --git a/www/sthttpd/Makefile b/www/sthttpd/Makefile
index 1e1486eac86..3227bcef113 100644
--- a/www/sthttpd/Makefile
+++ b/www/sthttpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2016/01/22 17:07:41 mmcc Exp $
+# $OpenBSD: Makefile,v 1.6 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	tiny/turbo/throttling HTTP server
 
 DISTNAME=	sthttpd-2.26.4
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://opensource.dyc.edu/pub/sthttpd/
 
diff --git a/www/sthttpd/pkg/thttpd.rc b/www/sthttpd/pkg/thttpd.rc
index 359f9127a3b..37f672b727c 100755
--- a/www/sthttpd/pkg/thttpd.rc
+++ b/www/sthttpd/pkg/thttpd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: thttpd.rc,v 1.1 2016/01/16 20:05:35 mmcc Exp $
+# $OpenBSD: thttpd.rc,v 1.2 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/thttpd"
 
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 3c8c4125b2b..812ad540447 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2017/02/18 17:21:51 jca Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT =		lightweight HTTP/SSL proxy
 
 V =			1.8.4
 DISTNAME =		tinyproxy-$V
 CATEGORIES =		www net
+REVISION =		0
 
 HOMEPAGE =		https://www.banu.com/tinyproxy/
 MAINTAINER =		frantisek holop <minusf@obiit.org>
diff --git a/www/tinyproxy/pkg/tinyproxy.rc b/www/tinyproxy/pkg/tinyproxy.rc
index d5e1b282e55..ac6113fa30c 100644
--- a/www/tinyproxy/pkg/tinyproxy.rc
+++ b/www/tinyproxy/pkg/tinyproxy.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tinyproxy.rc,v 1.2 2012/09/15 14:39:47 fgsch Exp $
+# $OpenBSD: tinyproxy.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/tinyproxy"
 
diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index bcdea7e75c7..75fc39c3dbb 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.39 2017/07/10 16:52:03 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.40 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT-main =	Java servlet 2.5 and Java server pages 2.1 server
+REVISION-main =	0
 
 MAJ_VER =	6
 MIN_VER =	0
diff --git a/www/tomcat/v6/pkg/tomcat.rc b/www/tomcat/v6/pkg/tomcat.rc
index 4f4c55ca168..251f10f0378 100755
--- a/www/tomcat/v6/pkg/tomcat.rc
+++ b/www/tomcat/v6/pkg/tomcat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
+# $OpenBSD: tomcat.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
 daemon_flags="-server"
diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index 6e42b9cace7..91abe909b21 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.51 2017/08/22 14:58:57 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.52 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT-main =	Java servlet 3.0 and Java server pages 2.2 server
+REVISION-main =	0
 
 MAJ_VER =	7
 MIN_VER =	0
diff --git a/www/tomcat/v7/pkg/tomcat.rc b/www/tomcat/v7/pkg/tomcat.rc
index 4f4c55ca168..251f10f0378 100755
--- a/www/tomcat/v7/pkg/tomcat.rc
+++ b/www/tomcat/v7/pkg/tomcat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
+# $OpenBSD: tomcat.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
 daemon_flags="-server"
diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile
index 7341239b792..78cac21ef4c 100644
--- a/www/tomcat/v8/Makefile
+++ b/www/tomcat/v8/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.28 2017/08/11 09:26:26 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.29 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT-main =	Java servlet 3.1 and Java server pages 2.3 server
+REVISION-main =	0
 
 MAJ_VER =	8
 MIN_VER =	5
diff --git a/www/tomcat/v8/pkg/tomcat.rc b/www/tomcat/v8/pkg/tomcat.rc
index 4f4c55ca168..251f10f0378 100644
--- a/www/tomcat/v8/pkg/tomcat.rc
+++ b/www/tomcat/v8/pkg/tomcat.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
+# $OpenBSD: tomcat.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
 daemon_flags="-server"
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 8447f40590a..8cccff16f19 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2017/06/24 20:19:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.65 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	wiki and bug tracking system for software projects
 
@@ -7,6 +7,7 @@ PORTROACH=	limitw:1,even
 DISTNAME=	Trac-${MODPY_EGG_VERSION:S/post/.post/}
 PKGNAME=	trac-${MODPY_EGG_VERSION:S/post/pl/}
 CATEGORIES=	www devel
+REVISION=	0
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 
diff --git a/www/trac/pkg/tracd.rc b/www/trac/pkg/tracd.rc
index 142d6853bf1..35bd6a55c5c 100644
--- a/www/trac/pkg/tracd.rc
+++ b/www/trac/pkg/tracd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: tracd.rc,v 1.1 2012/03/03 11:42:06 sthen Exp $
+# $OpenBSD: tracd.rc,v 1.2 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/tracd -d"
 daemon_flags="-p 8085 /var/www/trac"
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 768a4a4c63d..9d3d9382240 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2017/11/22 21:56:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT =		high-performance HTTP accelerator
 
 DISTNAME =		varnish-5.2.1
+REVISION =		0
 
 CATEGORIES =		www
 
diff --git a/www/varnish/pkg/varnishd.rc b/www/varnish/pkg/varnishd.rc
index 9faf6063b1c..9d5399992bb 100644
--- a/www/varnish/pkg/varnishd.rc
+++ b/www/varnish/pkg/varnishd.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: varnishd.rc,v 1.3 2016/08/23 13:48:23 gonzalo Exp $
+# $OpenBSD: varnishd.rc,v 1.4 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${PREFIX}/sbin/varnishd"
 daemon_flags="-j unix,user=_varnish,ccgroup=_varnish -f ${SYSCONFDIR}/varnish/default.vcl"
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 1d366788323..376ba015e6e 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2015/11/10 13:56:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=		WWW OFFLine Explorer
 
 DISTNAME=		wwwoffle-2.9i
 CATEGORIES=		www
+REVISION=		0
 
 HOMEPAGE=		http://www.gedanken.org.uk/software/wwwoffle/
 
diff --git a/www/wwwoffle/pkg/wwwoffled.rc b/www/wwwoffle/pkg/wwwoffled.rc
index 7e37854f0d5..723bcfc5888 100644
--- a/www/wwwoffle/pkg/wwwoffled.rc
+++ b/www/wwwoffle/pkg/wwwoffled.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: wwwoffled.rc,v 1.1 2015/11/10 13:56:01 sthen Exp $
+# $OpenBSD: wwwoffled.rc,v 1.2 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/wwwoffled"
 
diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 1b623562ae7..e04e28973d6 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.146 2017/11/14 08:34:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.147 2018/01/11 19:27:12 rpe Exp $
 
 PORTROACH=		limitw:1,even
 DPB_PROPERTIES=		parallel
@@ -12,6 +12,7 @@ EPOCH-main=		0
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-suid=		dbus-daemon-launch-helper-${V}
+REVISION-main=		0
 
 SHARED_LIBS +=  dbus-1               11.2     # 22.4
 
diff --git a/x11/dbus/pkg/messagebus.rc b/x11/dbus/pkg/messagebus.rc
index 51879357b2a..1b828494ccc 100644
--- a/x11/dbus/pkg/messagebus.rc
+++ b/x11/dbus/pkg/messagebus.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: messagebus.rc,v 1.2 2017/04/22 13:43:21 ajacoutot Exp $
+# $OpenBSD: messagebus.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/dbus-daemon --system"
 
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index 74fc8137926..2f5d2ac76fb 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.265 2017/11/05 02:17:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.266 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=		GNOME display manager
 
 GNOME_PROJECT=		gdm
 GNOME_VERSION=		3.26.2.1
-REVISION=		1
+REVISION=		2
 
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} puflogh1000X248.gif:0
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/x11/gnome/gdm/pkg/gdm.rc b/x11/gnome/gdm/pkg/gdm.rc
index 274d41ad69b..83152290347 100755
--- a/x11/gnome/gdm/pkg/gdm.rc
+++ b/x11/gnome/gdm/pkg/gdm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gdm.rc,v 1.41 2017/05/27 21:00:51 ajacoutot Exp $
+# $OpenBSD: gdm.rc,v 1.42 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/gdm"
 
diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile
index fc0f99e929c..bd416684faf 100644
--- a/x11/gnustep/base/Makefile
+++ b/x11/gnustep/base/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.67 2018/01/05 07:57:37 sebastia Exp $
+# $OpenBSD: Makefile,v 1.68 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	GNUstep base library
 
 DISTNAME=	gnustep-base-1.25.1
+REVISION=	0
 
 SHARED_LIBS=	gnustep-base 10.1
 CATEGORIES=	devel
diff --git a/x11/gnustep/base/pkg/gdomap.rc b/x11/gnustep/base/pkg/gdomap.rc
index c9c4e17febe..5f92300553b 100644
--- a/x11/gnustep/base/pkg/gdomap.rc
+++ b/x11/gnustep/base/pkg/gdomap.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: gdomap.rc,v 1.1 2012/08/19 10:13:29 sebastia Exp $
+# $OpenBSD: gdomap.rc,v 1.2 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/gdomap"
 daemon_flags="-p"
diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index a1f9d8b1077..8b06613c587 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.156 2017/11/12 15:17:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.157 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT-main =		K Desktop Environment, basic applications
 COMMENT-samba =		K Desktop Environment, samba support
@@ -13,7 +13,7 @@ PKGNAME-en_US =		kde3-locale-en_US-${VERSION}
 PKGNAME-locale =	kde3-locale-${VERSION}
 PKG_ARCH-en_US =	*
 PKG_ARCH-locale =	*
-REVISION-main =		51
+REVISION-main =		52
 REVISION-samba =	28
 REVISION-en_US =	6
 REVISION-locale =	5
diff --git a/x11/kde/base3/pkg/kdm.rc b/x11/kde/base3/pkg/kdm.rc
index 3afcf00c40d..a3ff1e335f2 100755
--- a/x11/kde/base3/pkg/kdm.rc
+++ b/x11/kde/base3/pkg/kdm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kdm.rc,v 1.2 2017/05/27 13:53:07 ajacoutot Exp $
+# $OpenBSD: kdm.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/kdm"
 
diff --git a/x11/kde4/workspace/Makefile b/x11/kde4/workspace/Makefile
index d886fdb346a..4291f7a18c4 100644
--- a/x11/kde4/workspace/Makefile
+++ b/x11/kde4/workspace/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.60 2017/11/01 06:27:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT =	KDE workspace
 DISTNAME =	kde-workspace-4.11.21
-REVISION =	18
+REVISION =	19
 
 MASTER_SITES =	${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/}
 
diff --git a/x11/kde4/workspace/pkg/kdm.rc b/x11/kde4/workspace/pkg/kdm.rc
index c90ca754a93..5309b754c85 100755
--- a/x11/kde4/workspace/pkg/kdm.rc
+++ b/x11/kde4/workspace/pkg/kdm.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: kdm.rc,v 1.9 2017/05/27 13:53:07 ajacoutot Exp $
+# $OpenBSD: kdm.rc,v 1.10 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/kdm"
 
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 06e8e4a17c5..b787f85dd3c 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.50 2017/09/06 04:45:50 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.51 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT=	simple login manager
 
 DISTNAME=	slim-1.3.6
-REVISION=	20
+REVISION=	21
 
 SHARED_LIBS=	slim	0.0 # 1.3
 
diff --git a/x11/slim/pkg/slim.rc b/x11/slim/pkg/slim.rc
index ffce8698a5d..30a4c281cd0 100755
--- a/x11/slim/pkg/slim.rc
+++ b/x11/slim/pkg/slim.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: slim.rc,v 1.11 2017/07/21 23:06:08 ajacoutot Exp $
+# $OpenBSD: slim.rc,v 1.12 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/slim -d"
 
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index dae754c5a4b..b7254b81c69 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2017/07/05 10:22:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2018/01/11 19:27:12 rpe Exp $
 
 COMMENT =		VNC server for real X displays
 
 DISTNAME =		x11vnc-0.9.13
-REVISION =		9
+REVISION =		10
 
 CATEGORIES =		x11
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/
diff --git a/x11/x11vnc/pkg/x11vnc.rc b/x11/x11vnc/pkg/x11vnc.rc
index f70c647120f..bb3d7918893 100755
--- a/x11/x11vnc/pkg/x11vnc.rc
+++ b/x11/x11vnc/pkg/x11vnc.rc
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/ksh
 #
-# $OpenBSD: x11vnc.rc,v 1.11 2017/05/27 19:57:08 ajacoutot Exp $
+# $OpenBSD: x11vnc.rc,v 1.12 2018/01/11 19:27:12 rpe Exp $
 
 daemon="${TRUEPREFIX}/bin/x11vnc"
 daemon_flags="-localhost -logfile /var/log/x11vnc -ncache 0 -forever -loop100 -auth guess"