Index: src/awk/cachedepends.awk
===================================================================
--- src/awk/cachedepends.awk	(revision 2167)
+++ src/awk/cachedepends.awk	(working copy)
@@ -46,14 +46,14 @@
 	print "(" >> TMPCACHE
 	print "  # Get settings for rc-script ..." >> TMPCACHE
 	print "" >> TMPCACHE
+	print "  [ -e /etc/rc.conf ]                      && source /etc/rc.conf" >> TMPCACHE
+	print "" >> TMPCACHE
 	print "  [ -e /etc/conf.d/net ]                   && \\" >> TMPCACHE
 	print "  [ \"${SVCNAME%%.*}\" = \"net\" ]           && \\" >> TMPCACHE
-	print "  [ \"${SVCNAME##*.}\" != \"${SVCNAME}\" ] && source /etc/conf.d/net" >> TMPCACHE
+	print "  [ \"${SVCNAME#*.}\" != \"${SVCNAME}\" ] && source /etc/conf.d/net" >> TMPCACHE
 	print "" >> TMPCACHE
 	print "  [ -e \"/etc/conf.d/${SVCNAME}\" ]        && source \"/etc/conf.d/${SVCNAME}\"" >> TMPCACHE
 	print "" >> TMPCACHE
-	print "  [ -e /etc/rc.conf ]                      && source /etc/rc.conf" >> TMPCACHE
-	print "" >> TMPCACHE
 	print "  depend() {" >> TMPCACHE
 	print "    return 0" >> TMPCACHE
 	print "  }" >> TMPCACHE
@@ -63,6 +63,16 @@
 function print_end() {
 	print "" >> TMPCACHE
 	print "  depend" >> TMPCACHE
+
+	# Support user defined RC_NEED and RC_USE
+	print "" >> TMPCACHE
+	print "  for x in ${RC_NEED} ; do" >> TMPCACHE
+	print "    need \"${x}\"" >> TMPCACHE
+	print "  done" >> TMPCACHE
+	print "" >> TMPCACHE
+	print "  for x in ${RC_USE} ; do" >> TMPCACHE
+	print "    use \"${x}\"" >> TMPCACHE
+	print "  done" >> TMPCACHE
 	print ")" >> TMPCACHE
 	print "" >> TMPCACHE
 }