diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 4ee1d31e2559..e482c2dbe1e1 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	httperf
 PORTVERSION=	0.9.1
 CATEGORIES=	benchmarks www
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tool for measuring webserver performance
+COMMENT=	Tool for measuring web server performance
 WWW=		https://github.com/httperf/httperf
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool ssl
 USE_GITHUB=	yes
 GH_TAGNAME=	568322e
 MAKE_ARGS=	LIBUTIL_OBJS=ssl_writev.o \
 		exec_prefix=${PREFIX}
 
 PLIST_FILES=	bin/httperf \
 		man/man1/httperf.1.gz
 PORTDOCS=	ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/moosefs2-cgiserv/Makefile b/sysutils/moosefs2-cgiserv/Makefile
index 21d745f4396f..12f1d45ce07d 100644
--- a/sysutils/moosefs2-cgiserv/Makefile
+++ b/sysutils/moosefs2-cgiserv/Makefile
@@ -1,9 +1,9 @@
 PKGNAMESUFFIX=	-cgiserv
 
-COMMENT=	MooseFS CGI webserver
+COMMENT=	MooseFS CGI web server
 
 MFS_COMPONENT=	cgiserv
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs3-cgiserv/Makefile b/sysutils/moosefs3-cgiserv/Makefile
index fb8de26fb7e4..e1d1391a8254 100644
--- a/sysutils/moosefs3-cgiserv/Makefile
+++ b/sysutils/moosefs3-cgiserv/Makefile
@@ -1,9 +1,9 @@
 PKGNAMESUFFIX=	-cgiserv
 
