Attachment #105706 for bug #146215

View | Details | Raw Unified | Return to bug 146215
Collapse All | Expand All

Lines 27-32 Link Here

(-)exim/Makefile (-1 / +40 lines)
27		27
28	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
29		29
		30	.if defined(WITH_SA_EXIM)
		31	.if defined(WITH_KAS)
		32	IGNORE= You cannot select both SA_EXIM and KAS options
		33	.endif
		34	.if defined(WITH_SO_1024)
		35	IGNORE= You cannot select both SA_EXIM and SO_1024 options
		36	.endif
		37	.endif
		38
		39	.if defined(WITH_KAS)
		40	.if defined(WITH_SO_1024)
		41	IGNORE= You cannot select both SA_KAS and SO_1024 options
		42	.endif
		43	.endif
		44
30	.if defined(WITH_SA_EXIM)	45	.if defined(WITH_SA_EXIM)
31	MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \	46	MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
32	SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim	47	SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim
Lines 34-41 Link Here
34	DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim	49	DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
35	.endif	50	.endif
36		51
		52	.if defined(WITH_SO_1024)
		53	MASTER_SITES+= ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/:so_1024
		54	DISTFILES+= spamooborona1024-src-${SO_1024_VERSION}.tar.gz:so_1024
		55	LDFLAGS+= -lz
		56	PLIST_SUB+= SO_1024=""
		57	.else
		58	PLIST_SUB+= SO_1024="@comment "
		59	.endif
		60
37	EXIM_VERSION= 4.71	61	EXIM_VERSION= 4.71
38	SA_EXIM_VERSION=4.2	62	SA_EXIM_VERSION=4.2
		63	SO_1024_VERSION=3.2
39		64
40	.if !defined(EXIMON_ONLY)	65	.if !defined(EXIMON_ONLY)
41	.if defined(PKGNAMESUFFIX)	66	.if defined(PKGNAMESUFFIX)
Lines 101-107 Link Here
101	-e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \	126	-e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \
102	-e 's,%%LOGDIR%%,${LOGDIR},g'	127	-e 's,%%LOGDIR%%,${LOGDIR},g'
103		128
104	PLIST_SUB= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \	129	PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \
105	EXIM_USER=${EXIM_USER} \	130	EXIM_USER=${EXIM_USER} \
106	EXIM_GROUP=${EXIM_GROUP} \	131	EXIM_GROUP=${EXIM_GROUP} \
107	LOGDIR="${LOGDIR}"	132	LOGDIR="${LOGDIR}"
Lines 439-444 Link Here
439	.if defined(WITH_SA_EXIM)	464	.if defined(WITH_SA_EXIM)
440	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}	465	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
441	.endif	466	.endif
		467	.if defined(WITH_SO_1024)
		468	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
		469	.endif
