diff options
-rw-r--r-- | mail/sendmail-devel/Makefile | 3 | ||||
-rw-r--r-- | mail/sendmail-devel/files/patch-Makefile.m4 | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index f2dd4ae7c5d8..ded083bea964 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -251,9 +251,6 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/man/cat*/* # final perm of sendmail is 2555 (see plist), needed for strip cmd ${CHMOD} 755 ${STAGEDIR}${PREFIX}/sbin/sendmail - ${RM} ${STAGEDIR}/etc/mail/submit.cf - ${RMDIR} ${STAGEDIR}/var/spool/clientmqueue - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* diff --git a/mail/sendmail-devel/files/patch-Makefile.m4 b/mail/sendmail-devel/files/patch-Makefile.m4 index efdea226d13f..7f14fa5534f9 100644 --- a/mail/sendmail-devel/files/patch-Makefile.m4 +++ b/mail/sendmail-devel/files/patch-Makefile.m4 @@ -1,6 +1,6 @@ ---- sendmail/Makefile.m4.orig 2019-02-15 10:30:19 UTC +--- sendmail/Makefile.m4.orig 2020-06-08 08:35:03 UTC +++ sendmail/Makefile.m4 -@@ -7,6 +7,7 @@ bldPRODUCT_START(`executable', `sendmail +@@ -7,14 +7,14 @@ bldPRODUCT_START(`executable', `sendmail') define(`bldBIN_TYPE', `G') define(`bldINSTALL_DIR', `') define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c version.c ') @@ -8,3 +8,12 @@ PREPENDDEF(`confENVDEF', `confMAPDEF') bldPUSH_SMLIB(`sm') bldPUSH_SMLIB(`smutil') + + + dnl hack: /etc/mail is not defined as "location of .cf" in the build system +-define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP', +-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl ++define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP')) + define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS', + `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat') + )dnl |