3 files changed, 15 insertions, 30 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index cfc0ff336c6a..7bb8de87d3de 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
@@ -187,6 +186,7 @@ WITH_DEFAULT_CHARSET?=	ISO-8859-1
 #WITHOUT_PAM=			yes
 #WITHOUT_AUTH_CRAM_MD5=		yes
 #WITHOUT_AUTH_PLAINTEXT=	yes
+#WITHOUT_AUTH_DOVECOT=		yes
 #WITHOUT_AUTH_SPA=		yes
 #
 # Enable support for authenticating via the Cyrus SASL library
@@ -395,6 +395,10 @@ SEDLIST+=	-e 's,^\# (AUTH_CRAM_MD5=),\1,'
 SEDLIST+=	-e 's,^\# (AUTH_PLAINTEXT=),\1,'
 .endif
 
+.if !defined(WITHOUT_DOVECOT)
+SEDLIST+=	-e 's,^\# (AUTH_DOVECOT=),\1,'
+.endif
+
 .if !defined(WITHOUT_AUTH_SPA)
 SEDLIST+=	-e 's,^\# (AUTH_SPA=),\1,'
 .endif
@@ -542,35 +546,20 @@ SEDLIST+=	-e 's,^\# (WITH_CONTENT_SCAN=),\1,'
 SEDLIST+=	-e 's,^\# (WITH_OLD_DEMIME=),\1,'
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR}
-.error EXIMON_ONLY is not user settable
-.endif
-
 .if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
-USE_RC_SUBR=	yes
-.if defined(WITH_RCORDER) && ${OSVERSION} >= 500037
-RC_DIR=		/etc/rc.d
-RC_SUFX=
-PLIST_SUB+=	RCORDER="" \
-		RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
-.else
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-PLIST_SUB+=	RCORDER="@comment " \
-		RC_DIR="%D/etc/rc.d" \
-		RC_SUFX=${RC_SUFX}
-.endif
-SED_SCRIPT+=	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%RC_DIR%%,${RC_DIR},g' \
-		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
+USE_RC_SUBR=	exim.sh
 PLIST_SUB+=	DAEMON=""
+SUB_LIST+=	LOGDIR="${LOGDIR}"
 .else
 PLIST_SUB+=	DAEMON="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR}
+.error EXIMON_ONLY is not user settable
+.endif
+
 .if ${OSVERSION} < 400014
 WITHOUT_IPV6=	yes
 .endif
@@ -625,7 +614,7 @@ do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure)
 
 post-build:
-.for script in exim ${DAILY_SCRIPTS}
+.for script in ${DAILY_SCRIPTS}
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh
 .endfor
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \
@@ -645,7 +634,6 @@ pre-install:
 
 post-install:
 .if !defined(WITHOUT_DAEMON)
-	@${INSTALL_SCRIPT} ${WRKDIR}/exim.sh ${DESTDIR}${RC_DIR}/exim${RC_SUFX}
 	@${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily
 .for script in ${DAILY_SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${PREFIX}/etc/periodic/daily/${script}
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh.in
index 4a1e0ea1a86d..4a1e0ea1a86d 100644
--- a/mail/exim/files/exim.sh
+++ b/mail/exim/files/exim.sh.in
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index c6e430ccf855..945dbd8db19d 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-%%DAEMON%%@unexec [ ! -f /var/run/exim.pid ] || %%RC_DIR%%/exim%%RC_SUFX%% stop || true
 sbin/exim
 sbin/exim-%%EXIM_VERSION%%
 sbin/exim_checkaccess
@@ -52,7 +51,5 @@ etc/exim/configure.default
 %%SA_EXIM%%@unexec if cmp -s %D/etc/exim/sa-exim.conf %D/etc/exim/sa-exim.conf.default; then rm -f %D/etc/exim/sa-exim.conf; fi
 %%SA_EXIM%%etc/exim/sa-exim.conf.default
 %%SA_EXIM%%@exec [ -f %B/sa-exim.conf ] || cp %B/%f %B/sa-exim.conf
-@unexec rmdir %B 2>/dev/null || true
-%%DAEMON%%%%RCORDER%%@cwd /
-%%DAEMON%%etc/rc.d/exim%%RC_SUFX%%
+@dirrmtry %B
 @dirrmtry %%LOGDIR%%