-COMMENT=	MooseFS CGI webserver
+COMMENT=	MooseFS CGI web server
 
 MFS_COMPONENT=	cgiserv
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index 4b456143f2e4..cd0cd0527e99 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	awffull
 PORTVERSION=	3.10.2
 PORTREVISION=	18
 CATEGORIES?=	www
 MASTER_SITES=	https://launchpadlibrarian.net/20395993/
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT=	Webserver log analysis tool forked from Webalizer
+COMMENT=	Web server log analysis tool forked from Webalizer
 WWW=		http://www.stedee.id.au/awffull
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:x11-fonts/bitstream-vera
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libpng.so:graphics/png \
 		libpcre.so:devel/pcre
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS?=	ja-awffull
 
 FONTDEFAULT?=	${LOCALBASE}/share/fonts/bitstream-vera/VeraBd.ttf
 FONTLABEL?=	${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 USES=		gettext iconv localbase shebangfix
 SHEBANG_FILES=	contrib/awffull_history_regen.pl \
 		contrib/awffull_history_regen_german.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \
 		--with-font-label=${FONTLABEL} \
 		--with-etcdir=${PREFIX}/etc
 
 NLS_CONFIGURE_ENABLE=	nls
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} \
 		ChangeLog DNS.README PERFORMANCE_TIPS.txt \
 		README* TODO country-codes.txt \
 		${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample* ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/*.pl ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/flags
 	${INSTALL_DATA} ${WRKSRC}/flags/README ${WRKSRC}/flags/*.png \
 		${STAGEDIR}${EXAMPLESDIR}/flags
 
 .include <bsd.port.mk>
diff --git a/www/awffull/pkg-descr b/www/awffull/pkg-descr
index df5df5b6ec16..a8783045ac87 100644
--- a/www/awffull/pkg-descr
+++ b/www/awffull/pkg-descr
@@ -1,5 +1,5 @@
-AWFFull is a webserver log analysis tool. Mainly used to produce
+AWFFull is a web server log analysis tool. Mainly used to produce
 simple reports, it can also be used as the starting point for more
 detailed Web Analytics.
 
 AWFFull is a fork of the venerable Webalizer log analysis program.
diff --git a/www/devd/Makefile b/www/devd/Makefile
index 5ec46134b3bb..dd5f241c2bb3 100644
--- a/www/devd/Makefile
+++ b/www/devd/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	devd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9
 PORTREVISION=	16
 CATEGORIES=	www devel
 
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Local webserver for developers
+COMMENT=	Local web server for developers
 WWW=		https://github.com/cortesi/devd
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	cortesi
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	${GO_PKGNAME}/cmd/${PORTNAME}
 GH_TUPLE=	golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys_v0.6.0
 
 PLIST_FILES=	bin/${PORTNAME}
 
 pre-build:
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
 	${MV} ${WRKSRC}/vendor/golang.org/x/sys_v0.6.0 ${WRKSRC}/vendor/golang.org/x/sys
 
 .include <bsd.port.mk>
diff --git a/www/dfileserver/Makefile b/www/dfileserver/Makefile
index 7c7221bac3a2..739732c7cc5e 100644
--- a/www/dfileserver/Makefile
+++ b/www/dfileserver/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	DFileServer
 PORTVERSION=	1.1.3
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://rodrigo.osorio.free.fr/freebsd/distfiles/ \
 		http://harpy.soarwitheagles.net/~dashy/
 
 MAINTAINER=	rodrigo@FreeBSD.org
-COMMENT=	Compact webserver designed to make sharing files easy
+COMMENT=	Compact web server designed to make sharing files easy
 WWW=		http://www.bebik.net/doku.php?id=software:dfileserver
 
 LICENSE=	BSD3CLAUSE
 
 USES=	dos2unix
 
 PLIST_FILES=	bin/dfileserver
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} 's,g++,${CXX},;s,$$GCCFLAGS,${CXXFLAGS},; \
 		s,strip,${STRIP_CMD},' ${WRKSRC}/build.sh
 
 do-build:
 	@(cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ./build.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DFileServer.x86 ${STAGEDIR}${PREFIX}/bin/dfileserver
 
 .include <bsd.port.mk>
diff --git a/www/dfileserver/pkg-descr b/www/dfileserver/pkg-descr
index bf1fe4980a38..aae0c9b0c1b6 100644
--- a/www/dfileserver/pkg-descr
+++ b/www/dfileserver/pkg-descr
@@ -1,6 +1,6 @@
-A small and simple webserver programmed in C++ that was designed to make
+A small and simple web server programmed in C++ that was designed to make
 sharing files easy.
 
 By default, it shares whatever folder it was executed from on port 2000.
 While simple, a good deal of flexibility is exposed when you read the
 documentation and look at the optional configuration files.
diff --git a/www/dhttpd/Makefile b/www/dhttpd/Makefile
index ff2979888e60..dacf9592d097 100644
--- a/www/dhttpd/Makefile
+++ b/www/dhttpd/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	dhttpd
 PORTVERSION=	1.02a
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Minimal secure webserver. Fast and efficient, no cgi-bin support
+COMMENT=	Minimal secure web server. Fast and efficient, no cgi-bin support
 
 LICENSE=	GPLv2
 
 USES=		cpe
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.02-4
 BUILD_WRKSRC=	${WRKSRC}/src
 
 PLIST_FILES=	sbin/dhttpd man/man1/dhttpd.1.gz
 
 USE_RC_SUBR=	dhttpd
 
 pre-everything::
 	@${ECHO_MSG} "=============================================================="
 	@${ECHO_MSG} "To change the default document root"
 	@${ECHO_MSG} "${PREFIX}/www/data edit"
 	@${ECHO_MSG} "${FILESDIR}/patch-config.hh"
 	@${ECHO_MSG} "for your needs and re-compile dhhtpd."
 	@${ECHO_MSG} "=============================================================="
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/config.hh \
 		${WRKSRC}/dhttpd.1
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/www/fnord/Makefile b/www/fnord/Makefile
index 5c648e0b8bcb..edb961edabd9 100644
--- a/www/fnord/Makefile
+++ b/www/fnord/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	fnord
 PORTVERSION=	1.11
 CATEGORIES=	www
 MASTER_SITES=	http://www.fefe.de/fnord/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Small and fast webserver with CGI-capability
+COMMENT=	Small and fast web server with CGI-capability
 WWW=		https://www.fefe.de/fnord/
 
 LICENSE=	GPLv2
 
 USES=		gmake tar:bzip2
 
 PLIST_FILES=	bin/fnord \
 		bin/fnord-conf \
 		bin/fnord.inetd
 
 SUB_FILES=	pkg-message fnord.inetd
 
 OPTIONS_DEFINE=	DAEMONTOOLS TCPSERVER CGI DIR_LIST SYSTEM_SYMLINK_DEREF OLD_STYLE_REDIRECT
 OPTIONS_DEFAULT=	CGI DIR_LIST
 DAEMONTOOLS_DESC=	Use DJB's daemontools
 TCPSERVER_DESC=		Use DJB's tcpserver
 CGI_DESC=		Enable CGI support
 DIR_LIST_DESC=		Enable directory listing
 SYSTEM_SYMLINK_DEREF_DESC=	Enable system symlink (needs DIR_LIST)
 OLD_STYLE_REDIRECT_DESC=	Enable old style redirection
 
 DAEMONTOOLS_RUN_DEPENDS=	setuidgid:sysutils/daemontools
 TCPSERVER_RUN_DEPENDS=		tcpserver:sysutils/ucspi-tcp
 
 MAKE_ARGS+=	DIET="" CC="${CC}" CXX="${CXX}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCGI}
 SED_SCRIPT+=	-e "s|^// \(\#define CGI\).*|\1|"
 .endif
 
 # HOPE YOU KNOW WHAT YOU'RE LINKING !
 #
 # e.g.: if a file foo is a symlink to /etc/passwd and you don't have a
 # chroot enviroment then the system-wide /etc/passwd is provided !!!
 #
 # If the symlink is dangling OR this option is not active the symlink is
 # provided as a new http-uri.
 #
 # e.g.: is foo a symlink to /etc/passwd than the client gets a href to
 # http://<vhost>/etc/passwd */
 
 .if ${PORT_OPTIONS:MSYSTEM_SYMLINK_DEREF}
 .if empty(PORT_OPTIONS:MDIR_LIST)
 IGNORE=	SYSTEM_SYMLINK_DEREF requires the DIR_LIST option
 .endif
 SED_SCRIPT+=	-e "s|^/\* \(\#define SYSTEM_SYMLINK_DEREF\).*|\1|"
 .endif
 
 .if ${PORT_OPTIONS:MDIR_LIST}
 SED_SCRIPT+=	-e "s|^/\* \(\#define DIR_LIST\).*|\1|"
 .endif
 
 # If a file is not found locally, and $REDIRECT_HOST is set, fnord will
 # issue a redirect to strcat($REDIRECT_HOST,uri).  Otherwise, if
 # $REDIRECT_URI is set, fnord will issue a redirect to $REDIRECT_URI.
 # Only if those fail will a 404 error be returned. */
 
 .if ${PORT_OPTIONS:MOLD_STYLE_REDIRECT}
 SED_SCRIPT+=	-e "s|^/\* \(\#define OLD_STYLE_REDIRECT\).*|\1|"
 .endif
 
 post-patch:
 	@[ -z '${SED_SCRIPT}' ] || \
 		 ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/httpd.c
 	@${REINPLACE_CMD} -e "/strip/d" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fnord ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fnord-conf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fnord.inetd ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/fnord/pkg-descr b/www/fnord/pkg-descr
index 58925e5047d4..c1a01cfbdc76 100644
--- a/www/fnord/pkg-descr
+++ b/www/fnord/pkg-descr
@@ -1,3 +1,3 @@
-fnord is a small and fast webserver with CGI-capability. fnord has
+fnord is a small and fast web server with CGI-capability. fnord has
 been written by Felix von Leitner. fnord supports virtual hosting
 und runs under tcpserver.
diff --git a/www/gatling/Makefile b/www/gatling/Makefile
index fbc06f22330f..27380b88487e 100644
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@@ -1,103 +1,103 @@
 PORTNAME=	gatling
 PORTVERSION=	0.16
 CATEGORIES=	www benchmarks ftp
 MASTER_SITES=	https://www.fefe.de/gatling/
 
 MAINTAINER=	coco@executive-computing.de
-COMMENT=	High performance webserver with scalability benchmark tools
+COMMENT=	High performance web server with scalability benchmark tools
 WWW=		https://www.fefe.de/gatling/
 
 LICENSE=	GPLv2
 
 BROKEN_mips=	fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
 BROKEN_mips64=	fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
 
 BUILD_DEPENDS=	libowfat>=0.32:devel/libowfat
 
 USES=		compiler:c++11-lang gmake localbase:ldflags ssl tar:xz
 USE_RC_SUBR=	gatling
 
 MAKEFILE=	GNUmakefile
 
 CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${OPENSSLINC}
 # Make alloca() prototype visible
 CFLAGS+=	-D__BSD_VISIBLE
 # Make crypt() prototype visible
 CFLAGS+=	-D__XSI_VISIBLE
 LDFLAGS+=	-L${OPENSSLLIB}
 
 PLIST_FILES=	${PLIST_BIN:S,^,bin/,} \
 		${PLIST_SBIN:S,^,sbin/,} \
 		man/man8/gatling.8.gz \
 		sbin/gatling_wrapper
 
 PORTDOCS=	CHANGES README README.antidos README.cgi README.ftp \
 		README.htaccess README.http README.performance README.prefetch \
 		README.proxy README.redirect
 PORTEXAMPLES=	acc cgi getlinks hcat hitprofile matchiprange referrer \
 		run-gatling
 
 OPTIONS_DEFINE=		BENCHMARKS BROKEN_ITOJUN_V6 DEBUG DOCS EXAMPLES \
 			OPTIMIZED_CFLAGS SMB TLS ZLIB
 OPTIONS_DEFAULT=	BENCHMARKS OPTIMIZED_CFLAGS SMB TLS ZLIB
 OPTIONS_SUB=		yes
 
 BENCHMARKS_DESC=	Install some benchmark programs
 BROKEN_ITOJUN_V6_DESC=	Works around problems binding to IPv4 addresses
 TLS_DESC=		Build and install tlsgatling
 ZLIB_DESC=		Compress outgoing data
 
 BENCHMARKS_MAKE_ENV=		BENCHMARKS=1
 BENCHMARKS_PLIST_FILES=		man/man1/bench.1.gz
 BENCHMARKS_PORTDOCS=		README.bindbench README.forkbench \
 				README.httpbench README.manymapbench \
 				README.mmapbench
 BENCHMARKS_PORTEXAMPLES=	prep run-bench
 BENCHMARKS_VARS=		BENCH1=bench.1 \
 		PLIST_BIN+=bindbench forkbench forksbench httpbench ioerr manymapbench mktestdata mmapbench pthreadbench
 # Causes a warning about "KAME madness" but works around
 # gatling failing to bind to IPv4 addresses.
 BROKEN_ITOJUN_V6_CFLAGS=	-D__broken_itojun_v6__
 DEBUG_MAKE_ENV=			DEBUG=1
 DEBUG_VARS=			STRIP=
 SMB_USES=			iconv
 SMB_MAKE_ENV=			ICONV=1
 SMB_EXTRA_PATCHES_OFF=		${PATCHDIR}/extra-patch-disable_smb
 TLS_MAKE_ENV=			TLSGATLING=1
 TLS_PORTDOCS=			README.tls
 TLS_VARS=			PLIST_SBIN+=tlsgatling
 ZLIB_MAKE_ENV=			ZLIB=1
 
 PLIST_BIN=	dl
 PLIST_SBIN=	gatling
 GATLING8=	gatling.8
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG)
 CFLAGS+=	-O2 -fomit-frame-pointer
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/\(trymd5.c\) \(-lcrypto\)/\1 $$(LDFLAGS) \2/'	\
 		${WRKSRC}/GNUmakefile
 
 pre-install:
 	cd ${WRKSRC} && ${CP} gatling.1 gatling.8
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_BIN} ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_SBIN} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .if !empty(BENCH1)
 	cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endif
 	cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/hiawatha-monitor/Makefile b/www/hiawatha-monitor/Makefile
