48 files changed, 48 insertions, 48 deletions

diff --git a/devel/bit/Makefile b/devel/bit/Makefile
index 1531971bcff5..015cc44cc9e5 100644
--- a/devel/bit/Makefile
+++ b/devel/bit/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	1.0.5
 CATEGORIES=	devel
 
 MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	Bit is a modern Git CLI
+COMMENT=	Modern command-line interface to Git
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/cjose/Makefile b/devel/cjose/Makefile
index 3a451887e937..679b7c22a313 100644
--- a/devel/cjose/Makefile
+++ b/devel/cjose/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jamie@chair6.net
-COMMENT=	C library implementing Javascript Object Signing & Encryption (JOSE)
+COMMENT=	C library implementing JavaScript Object Signing and Encryption (JOSE)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index 8ec51e5c2977..8616bcb0c447 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.gedanken.org.uk/software/cxref/download/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C program cross-referencing & documentation tool
+COMMENT=	C program cross-referencing and documentation tool
 
 LICENSE=	GPLv2
 
diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile
index fe08d8248aa8..03f02b4aea69 100644
--- a/devel/fpc-fcl-json/Makefile
+++ b/devel/fpc-fcl-json/Makefile
@@ -3,7 +3,7 @@
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-json
 
-COMMENT=	Free Pascal JavaScript Object Notation implemenation (FCL)
+COMMENT=	Free Pascal JavaScript Object Notation implementation (FCL)
 
 USES=		fpc
 USE_FPC=	fcl-base rtl-objpas fcl-res
diff --git a/devel/fpc-fcl-sound/Makefile b/devel/fpc-fcl-sound/Makefile
index 5f20bbc0e53f..738232d79f61 100644
--- a/devel/fpc-fcl-sound/Makefile
+++ b/devel/fpc-fcl-sound/Makefile
@@ -3,7 +3,7 @@
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-sound
 
-COMMENT=	Free Pascal sound loading, storing and converion (FCL)
+COMMENT=	Free Pascal sound loading, storing, and conversion (FCL)
 
 USES=		fpc
 USE_FPC=	fcl-base fcl-res rtl-objpas
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index f0d7f80424ed..e3610822eb24 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -3,7 +3,7 @@
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-fcl-web
 
-COMMENT=	Free Pascal web application libary (FCL)
+COMMENT=	Free Pascal web application library (FCL)
 
 USES=		fpc
 USE_FPC=	dblib fcl-async fcl-base fcl-db fcl-xml fcl-json fcl-net \
diff --git a/devel/inifiled/Makefile b/devel/inifiled/Makefile
index 6acdcf977e43..9fbb2a4e8f88 100644
--- a/devel/inifiled/Makefile
+++ b/devel/inifiled/Makefile
@@ -8,7 +8,7 @@ DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	Compile time ini file parser and writter generator for D
+COMMENT=	Compile-time .ini file parser and writer generator for D
 
 LICENSE=	BSL
 
diff --git a/devel/libe/Makefile b/devel/libe/Makefile
index db291f512851..d8dc2018b8b5 100644
--- a/devel/libe/Makefile
+++ b/devel/libe/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	releases/
 CATEGORIES=		devel
 
 MAINTAINER=	egypcio@FreeBSD.org
-COMMENT=	High-performance datastructures and utilities for C++
+COMMENT=	High-performance data structures and utilities for C++
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/libfastjson/Makefile b/devel/libfastjson/Makefile
index d65193256c36..9e4d2d3f59ed 100644
--- a/devel/libfastjson/Makefile
+++ b/devel/libfastjson/Makefile
@@ -7,7 +7,7 @@ DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	libfastjson is a fork from json-c
+COMMENT=	Fork of json-c (JSON implementation in C)
 
 LICENSE=	MIT
 
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index aa425f5f21b3..dd40dda0006a 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
 MAINTAINER=	kwm@FreeBSD.org
-COMMENT=	GLib based implimentation of the GData protocol
+COMMENT=	GLib-based implementation of the GData protocol
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/devel/lpc21isp/Makefile b/devel/lpc21isp/Makefile
index 749b6502de13..76f7c042cfe2 100644
--- a/devel/lpc21isp/Makefile
+++ b/devel/lpc21isp/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	ISP programmer tool for flashing NXP & Analog Devices ARM7 CPUs
+COMMENT=	ISP programmer tool for flashing NXP and Analog Devices ARM7 CPUs
 
 LICENSE=	LGPL3+
 
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
index 4337aef45ab5..374ead37fb63 100644
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 PKGNAMEPREFIX=	netsurf-
 
 MAINTAINER=	nc@FreeBSD.org
