Date: Sun, 24 Mar 2019 20:36:27 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496780 - head/mail/sendmail Message-ID: <201903242036.x2OKaRq8068381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sun Mar 24 20:36:27 2019 New Revision: 496780 URL: https://svnweb.freebsd.org/changeset/ports/496780 Log: - simplify mailer.conf PR: 236553 Submitted by: Helge Oldach Modified: head/mail/sendmail/Makefile head/mail/sendmail/pkg-message head/mail/sendmail/pkg-plist Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Sun Mar 24 20:35:45 2019 (r496779) +++ head/mail/sendmail/Makefile Sun Mar 24 20:36:27 2019 (r496780) @@ -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 # Modified: head/mail/sendmail/pkg-message ============================================================================== --- head/mail/sendmail/pkg-message Sun Mar 24 20:35:45 2019 (r496779) +++ head/mail/sendmail/pkg-message Sun Mar 24 20:36:27 2019 (r496780) @@ -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 # Modified: head/mail/sendmail/pkg-plist ============================================================================== --- head/mail/sendmail/pkg-plist Sun Mar 24 20:35:45 2019 (r496779) +++ head/mail/sendmail/pkg-plist Sun Mar 24 20:36:27 2019 (r496780) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903242036.x2OKaRq8068381>