index 030e9b136053..e07c2d3d674a 100644
--- a/www/hiawatha-monitor/Makefile
+++ b/www/hiawatha-monitor/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	hiawatha-monitor
 PORTVERSION=	1.6
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	monitor-${PORTVERSION}
 
 MAINTAINER=	christopher.petrik@usm.edu
-COMMENT=	Monitoring tool for the Hiawatha webserver
+COMMENT=	Monitoring tool for the Hiawatha web server
 WWW=		https://www.hiawatha-webserver.org/monitor
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		php:flavors shebangfix
 USE_PHP=	ctype mysqli xml xsl zlib
 SHEBANG_FILES=	database/delete_old_logs \
 		database/fetch_webserver_logs \
 		database/flush_cache \
 		database/private_pages \
 		database/send_reports \
 		database/set_password
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/monitor
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/var/www/monitor,${WWWDIR},g' ${WRKSRC}/INSTALL
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	cd ${STAGEDIR}${WWWDIR} && ${CHMOD} ${BINMODE} ${SHEBANG_FILES}
 .for f in private_pages.conf public_pages.conf website.conf
 	${MV} ${STAGEDIR}${WWWDIR}/settings/${f} \
 		${STAGEDIR}${WWWDIR}/settings/${f}.sample
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index d51394b80816..6761b0394e0d 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	hiawatha
 PORTVERSION=	11.2
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
 MAINTAINER=	johntdarrah@gmail.com
