diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2019-03-24 20:36:27 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2019-03-24 20:36:27 +0000 |
| commit | 7aee9466b6e47ea453c8182836a20077543f5eba (patch) | |
| tree | cbf30b93308a3ce7f5ffffabcf771d5c3f9a7c3c /mail/sendmail | |
| parent | 42af77c38adffa05d8bf7297196203c1d03fadda (diff) | |
| download | ports-7aee9466b6e47ea453c8182836a20077543f5eba.tar.gz ports-7aee9466b6e47ea453c8182836a20077543f5eba.zip | |
- simplify mailer.conf
PR: 236553
Submitted by: Helge Oldach
Notes
Notes:
svn path=/head/; revision=496780
Diffstat (limited to 'mail/sendmail')
| -rw-r--r-- | mail/sendmail/Makefile | 25 | ||||
| -rw-r--r-- | mail/sendmail/pkg-message | 2 | ||||
| -rw-r--r-- | mail/sendmail/pkg-plist | 1 |
3 files changed, 17 insertions, 11 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 0ff5790ddf61..147be910c7eb 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -2,7 +2,7 @@ PORTNAME= sendmail PORTVERSION= 8.15.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -235,6 +235,11 @@ pre-install: @${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST} .endif .endif + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail + @${SED} \ + -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ + ${DESTDIR}/etc/mail/mailer.conf \ + > ${STAGEDIR}${PREFIX}/etc/mail/mailer.conf.sendmail # We want mail.local and rmail for our system. # the build install catmans only, we have to fix this. @@ -290,16 +295,16 @@ mailer.base: ${DESTDIR}/etc/mail/mailer.conf mailer.conf: +.if exists(${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail) + @${CP} -v ${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail \ + ${DESTDIR}${PREFIX}/etc/mail/mailer.conf +.else + @${MKDIR} ${DESTDIR}${PREFIX}/etc/mail @${SED} \ - -e "s=^sendmail[ ]*/.*$$=sendmail ${SENDMAIL}=" \ - -e "s=^send-mail[ ]*/.*$$=send-mail ${SENDMAIL}=" \ - -e "s=^mailq[ ]*/.*$$=mailq ${SENDMAIL}=" \ - -e "s=^newaliases[ ]*/.*$$=newaliases ${SENDMAIL}=" \ - -e "s=^hoststat[ ]*/.*$$=hoststat ${SENDMAIL}=" \ - -e "s=^purgestat[ ]*/.*$$=purgestat ${SENDMAIL}=" \ - ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new - ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \ - ${DESTDIR}/etc/mail/mailer.conf + -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ + ${DESTDIR}/etc/mail/mailer.conf \ + > ${DESTDIR}${PREFIX}/etc/mail/mailer.conf +.endif # create sumbit.cf on older systems # diff --git a/mail/sendmail/pkg-message b/mail/sendmail/pkg-message index 9f3a81b874f2..02cf98c6d1d9 100644 --- a/mail/sendmail/pkg-message +++ b/mail/sendmail/pkg-message @@ -18,7 +18,7 @@ define(`UUCP_MAILER_PATH', `%%LOCALBASE%%/bin/uux')dnl To activate sendmail as your default mailer, call the target 'mailer.conf': $ cd %%PORTSDIR%%/mail/sendmail && make mailer.conf -Your '/etc/mail/mailer.conf' should look like this: +Your '%%PREFIX%%/etc/mail/mailer.conf' should look like this: # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # diff --git a/mail/sendmail/pkg-plist b/mail/sendmail/pkg-plist index b115366f6f48..aab34346deca 100644 --- a/mail/sendmail/pkg-plist +++ b/mail/sendmail/pkg-plist @@ -6,6 +6,7 @@ bin/newaliases bin/purgestat bin/rmail bin/vacation +etc/mail/mailer.conf.sendmail libexec/mail.local libexec/smrsh %%MANPREFIX%%man/man1/mailq.1.gz |