-COMMENT=	NetSurf project buildsystem
+COMMENT=	NetSurf project build system
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/devel/nexus2-oss/Makefile b/devel/nexus2-oss/Makefile
index 482226e834f5..ef2f6b7fc44b 100644
--- a/devel/nexus2-oss/Makefile
+++ b/devel/nexus2-oss/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-oss
 DISTNAME=	nexus-${PORTVERSION}-${DISTVERSIONSUFFIX}-bundle
 
 MAINTAINER=	michael.osipov@siemens.com
-COMMENT=	Maven (and others) artifacts repostory manager
+COMMENT=	Maven (and others) artifacts repository manager
 
 LICENSE=	EPL
 
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index e840531eca3d..5e63deff37ea 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	OSSP/lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OSSP ex is a small exception handling library for use in C
+COMMENT=	Small exception handling library for use in C
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/p5-Class-EHierarchy/Makefile b/devel/p5-Class-EHierarchy/Makefile
index 0a315d770d1f..999eb2ee7b3a 100644
--- a/devel/p5-Class-EHierarchy/Makefile
+++ b/devel/p5-Class-EHierarchy/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Base class for hierarchally ordered objects
+COMMENT=	Base class for hierarchically ordered objects
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-Data-Range-Compare/Makefile b/devel/p5-Data-Range-Compare/Makefile
index 8531e50e92ce..6a57f786ada4 100644
--- a/devel/p5-Data-Range-Compare/Makefile
+++ b/devel/p5-Data-Range-Compare/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Find gaps & intersections in lists of ranges
+COMMENT=	Find gaps and intersections in lists of ranges
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index ca6980969cd5..64c3d19e3f88 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	culot@FreeBSD.org
-COMMENT=	Structured Tags datastructures
+COMMENT=	Structured Tags data structures
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index d0343b8077df..aa529e4def2c 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Perl DateTime extension for computing rfc2445 recurrences
+COMMENT=	Perl DateTime extension for computing RFC 2445 recurrences
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 27047ba8498d..8da617ab4bf6 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR=	CPAN:URI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Perl5 module for single call read & write file routines
+COMMENT=	Perl module for single call read and write file routines
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index 8026342796ee..ce4fb6214979 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	coryking@mozimedia.com
-COMMENT=	Allows your classes to do coercion of parameters  (Params::Coerce)
+COMMENT=	Allows your classes to do parameter coercion
 
 BUILD_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
 RUN_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
diff --git a/devel/p5-Proc-Pidfile/Makefile b/devel/p5-Proc-Pidfile/Makefile
index f80e6e56faf6..8e04ea3a945c 100644
--- a/devel/p5-Proc-Pidfile/Makefile
+++ b/devel/p5-Proc-Pidfile/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
-COMMENT=	Perl extension for maintaining pid file for curent process
+COMMENT=	Perl extension to manage .pid file for current process
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/p5-Xporter/Makefile b/devel/p5-Xporter/Makefile
index 0648143bc16c..3529cbb86f6d 100644
--- a/devel/p5-Xporter/Makefile
+++ b/devel/p5-Xporter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	CPAN:LAWALSH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Alternative Exporter with persistant defaults and auto-ISA
+COMMENT=	Alternative Exporter with persistent defaults and auto-ISA
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile
index 0462bc8be743..c1830436a13d 100644
--- a/devel/pecl-swoole/Makefile
+++ b/devel/pecl-swoole/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	4.6.4
 CATEGORIES=	devel net
 
 MAINTAINER=	vanilla@FreeBSD.org
-COMMENT=	Asynchronous & concurrent & distributed networking framework
+COMMENT=	Asynchronous, concurrent, and distributed networking framework
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-Dumper/Makefile b/devel/py-Dumper/Makefile
index 697a526f0a1e..3c5195f1631d 100644
--- a/devel/py-Dumper/Makefile
+++ b/devel/py-Dumper/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pi@FreeBSD.org
-COMMENT=	Conveniently print any Python datastructure
+COMMENT=	Conveniently print any Python data structure
 
 LICENSE=	PSFL
 