442		470
443	do-configure:	471	do-configure:
444	@${MKDIR} ${WRKSRC}/Local	472	@${MKDIR} ${WRKSRC}/Local
Lines 467-472 Link Here
467	@${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \	495	@${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \
468	${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf	496	${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf
469	.endif	497	.endif
		498	.if defined(WITH_SO_1024)
		499	@${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/local_scan_1024.c/' \
		500	${WRKSRC}/OS/Makefile-Default
		501	@${CP} ${WRKDIR}/local_scan_1024.c ${WRKSRC}/Local
		502	.endif
470	@${REINPLACE_CMD} -E -e 's/XX_STRIPCMD_XX/${STRIP_CMD:S,/,\/,g}/' \	503	@${REINPLACE_CMD} -E -e 's/XX_STRIPCMD_XX/${STRIP_CMD:S,/,\/,g}/' \
471	${WRKSRC}/OS/Makefile-FreeBSD	504	${WRKSRC}/OS/Makefile-FreeBSD
472	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure)	505	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure)
Lines 524-529 Link Here
524	${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \	557	${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \
525	${PREFIX}/etc/exim/sa-exim.conf	558	${PREFIX}/etc/exim/sa-exim.conf
526	.endif	559	.endif
		560	.if defined(WITH_SO_1024)
		561	.if !exists(/var/spool/spamooborona)
		562	@${MKDIR} -m 750 /var/spool/spamooborona
		563	@${CHOWN} ${EXIM_USER}:${EXIM_GROUP} /var/spool/spamooborona
		564	.endif
		565	.endif
527	@${CAT} ${PKGMESSAGE}	566	@${CAT} ${PKGMESSAGE}
528	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	567	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
529		568

Lines 49-54 Link Here

(-)exim/Makefile.options (+2 lines)
49	READLINE = "Enable readline(3) library"	49	READLINE = "Enable readline(3) library"
50	SASLAUTHD = "Enable use of Cyrus SASL auth daemon"	50	SASLAUTHD = "Enable use of Cyrus SASL auth daemon"
51	SA_EXIM = "SA-Exim support"	51	SA_EXIM = "SA-Exim support"
		52	SO_1024 = "Build with Spamooborona-1024 local scan"
52	SPF = "Enable Sender Policy Framework checking"	53	SPF = "Enable Sender Policy Framework checking"
53	SQLITE = "Enable SQLite lookups"	54	SQLITE = "Enable SQLite lookups"
54	SRS = "Enable Sender Rewriting Scheme"	55	SRS = "Enable Sender Rewriting Scheme"
Lines 96-101 Link Here
96	READLINE \	97	READLINE \
97	SASLAUTHD \	98	SASLAUTHD \
98	SA_EXIM \	99	SA_EXIM \
		100	SO_1024 \
99	SPF \	101	SPF \
100	SQLITE \	102	SQLITE \
101	SRS \	103	SRS \

Lines 4-6 Link Here

(-)exim/distinfo (+3 lines)
4	MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a	4	MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a
5	SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a	5	SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
6	SIZE (exim/sa-exim-4.2.tar.gz) = 66575	6	SIZE (exim/sa-exim-4.2.tar.gz) = 66575
		7	MD5 (exim/spamooborona1024-src-3.2.tar.gz) = f7d23edf02752633377b08b1f2c413d7
		8	SHA256 (exim/spamooborona1024-src-3.2.tar.gz) = ab22a430f3860460045f6b213c68c89700a0cd10cbb6c7a808ece326c53787ee
		9	SIZE (exim/spamooborona1024-src-3.2.tar.gz) = 8537

Lines 33-38 Link Here

(-)exim/options (+1 lines)
33	READLINE "Enable readline(3) library" off \	33	READLINE "Enable readline(3) library" off \
34	SASLAUTHD "Enable use of Cyrus SASL auth daemon" off \	34	SASLAUTHD "Enable use of Cyrus SASL auth daemon" off \
35	SA_EXIM "SA-Exim support" off \	35	SA_EXIM "SA-Exim support" off \
		36	SO_1024 "Build with Spamoborona-1024 local scan" off \
36	SPF "Enable Sender Policy Framework checking" off \	37	SPF "Enable Sender Policy Framework checking" off \
37	SQLITE "Enable SQLite lookups" off \	38	SQLITE "Enable SQLite lookups" off \
38	SRS "Enable Sender Rewriting Scheme" off \	39	SRS "Enable Sender Rewriting Scheme" off \

Lines 52-54 Link Here

(-)exim/pkg-plist (+1 lines)
52	%%SA_EXIM%%@exec [ -f %B/sa-exim.conf ] \|\| cp %B/%f %B/sa-exim.conf	52	%%SA_EXIM%%@exec [ -f %B/sa-exim.conf ] \|\| cp %B/%f %B/sa-exim.conf
53	@unexec rmdir %B 2> /dev/null \|\| true	53	@unexec rmdir %B 2> /dev/null \|\| true
54	@unexec rmdir %%LOGDIR%% 2> /dev/null \|\| true	54	@unexec rmdir %%LOGDIR%% 2> /dev/null \|\| true
		55	%%SO_1024%%@unexec rmdir /var/spool/spamooborona 2> /dev/null \|\| true

Return to bug 146215