diff options
| author | vsevolod <vsevolod@FreeBSD.org> | 2015-07-13 19:52:12 +0800 |
|---|---|---|
| committer | vsevolod <vsevolod@FreeBSD.org> | 2015-07-13 19:52:12 +0800 |
| commit | 795561a8639cc87b8b422ad94b2a1b94bbb57f03 (patch) | |
| tree | a1749cda59511c1a87c974b54d8c0d3c78f8c27c | |
| parent | c17e7a6ff70840123276b08d8095444bfaf70f65 (diff) | |
| download | freebsd-ports-gnome-795561a8639cc87b8b422ad94b2a1b94bbb57f03.tar.gz freebsd-ports-gnome-795561a8639cc87b8b422ad94b2a1b94bbb57f03.tar.zst freebsd-ports-gnome-795561a8639cc87b8b422ad94b2a1b94bbb57f03.zip | |
- Restore LMTP support by default [1]
- Fix install commands in the Makefile
- Bump portrevision
PR: 201438
Submitted by: Gennady Proskurin <gpr at mail.ru>
| -rw-r--r-- | mail/exim/Makefile | 18 | ||||
| -rw-r--r-- | mail/exim/options | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 49d6829de1be..1df7b7fef5a6 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= mail ipv6 MASTER_SITES= EXIM/exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} @@ -122,7 +122,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message EXIM_INSTALL_ARG+= "eximon" "eximon.bin" .endif # !EXIMON_ONLY - PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING PORTDOC_FILES= ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \ OptionLists.txt README README.SIEVE dbm.discuss.txt \ @@ -244,7 +243,6 @@ SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,' EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` .endif - .if ${PORT_OPTIONS:MFIXED_NEVER_USERS} SEDLIST+= -e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},' .endif @@ -574,24 +572,24 @@ post-install: .endfor .endif @${MKDIR} -m 750 ${STAGEDIR}${LOGDIR} - @${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOC_BASE} - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .for docfile in ${PORTDOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for example in ${PORT_EXAMPLES} - @${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR} .endfor .endif .if ${PORT_OPTIONS:MSA_EXIM} - @${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \ + ${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \ ${STAGEDIR}${PREFIX}/etc/exim/sa-exim.conf.sample .endif diff --git a/mail/exim/options b/mail/exim/options index a64d4a52b923..d5cc88b9d27d 100644 --- a/mail/exim/options +++ b/mail/exim/options @@ -34,7 +34,7 @@ OPTIONS_DEFAULT+= AUTH_CRAM_MD5 \ DSEARCH \ EMBEDDED_PERL \ ICONV \ - LTMP \ + LMTP \ LSEARCH \ MAILDIR \ MAILSTORE \ |