svn commit: r277787 - in head: contrib/sendmail/cf/m4 etc/sendmail

[Gregory Neil Shapiro]

Author: gshapiro
Date: Tue Jan 27 04:06:47 2015
New Revision: 277787
URL: https://svnweb.freebsd.org/changeset/base/277787

Log:
  Remove build specific details from sendmail.cf/submit.cf in support of
  https://wiki.freebsd.org/ReproducibleBuilds
  
  The contrib/sendmail change will be made in the upstream source for a
  future sendmail release.
  
  Reviewed by:	des
  MFC after:	3 days

Modified:
  head/contrib/sendmail/cf/m4/cfhead.m4
  head/etc/sendmail/Makefile

Modified: head/contrib/sendmail/cf/m4/cfhead.m4
==============================================================================
--- head/contrib/sendmail/cf/m4/cfhead.m4	Tue Jan 27 03:37:58 2015	(r277786)
+++ head/contrib/sendmail/cf/m4/cfhead.m4	Tue Jan 27 04:06:47 2015	(r277787)
@@ -20,7 +20,7 @@
 ifdef(`__win32__', `dnl', `dnl
 ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
 syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl
-include(TEMPFILE)dnl
+ifdef(`_NO_MAKEINFO_',, `include(TEMPFILE)')dnl
 syscmd(rm -f TEMPFILE)dnl')')
 #####
 ######################################################################

Modified: head/etc/sendmail/Makefile
==============================================================================
--- head/etc/sendmail/Makefile	Tue Jan 27 03:37:58 2015	(r277786)
+++ head/etc/sendmail/Makefile	Tue Jan 27 04:06:47 2015	(r277787)
@@ -17,7 +17,8 @@ M4FILES!=	find ${SENDMAIL_CF_DIR} -type 
 
 .mc.cf: ${M4FILES}
 	${RM} ${.TARGET}
-	${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
+	${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ -D_NO_MAKEINFO_ \
+	    ${SENDMAIL_M4_FLAGS} \
 	    ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
 	${CHMOD} ${ROMODE} ${.TARGET}