From 546d30b94b6b9c398f0ff01200cadff8279d339d Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 1 Oct 2019 18:14:37 +0000 Subject: [PATCH] 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 | 2 +- usr.sbin/{httpd => simple_httpd}/Makefile | 3 +-- usr.sbin/{httpd => simple_httpd}/README | 0 usr.sbin/{httpd => simple_httpd}/simple_httpd.c | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename usr.sbin/{httpd => simple_httpd}/Makefile (61%) rename usr.sbin/{httpd => simple_httpd}/README (100%) rename usr.sbin/{httpd => simple_httpd}/simple_httpd.c (100%) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 9bee390e9cd8..ed4a6bb388a7 100644 --- a/usr.sbin/Makefile +++ b/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 diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/simple_httpd/Makefile similarity index 61% rename from usr.sbin/httpd/Makefile rename to usr.sbin/simple_httpd/Makefile index 080a1afb0b2d..ecd997e7b055 100644 --- a/usr.sbin/httpd/Makefile +++ b/usr.sbin/simple_httpd/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ # -PROG= httpd -SRCS= simple_httpd.c +PROG= simple_httpd MAN= WARNS?=6 diff --git a/usr.sbin/httpd/README b/usr.sbin/simple_httpd/README similarity index 100% rename from usr.sbin/httpd/README rename to usr.sbin/simple_httpd/README diff --git a/usr.sbin/httpd/simple_httpd.c b/usr.sbin/simple_httpd/simple_httpd.c similarity index 100% rename from usr.sbin/httpd/simple_httpd.c rename to usr.sbin/simple_httpd/simple_httpd.c