===================================================================
RCS file: /cvs/openbsd/update_openbsd/make_SMTPAUTH_sendmail,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -r1.2 -r1.5
--- openbsd/update_openbsd/make_SMTPAUTH_sendmail	2008/05/20 22:19:02	1.2
+++ openbsd/update_openbsd/make_SMTPAUTH_sendmail	2009/05/06 17:48:59	1.5
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: make_SMTPAUTH_sendmail,v 1.1 2008/05/20 21:17:42 andrew Exp $
+# $RedRiver: make_SMTPAUTH_sendmail,v 1.4 2009/03/13 17:55:43 andrew Exp $
 
 pkg_info -e cyrus-sasl-* > /dev/null
 if [ $? -ne 0 ]; then
@@ -10,14 +10,38 @@
 	fi
 fi
 
-WANT_SMTPAUTH=Yes 
+export MAKECONF
 
-cd /usr/src/gnu/usr.sbin/sendmail/sendmail/
+local _tempfile
+local _oldmakeconf=$MAKECONF
+if [ X"$MAKECONF" == X"" ]; then
+	MAKECONF=/etc/mk.conf
+fi
+
+grep -q ^WANT_SMTPAUTH=[Yy][Ee][Ss] $MAKECONF
+if [ $? -ne 0 ]; then
+	_tempfile=`mktemp`
+	cat $MAKECONF > $_tempfile
+	echo WANT_SMTPAUTH=Yes >> $_tempfile
+
+	MAKECONF=$_tempfile
+fi
+
+mv -f sendmail-smtp_auth.gz sendmail-smtp_auth.gz.old
+
+cd /usr/src/gnu/usr.sbin/sendmail/
 echo Making sendmail
 make clean 
+make obj
 make depend
 make
 
-gzip -o ${OLDPWD}/sendmail.gz sendmail
-echo sendmail with SMTPAUTH is now in ${OLDPWD}/sendmail.gz
-make clean
+gzip -o ${OLDPWD}/sendmail-smtp_auth.gz sendmail/obj/sendmail
+#make clean
+
+if [ X"$_tempfile" != X"" ]; then
+	rm -f $_tempfile
+]
+MAKECONF=$_oldmakeconf
+
+echo sendmail with SMTPAUTH is now in ${OLDPWD}/sendmail-smtp_auth.gz