Do not force stop services when a package is deinstalled.

Starting or stopping services is the role of pkg(8).

Sponsored by:	Absolight

44 files changed, 23 insertions, 56 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 75ffec4d2015..106debcc5f44 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=		open-vm-tools
 PORTVERSION=		${RELEASE_VER}
 DISTVERSIONPREFIX=	stable-
+PORTREVISION=	1
 PORTEPOCH=		2
 CATEGORIES=		emulators
 
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 5e8fe2f6ace9..5ad1b91b5619 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -59,5 +59,3 @@ share/vmware-tools/vm-support
 etc/pam.d/vmtoolsd
 @dir %%DATADIR%%/scripts/vmware
 @dir %%DATADIR%%/tests
-@preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' ; service vmware-guestd stop 2>/dev/null || /usr/bin/true
-@postexec service vmware-kmod restart && service vmware-guestd restart || /usr/bin/true
diff --git a/japanese/spamassassin/Makefile b/japanese/spamassassin/Makefile
index 4b585fb06631..b0fc120adee1 100644
--- a/japanese/spamassassin/Makefile
+++ b/japanese/spamassassin/Makefile
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 2f1dbb35d81c..56ea618a9909 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	courier
 PORTVERSION=	0.65.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 0d10c51ad183..5f4fb076dc25 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -1,14 +1,3 @@
-@unexec [ -x %D/sbin/pop3d-ssl ] && %D/sbin/pop3d-ssl stop || true
-@unexec [ -x %D/sbin/pop3d ] && %D/sbin/pop3d stop || true
-@unexec [ -x %D/sbin/imapd-ssl ] && %D/sbin/imapd-ssl stop || true
-@unexec [ -x %D/sbin/imapd ] && %D/sbin/imapd stop || true
-@unexec [ -x %D/sbin/esmtpd-ssl ] && %D/sbin/esmtpd-ssl stop || true
-@unexec [ -x %D/sbin/esmtpd-msa ] && %D/sbin/esmtpd-msa stop || true
-@unexec [ -x %D/sbin/esmtpd ] && %D/sbin/esmtpd stop || true
-@unexec [ -x %D/sbin/courier ] && %D/sbin/courier stop || true
-@unexec [ -x %D/sbin/webmaild ] && %D/sbin/webmaild stop || true
-@unexec [ -x %D/sbin/courierldapaliasd ] && %D/sbin/courierldapaliasd stop || true
-@unexec [ -x %D/sbin/courierfilter ] && %D/sbin/courierfilter stop || true
 @unexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
 bin/addcr
 @(%%MAILOWN%%,%%MAILGRP%%,) bin/cancelmsg
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index 095ecc3ac760..02de6e2d7deb 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	proxsmtp
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	http://thewalter.net/stef/software/proxsmtp/ \
 		ZI
diff --git a/mail/proxsmtp/pkg-plist b/mail/proxsmtp/pkg-plist
index 6f8360701044..6ec7c330e52b 100644
--- a/mail/proxsmtp/pkg-plist
+++ b/mail/proxsmtp/pkg-plist
@@ -1,4 +1,3 @@
-@unexec [ ! -f /var/run/proxsmtpd.pid ] || %%PREFIX%%/etc/rc.d/proxsmtpd.sh stop || true
 @sample etc/proxsmtpd.conf.sample
 man/man5/proxsmtpd.conf.5.gz
 man/man8/proxsmtpd.8.gz
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index dbae37137cf1..1cbd98c8db94 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamassassin
 PORTVERSION=	3.4.1
-PORTREVISION?=	11	# also bump japanese/spamassassin
+PORTREVISION?=	12	# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	APACHE/spamassassin/source CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index d2bb038b60bb..276dc4a71e7e 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -1,4 +1,3 @@
-@preunexec if service sa-spamd status | grep -q "spamd is running"; then service sa-spamd stop; fi
 bin/sa-awl
 bin/sa-check_spamd
 bin/sa-compile
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 9ec06fdb6b18..c079a5966020 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqwebmail
 PORTVERSION=	5.9.0
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index 1173dc14726c..643d7a89c568 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,6 +1,5 @@
 @sample %%ETCDIR%%/ldapaddressbook.sample
 @sample %%ETCDIR%%/sqwebmaild.sample
-@unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true
 libexec/sqwebmail/deliverquota
 libexec/sqwebmail/maildirmake
 libexec/sqwebmail/makemime
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile
index 0dfb20ca4120..74d4b48c9155 100644
--- a/misc/e2fsprogs-libuuid/Makefile
+++ b/misc/e2fsprogs-libuuid/Makefile
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc devel
 PKGNAMESUFFIX=	-libuuid
 