diff --git a/devel/py-colorama/Makefile b/devel/py-colorama/Makefile
index 482b369a5506..8c52aa48cebc 100644
--- a/devel/py-colorama/Makefile
+++ b/devel/py-colorama/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ygy@FreeBSD.org
-COMMENT=	Cross-platform API to print colored terminal text from Python apps
+COMMENT=	Cross-platform API to print colored terminal text from Python applications
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index 2dd45e0c74ee..1785d510ed44 100644
--- a/devel/py-doit/Makefile
+++ b/devel/py-doit/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Task management & automation tool
+COMMENT=	Task management and automation tool
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-genson/Makefile b/devel/py-genson/Makefile
index 0691a97f7415..edaa90476796 100644
--- a/devel/py-genson/Makefile
+++ b/devel/py-genson/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
-COMMENT=	GenSON is a powerful, user-friendly JSON Schema generator
+COMMENT=	Powerful, user-friendly JSON Schema generator
 
 LICENSE=	MIT
 
diff --git a/devel/py-holidays/Makefile b/devel/py-holidays/Makefile
index db2ae2176f45..2e5ad1843cec 100644
--- a/devel/py-holidays/Makefile
+++ b/devel/py-holidays/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gmm@tutanota.com
-COMMENT=	Generate country, province, & state specific holiday sets on the fly
+COMMENT=	Generate country, province, and state specific holiday sets on the fly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile
index 91eb4d2c09b4..2130ccd4f98f 100644
--- a/devel/py-invoke/Makefile
+++ b/devel/py-invoke/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Python task execution tool & library
+COMMENT=	Python task execution tool and library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-os-client-config/Makefile b/devel/py-os-client-config/Makefile
index 560b1455ea8a..715f38f45c48 100644
--- a/devel/py-os-client-config/Makefile
+++ b/devel/py-os-client-config/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	OpenStack Client Configuation Library
+COMMENT=	OpenStack client configuration library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-os-client-config1/Makefile b/devel/py-os-client-config1/Makefile
index 8067a04a26aa..ccb5800e10d7 100644
--- a/devel/py-os-client-config1/Makefile
+++ b/devel/py-os-client-config1/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	1
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	OpenStack Client Configuation Library
+COMMENT=	OpenStack client configuration library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile
index fe745df667d4..7c835c1a40e5 100644
--- a/devel/py-selection/Makefile
+++ b/devel/py-selection/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
-COMMENT=	API to extract content from HTML & XML documents
+COMMENT=	API to extract contents from HTML and XML documents
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-simpletal/Makefile b/devel/py-simpletal/Makefile
index 2046004001f5..551443bf2235 100644
--- a/devel/py-simpletal/Makefile
+++ b/devel/py-simpletal/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SimpleTAL-${PORTVERSION}
 
 MAINTAINER=	ayu@commun.jp
-COMMENT=	Stand alone TAL Python implementation to power HTML & XML templates
+COMMENT=	Stand-alone TAL Python implementation to power HTML and XML templates
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/devel/py-websockets/Makefile b/devel/py-websockets/Makefile
index 5394d0a64d4c..a0864269bdc8 100644
--- a/devel/py-websockets/Makefile
+++ b/devel/py-websockets/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
-COMMENT=	Implementation of the WebSocket Protocol (RFC 6455 & 7692)
+COMMENT=	Implementation of the WebSocket Protocol (RFC 6455 and 7692)
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile
index 245a1f4ff330..6818a8b7f897 100644
--- a/devel/rgbds/Makefile
+++ b/devel/rgbds/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel games
 MASTER_SITES=	https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	tobik@FreeBSD.org
-COMMENT=	Free assembler/linker for the Game Boy & Game Boy Color
+COMMENT=	Free assembler/linker for the Game Boy and Game Boy Color
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-async-io/Makefile b/devel/rubygem-async-io/Makefile
index ac6101a3e783..c0231c13a3a1 100644
--- a/devel/rubygem-async-io/Makefile
+++ b/devel/rubygem-async-io/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Provides support for asynchonous TCP, UDP, UNIX and SSL sockets
+COMMENT=	Provides support for asynchronous TCP, UDP, Unix, and SSL sockets
 
 LICENSE=	MIT
 
diff --git a/devel/rubygem-configstruct/Makefile b/devel/rubygem-configstruct/Makefile
index 760b007decfb..b638bbbefba6 100644
--- a/devel/rubygem-configstruct/Makefile
+++ b/devel/rubygem-configstruct/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mose@mose.com
-COMMENT=	Lib for managing config files based on OpenStruct
+COMMENT=	Configuration file management library based on OpenStruct
 
 LICENSE=	MIT
 
