===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.364
retrieving revision 1.365
diff -c -r1.364 -r1.365
*** src/etc/rc	2011/07/07 23:09:46	1.364
--- src/etc/rc	2011/07/07 23:29:45	1.365
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.364 2011/07/07 23:09:46 guenther Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.365 2011/07/07 23:29:45 robert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 571,586 ****
  [ X"${bt}" != X"NO" -a -f ${bt_rules} ] && \
  	btctl -f ${bt_rules}
  
! if [ X"${spamd_flags}" != X"NO" ]; then
! 	if [ X"${spamd_black}" != X"NO" ]; then
! 		spamd_flags="${spamd_flags} -b"
! 	fi
! 	echo -n ' spamd';		eval /usr/libexec/spamd ${spamd_flags}
  	/usr/libexec/spamd-setup -D
! 	if [ X"${spamd_black}" = X"NO" ]; then
! 		echo -n ' spamlogd'
! 		/usr/libexec/spamlogd ${spamlogd_flags}
! 	fi
  fi
  
  echo '.'
--- 571,584 ----
  [ X"${bt}" != X"NO" -a -f ${bt_rules} ] && \
  	btctl -f ${bt_rules}
  
! start_daemon spamd
! 
! [ X"${spamd_flags}" != X"NO" ] && \
  	/usr/libexec/spamd-setup -D
! 
! if [ X"${spamd_black}" = X"NO" ]; then
! 	echo -n ' spamlogd'
! 	/usr/libexec/spamlogd ${spamlogd_flags}
  fi
  
  echo '.'
***************
*** 621,633 ****
  date
  
  mixerctl_conf
- echo -n 'starting console services:'
  
! if [ X"${aucat_flags}" != X"NO" ]; then
! 	echo -n ' aucat';		aucat -l ${aucat_flags}
! fi
! 
! start_daemon wsmoused xdm
  echo '.'
  
  exit 0
--- 619,627 ----
  date
  
  mixerctl_conf
  
! echo -n 'starting console services:'
! start_daemon aucat wsmoused xdm
  echo '.'
  
  exit 0