Do not force stop services when a package is deinstalled.

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

Sponsored by:	Absolight

8 files changed, 4 insertions, 17 deletions

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