diff --git a/misc/e2fsprogs-libuuid/pkg-plist b/misc/e2fsprogs-libuuid/pkg-plist
index 4a0e08ce9e2c..54ee86a4ff13 100644
--- a/misc/e2fsprogs-libuuid/pkg-plist
+++ b/misc/e2fsprogs-libuuid/pkg-plist
@@ -20,4 +20,3 @@ man/man3/uuid_generate_time.3.gz
 man/man8/uuidd.8.gz
 sbin/uuidd
 @dir /var/run/libuuid
-@preunexec %D/etc/rc.d/uuidd stop  >/dev/null 2>&1 || true
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 4684c53f6fe7..68b243047688 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jabberd
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		LOCAL/matthew/${PORTNAME}
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
index fad3ab877bcf..5dab40f176c3 100644
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@@ -1,4 +1,3 @@
-@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd stop || true
 bin/c2s
 bin/jabberd
 bin/router
diff --git a/net/isc-dhcp43-relay/pkg-plist b/net/isc-dhcp43-relay/pkg-plist
index deb1c2c594d9..f40e18e34013 100644
--- a/net/isc-dhcp43-relay/pkg-plist
+++ b/net/isc-dhcp43-relay/pkg-plist
@@ -1,6 +1,3 @@
-@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
-%%IPV6%%@unexec %D/etc/rc.d/isc-dhcrelay6 forcestop 2>/dev/null || true
 %%IPV6%%etc/rc.d/isc-dhcrelay6
 sbin/dhcrelay
 man/man8/dhcrelay.8.gz
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index 95165d4fccc7..4f74b3a2fee3 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -19,9 +19,9 @@ LICENSE=	ISCL
 
 USES=		gmake
 
-PORTREVISION_SERVER=	0
+PORTREVISION_SERVER=	1
 PORTREVISION_CLIENT=	0
-PORTREVISION_RELAY=	0
+PORTREVISION_RELAY=	1
 
 DEPRECATED=	Please upgrade to isc-dhcp44
 EXPIRATION_DATE=2018-07-30
diff --git a/net/isc-dhcp44-relay/pkg-plist b/net/isc-dhcp44-relay/pkg-plist
index deb1c2c594d9..f40e18e34013 100644
--- a/net/isc-dhcp44-relay/pkg-plist
+++ b/net/isc-dhcp44-relay/pkg-plist
@@ -1,6 +1,3 @@
-@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
-%%IPV6%%@unexec %D/etc/rc.d/isc-dhcrelay6 forcestop 2>/dev/null || true
 %%IPV6%%etc/rc.d/isc-dhcrelay6
 sbin/dhcrelay
 man/man8/dhcrelay.8.gz
diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile
index 473fdfa6c522..2c8d2211c88a 100644
--- a/net/isc-dhcp44-server/Makefile
+++ b/net/isc-dhcp44-server/Makefile
@@ -19,7 +19,7 @@ LICENSE=	MPL20
 
 USES=		gmake
 
-PORTREVISION_SERVER=	2
+PORTREVISION_SERVER=	3
 PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 
diff --git a/net/isc-dhcp44-server/pkg-plist b/net/isc-dhcp44-server/pkg-plist
index 84f017a18683..e2203a18fdfc 100644
--- a/net/isc-dhcp44-server/pkg-plist
+++ b/net/isc-dhcp44-server/pkg-plist
@@ -1,4 +1,3 @@
-@unexec echo "You should stop the dhcpd and dhcpd6 daemons if you are permanently removing this port."
 @sample etc/dhcpd.conf.sample
 %%IPV6%%@sample etc/dhcpd6.conf.sample
 %%IPV6%%etc/rc.d/isc-dhcpd6
diff --git a/net/quoted/Makefile b/net/quoted/Makefile
index 426db2b0af92..e0457f77115a 100644
--- a/net/quoted/Makefile
+++ b/net/quoted/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	quoted
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.mrp3.com/webutil/
 
diff --git a/net/quoted/pkg-plist b/net/quoted/pkg-plist
index d5061dbc17c3..3dc07c42afcc 100644
--- a/net/quoted/pkg-plist
+++ b/net/quoted/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/quoted.sh stop 2>/dev/null > /dev/null || true
 @unexec rm -f /var/run/quoted.pid
 bin/quoted
 etc/quotes
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 282241b26c28..2b41ffd760f1 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	32
+PORTREVISION=	33
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 317801f9d32b..e5305418f9e0 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true
 bin/hal-device
 bin/hal-disable-polling
 bin/hal-find-by-capability
