aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archivers/advancecomp/Makefile2
-rw-r--r--archivers/hs-tar/Makefile2
-rw-r--r--archivers/p5-Compress-LZF/Makefile2
-rw-r--r--archivers/sharutils/Makefile2
-rw-r--r--archivers/unmass/Makefile2
-rw-r--r--archivers/unzip/Makefile2
-rw-r--r--astro/google-earth/Makefile2
-rw-r--r--astro/orsa/Makefile2
-rw-r--r--astro/p5-Astro-WaveBand/Makefile2
-rw-r--r--astro/prune/Makefile2
-rw-r--r--astro/tclgeomap/Makefile2
-rw-r--r--astro/tkgeomap/Makefile2
-rw-r--r--audio/asmixer/Makefile2
-rw-r--r--audio/audacious-dumb/Makefile2
-rw-r--r--audio/darkice/Makefile2
-rw-r--r--audio/dekagen/Makefile2
-rw-r--r--audio/dumb/Makefile2
-rw-r--r--audio/gnump3d/Makefile2
-rw-r--r--audio/lmms/Makefile2
-rw-r--r--audio/midipp/Makefile2
-rw-r--r--audio/mikmod/Makefile2
-rw-r--r--audio/mpg123/Makefile2
-rw-r--r--audio/musepack/Makefile2
-rw-r--r--audio/p5-tagged/Makefile2
-rw-r--r--audio/sound-juicer/Makefile2
-rw-r--r--benchmarks/sysbench/Makefile2
-rw-r--r--biology/garlic/Makefile2
-rw-r--r--biology/p5-Bio-GFF3/Makefile2
-rw-r--r--chinese/pyDict/Makefile2
-rw-r--r--comms/anyremote/Makefile2
-rw-r--r--databases/autobackupmysql/Makefile2
-rw-r--r--databases/flare/Makefile2
-rw-r--r--databases/jdbm2/Makefile2
-rw-r--r--databases/mysql-proxy/Makefile2
-rw-r--r--databases/p5-DBD-AnyData/Makefile2
-rw-r--r--databases/py-dbutils/Makefile2
-rw-r--r--databases/py-pickledb/Makefile2
-rw-r--r--deskutils/multisync/Makefile2
-rw-r--r--deskutils/p5-ZConf-Runner/Makefile2
-rw-r--r--deskutils/tomboy-plugin-todo/Makefile2
-rw-r--r--deskutils/wammu/Makefile2
-rw-r--r--devel/R-cran-plyr/Makefile2
-rw-r--r--devel/art/Makefile2
-rw-r--r--devel/astyle/Makefile2
-rw-r--r--devel/autobook/Makefile2
-rw-r--r--devel/cut/Makefile2
-rw-r--r--devel/doxygen/Makefile2
-rw-r--r--devel/fhist/Makefile2
-rw-r--r--devel/hs-asn1-data/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/jansson/Makefile2
-rw-r--r--devel/jclassinfo/Makefile2
-rw-r--r--devel/kdevelop-kde4/Makefile2
-rw-r--r--devel/libhoard/Makefile2
-rw-r--r--devel/libvanessa_adt/Makefile2
-rw-r--r--devel/ossp-var/Makefile2
-rw-r--r--devel/p5-App-cpanminus/Makefile2
-rw-r--r--devel/p5-Capture-Tiny/Makefile2
-rw-r--r--devel/p5-Chooser/Makefile2
-rw-r--r--devel/p5-Class-Accessor-Complex/Makefile2
-rw-r--r--devel/p5-Class-ReturnValue/Makefile2
-rw-r--r--devel/p5-Devel-TraceCalls/Makefile2
-rw-r--r--devel/p5-Log-Handler/Makefile2
-rw-r--r--devel/p5-Object-MultiType/Makefile2
-rw-r--r--devel/p5-Shell-EnvImporter/Makefile2
-rw-r--r--devel/p5-String-Parity/Makefile2
-rw-r--r--devel/p5-Term-Menus/Makefile2
-rw-r--r--devel/pdcurses-the/Makefile2
-rw-r--r--devel/pdcurses/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm/Makefile2
-rw-r--r--devel/pear-HTML_Table/Makefile2
-rw-r--r--devel/pecl-runkit/Makefile2
-rw-r--r--devel/py-Jinja/Makefile2
-rw-r--r--devel/py-Jinja2/Makefile2
-rw-r--r--devel/py-bitstring/Makefile2
-rw-r--r--devel/py-distribute/Makefile2
-rw-r--r--devel/py-distutils-extra/Makefile2
-rw-r--r--devel/py-sysv_ipc/Makefile2
-rw-r--r--devel/py-xoltar-toolkit/Makefile2
-rw-r--r--devel/py-zope.copypastemove/Makefile2
-rw-r--r--devel/radare2/Makefile2
-rw-r--r--devel/rth/Makefile2
-rw-r--r--devel/rubygem-ditz/Makefile2
-rw-r--r--devel/rubygem-echoe/Makefile2
-rw-r--r--devel/rubygem-mocha/Makefile2
-rw-r--r--devel/rubygem-thor/Makefile2
-rw-r--r--devel/rudiments/Makefile2
-rw-r--r--devel/simpletest/Makefile2
-rw-r--r--devel/soapui/Makefile2
-rw-r--r--devel/ucommon/Makefile2
-rw-r--r--dns/adns/Makefile2
-rw-r--r--dns/dnsmasq/Makefile2
-rw-r--r--dns/rubygem-public_suffix_service/Makefile2
-rw-r--r--dns/sheerdns/Makefile2
-rw-r--r--editors/gphpedit/Makefile2
-rw-r--r--emulators/hfs/Makefile2
-rw-r--r--emulators/raine/Makefile2
-rw-r--r--emulators/tme/Makefile2
-rw-r--r--finance/Makefile2
-rw-r--r--ftp/filezilla/Makefile2
-rw-r--r--ftp/gnusget/Makefile2
-rw-r--r--ftp/p5-Net-FTPServer/Makefile2
-rw-r--r--ftp/pavuk/Makefile2
-rw-r--r--ftp/pure-ftpd/Makefile2
-rw-r--r--games/black-box/Makefile2
-rw-r--r--games/doom-data/Makefile2
-rw-r--r--games/filters/Makefile2
-rw-r--r--games/rigsofrods/Makefile2
-rw-r--r--graphics/p5-Graph-Easy/Makefile2
-rw-r--r--mail/mairix/Makefile2
-rw-r--r--mail/ruby-rmail/Makefile2
-rw-r--r--math/p5-Math-Logic/Makefile2
-rw-r--r--misc/aclgen/Makefile2
-rw-r--r--multimedia/devede/Makefile2
-rw-r--r--net/p5-Net-LDAP-LDAPhash/Makefile2
-rw-r--r--net/p5-Net-MovableType/Makefile2
-rw-r--r--net/p5-Net-Whois-IP/Makefile2
-rw-r--r--net/xipdump/Makefile2
-rw-r--r--security/pcsc-tools/Makefile2
-rw-r--r--sysutils/rubygem-sys-host/Makefile2
-rw-r--r--sysutils/skill/Makefile2
-rw-r--r--sysutils/whatpix/Makefile2
-rw-r--r--textproc/rubygem-ezamar/Makefile2
-rw-r--r--textproc/word2x/Makefile2
-rw-r--r--www/hs-warp/Makefile2
125 files changed, 125 insertions, 125 deletions
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile
index 66d76421896..898a57d7f44 100644
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= archivers
MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Recompression utilities for .ZIP, .PNG, .MNG and .GZ files
+COMMENT= Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index a305c3ca48e..ea1c91250f3 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.4.0.0
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Reading, writing and manipulating ".tar" archive files
+COMMENT= Reading, writing, and manipulating ".tar" archive files
LICENSE= BSD
diff --git a/archivers/p5-Compress-LZF/Makefile b/archivers/p5-Compress-LZF/Makefile
index 544c64efbe1..f8df72c7834 100644
--- a/archivers/p5-Compress-LZF/Makefile
+++ b/archivers/p5-Compress-LZF/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= Extremely light-weight Lempel-Ziv-Free compression
+COMMENT= Extremely lightweight Lempel-Ziv-Free compression
PERL_CONFIGURE= yes
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index b7b07f14cde..532a3692dcb 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= archivers
MASTER_SITES= GNU
MAINTAINER= garga@FreeBSD.org
-COMMENT= Pack, send and unpack shell archives; synchronize via e-mail
+COMMENT= Pack, send, and unpack shell archives; synchronize via e-mail
LICENSE= GPLv3
diff --git a/archivers/unmass/Makefile b/archivers/unmass/Makefile
index cf089126698..4e282b888c7 100644
--- a/archivers/unmass/Makefile
+++ b/archivers/unmass/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://mirex.mypage.sk/FILES/ \
CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Extract game archives such as wad, dar, mea exe's and many more
+COMMENT= Extract game archives such as wad, dar, mea exe's, and many more
LICENSE= GPLv2
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 0692cfb053a..5f4f3a561ab 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}60
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main
MAINTAINER?= ehaupt@FreeBSD.org
-COMMENT?= List, test and extract compressed files in a ZIP archive
+COMMENT?= List, test, and extract compressed files in a ZIP archive
LICENSE= Info-ZIP
LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index f560ac24c8b..5669d9d7761 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
EXTRACT_ONLY= # none
MAINTAINER= nox@FreeBSD.org
-COMMENT= Explore, Search and Discover
+COMMENT= Explore, Search, and Discover
EXTRACT_DEPENDS= unmakeself:${PORTSDIR}/archivers/unmakeself
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 773fe39317a..ea1bfcbb277 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/${PORTNAME:U}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Orbit Reconstruction, Simulation and Analysis
+COMMENT= Orbit Reconstruction, Simulation, and Analysis
LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl \
cln.6:${PORTSDIR}/math/cln \
diff --git a/astro/p5-Astro-WaveBand/Makefile b/astro/p5-Astro-WaveBand/Makefile
index 31913240002..55649c1ce58 100644
--- a/astro/p5-Astro-WaveBand/Makefile
+++ b/astro/p5-Astro-WaveBand/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Transparently work in waveband, wavelength or filter
+COMMENT= Transparently work in waveband, wavelength, or filter
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
diff --git a/astro/prune/Makefile b/astro/prune/Makefile
index 9e12b471521..88403dff6fb 100644
--- a/astro/prune/Makefile
+++ b/astro/prune/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= Application for viewing, editing and converting GPS coordinate data
+COMMENT= Application for viewing, editing, and converting GPS coordinate data
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index e4d413a9541..14a7264465e 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= astro tcl
MASTER_SITES= SF/tkgeomap/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Read, manipulate and display geo data
+COMMENT= Read, manipulate, and display geo data
USE_TCL= 82+
GNU_CONFIGURE= yes
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 15a5844f5c2..634b6c0c1d1 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= astro tk
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= Read, manipulate and display geo data
+COMMENT= Read, manipulate, and display geo data
LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap
diff --git a/audio/asmixer/Makefile b/audio/asmixer/Makefile
index 25b57e7ecae..90f267ee62d 100644
--- a/audio/asmixer/Makefile
+++ b/audio/asmixer/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio afterstep
MASTER_SITES= http://www.tigr.net/afterstep/download/asmixer/
MAINTAINER= ports@FreeBSD.org
-COMMENT= A mixer control for X, and specifically the AfterStep Window Manager
+COMMENT= A mixer control for X and specifically the AfterStep Window Manager
MAN1= ${PORTNAME}.1x
PLIST_FILES= bin/asmixer
diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index 7ec0546b076..e82e0a9194e 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.netswarm.net/misc/ \
CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Audacious plugin that support the IT, XM, S3M or MOD formats
+COMMENT= Audacious plugin that support the IT, XM, S3M, or MOD formats
LICENSE= GPLv2
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 9393bbe9320..f47e800b247 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= audio net
MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
-COMMENT= An IceCast, IceCast2 and ShoutCast live audio streamer
+COMMENT= An IceCast, IceCast2, and ShoutCast live audio streamer
LICENSE= GPLv3
diff --git a/audio/dekagen/Makefile b/audio/dekagen/Makefile
index 946d5621e2e..df2004c02ab 100644
--- a/audio/dekagen/Makefile
+++ b/audio/dekagen/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.ibiblio.org/pub/linux/apps/sound/convert/
MAINTAINER= martin.kraft@fal.de
-COMMENT= A frontend to rip, convert and name MP3/Ogg
+COMMENT= A frontend to rip, convert, and name MP3/Ogg
# The only reason for installing xmcd is, that dekagen uses cda
# for CDDB inquiries. You can safely 'make -DWITHOUT_XMCD', if you
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index cd5d03dbd18..261e222c0d1 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= IT, XM, S3M and MOD player library
+COMMENT= IT, XM, S3M, and MOD player library
USE_GMAKE= yes
diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index 0d4c24db3fa..c7b5b9a23b0 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jadawin@FreeBSD.org
-COMMENT= Streaming server for MP3, Ogg Vorbis and other streamable audio files
+COMMENT= Streaming server for MP3, Ogg Vorbis, and other streamable audio files
RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \
sox:${PORTSDIR}/audio/sox \
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index d7cb518729f..5d1cc85dced 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= audio
MASTER_SITES= SF
MAINTAINER= rodrigo@bebik.net
-COMMENT= An all-in-one sequencer, drum machine, sampler and more
+COMMENT= An all-in-one sequencer, drum machine, sampler, and more
LICENSE= GPLv2
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index f59562c4eb0..c4b08bb17ba 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \
http://hselasky.homeunix.org:8192/distfiles/
MAINTAINER= hselasky@FreeBSD.org
-COMMENT= A MIDI playback, recording and live performance tool
+COMMENT= A MIDI playback, recording, and live performance tool
BUILD_DEPENDS= libumidi>=2.0.2:${PORTSDIR}/audio/libumidi
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index abea1c1c6df..6655e9ec765 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://mikmod.raphnet.net/files/ \
CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Mod player which plays MTM, STM, XM, MOD, S3M, ULT, UNI and IT mods
+COMMENT= Mod player which plays MTM, STM, XM, MOD, S3M, ULT, UNI, and IT mods
LICENSE= GPLv2
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 5d1717be869..63472818974 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF \
http://www.mpg123.de/download/
MAINTAINER= novel@FreeBSD.org
-COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
+COMMENT= Command-line player for mpeg layer 1, 2, and 3 audio
LICENSE= LGPL21
diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index d0b658be60f..01fb97143a6 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://files.musepack.net/source/
DISTNAME= ${PORTNAME}_src_r435
MAINTAINER= shoesoft@gmx.net
-COMMENT= Decoder, encoder and replaygain for musepack (mpc)
+COMMENT= Decoder, encoder, and replaygain for musepack (mpc)
USE_LDCONFIG= yes
USE_AUTOTOOLS= aclocal autoheader libtoolize automake autoconf libtool
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index 4dcf5e77641..886762530a3 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= CPAN/MP3 \
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
-COMMENT= Read, change and write different tags of MP3 audio files
+COMMENT= Read, change, and write different tags of MP3 audio files
PERL_CONFIGURE= yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 9cb962f6b27..f4735394717 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Clean, mean and lean CD ripper for GNOME2
+COMMENT= Clean, mean, and lean CD ripper for GNOME2
LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 770c1c7c74f..5e8bf134ad2 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= benchmarks databases
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= A modular, cross-platform and multi-threaded benchmark tool
+COMMENT= A modular, cross-platform, and multi-threaded benchmark tool
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index e8a047a610f..44dfe406868 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -16,7 +16,7 @@ DISTFILES+= ${DISTNAME}-doc${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= maho@FreeBSD.org
-COMMENT= Molecular viewer, editor and visualization program
+COMMENT= Molecular viewer, editor, and visualization program
USE_GMAKE= yes
USE_XORG= x11
diff --git a/biology/p5-Bio-GFF3/Makefile b/biology/p5-Bio-GFF3/Makefile
index 0d8700d7eb8..a4dfdb8a2d1 100644
--- a/biology/p5-Bio-GFF3/Makefile
+++ b/biology/p5-Bio-GFF3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= Fast, low-level functions for parsing and formatting GFF3
+COMMENT= Fast low-level functions for parsing and formatting GFF3
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
diff --git a/chinese/pyDict/Makefile b/chinese/pyDict/Makefile
index 8d76e845c18..06a492c7f49 100644
--- a/chinese/pyDict/Makefile
+++ b/chinese/pyDict/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= LOCAL/chinsan/pyDict/ \
http://525183.serverbox.org/freebsd/pyDict/
MAINTAINER= sunrychen@gmail.com
-COMMENT= A Chinese <-> English dictionary, under both console and X11
+COMMENT= A Chinese <-> English dictionary under both, console and X11
RUN_DEPENDS= ${LOCALBASE}/include/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk \
${LOCALBASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index a90cabdbe22..0adebdf8602 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= comms
MASTER_SITES= SF
MAINTAINER= samm@os2.kiev.ua
-COMMENT= Remote control service over Bluetooth, infrared or TCP/IP networking
+COMMENT= Remote control service over Bluetooth, infrared, or TCP/IP networking
USE_GNOME= glib20
GNU_CONFIGURE= yes
diff --git a/databases/autobackupmysql/Makefile b/databases/autobackupmysql/Makefile
index 2ff4eb4256a..1670a531a84 100644
--- a/databases/autobackupmysql/Makefile
+++ b/databases/autobackupmysql/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .sh
MAINTAINER= fw@moov.de
-COMMENT= Make daily, weekly and monthly backups of your MySQL databases
+COMMENT= Make daily, weekly, and monthly backups of your MySQL databases
RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
diff --git a/databases/flare/Makefile b/databases/flare/Makefile
index b02046962eb..c6cd60266c1 100644
--- a/databases/flare/Makefile
+++ b/databases/flare/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://labs.gree.jp/data/source/
EXTRACT_SUFX= .tgz
MAINTAINER= nork@FreeBSD.org
-COMMENT= Flare - distributed, and persistent key-value storage
+COMMENT= Flare - distributed and persistent key-value storage
LIB_DEPENDS= boost_program_options.4:${PORTSDIR}/devel/boost-libs \
tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index febe48b08ab..0cd9712c9bf 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= ale@FreeBSD.org
-COMMENT= A fast, simple and transactional Java persistence engine
+COMMENT= A fast, simple, and transactional Java persistence engine
USE_ZIP= yes
USE_JAVA= yes
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index d3baeaa9f1f..4aafe486ab5 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-Proxy
MAINTAINER= swills@FreeBSD.org
-COMMENT= Monitor, analyze or transform the communication of MySQL
+COMMENT= Monitor, analyze, or transform the communication of MySQL
LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \
glib:${PORTSDIR}/devel/glib20
diff --git a/databases/p5-DBD-AnyData/Makefile b/databases/p5-DBD-AnyData/Makefile
index bacb6d0d618..957b4528953 100644
--- a/databases/p5-DBD-AnyData/Makefile
+++ b/databases/p5-DBD-AnyData/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= DBI access to XML, CSV and other formats
+COMMENT= DBI access to XML, CSV, and other formats
BUILD_DEPENDS= p5-AnyData>=0.07:${PORTSDIR}/devel/p5-AnyData \
p5-DBI>1:${PORTSDIR}/databases/p5-DBI \
diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index f51820d3a6c..32eba1ceb45 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= DBUtils-${PORTVERSION}
MAINTAINER= python@FreeBSD.org
-COMMENT= Providing solid, persistent and pooled connections to a database
+COMMENT= Providing solid, persistent, and pooled connections to a database
USE_PYTHON= -2.7
USE_PYDISTUTILS=easy_install
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index a1545cab593..f2feda92d0c 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= duchateau.olivier@gmail.com
-COMMENT= A lightweight, fast and simple key-value store
+COMMENT= A lightweight, fast, and simple key-value store
LICENSE= BSD
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 930d7645e82..15747c78e5e 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF/multisync/OldFiles
DISTNAME= multisync-${PORTVERSION}
MAINTAINER?= pav@FreeBSD.org
-COMMENT?= Synchronize calendars, addressbooks and other PIM data
+COMMENT?= Synchronize calendars, addressbooks, and other PIM data
WRKSRC?= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index 8d141bba9f1..b44dec38182 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:VVELOX
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
-COMMENT= Run a file using a chosen method, desktop entry or mimetype
+COMMENT= Run a file using a chosen method, desktop entry, or mimetype
BUILD_DEPENDS= p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
diff --git a/deskutils/tomboy-plugin-todo/Makefile b/deskutils/tomboy-plugin-todo/Makefile
index d5ff0c71afc..5fd9dedcade 100644
--- a/deskutils/tomboy-plugin-todo/Makefile
+++ b/deskutils/tomboy-plugin-todo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://romain.blogreen.org/distfiles/
DISTNAME= tomboy-todo-${PORTVERSION}
MAINTAINER= mono@FreeBSD.org
-COMMENT= Highlight FIXME, TODO and XXX in your notes
+COMMENT= Highlight FIXME, TODO, and XXX in your notes
BUILD_DEPENDS= tomboy:${PORTSDIR}/deskutils/tomboy
RUN_DEPENDS= tomboy:${PORTSDIR}/deskutils/tomboy
diff --git a/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 518895c0baa..4cb1ad9e58a 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://dl.cihar.com/wammu/v0/ \
http://dl.cihar.com.nyud.net/wammu/v0/
MAINTAINER= bsam@FreeBSD.org
-COMMENT= GUI program to manage contacts, todos, calendar and messages in your phone
+COMMENT= GUI program to manage contacts, todos, calendar, and messages in your phone
BUILD_DEPENDS+= gammu:${PORTSDIR}/comms/gammu
RUN_DEPENDS+= gammu:${PORTSDIR}/comms/gammu
diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile
index e64955e7984..5e05d21991a 100644
--- a/devel/R-cran-plyr/Makefile
+++ b/devel/R-cran-plyr/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= tota@FreeBSD.org
-COMMENT= Tools for splitting, applying and combining data
+COMMENT= Tools for splitting, applying, and combining data
RUN_DEPENDS= R-cran-itertools>0:${PORTSDIR}/devel/R-cran-itertools \
R-cran-iterators>0:${PORTSDIR}/devel/R-cran-iterators
diff --git a/devel/art/Makefile b/devel/art/Makefile
index a6e493ee49c..372a3892d64 100644
--- a/devel/art/Makefile
+++ b/devel/art/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://skylark.tsu.ru/art/0.9/download/src/ \
SF/art-project/src/
MAINTAINER= virtual.lark@gmail.com
-COMMENT= A resource tracing, debugging and profiling tool
+COMMENT= A resource tracing, debugging, and profiling tool
LICENSE= GPLv3
diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 2e43fd7a122..5ea9e3b4798 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_linux
MAINTAINER= lme@FreeBSD.org
-COMMENT= A reindenter and reformatter of C, C++, C\# and Java source code
+COMMENT= A reindenter and reformatter of C, C++, C\#, and Java source code
ALL_TARGET= astyle
CFLAGS+= -W -Wall -fno-rtti -fno-exceptions
diff --git a/devel/autobook/Makefile b/devel/autobook/Makefile
index 5fa3e6bc472..e220f27e9c7 100644
--- a/devel/autobook/Makefile
+++ b/devel/autobook/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://sources.redhat.com/autobook/
MAINTAINER= edwin@mavetju.org
-COMMENT= GNU autoconf, automake and libtool - The Book
+COMMENT= GNU autoconf, automake, and libtool - The Book
NO_BUILD= yes # it's only text!
diff --git a/devel/cut/Makefile b/devel/cut/Makefile
index 87d5f7fd8a1..70b85b07d39 100644
--- a/devel/cut/Makefile
+++ b/devel/cut/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.falvotech.com/content/cut/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Unit Testing Framework for C, C++ and Objective-C
+COMMENT= Unit Testing Framework for C, C++, and Objective-C
USE_PYTHON_RUN= yes
ALL_TARGET= build
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 93c1ed32bcb..8f71caa9cc4 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= cyberbotx@cyberbotx.com
-COMMENT= A documentation system for C, C++ and other languages
+COMMENT= A documentation system for C, C++, and other languages
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 53ef8bedd80..eed2d9790da 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Utilities to maintain file history, do file comparisions and merges
+COMMENT= Utilities to maintain file history, do file comparisons, and merges
LICENSE= GPLv3
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 029c01acfae..5adee55042f 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.6.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= ASN1 data reader and writer in RAW, BER, DER and CER forms
+COMMENT= ASN1 data reader and writer in RAW, BER, DER, and CER forms
LICENSE= BSD
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 7fa35132774..9bcbcdc0b79 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.6.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Help writing simple, concise and fast generic operations
+COMMENT= Help writing simple, concise, and fast generic operations
LICENSE= BSD
diff --git a/devel/jansson/Makefile b/devel/jansson/Makefile
index 8b9c93fb198..a90a1cc7dcd 100644
--- a/devel/jansson/Makefile
+++ b/devel/jansson/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.digip.org/jansson/releases/
MAINTAINER= vanilla@FreeBSD.org
-COMMENT= A C library for encoding, decoding and manipulating JSON data
+COMMENT= A C library for encoding, decoding, and manipulating JSON data
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile
index c04b91aa233..f6b88adedb4 100644
--- a/devel/jclassinfo/Makefile
+++ b/devel/jclassinfo/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= Shows information about Java class, dependencies and more
+COMMENT= Shows information about Java class, dependencies, and more
BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index f9863e7f810..015a75c2530 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= Opensource IDE based on KDevPlatform, KDE and Qt libraries
+COMMENT= Opensource IDE based on KDevPlatform, KDE, and Qt libraries
LIB_DEPENDS+= kdevplatforminterfaces.5:${PORTSDIR}/devel/kdevplatform
diff --git a/devel/libhoard/Makefile b/devel/libhoard/Makefile
index f4378f0f215..7a53d28c33e 100644
--- a/devel/libhoard/Makefile
+++ b/devel/libhoard/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.cs.umass.edu/~emery/hoard/hoard-${PORTVERSION}/source/
DISTNAME= hoard-38
MAINTAINER= osa@FreeBSD.org
-COMMENT= Fast, scalable and memory-efficient allocator for MP
+COMMENT= Fast, scalable, and memory-efficient allocator for MP
LICENSE= GPLv2
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index bf4678731ea..d6638d35034 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= vanessa_adt/${PORTVERSION}
DISTNAME= vanessa_adt-${PORTVERSION}
MAINTAINER= thomas@bsdunix.ch
-COMMENT= Library that provides ADTs (queues, dynamic arrays and more)
+COMMENT= Library that provides ADTs (queues, dynamic arrays, and more)
LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 2a03d5fc1a5..9fb74f0a43b 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= lib/${PORTNAME}
PKGNAMEPREFIX= ossp-
MAINTAINER= ports@FreeBSD.org
-COMMENT= A flexible, full-featured and fast variable expansion library
+COMMENT= A flexible, full-featured, and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/p5-App-cpanminus/Makefile b/devel/p5-App-cpanminus/Makefile
index deb7f5a81e9..466b68b8852 100644
--- a/devel/p5-App-cpanminus/Makefile
+++ b/devel/p5-App-cpanminus/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:MIYAGAWA
PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
-COMMENT= Perl extension to get, unpack, build and install modules from CPAN
+COMMENT= Perl extension to get, unpack, build, and install modules from CPAN
PERL_CONFIGURE= yes
diff --git a/devel/p5-Capture-Tiny/Makefile b/devel/p5-Capture-Tiny/Makefile
index 2e30519ec9d..074b3b38789 100644
--- a/devel/p5-Capture-Tiny/Makefile
+++ b/devel/p5-Capture-Tiny/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
-COMMENT= Capture STDOUT and STDERR from Perl, XS or external programs
+COMMENT= Capture STDOUT and STDERR from Perl, XS, or external programs
PERL_CONFIGURE= yes
diff --git a/devel/p5-Chooser/Makefile b/devel/p5-Chooser/Makefile
index 84517ec25b6..6d7d51d8df3 100644
--- a/devel/p5-Chooser/Makefile
+++ b/devel/p5-Chooser/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:VVELOX
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
-COMMENT= Takes a string composed of various tests, arguements, and etc and returns a value
+COMMENT= Takes a string composed of various tests, arguments, etc and returns a value
RUN_DEPENDS= p5-Net-CIDR-Lite>=0.21:${PORTSDIR}/net/p5-Net-CIDR-Lite \
p5-IO-Socket-SSL>=1.74:${PORTSDIR}/security/p5-IO-Socket-SSL \
diff --git a/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index 99cae3e5612..99d60b299dd 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
-COMMENT= Arrays, hashes, booleans, integers, sets and more
+COMMENT= Arrays, hashes, booleans, integers, sets, and more
BUILD_DEPENDS= p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
p5-Data-Miscellany>=0:${PORTSDIR}/devel/p5-Data-Miscellany \
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index 0d90b9810a2..e3b168e4b22 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
-COMMENT= A return-value object that can be treated as a boolean,array or object
+COMMENT= A return-value object that can be treated as a boolean, array, or object
BUILD_DEPENDS= p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/p5-Devel-TraceCalls/Makefile b/devel/p5-Devel-TraceCalls/Makefile
index 851b9c00d1e..ed260616e97 100644
--- a/devel/p5-Devel-TraceCalls/Makefile
+++ b/devel/p5-Devel-TraceCalls/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
-COMMENT= Track calls to subs, classes and object instances
+COMMENT= Track calls to subs, classes, and object instances
PERL_CONFIGURE= yes
diff --git a/devel/p5-Log-Handler/Makefile b/devel/p5-Log-Handler/Makefile
index 73af54f5742..404f3170fef 100644
--- a/devel/p5-Log-Handler/Makefile
+++ b/devel/p5-Log-Handler/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= sahil@FreeBSD.org
-COMMENT= An object-oriented handler for logging, tracing and debugging in Perl
+COMMENT= An object-oriented handler for logging, tracing, and debugging in Perl
BUILD_DEPENDS= p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/p5-Object-MultiType/Makefile b/devel/p5-Object-MultiType/Makefile
index e2e5f2a96d6..c17853b9521 100644
--- a/devel/p5-Object-MultiType/Makefile
+++ b/devel/p5-Object-MultiType/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= Perl Objects as Hash, Array and Scalar at the same time
+COMMENT= Perl Objects as Hash, Array, and Scalar at the same time
MAN3= Object::MultiType.3
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index bfe2dc7995c..c7a12e78015 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= mhjacks@swbell.net
-COMMENT= Inherit different shell environments, and restore previous
+COMMENT= Inherit different shell environments and restore previous
RUN_DEPENDS= p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
diff --git a/devel/p5-String-Parity/Makefile b/devel/p5-String-Parity/Makefile
index 5b7b3b9ee5d..73a0270f14e 100644
--- a/devel/p5-String-Parity/Makefile
+++ b/devel/p5-String-Parity/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
-COMMENT= A perl5 module to generate and test even, odd, mark and space parity
+COMMENT= A perl5 module to generate and test even, odd, mark, and space parity
PERL_CONFIGURE= yes
diff --git a/devel/p5-Term-Menus/Makefile b/devel/p5-Term-Menus/Makefile
index 52ae746a755..f8090d9e0e2 100644
--- a/devel/p5-Term-Menus/Makefile
+++ b/devel/p5-Term-Menus/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:REEDFISH
PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
-COMMENT= Create Powerful Terminal, Console and CMD Environment Menus
+COMMENT= Create Powerful Terminal, Console, and CMD Environment Menus
LICENSE= GPLv3
diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile
index 1a617149c3b..17618ad20da 100644
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX= -the
DISTNAME= PDCurses-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11
+COMMENT= Curses library implementation for Win32, DOS, OS/2, and X11
CONFLICTS= pdcurses-[0-9]*
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 7468ef83d59..ff2e55f7753 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF
DISTNAME= PDCurses-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11
+COMMENT= Curses library implementation for Win32, DOS, OS/2, and X11
CONFLICTS= pdcurses-the-[0-9]*
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 8901dfe2706..d4eee4a989a 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 3.2.12
CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
-COMMENT= Provide methods for creating, validating and processing HTML forms
+COMMENT= Provide methods for creating, validating, and processing HTML forms
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index 80a32ab24c2..b0d13d3949c 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.8.3
CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
-COMMENT= Makes the design of HTML tables easy, flexible, reusable and efficient
+COMMENT= Makes the design of HTML tables easy, flexible, reusable, and efficient
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/pecl-runkit/Makefile b/devel/pecl-runkit/Makefile
index 12aaae3a7bf..eed1479f401 100644
--- a/devel/pecl-runkit/Makefile
+++ b/devel/pecl-runkit/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= PECL
MAINTAINER= pav@FreeBSD.org
-COMMENT= PECL extension to modify constants, user-defined functions and classes
+COMMENT= PECL extension to modify constants, user-defined functions, and classes
USE_PHP= yes
USE_PHPEXT= yes
diff --git a/devel/py-Jinja/Makefile b/devel/py-Jinja/Makefile
index 66b46a4bf8f..4d4d27e1bb0 100644
--- a/devel/py-Jinja/Makefile
+++ b/devel/py-Jinja/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= CHEESESHOP \
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
-COMMENT= A fast, and easy to use stand-alone template engine
+COMMENT= A fast and easy to use stand-alone template engine
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 9ae872af9df..76725ac6c58 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= CHEESESHOP \
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
-COMMENT= A fast, and easy to use stand-alone template engine
+COMMENT= A fast and easy to use stand-alone template engine
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/py-bitstring/Makefile b/devel/py-bitstring/Makefile
index 932c9663eff..6f9f16a5762 100644
--- a/devel/py-bitstring/Makefile
+++ b/devel/py-bitstring/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sbz@FreeBSD.org
-COMMENT= Simple construction, analysis and modification of binary data
+COMMENT= Simple construction, analysis, and modification of binary data
LICENSE= MIT
diff --git a/devel/py-distribute/Makefile b/devel/py-distribute/Makefile
index 39bcaa37b32..ddaaff9991a 100644
--- a/devel/py-distribute/Makefile
+++ b/devel/py-distribute/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
-COMMENT= A Python packages installer, and Setuptools replacement
+COMMENT= A Python packages installer and Setuptools replacement
CONFLICTS= ${PYTHON_PKGNAMEPREFIX}setuptools-[0-9]*
diff --git a/devel/py-distutils-extra/Makefile b/devel/py-distutils-extra/Makefile
index ce344c7e6d3..f856249aaa9 100644
--- a/devel/py-distutils-extra/Makefile
+++ b/devel/py-distutils-extra/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Add support for i18n, documentation and icons to distutils
+COMMENT= Add support for i18n, documentation, and icons to distutils
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/py-sysv_ipc/Makefile b/devel/py-sysv_ipc/Makefile
index ac6e467d77d..8e19d3b4bf7 100644
--- a/devel/py-sysv_ipc/Makefile
+++ b/devel/py-sysv_ipc/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://semanchuk.com/philip/sysv_ipc/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
-COMMENT= System V IPC for Python - Semaphores, Shared Memory and Message Queues
+COMMENT= System V IPC for Python - Semaphores, Shared Memory, and Message Queues
LICENSE= BSD
diff --git a/devel/py-xoltar-toolkit/Makefile b/devel/py-xoltar-toolkit/Makefile
index 5b340af2878..e7a6334dca0 100644
--- a/devel/py-xoltar-toolkit/Makefile
+++ b/devel/py-xoltar-toolkit/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-01jun01
MAINTAINER= ports@FreeBSD.org
-COMMENT= Functional programming, lazy expressions and thread pools for Python
+COMMENT= Functional programming, lazy expressions, and thread pools for Python
USE_PYTHON= yes
NO_WRKSUBDIR= yes
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index 59c174819a5..231cf3a799f 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= zope@FreeBSD.org
-COMMENT= Copy, Paste and Move support for content components
+COMMENT= Copy, Paste, and Move support for content components
LICENSE= ZPL21
diff --git a/devel/radare2/Makefile b/devel/radare2/Makefile
index afbda14bf02..04ded8da885 100644
--- a/devel/radare2/Makefile
+++ b/devel/radare2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://radare.org/get/
MAINTAINER= kpedersen@opencde.org
-COMMENT= Tools to disasm, debug, analyze and manipulate binary files
+COMMENT= Tools to disasm, debug, analyze, and manipulate binary files
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/rth/Makefile b/devel/rth/Makefile
index 8803c6312d1..aeba2652f85 100644
--- a/devel/rth/Makefile
+++ b/devel/rth/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF/${PORTNAME}/Release%20${PORTVERSION}/Release%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jsi@jules.de
-COMMENT= Web-based requirement, test and bugtracking system
+COMMENT= Web-based requirement, test, and bugtracking system
USE_ZIP= yes
NO_BUILD= yes
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index e38d5486ea7..c0be4861b7d 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel rubygems
MASTER_SITES= RG
MAINTAINER= kuriyama@FreeBSD.org
-COMMENT= Simple, light-weight distributed issue tracker
+COMMENT= Simple lightweight distributed issue tracker
RUN_DEPENDS= rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop
diff --git a/devel/rubygem-echoe/Makefile b/devel/rubygem-echoe/Makefile
index d38ed112899..dd9768c947c 100644
--- a/devel/rubygem-echoe/Makefile
+++ b/devel/rubygem-echoe/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
-COMMENT= Rake tasks for docs, extension compiling, testing and deployment
+COMMENT= Rake tasks for docs, extension compiling, testing, and deployment
RUN_DEPENDS= rubygem-rubyforge>=0:${PORTSDIR}/devel/rubygem-rubyforge \
rubygem-gemcutter>=0:${PORTSDIR}/devel/rubygem-gemcutter \
diff --git a/devel/rubygem-mocha/Makefile b/devel/rubygem-mocha/Makefile
index 3d462a824fe..4d99404a4fb 100644
--- a/devel/rubygem-mocha/Makefile
+++ b/devel/rubygem-mocha/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= devel rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
-COMMENT= A library for mocking and stubbing syntax like JMock, and SchMock
+COMMENT= A library for mocking and stubbing syntax like JMock and SchMock
USE_RUBY= yes
USE_RAKE= yes
diff --git a/devel/rubygem-thor/Makefile b/devel/rubygem-thor/Makefile
index 17594031d28..e77d91e07c0 100644
--- a/devel/rubygem-thor/Makefile
+++ b/devel/rubygem-thor/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= devel rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
-COMMENT= A scripting framework that replaces rake, sake and rubigen
+COMMENT= A scripting framework that replaces rake, sake, and rubigen
USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 337f7e3216b..1158dcdf512 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= A utility C++ class library for daemons, clients, servers and more
+COMMENT= A utility C++ class library for daemons, clients, servers, and more
LICENSE= LGPL20
diff --git a/devel/simpletest/Makefile b/devel/simpletest/Makefile
index ce225ae8092..c32937b9f0e 100644
--- a/devel/simpletest/Makefile
+++ b/devel/simpletest/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME:L}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Unit testing, mock objects and web testing framework for PHP
+COMMENT= Unit testing, mock objects, and web testing framework for PHP
USE_PHP= pcre
USE_PHP_BUILD= yes
diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index 74ec814373b..b1985b2919b 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/4.5.1/
DISTNAME= ${PORTNAME}-${PORTVERSION}-linux-bin
MAINTAINER= fbsd-ports@opsec.eu
-COMMENT= A web service, SOA and SOAP testing tool
+COMMENT= A web service, SOA, and SOAP testing tool
USE_ZIP= YES
USE_JAVA= 1.5+
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 61edd3a112f..c1df9ad0325 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= GNU
MASTER_SITE_SUBDIR= commoncpp
MAINTAINER= gahr@FreeBSD.org
-COMMENT= A very light-weight C++ design patternlibrary
+COMMENT= A very lightweight C++ design patternlibrary
LICENSE= LGPL3
diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 917500e6870..294489e1463 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= dns
MASTER_SITES= http://www.chiark.greenend.org.uk/~ian/adns/ftp/
MAINTAINER= eadler@FreeBSD.org
-COMMENT= Easy to use, asynchronous-capable DNS client library and utilities
+COMMENT= Easy to use asynchronous-capable DNS client library and utilities
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 3c0d4135224..2ca44538d70 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= mandree
EXTRACT_SUFX= .tar.lzma
MAINTAINER= mandree@FreeBSD.org
-COMMENT= Lightweight DNS forwarder, DHCP and TFTP server
+COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server
LICENSE= GPLv2
diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile
index 80912d72ef0..aae95842b25 100644
--- a/dns/rubygem-public_suffix_service/Makefile
+++ b/dns/rubygem-public_suffix_service/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= dns rubygems
MASTER_SITES= RG
MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Parse and decompose domain names into TLD, domain and subdomains
+COMMENT= Parse and decompose domain names into TLD, domain, and subdomains
USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/dns/sheerdns/Makefile b/dns/sheerdns/Makefile
index 0a5b7584b6f..fff2eccd1b3 100644
--- a/dns/sheerdns/Makefile
+++ b/dns/sheerdns/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= dns
MASTER_SITES= http://threading.2038bug.com/sheerdns/
MAINTAINER= ports@FreeBSD.org
-COMMENT= A light-weight, simple and fast master DNS server
+COMMENT= A lightweight, simple, and fast master DNS server
USE_GMAKE= yes
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index b9b204b8b43..a572ad3fa0b 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.gphpedit.org/download/store/ \
http://www.jolupatech.info/crux/gphpedit/
MAINTAINER= novel@FreeBSD.org
-COMMENT= PHP, HTML and CSS development environment for GNOME 2.x
+COMMENT= PHP, HTML, and CSS development environment for GNOME 2.x
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index 3aeed6f08e5..9111e45094d 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Read Macintosh HFS floppy disks, hard drives and CDROMs
+COMMENT= Read Macintosh HFS floppy disks, hard drives, and CDROMs
CONFLICTS= hfsutils-[0-9]*
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 3cee40691b5..6ed2b314998 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.rainemu.com/html/archive/
DISTNAME= ${PORTNAME}s-${PORTVERSION}
MAINTAINER= flz@FreeBSD.org
-COMMENT= Arcade Emulator for M68000, M68020 and Z80 based hardware
+COMMENT= Arcade Emulator for M68000, M68020, and Z80 based hardware
BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro \
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index d9cf1d6c3eb..f03e9b2ca2f 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= http://people.csail.mit.edu/fredette/tme/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Emulator for Sun 2/120, 3/150 and SPARCstation 2 machines
+COMMENT= Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/finance/Makefile b/finance/Makefile
index 6738a03b702..83fd8ca6195 100644
--- a/finance/Makefile
+++ b/finance/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
#
- COMMENT = Monetary, financial and related applications
+ COMMENT = Monetary, financial, and related applications
SUBDIR += R-cran-PerformanceAnalytics
SUBDIR += R-cran-RFinanceYJ
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 665a3db4fb0..75f25088b67 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
DISTNAME= FileZilla_${PORTVERSION}_src
MAINTAINER= jsa@FreeBSD.org
-COMMENT= Fast and reliable cross-platform FTP, FTPS and SFTP client
+COMMENT= Fast and reliable cross-platform FTP, FTPS, and SFTP client
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/ftp/gnusget/Makefile b/ftp/gnusget/Makefile
index 8a892ae99d4..c28ccd27256 100644
--- a/ftp/gnusget/Makefile
+++ b/ftp/gnusget/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= ftp
MASTER_SITES= http://fb.roolz.org/gnusget/
MAINTAINER= ilya.otyutskiy@gmail.com
-COMMENT= Shell-extension for wget, which uses download- and history-file
+COMMENT= Shell-extension for wget which uses download- and history-file
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index f9e8b8a327b..a88eae4eb9d 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= A full-featured, secure, extensible and configurable Perl FTP server
+COMMENT= A full-featured, secure, extensible, and configurable Perl FTP server
RUN_DEPENDS= p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM \
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 09392234e84..078ed69660b 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= ftp www
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= HTTP, FTP and Gopher mirroring tool
+COMMENT= HTTP, FTP, and Gopher mirroring tool
USE_BZIP2= yes
WANT_GNOME= yes
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index d319e3cc86f..6c5539a8d66 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/releases/ \
SF/pureftpd/Pure-FTPd/${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= A small, easy to set up, fast and very secure FTP server
+COMMENT= A small, easy to set up, fast, and very secure FTP server
SUB_FILES= pkg-message
SUB_LIST= PAM_DIR=${PAM_DIR} PAM_TARGET=${PAM_TARGET}
diff --git a/games/black-box/Makefile b/games/black-box/Makefile
index fae282dc95e..69f7cb8b87c 100644
--- a/games/black-box/Makefile
+++ b/games/black-box/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.linux-games.com/black-box/
MAINTAINER= nemysis@gmx.ch
-COMMENT= You can shoot in and watch, where the shot leaves the box
+COMMENT= You can shoot in and watch where the shot leaves the box
LICENSE= GPLv2
diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile
index c4c77ef369e..643914dec3a 100644
--- a/games/doom-data/Makefile
+++ b/games/doom-data/Makefile
@@ -17,7 +17,7 @@ DISTFILES= #
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Doom data files (Doom, Doom II, Hexen, Heretic and Strife)
+COMMENT= Doom data files (Doom, Doom II, Hexen, Heretic, and Strife)
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/games/filters/Makefile b/games/filters/Makefile
index 85ae9cafe85..5cc659b381f 100644
--- a/games/filters/Makefile
+++ b/games/filters/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://ftp.debian.org/debian/pool/main/f/filters/ \
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= A collection of filters, including B1FF and the Swedish Chef
+COMMENT= A collection of filters, including B1FF, and the Swedish Chef
CONFLICTS= talkfilters-* jive-* chef-* kenny-*
diff --git a/games/rigsofrods/Makefile b/games/rigsofrods/Makefile
index 37496c4657f..2a02f70e812 100644
--- a/games/rigsofrods/Makefile
+++ b/games/rigsofrods/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= Truck, car, airplane and boat simulator with advanced physics
+COMMENT= Truck, car, airplane, and boat simulator with advanced physics
LIB_DEPENDS= zzip.13:${PORTSDIR}/devel/zziplib \
freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/graphics/p5-Graph-Easy/Makefile b/graphics/p5-Graph-Easy/Makefile
index 420ad15bcdc..2964c15217c 100644
--- a/graphics/p5-Graph-Easy/Makefile
+++ b/graphics/p5-Graph-Easy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
-COMMENT= Render graphs as ASCII, HTML, SVG or Graphviz
+COMMENT= Render graphs as ASCII, HTML, SVG, or Graphviz
BUILD_DEPENDS= p5-Heap>0:${PORTSDIR}/devel/p5-Heap
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index fc7d422b92d..228769db5f1 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail
MASTER_SITES= SF
MAINTAINER= jjuanino@gmail.com
-COMMENT= Indexing and searching in Maildir, MH or mbox folders
+COMMENT= Indexing and searching in Maildir, MH, or mbox folders
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/mail/ruby-rmail/Makefile b/mail/ruby-rmail/Makefile
index f66f367adfc..67fdc6c624b 100644
--- a/mail/ruby-rmail/Makefile
+++ b/mail/ruby-rmail/Makefile
@@ -14,7 +14,7 @@ DISTNAME= rubymail-${PORTVERSION}
DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
-COMMENT= A light-weight mail manipulating library for Ruby
+COMMENT= A lightweight mail manipulating library for Ruby
USE_RUBY= yes
USE_RUBY_SETUP= yes
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index 63cdedd8db5..a5b7a930d6b 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
-COMMENT= Perl module providing pure 2, 3 or multi-value logic
+COMMENT= Perl module providing pure 2, 3, or multi-value logic
PERL_CONFIGURE= yes
MAN3= Math::Logic.3
diff --git a/misc/aclgen/Makefile b/misc/aclgen/Makefile
index cce605da90e..329254db129 100644
--- a/misc/aclgen/Makefile
+++ b/misc/aclgen/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://gatling.ikk.sztaki.hu/pub/aclgen/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Optimize Cisco routers ip access lists
+COMMENT= Optimize Cisco routers IP access lists
NO_WRKSUBDIR= YES
MAKEFILE= /usr/share/mk/bsd.prog.mk
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 7dda3970c40..5395c634319 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.rastersoft.com/descargas/ \
http://bsd-geek.de/FreeBSD/distfiles/
MAINTAINER= lme@FreeBSD.org
-COMMENT= Create video DVDs, VCDs, sVCDs or CVDs from any number of video files
+COMMENT= Create video DVDs, VCDs, sVCDs, or CVDs from any number of video files
RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
mencoder:${PORTSDIR}/multimedia/mencoder \
diff --git a/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index 44dec4bf959..660598f775d 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= CPAN:VVELOX
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
-COMMENT= Make a hash out or the return from a search using Net::LDAP::Search
+COMMENT= Make a hash out of the return from a search using Net::LDAP::Search
BUILD_DEPENDS= p5-perl-ldap>=0.39:${PORTSDIR}/net/p5-perl-ldap
RUN_DEPENDS= p5-perl-ldap>=0.39:${PORTSDIR}/net/p5-perl-ldap
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index 3f699671e79..44c386ffb53 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= A light-weight MovableType client Perl module
+COMMENT= A lightweight MovableType client Perl module
BUILD_DEPENDS= p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/net/p5-Net-Whois-IP/Makefile b/net/p5-Net-Whois-IP/Makefile
index 9a6e6e26643..da94ba0174e 100644
--- a/net/p5-Net-Whois-IP/Makefile
+++ b/net/p5-Net-Whois-IP/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= culot@FreeBSD.org
-COMMENT= Perl extension for looking up the whois information for ip addresses
+COMMENT= Perl extension for looking up the whois information for IP addresses
MAN3= Net::Whois::IP.3
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 79e60992d2b..ac614bcc0b0 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
EXTRACT_SUFX= .tgz
MAINTAINER= umeno@rr.iij4u.or.jp
-COMMENT= Displays ip packets using X window
+COMMENT= Displays IP packets using X window
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 4922b0ef051..0d9a698cd5c 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= security
MASTER_SITES= http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
MAINTAINER= arved@FreeBSD.org
-COMMENT= Tools to test a PCSC driver, card or reader
+COMMENT= Tools to test a PCSC driver, card, or reader
LICENSE= GPLv2
diff --git a/sysutils/rubygem-sys-host/Makefile b/sysutils/rubygem-sys-host/Makefile
index 25d3d164159..20ea4600a20 100644
--- a/sysutils/rubygem-sys-host/Makefile
+++ b/sysutils/rubygem-sys-host/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= sysutils rubygems
MASTER_SITES= RG
MAINTAINER= freebsdports@chillibear.com
-COMMENT= Provides hostname, ip address, and other information for a given host
+COMMENT= Provides hostname, IP address, and other information for a given host
USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 33bf4a47ecc..9e78fa56ce3 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.flux.utah.edu/pub/skill/ \
EXTRACT_SUFX= .tgz
MAINTAINER= jonny@jonny.eng.br
-COMMENT= SuperKILL, kill or renice processes by pid, name, tty or uid
+COMMENT= SuperKILL, kill, or renice processes by pid, name, tty, or uid
MAN1= skill.1
MLINKS= skill.1 snice.1
diff --git a/sysutils/whatpix/Makefile b/sysutils/whatpix/Makefile
index 9082426c577..9183954d523 100644
--- a/sysutils/whatpix/Makefile
+++ b/sysutils/whatpix/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://whatpix.sourceforge.net/download/
MAINTAINER= pcasidy@casidy.com
-COMMENT= Perl console application which finds, moves or deletes duplicate files
+COMMENT= Perl console application which finds, moves, or deletes duplicate files
RUN_DEPENDS= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
diff --git a/textproc/rubygem-ezamar/Makefile b/textproc/rubygem-ezamar/Makefile
index c935dbafef9..a03a70dc14f 100644
--- a/textproc/rubygem-ezamar/Makefile
+++ b/textproc/rubygem-ezamar/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= textproc rubygems
MASTER_SITES= RG
MAINTAINER= jyyou@cs.nctu.edu.tw
-COMMENT= A light-weight and simple templating engine for Ruby
+COMMENT= A lightweight and simple templating engine for Ruby
USE_RUBY= yes
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index b6fd58265a4..6e5d882046e 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-zero/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Converter from MS Word to text, HTML or LaTeX
+COMMENT= Converter from MS Word to text, HTML, or LaTeX
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 9eb6a7475e0..f01193076cf 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A fast, light-weight web server for WAI applications
+COMMENT= A fast, lightweight web server for WAI applications
LICENSE= MIT