diff --git a/devel/rubygem-cri/Makefile b/devel/rubygem-cri/Makefile
index eb9c896c04e7..8ac33b351dcf 100644
--- a/devel/rubygem-cri/Makefile
+++ b/devel/rubygem-cri/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Allow building easy-to-use commandline interfaces
+COMMENT=	Allow building easy-to-use command-line interfaces
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-ecma-re-validator/Makefile b/devel/rubygem-ecma-re-validator/Makefile
index c735500f4dd0..449ac6dc73b2 100644
--- a/devel/rubygem-ecma-re-validator/Makefile
+++ b/devel/rubygem-ecma-re-validator/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Regular expresionn validator against ECMA-262
+COMMENT=	Regular expression validator against ECMA-262
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-ffi/Makefile b/devel/rubygem-ffi/Makefile
index 13b6bb84b14f..3f761f5a52a1 100644
--- a/devel/rubygem-ffi/Makefile
+++ b/devel/rubygem-ffi/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Extension for dynamic libraries & binding functions
+COMMENT=	Extension for dynamic libraries and binding functions
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-ffi110/Makefile b/devel/rubygem-ffi110/Makefile
index e31ac32d796c..1feec09ea169 100644
--- a/devel/rubygem-ffi110/Makefile
+++ b/devel/rubygem-ffi110/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 PKGNAMESUFFIX=	110
 
 MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Extension for dynamic libraries & binding functions
+COMMENT=	Extension for dynamic libraries and binding functions
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-jsonpath/Makefile b/devel/rubygem-jsonpath/Makefile
index 8d27b1e00103..124d77d70bde 100644
--- a/devel/rubygem-jsonpath/Makefile
+++ b/devel/rubygem-jsonpath/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	JsonPath is a way of addressing elements within a JSON object
+COMMENT=	Way of addressing elements within a JSON object
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
diff --git a/devel/rubygem-multi_test/Makefile b/devel/rubygem-multi_test/Makefile
index f6a4e8f2e7f0..1c1350801770 100644
--- a/devel/rubygem-multi_test/Makefile
+++ b/devel/rubygem-multi_test/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Help control rogue test, unit, autorun requirments
+COMMENT=	Help control rogue test, unit, autorun requirements
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-mustermann/Makefile b/devel/rubygem-mustermann/Makefile
index 0f52f7373b99..23a963c15754 100644
--- a/devel/rubygem-mustermann/Makefile
+++ b/devel/rubygem-mustermann/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Lbrary implementing patterns that behave like regular expressions
+COMMENT=	Library implementing patterns that behave like regular expressions
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index 35972fa424bb..8206e167dc6d 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Framework for graph datastructures and algorithms implemented in Ruby
+COMMENT=	Ruby framework for graph algorithms and data structures
 
 RUN_DEPENDS=	rubygem-lazy_priority_queue>=0.1.0:devel/rubygem-lazy_priority_queue \
 		rubygem-stream>=0.5.0:devel/rubygem-stream
diff --git a/devel/spread-sheet-widget/Makefile b/devel/spread-sheet-widget/Makefile
index cae9b27168a7..7fcb4ee3a64a 100644
--- a/devel/spread-sheet-widget/Makefile
+++ b/devel/spread-sheet-widget/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	GNU_ALPHA/ssw
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	SSW is a library for Gtk+ which provides a widget for tabular data
+COMMENT=	Library for GTK which provides widget for tabular data
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 8dc3b7f1393f..41691294c28a 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://core.tcl.tk/tcltls/uv/ \
 		http://tcltls.rkeene.org/uv/
 
 MAINTAINER=	mi@aldan.algebra.com
-COMMENT=	SSL extensions for TCL; dynamicly loadable
+COMMENT=	Dynamically loadable SSL extensions for TCL
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
diff --git a/devel/websocketpp/Makefile b/devel/websocketpp/Makefile
index db39153a738e..113d930049d6 100644
--- a/devel/websocketpp/Makefile
+++ b/devel/websocketpp/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	0.8.2
 CATEGORIES=	devel
 
 MAINTAINER=	arved@FreeBSD.org
-COMMENT=	Header only implementation of the WebSocket protocol
+COMMENT=	Header-only implementation of the WebSocket protocol
 
 LICENSE=	MIT BSD3CLAUSE ZLIB
 LICENSE_COMB=	multi