View | Details | Raw Unified | Return to bug 259530 | Differences between
and this patch

Collapse All | Expand All

(-)b/mail/postfix-current/Makefile (-14 / +15 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	postfix
3
PORTNAME=	postfix
4
DISTVERSION=	3.7-20210815
4
DISTVERSION=	3.7-20210815
5
PORTREVISION?=	1
5
PORTREVISION?=	2
6
PORTEPOCH=	6
6
PORTEPOCH=	6
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
8
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
Lines 284-302 POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" Link Here
284
.endif
284
.endif
285
285
286
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
286
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
287
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!; \
287
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
288
		s!(_directory = )/usr/!\1${PREFIX}/!g; s!^(data_directory = \
288
		s!(_directory = )/usr/!\1${PREFIX}/!g;\
289
		/var/)lib/!\1db/!g; s!^\#(mynetworks_style = host)!\1!g; \
289
		s!^(data_directory = /var/)lib/!\1db/!g;\
290
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g; \
290
		s!^\#(mynetworks_style = host)!\1!g;\
291
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g; \
291
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
292
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g; s!^(setgid_group \
292
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
293
		=)!\1 maildrop!g; s!^(manpage_directory =)!\1 \
293
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
294
		${MANPREFIX}/man!g; s!^((html|readme)_directory =)!\1 \
294
		s!^(setgid_group =)!\1 maildrop!g;\
295
		${READMEDIR}!g; \!^\#alias_database = \
295
		s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
296
		dbm:/etc/mail/aliases$$!d; s!(:|= \
296
		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
297
		)/etc/postfix!\1$$config_directory!g; \
297
		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
298
		s!/etc/postfix!${ETCDIR}!g; s!^(sample_directory =)!\1 \
298
		s!(:|= )/etc/postfix!\1$$config_directory!g;\
299
		${ETCDIR}!g; \
299
		s!/etc/postfix!${ETCDIR}!g;\
300
		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
300
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
301
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
301
302
302
pre-patch:
303
pre-patch:
(-)b/mail/postfix/Makefile (-16 / +16 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	postfix
3
PORTNAME=	postfix
4
DISTVERSION=	3.6.2
4
DISTVERSION=	3.6.2
5
PORTREVISION?=	2
5
PORTREVISION?=	3
6
PORTEPOCH=	1
6
PORTEPOCH=	1
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
8
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
Lines 36-42 sasl_CONFLICTS_INSTALL= postfix-[0-9]* postfix-base-[0-9]* \ Link Here
36
COMMENT_ldap=	(with OpenLDAP and Cyrus SASL support)
36
COMMENT_ldap=	(with OpenLDAP and Cyrus SASL support)
37
COMMENT_sasl=	(with Cyrus SASL support)
37
COMMENT_sasl=	(with Cyrus SASL support)
38
38
39
USES=		cpe shebangfix
39
USES=		cpe shebangfix ssl
40
USE_RC_SUBR=	postfix
40
USE_RC_SUBR=	postfix
41
USE_SUBMAKE=	yes
41
USE_SUBMAKE=	yes
42
42
Lines 277-295 POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" Link Here
277
.endif
277
.endif
278
278
279
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
279
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
280
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!; \
280
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
281
		s!(_directory = )/usr/!\1${PREFIX}/!g; s!^(data_directory = \
281
		s!(_directory = )/usr/!\1${PREFIX}/!g;\
282
		/var/)lib/!\1db/!g; s!^\#(mynetworks_style = host)!\1!g; \
282
		s!^(data_directory = /var/)lib/!\1db/!g;\
283
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g; \
283
		s!^\#(mynetworks_style = host)!\1!g;\
284
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g; \
284
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
285
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g; s!^(setgid_group \
285
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
286
		=)!\1 maildrop!g; s!^(manpage_directory =)!\1 \
286
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
287
		${MANPREFIX}/man!g; s!^((html|readme)_directory =)!\1 \
287
		s!^(setgid_group =)!\1 maildrop!g;\
288
		${READMEDIR}!g; \!^\#alias_database = \
288
		s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
289
		dbm:/etc/mail/aliases$$!d; s!(:|= \
289
		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
290
		)/etc/postfix!\1$$config_directory!g; \
290
		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
291
		s!/etc/postfix!${ETCDIR}!g; s!^(sample_directory =)!\1 \
291
		s!(:|= )/etc/postfix!\1$$config_directory!g;\
292
		${ETCDIR}!g; \
292
		s!/etc/postfix!${ETCDIR}!g;\
293
		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
293
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
294
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
294
295
295
pre-patch:
296
pre-patch:
296
- 

Return to bug 259530