Move httpd to simple_httpd...

This avoids PATH conflicts with a real httpd, as a user will likely almost
always prefer the more fully-featured httpd. This also lines up with the
historical name of the program.

usr.sbin/Makefile

@@ -138,7 +138,7 @@ SUBDIR.${MK_FMTREE}+=	fmtree
 SUBDIR.${MK_FREEBSD_UPDATE}+=	freebsd-update
 SUBDIR.${MK_GSSAPI}+=	gssd
 SUBDIR.${MK_GPIO}+=	gpioctl
-SUBDIR.${MK_HTTPD}+=	httpd
+SUBDIR.${MK_HTTPD}+=	simple_httpd
 SUBDIR.${MK_INET6}+=	ip6addrctl
 SUBDIR.${MK_INET6}+=	mld6query
 SUBDIR.${MK_INET6}+=	ndp

usr.sbin/simple_httpd/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
-PROG=	httpd
-SRCS=	simple_httpd.c
+PROG=	simple_httpd
 MAN=
 WARNS?=6