*** 5.3-RELEASE/src/etc/sendmail/Makefile	Mon Nov 24 16:17:21 2003
--- jhs/src/etc/sendmail/Makefile	Mon Nov 24 16:31:10 2003
***************
*** 13,19 ****
  # this is overkill, but....
  M4FILES!=	find ${CFDIR} -type f -name '*.m4' -print
  
! .SUFFIXES: .mc .cf
  
  .mc.cf: ${M4FILES}
  	${RM} ${.TARGET}
--- 13,19 ----
  # this is overkill, but....
  M4FILES!=	find ${CFDIR} -type f -name '*.m4' -print
  
! .SUFFIXES:	.cpp .mc .cf
  
  .mc.cf: ${M4FILES}
  	${RM} ${.TARGET}
***************
*** 21,26 ****
--- 21,48 ----
  	    ${CFDIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
  	${CHMOD} ${ROMODE} ${.TARGET}
  
+ .if exists (../../contrib/sendmail/cf/feature/require_rdns.m4)
+ REQUIRE_DNS= D
+ .else
+ REQUIRE_DNS= U
+ .endif
+ # The .mc.cf rule can now take .mc source from /usr/obj/`pwd`, so
+ # the .cpp.mc rule no longer needs target ${.CURDIR}/${.TARGET}
+ .cpp.mc:
+ 	$(RM) ${.TARGET}
+ 	cpp -P -Wcomments -D `basename ${.TARGET} .mc | sed "s/\./_/g" ` \
+ 		-D HOSTNAME="`basename ${.TARGET} .mc`" \
+ 		-${REQUIRE_DNS} require_dns ${.IMPSRC}	\
+ 		| sed "s/\'\'/\'/"g		\
+ 		| sed "s/__HASH__/\#/g"		\
+ 		| sed "s/__SPACE__/ /g"		\
+ 		| sed "s/__TAB__/	/g"	\
+ 		| sed "s/ $$//g"		\
+ 		| sed "s/	$$//g"		\
+ 		| grep -v '^$$'			\
+ 		| sed "s/__BREAK__//g"		\
+ 		> ${.TARGET}
+ 
  DEST_CF=	${DESTDIR}/etc/mail/sendmail.cf
  DEST_SUBMIT_CF=	${DESTDIR}/etc/mail/submit.cf
  
***************
*** 104,108 ****
--- 155,171 ----
  	    freebsd.submit.cf ${DEST_SUBMIT_CF}
  .endif
  .endif
+ 
+ $(HOSTS):	$(M4FILES) common.cpp
+ 
+ clean:
+ 	for i in $(HOSTS) ; do                          \
+ 		rm -f                                   \
+ 		$$i                                     \
+ 		`basename $$i .cf`.mc                   \
+ 		${.CURDIR}/`basename $$i .cf`.mc        \
+ 		${.CURDIR}/`basename $$i .cf`.cpp ;     \
+ 		done
+ 	rm -f ${CLEANFILES} @# To rm /usr/obj/usr/src/etc/sendmail/freebsd.cf
  
  .include <bsd.prog.mk>