- Don't try removing /var/qmail/queue at all

- Remove /var/qmail/queue from STAGEDIR so it's not an orphan

5 files changed, 6 insertions, 5 deletions

diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index d9f28e545b82..7f0f55b1f7c7 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 555287c736fc..59f528f9114a 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
 		${MASTER_SITE_LOCAL:S/$/:spamcontrol/}
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index cb95a55b2d67..2041ce7a95a6 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index f0d1f1a46c4f..f63787406fd6 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -909,6 +909,8 @@ post-install:
 	  ${ECHO_CMD} "@exec install -d -o root -g qmail ${PREFIX}"; \
 	  ${ECHO_CMD} "@unexec rmdir ${QMAIL_PREFIX} 2>/dev/null || :"; \
 	} >> ${TMPPLIST}
+# Stop check-orphans finding the queue dir
+	${RM} -rf ${STAGEDIR}${PREFIX}/queue/
 
 certificate:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 21f6d5dbb73c..d31fb9dbdca2 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -227,7 +227,6 @@ scripts/mkaliasdir
 @dirrm scripts
 @dirrmtry control
 @dirrmtry alias
-@dirrmtry queue
 @dirrmtry users
 @unexec echo "1) If you are permanently removing qmail, you should also 'rm -rf ${PKG_PREFIX}' and remove the qmail users/groups." | /usr/bin/fmt
 @unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt