svn commit: r541281 - in head/mail/sendmail-devel: . files

[Dirk Meyer]

Author: dinoex
Date: Sun Jul  5 14:13:07 2020
New Revision: 541281
URL: https://svnweb.freebsd.org/changeset/ports/541281

Log:
  - keep STAGEDIR clean

Modified:
  head/mail/sendmail-devel/Makefile
  head/mail/sendmail-devel/files/patch-Makefile.m4

Modified: head/mail/sendmail-devel/Makefile
==============================================================================
--- head/mail/sendmail-devel/Makefile	Sun Jul  5 13:34:40 2020	(r541280)
+++ head/mail/sendmail-devel/Makefile	Sun Jul  5 14:13:07 2020	(r541281)
@@ -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/*

Modified: head/mail/sendmail-devel/files/patch-Makefile.m4
==============================================================================
--- head/mail/sendmail-devel/files/patch-Makefile.m4	Sun Jul  5 13:34:40 2020	(r541280)
+++ head/mail/sendmail-devel/files/patch-Makefile.m4	Sun Jul  5 14:13:07 2020	(r541281)
@@ -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