diff --git a/sysutils/syslog-ng310/Makefile b/sysutils/syslog-ng310/Makefile
index 400b60ffdc15..953c17935e0f 100644
--- a/sysutils/syslog-ng310/Makefile
+++ b/sysutils/syslog-ng310/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng310/pkg-plist b/sysutils/syslog-ng310/pkg-plist
index fa1dd175cbcc..775c7078554d 100644
--- a/sysutils/syslog-ng310/pkg-plist
+++ b/sysutils/syslog-ng310/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index ca232ab4d94f..326504e5f9be 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.11.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng311/pkg-plist b/sysutils/syslog-ng311/pkg-plist
index 1945d89033bd..58ca455b93e0 100644
--- a/sysutils/syslog-ng311/pkg-plist
+++ b/sysutils/syslog-ng311/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng312/Makefile b/sysutils/syslog-ng312/Makefile
index ac06bae3d71f..84b143b52586 100644
--- a/sysutils/syslog-ng312/Makefile
+++ b/sysutils/syslog-ng312/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng312/pkg-plist b/sysutils/syslog-ng312/pkg-plist
index 8db246565805..ec08a3425992 100644
--- a/sysutils/syslog-ng312/pkg-plist
+++ b/sysutils/syslog-ng312/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng313/Makefile b/sysutils/syslog-ng313/Makefile
index ccfe8bde6146..6ee0e8084c4a 100644
--- a/sysutils/syslog-ng313/Makefile
+++ b/sysutils/syslog-ng313/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.13.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng313/pkg-plist b/sysutils/syslog-ng313/pkg-plist
index dda7a18bfc2d..33d92609a4c6 100644
--- a/sysutils/syslog-ng313/pkg-plist
+++ b/sysutils/syslog-ng313/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng314/Makefile b/sysutils/syslog-ng314/Makefile
index f346e3aadc53..618edcb9530a 100644
--- a/sysutils/syslog-ng314/Makefile
+++ b/sysutils/syslog-ng314/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.14.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng314/pkg-plist b/sysutils/syslog-ng314/pkg-plist
index 2c465634293a..5f8c6536c953 100644
--- a/sysutils/syslog-ng314/pkg-plist
+++ b/sysutils/syslog-ng314/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng315/Makefile b/sysutils/syslog-ng315/Makefile
index b7be83dd03a4..66e8f816c968 100644
--- a/sysutils/syslog-ng315/Makefile
+++ b/sysutils/syslog-ng315/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.15.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng315/pkg-plist b/sysutils/syslog-ng315/pkg-plist
index b2cefbeb2255..e0cff0576012 100644
--- a/sysutils/syslog-ng315/pkg-plist
+++ b/sysutils/syslog-ng315/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index 1219d3d0486b..864cb5bf8370 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \
diff --git a/sysutils/syslog-ng36/pkg-plist b/sysutils/syslog-ng36/pkg-plist
index b89015f05447..7470109ca152 100644
--- a/sysutils/syslog-ng36/pkg-plist
+++ b/sysutils/syslog-ng36/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index 7e51beb47e2e..93040b940ec3 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.7.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils
 #MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 DISTNAME=	syslog-ng-${DISTVERSION}_with_man
diff --git a/sysutils/syslog-ng37/pkg-plist b/sysutils/syslog-ng37/pkg-plist
index d6b692143a34..8a2c68cebe35 100644
--- a/sysutils/syslog-ng37/pkg-plist
+++ b/sysutils/syslog-ng37/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/sysutils/syslog-ng39/Makefile b/sysutils/syslog-ng39/Makefile
index 2d570c32956a..e80e5ce0823a 100644
--- a/sysutils/syslog-ng39/Makefile
+++ b/sysutils/syslog-ng39/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 DISTVERSION=	3.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
diff --git a/sysutils/syslog-ng39/pkg-plist b/sysutils/syslog-ng39/pkg-plist
index 0a46a0219b8c..f9628b82f601 100644
--- a/sysutils/syslog-ng39/pkg-plist
+++ b/sysutils/syslog-ng39/pkg-plist
@@ -1,4 +1,3 @@
-@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
diff --git a/www/havp/Makefile b/www/havp/Makefile
index c646ba0ac607..c0505e7c920d 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	havp
 PORTVERSION=	0.91
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://www.server-side.de/download/ \
 		http://bio3k.softboard.ru/uploads/arch/ \
diff --git a/www/havp/pkg-plist b/www/havp/pkg-plist
index 633e4009abfe..d1bc4c6f5c58 100644
--- a/www/havp/pkg-plist
+++ b/www/havp/pkg-plist
@@ -1,6 +1,5 @@
 sbin/havp
 @sample etc/havp/havp.config.default etc/havp/havp.config
-@unexec [ ! -f %%RUN_DIR%%/havp.pid ] || %D/etc/rc.d/havp stop
 %%EXAMPLESDIR%%/blacklist.sample
 %%EXAMPLESDIR%%/templates/br/blacklist.html
 %%EXAMPLESDIR%%/templates/br/dns.html