- Add patch recommended by the exim developers to fix mime regression in 4.83

- Remove SA_1024 as it has been adandoned long ago [1]
- Fix message in post-install stage [1]
- Bump revision

Submitted by:	Victor Ustugov via jabber [1]

mail/exim/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
 MASTER_SITE_SUBDIR=	exim4/:exim
@@ -57,7 +57,6 @@ PGSQL_USE=	pgsql=yes
 REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin
-SO_1024_LDFLAGS=	-lz
 SPF_LIB_DEPENDS=	libspf2.so:${PORTSDIR}/mail/libspf2
 SQLITE_USE=	sqlite=yes
 SQLITE_USES=	pkgconfig
@@ -88,14 +87,8 @@ MASTER_SITE_SUBDIR+=	sa-exim/:sa_exim
 DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
 .endif
 
-.if ${PORT_OPTIONS:MSO_1024} || defined(FETCH_ALL)
-MASTER_SITES+=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/:so_1024
-DISTFILES+=	spamooborona1024-src-${SO_1024_VERSION}.tar.gz:so_1024
-.endif
-
 EXIM_VERSION=	4.83
 SA_EXIM_VERSION=4.2
-SO_1024_VERSION=3.2
 EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
 
 .if !defined(EXIMON_ONLY)
@@ -519,10 +512,6 @@ post-extract:
 .if ${PORT_OPTIONS:MSA_EXIM}
 	@cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 .endif
-.if ${PORT_OPTIONS:MSO_1024}
-	@cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
-	@cd ${WRKDIR} && ${PATCH} --quiet < ${FILESDIR}/extra-patch-so_1024-delimiter
-.endif
 
 do-configure:
 	@${MKDIR} ${WRKSRC}/Local
@@ -549,11 +538,6 @@ do-configure:
 	} > ${WRKSRC}/Local/sa-exim.h
 	@${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \
 	    ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf
-.endif
-.if ${PORT_OPTIONS:MSO_1024}
-	@${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/local_scan_1024.c/' \
-		${WRKSRC}/OS/Makefile-Default
-	@${CP} ${WRKDIR}/local_scan_1024.c ${WRKSRC}/Local
 .endif
 	@${REINPLACE_CMD} -E -e 's/XX_STRIPCMD_XX/${STRIP_CMD:S,/,\/,g}/' \
 		${WRKSRC}/OS/Makefile-FreeBSD
@@ -576,9 +560,6 @@ post-install:
 .for script in ${DAILY_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script}
 .endfor
-.endif
-.if ${PORT_OPTIONS:MSO_1024}
-	@${MKDIR} -m 750 ${STAGEDIR}var/spool/spamooborona
 .endif
 	@${MKDIR} -m 750 ${STAGEDIR}${LOGDIR}
 	@${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${MAN8PREFIX}/man/man8

mail/exim/distinfo

@@ -2,5 +2,3 @@ SHA256 (exim/exim-4.83.tar.bz2) = efa031b89ffb2ab844a4bf9d3a5d7ca4d587d82b62ae23
 SIZE (exim/exim-4.83.tar.bz2) = 1761169
 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
-SHA256 (exim/spamooborona1024-src-3.2.tar.gz) = ab22a430f3860460045f6b213c68c89700a0cd10cbb6c7a808ece326c53787ee
-SIZE (exim/spamooborona1024-src-3.2.tar.gz) = 8537

mail/exim/files/POST-INSTALL-NOTES

@@ -30,7 +30,7 @@ To use Exim instead of sendmail on startup:
    'daily_submit_queuerun' to "NO" in periodic.conf(5),
    if you intend to manage queue runners / deliveries closely.
 *) Set the 'exim_enable' rc.conf(5) variable to 'YES'.
-*) Start exim with '%%RC_DIR%%/exim%%RC_SUFX%% start'.
+*) Start exim with '%%PREFIX%%/etc/rc.d/exim start'.
 
 You may also want to configure newsyslog(8) to rotate Exim log files:
 

mail/exim/files/extra-patch-so_1024-delimiter

@@ -1,13 +0,0 @@
-Taken from: http://timofeev.biz/2010/10/14/151
-
---- local_scan_1024.c	2009-11-27 14:02:06.000000000 +0300
-+++ local_scan_1024.c	2012-12-30 22:18:53.491544089 +0400
-@@ -443,7 +443,7 @@
-     if (strncmp (answ, "SODAEMON ", 9) == 0)
-     {
-         strP = (char*) answ;
--        for (tok = strtok (strP, "\n"); tok; tok = strtok (NULL, "\n"))
-+        for (tok = strtok (strP, "\r\n"); tok; tok = strtok (NULL, "\r\n"))
-         {
-             /* signature always goes first */
-             if (strncmp (tok, "SODAEMON ", 9) == 0)

mail/exim/options

@@ -50,7 +50,7 @@ OPTIONS_DEFAULT+=	AUTH_CRAM_MD5 \
 
 OPTIONS_RADIO_TLS=	TLS GNUTLS
 TLS_DESC=	TLS support
-OPTIONS_RADIO_LS=	SA_EXIM SO_1024 KAS
+OPTIONS_RADIO_LS=	SA_EXIM KAS
 LS_DESC=	Local scan patch
 OPTIONS_RADIO_SRSR=	SRS SRS_ALT
 SRSR_DESC=	Sender Rewriting Scheme
@@ -110,7 +110,6 @@ READLINE_DESC=		Enable readline(3) library
 REDIS_DESC=		Enable redis lookups (experimental)
 SASLAUTHD_DESC=		Enable use of Cyrus SASL auth daemon
 SA_EXIM_DESC=		Build with Spamassassin local scan
-SO_1024_DESC=		Build with Spamooborona-1024 local scan
 SPF_DESC=		Enable Sender Policy Framework checking
 SQLITE_DESC=		Enable SQLite lookups
 SRS_DESC=		Enable Sender Rewriting Scheme

mail/exim/pkg-plist

@@ -54,11 +54,3 @@
 %%EXIM%%@owner root
 %%EXIM%%@group wheel
 %%EXIM%%@exec install -d -o %%EXIM_USER%% -g %%EXIM_GROUP%% /%%LOGDIR%%
-%%SO_1024%%@owner %%EXIM_USER%%
-%%SO_1024%%@group %%EXIM_GROUP%%
-%%SO_1024%%@cwd /
-%%SO_1024%%@dirrmtry var/spool/spamooborona
-%%SO_1024%%@cwd %%RESETPREFIX%%
-%%SO_1024%%@owner root
-%%SO_1024%%@group wheel
-%%SO_1024%%@exec install -d -o %%EXIM_USER%% -g %%EXIM_GROUP%% /var/spool/spamooborona