-COMMENT=	Advanced and secure webserver for Unix
+COMMENT=	Advanced and secure web server for Unix
 WWW=		https://www.hiawatha-webserver.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 
 USES=		cmake:insource compiler:c11 cpe localbase:ldflags shebangfix
 CPE_VENDOR=	${PORTNAME}-webserver
 USE_RC_SUBR=	hiawatha
 SHEBANG_FILES=	extra/letsencrypt/lefh.in
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DWEBROOT_DIR=${WWWDIR} \
 		-DWORK_DIR=/var/db/${PORTNAME}
 CMAKE_ON=	USE_SYSTEM_MBEDTLS
 
 OPTIONS_DEFINE=		CACHE CGIWRAPPER LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \
 			TOOLKIT XSLT
 OPTIONS_DEFAULT=	CACHE CGIWRAPPER RPROXY TOOLKIT XSLT
 OPTIONS_SUB=		yes
 
 CACHE_DESC=		Caching support
 CGIWRAPPER_DESC=	Install cgi-wrapper(1) (needs setuid bit)
 LEFH_DESC=		Install Let's Encrypt For Hiawatha script
 LOADCHECK_DESC=		Load check support (experimental)
 MONITOR_DESC=		Hiawatha Monitor support
 RPROXY_DESC=		Reverse proxy support
 TOMAHAWK_DESC=		Tomahawk command shell support
 TOOLKIT_DESC=		URL toolkit support
 XSLT_DESC=		XSLT support
 
 CACHE_CMAKE_BOOL=	ENABLE_CACHE
 LEFH_USES=		php:cli
 LOADCHECK_CMAKE_BOOL=	ENABLE_LOADCHECK
 MONITOR_CMAKE_BOOL=	ENABLE_MONITOR
 RPROXY_CMAKE_BOOL=	ENABLE_RPROXY
 TOMAHAWK_CMAKE_BOOL=	ENABLE_TOMAHAWK
 TOOLKIT_CMAKE_BOOL=	ENABLE_TOOLKIT
 XSLT_USES=		gnome
 XSLT_USE=		GNOME=libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/ssi-cgi|${PREFIX}/bin/ssi-cgi|g' \
 		-e 's|/usr/bin|${LOCALBASE}/bin|g' \
 		${WRKSRC}/config/cgi-wrapper.conf \
 		${WRKSRC}/config/hiawatha.conf.in
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
 		-e 's|/etc/hiawatha|${ETCDIR}|g' \
 		${WRKSRC}/man/hiawatha.1.in
 
 post-install:
 .for f in hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf error.xslt \
 	index.xslt
 	${INSTALL_DATA} ${WRKSRC}/config/${f} \
 		${STAGEDIR}${PREFIX}/etc/hiawatha/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/index.html \
 		${STAGEDIR}${WWWDIR}/index.html.sample
 
 .include <bsd.port.mk>
diff --git a/www/hiawatha/pkg-descr b/www/hiawatha/pkg-descr
index 57341792d979..ed10f5d60ff8 100644
--- a/www/hiawatha/pkg-descr
+++ b/www/hiawatha/pkg-descr
@@ -1,5 +1,5 @@
-Hiawatha is an advanced and secure webserver for Unix. It has been written with
+Hiawatha is an advanced and secure web server for Unix. It has been written with
 'being secure' as its main goal. Hiawatha has many security features that no
-other webserver has. Besides being very secure, it's also a very fast webserver.
+other web server has. Besides being very secure, it's also a very fast web server.
 It's twice as fast as Apache for static content. It supports load-balanced
 FastCGI, which makes it fast and scalable for serving CGI.
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 3c27cce84ead..27d732746dab 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	mod_auth_openid
 PORTVERSION=	0.8
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	Authentication module for the Apache 2 webserver with OpenID
+COMMENT=	Authentication module for the Apache 2 web server with OpenID
 WWW=		https://findingscience.com/mod_auth_openid/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libopkele.so:devel/libopkele \
 		libsqlite3.so:databases/sqlite3
 
 USES=		apache autoreconf cpe gmake libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmuller
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openid.so
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include -I/usr/include/openssl
 
 CPE_VENDOR=	findingscience
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${APXS} -i|$${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
 		${WRKSRC}/src/Makefile.am
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 
 .include <bsd.port.mk>
diff --git a/www/mod_auth_openid/pkg-descr b/www/mod_auth_openid/pkg-descr
index 1dd4df8ad77a..5065d724b424 100644
--- a/www/mod_auth_openid/pkg-descr
+++ b/www/mod_auth_openid/pkg-descr
@@ -1,3 +1,3 @@
-mod_auth_openid is an authentication module for the Apache 2 webserver.
+mod_auth_openid is an authentication module for the Apache 2 web server.
 It handles the functions of an OpenID consumer as specified in the OpenID
 2.0 specification.
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index 5b27c2d4a1f6..a68f45ecd803 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	mod_tidy
 PORTVERSION=	0.5.5
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mod-tidy.sourceforge.net/src/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
-COMMENT=	Validates the HTML output of your apache2 webserver
+COMMENT=	Validates the HTML output of your apache2 web server
 WWW=		http://mod-tidy.sourceforge.net/
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include/tidy
 AP_LIB+=	${LOCALBASE}/lib -ltidy
 
 .include <bsd.port.mk>
diff --git a/www/mod_tidy/pkg-descr b/www/mod_tidy/pkg-descr
index 676985c4b9ad..06660fcc875e 100644
--- a/www/mod_tidy/pkg-descr
+++ b/www/mod_tidy/pkg-descr
@@ -1,6 +1,6 @@
-mod_tidy validates the HTML output of your apache2 webserver. So you don't need
+mod_tidy validates the HTML output of your apache2 web server. So you don't need
 a separate application to check your HTML.
 It works as a filter that hooks up to HTML output. mod_tidy feeds the HTML
 output to TidyLib which validates the HTML output. If TidyLib finds
 an error the client receives a HTML page with a list of all found errors. If
 TidyLib doesn't complain you will get your HTML data as without mod_tidy.
diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile
index 28c63f2c6f9a..2e9c7f6659b6 100644
--- a/www/nostromo/Makefile
+++ b/www/nostromo/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	nostromo
 PORTVERSION=	1.9.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.nazgul.ch/dev/
 
 MAINTAINER=	loox@e-shell.net
-COMMENT=	Fast, secure HTTP/1.1 CGI/1.1 SSL IPv4/IPv6 webserver
+COMMENT=	Fast, secure HTTP/1.1 CGI/1.1 SSL IPv4/IPv6 web server
 WWW=		http://www.nazgul.ch/dev_nostromo.html
 
 LICENSE=	ISCL
 
 NOSTROMO_DIR?=		nostromo
 NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
 NOSTROMO_LOGDIR_PERMS?=	0775
 
 USE_RC_SUBR=	nostromo
 USES=		uidfix ssl
 
 MAKE_ENV?=	MAKEOBJDIR=. NOSTROMO_DIR=${NOSTROMO_DIR} MANDIR=${PREFIX}/man/man
 PLIST_SUB+=	NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}"
 
 # XXX PIE with static libraries is currently unsupported.
 MAKE_ENV+=	WITHOUT_PIE=true
 
 post-extract:
 	@${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \
 		${WRKSRC}/src/nhttpd/nhttpd.8	\
 		${WRKSRC}/src/nhttpd/main.c	\
 		${WRKSRC}/conf/nhttpd.conf-dist
 	@${REINPLACE_CMD} -e "s@/var/nostromo@${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}@g" \
 		-e "s@-o [^ ]* -g [^ ]*@ -o ${BINOWN} -g ${BINGRP}@" \
 		-e 's@conf-dist$$@conf.sample@'	\
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Mechanize-GZip/Makefile b/www/p5-WWW-Mechanize-GZip/Makefile
index 3b5558096b1c..f63db51e2fe3 100644
--- a/www/p5-WWW-Mechanize-GZip/Makefile
+++ b/www/p5-WWW-Mechanize-GZip/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	WWW-Mechanize-GZip
 PORTVERSION=	0.14
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Use WWW::Mechanize by requesting gzip-compression from the webserver
+COMMENT=	Use WWW::Mechanize by requesting gzip-compression from the web server
 WWW=		https://metacpan.org/release/WWW-Mechanize-GZip
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Mechanize-GZip/pkg-descr b/www/p5-WWW-Mechanize-GZip/pkg-descr
index cb43901ef798..d11cca885e1a 100644
--- a/www/p5-WWW-Mechanize-GZip/pkg-descr
+++ b/www/p5-WWW-Mechanize-GZip/pkg-descr
@@ -1,13 +1,13 @@
 The WWW::Mechanize::GZip module tries to fetch a URL by requesting
-gzip-compression from the webserver.
+gzip-compression from the web server.
 
 If the response contains a header with 'Content-Encoding: gzip',
 it decompresses the response in order to get the original
 (uncompressed) content.
 
 This module will help to reduce bandwith fetching webpages, if
-supported by the webeserver. If the webserver does not support
+supported by the web server. If the web server does not support
 gzip-compression, no decompression will be made.
 
 This modules is a direct subclass of WWW::Mechanize and will
 therefore support any methods provided by WWW::Mechanize.
diff --git a/www/perlbal/Makefile b/www/perlbal/Makefile
index 381a2cf34b82..3ed785880500 100644
--- a/www/perlbal/Makefile
+++ b/www/perlbal/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	Perlbal
 PORTVERSION=	1.80
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DORMANDO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Reverse-proxy load balancer and webserver
+COMMENT=	Reverse-proxy load balancer and web server
 WWW=		https://metacpan.org/release/Perlbal
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource \
 		p5-Danga-Socket>=1.44:devel/p5-Danga-Socket \
 		p5-HTTP-Date>=0:www/p5-HTTP-Date \
 		p5-HTTP-Message>=0:www/p5-HTTP-Message \
 		p5-IO-AIO>=0:devel/p5-IO-AIO \
 		p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
 		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 USE_RC_SUBR=	perlbal
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's,/etc/perlbal,${PREFIX}/etc/perlbal,g' \
 		${WRKSRC}/lib/Perlbal/Manual/Configuration.pod \
 		${WRKSRC}/lib/Perlbal/Plugin/Include.pm \
 		${WRKSRC}/perlbal
 	@${RM} ${WRKSRC}/lib/Perlbal/Manual/Configuration.pod.bak \
 		${WRKSRC}/lib/Perlbal/Plugin/Include.pm.bak \
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/pserv/Makefile b/www/pserv/Makefile
index 29d7da38452a..4d8505ebfff3 100644
--- a/www/pserv/Makefile
+++ b/www/pserv/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	pserv
 PORTVERSION=	3.4
 CATEGORIES=	www
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ale@FreeBSD.org
-COMMENT=	Portable and small webserver written in C
+COMMENT=	Portable and small web server written in C
 WWW=		https://sourceforge.net/projects/pserv/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 
 CONFLICTS=	popular
 
 OPTIONS_DEFINE=	LOG PHP
 OPTIONS_DEFAULT=	LOG PHP
 LOG_DESC=	Enable loggin
 
 PHP_USES=	php:cgi
 
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g;s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/defaults/pserv.conf ${WRKSRC}/sources/main.h
 
 post-patch-LOG-off:
 	@${REINPLACE_CMD} "s|define LOG|undef LOG|" \
 		${WRKSRC}/sources/main.h
 
 post-patch-PHP-off:
 	@${REINPLACE_CMD} "s|define PHP|undef PHP|" \
 		${WRKSRC}/sources/main.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sources/pserv ${STAGEDIR}${PREFIX}/sbin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pserv
 	${INSTALL_DATA} ${WRKSRC}/defaults/mime_types.dat ${STAGEDIR}${PREFIX}/etc/pserv/mime.types
 	${INSTALL_DATA} ${WRKSRC}/defaults/pserv.conf ${STAGEDIR}${PREFIX}/etc/pserv/pserv.conf.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/pserv.sh ${STAGEDIR}${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rack/Makefile b/www/rubygem-rack/Makefile
index d16fc8de1eca..1ffc0052eaa6 100644
--- a/www/rubygem-rack/Makefile
+++ b/www/rubygem-rack/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	rack
 PORTVERSION=	3.0.8
 PORTEPOCH=	3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Rack, a Ruby Webserver Interface
+COMMENT=	Rack, a Ruby Web server Interface
 WWW=		https://github.com/rack/rack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 USES=		cpe gem
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	rack_project
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rack16/Makefile b/www/rubygem-rack16/Makefile
index 2941edceba95..eb187fc2a25c 100644
--- a/www/rubygem-rack16/Makefile
+++ b/www/rubygem-rack16/Makefile
@@ -1,37 +1,37 @@
 # XXX: If updating this port, please check compatibality with at least the following ports,
 # XXX: preferably, the full rubygem-* tree.  rack version requirements are specified with ~>
 # XXX: which requires *EXACTLY* that version.
 #
 # 	www/rubygem-actionpack4
 
 PORTNAME=	rack
 PORTVERSION=	1.6.13
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	16
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Rack, a Ruby Webserver Interface
+COMMENT=	Rack, a Ruby Web server Interface
 WWW=		https://github.com/rack/rack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gem shebangfix
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	rack_project
 
 PORTSCOUT=	limit:^1\.6\.
 
 SHEBANG_FILES=	test/cgi/test.ru
 SHEBANG_LANG=	rackup
 rackup_OLD_CMD=	../../bin/rackup
 rackup_CMD=	${LOCALBASE}/bin/rackup
 
 # Avoid CONFLICTS_INSTALL with www/rubygem-rack
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/rackup
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-rack22/Makefile b/www/rubygem-rack22/Makefile
index e324ba6cddc9..653300f5d0ec 100644
--- a/www/rubygem-rack22/Makefile
+++ b/www/rubygem-rack22/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	rack
 PORTVERSION=	2.2.7
 PORTEPOCH=	3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	22
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Rack, a Ruby Webserver Interface
+COMMENT=	Rack, a Ruby Web server Interface
 WWW=		https://github.com/rack/rack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 USES=		cpe gem
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/rackup
 
 CPE_VENDOR=	rack_project
 
 PORTSCOUT=	limit:^2\.2\.
 
 .include <bsd.port.mk>