Date: Sat, 09 Feb 2013 11:50:02 +0100 From: Christoph Mallon <christoph.mallon@gmx.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/175981: [PATCH] Correct typos in ports Message-ID: <E1U480Q-0005bQ-18@rotluchs.lokal> Resent-Message-ID: <201302091100.r19B00PZ032046@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175981
>Category: ports
>Synopsis: [PATCH] Correct typos in ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 09 11:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Christoph Mallon
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
>Description:
This series of patches corrects several typos in pkg-descrs, pkg-messages, manpages, output of scripts and other places in the ports tree.
>How-To-Repeat:
>Fix:
Please apply these patches.
--- 0001-all-Correct-misspellings-of-the-word-necessary.patch begins here ---
>From 032e49b437b02c6c75055de127d3a81087ddf50e Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Tue, 15 Jan 2013 19:05:47 +0100
Subject: [PATCH 1/4] all: Correct misspellings of the word "necessary".
---
audio/baresip/Makefile.depends | 2 +-
deskutils/kbirthday/Makefile | 2 +-
games/exmars/pkg-descr | 2 +-
games/ruby-exmars/pkg-descr | 2 +-
lang/pfe/pkg-descr | 2 +-
lang/schemetoc/files/README.FreeBSD | 2 +-
mail/gld/files/pkg-message.in | 2 +-
print/acrobatviewer/pkg-message | 2 +-
print/rtf2latex/files/Makefile | 2 +-
www/limesurvey/Makefile | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index 58d6a6d..d5ea40e 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -3,7 +3,7 @@
ALSA_DEPEND= ${LOCALBASE}/include/alsa/asoundlib.h:${PORTSDIR}/audio/alsa-lib
BV32_DEPEND= # nonexistent
CELT_DEPEND= ${LOCALBASE}/include/celt/celt.h:${PORTSDIR}/audio/celt
-CONS_DEPEND= # unneccessary
+CONS_DEPEND= # unnecessary
EVDEV_DEPEND=
FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:${PORTSDIR}/multimedia/ffmpeg
G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:${PORTSDIR}/comms/spandsp
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index 2cd8967..2114df3 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
# may or may not solve the alpha compilation issue....
CONFIGURE_ARGS= --with-pic
-# necesary to access the second master site by getting rid of the default switch -A
+# necessary to access the second master site by getting rid of the default switch -A
FETCH_CMD ?=/usr/bin/fetch -Rr
post-patch:
diff --git a/games/exmars/pkg-descr b/games/exmars/pkg-descr
index bba9dda..a2e2a18 100644
--- a/games/exmars/pkg-descr
+++ b/games/exmars/pkg-descr
@@ -8,7 +8,7 @@ everything with a high level interface for Ruby.
The resulting program has the following main features:
-* Uses the parser from pMARS, so no previous parsing is neccessary. At first
+* Uses the parser from pMARS, so no previous parsing is necessary. At first
this was my main motivation for exMARS.
* Speed: 50% faster than pmars on a Pentium III, and often more than twice as
fast than pmars on a Pentium 4 (using gcc 3.3.1, and the same compiler
diff --git a/games/ruby-exmars/pkg-descr b/games/ruby-exmars/pkg-descr
index 019ebf9..857c38b 100644
--- a/games/ruby-exmars/pkg-descr
+++ b/games/ruby-exmars/pkg-descr
@@ -8,7 +8,7 @@ everything with a high level interface for Ruby.
The resulting program has the following main features:
-* Uses the parser from pMARS, so no previous parsing is neccessary. At first
+* Uses the parser from pMARS, so no previous parsing is necessary. At first
this was my main motivation for exMARS.
* Speed: 50% faster than pmars on a Pentium III, and often more than twice as
fast than pmars on a Pentium 4 (using gcc 3.3.1, and the same compiler
diff --git a/lang/pfe/pkg-descr b/lang/pfe/pkg-descr
index 8c98155..9a0b0eb 100644
--- a/lang/pfe/pkg-descr
+++ b/lang/pfe/pkg-descr
@@ -1,4 +1,4 @@
-This package contains all neccessary ANSI-C source files to build a
+This package contains all necessary ANSI-C source files to build a
running Forth-environment on most UNIX machines, on DOS and on OS/2.
The Forth-system is closely modeled along the new American National
diff --git a/lang/schemetoc/files/README.FreeBSD b/lang/schemetoc/files/README.FreeBSD
index b5ce58b..6877988 100644
--- a/lang/schemetoc/files/README.FreeBSD
+++ b/lang/schemetoc/files/README.FreeBSD
@@ -16,7 +16,7 @@ and will by default not. So, if you are building an application
written for scheme->c which needs X support (such as ezd), you
will need to supply a -lX11 flag on the command line. If you are
compiling a single scheme file(not an object file) which has the
-(with xlib) line in the module statement it is not neccesary to
+(with xlib) line in the module statement it is not necessary to
include -lX11.
Those not wishing to use the X library support can delete the following
diff --git a/mail/gld/files/pkg-message.in b/mail/gld/files/pkg-message.in
index 18dd2b9..3a4f624 100644
--- a/mail/gld/files/pkg-message.in
+++ b/mail/gld/files/pkg-message.in
@@ -4,7 +4,7 @@
gld_enable="YES"
- To complete the installation, you need to create the neccesary
+ To complete the installation, you need to create the necessary
database and tables. An example configuration file is available in
%%PREFIX%%/etc/gld.conf-dist. For more information see the
documentation in %%DOCSDIR%%/share/doc/gld.
diff --git a/print/acrobatviewer/pkg-message b/print/acrobatviewer/pkg-message
index f39ad50..c547b20 100644
--- a/print/acrobatviewer/pkg-message
+++ b/print/acrobatviewer/pkg-message
@@ -1,5 +1,5 @@
Please advise all your users intended to use Acrobat Viewer to create
-"~/AcrobatFonts" directory, which is neccessary for Acrobat Viewer to normally
+"~/AcrobatFonts" directory, which is necessary for Acrobat Viewer to normally
save its configuration data.
diff --git a/print/rtf2latex/files/Makefile b/print/rtf2latex/files/Makefile
index f1985ea..dc631a9 100644
--- a/print/rtf2latex/files/Makefile
+++ b/print/rtf2latex/files/Makefile
@@ -18,7 +18,7 @@ PREFIX?=/usr/local
# want to specify this for ULTRIX - ULTRIX has both, strchr and index but
# lacks prototypes for the latter.
#
-# uncomment this line and delete unneccesary flags if needed.
+# uncomment this line and delete unnecessary flags if needed.
#XCFLAGS=-DNO_MALLOC_H -DSTDARG -DVARARGS -DSYSV
#XCFLAGS = -DSYSV
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index e0d1419..14a283b 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -28,7 +28,7 @@ ZIP_DESC= Install PHP zip extension
USE_PGSQL= yes
USE_PHP= pgsql
.else
-# server is not neccesery on this host.
+# server is not necessary on this host.
#USE_MYSQL= server
USE_MYSQL= client
USE_PHP= mysql
--
1.8.1.3
--- 0001-all-Correct-misspellings-of-the-word-necessary.patch ends here ---
--- 0002-all-Correct-misspellings-of-the-word-occurrence.patch begins here ---
>From 07e6caa1ab57c178c994f7d1e9778726f407fae0 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Tue, 15 Jan 2013 19:23:10 +0100
Subject: [PATCH 2/4] all: Correct misspellings of the word "occurrence".
---
Tools/scripts/patchtool.py | 2 +-
audio/maplay/files/patch-maplay.cc | 2 +-
benchmarks/p5-Benchmark-Stopwatch/pkg-descr | 2 +-
chinese/p5-Encode-HanConvert/pkg-descr | 2 +-
devel/bsdcflow/pkg-descr | 2 +-
games/nonsense/files/nonsense.6 | 2 +-
mail/spfval/pkg-descr | 2 +-
misc/xdelta/files/patch-configure | 2 +-
net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html | 2 +-
net/csync2/files/pkg-install.in | 2 +-
net/netsed/files/patch-netsed.c | 2 +-
net/ser/files/patch-modules::nathelper::nathelper.c | 2 +-
ports-mgmt/managepkg/pkg-descr | 2 +-
security/p5-Digest-Nilsimsa/pkg-descr | 2 +-
security/vlog/files/patch-curses.c | 2 +-
sysutils/boxbackup-devel/files/999.boxbackup.in | 2 +-
sysutils/boxbackup/files/999.boxbackup.in | 2 +-
sysutils/su2/pkg-descr | 2 +-
textproc/mifluz/pkg-descr | 2 +-
textproc/modlogan/files/patch-cssfile-writting | 2 +-
www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch | 2 +-
www/apache22/files/mpm-itk-20110321-01 | 2 +-
x11-fonts/fontconfig/files/fc-query.1 | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
index 21545e0..fe18678 100755
--- a/Tools/scripts/patchtool.py
+++ b/Tools/scripts/patchtool.py
@@ -218,7 +218,7 @@ def gendiff(path, wrksrc, outfile = ''):
sys.stdout.writelines(outbuf)
retval = True
retmsg = ''
- else: # Error occured
+ else: # Error occurred
raise ECmdError('"%s"' % cmdline, \
'external command returned non-zero error code')
# Not reached #
diff --git a/audio/maplay/files/patch-maplay.cc b/audio/maplay/files/patch-maplay.cc
index 13f2566..ac55338 100644
--- a/audio/maplay/files/patch-maplay.cc
+++ b/audio/maplay/files/patch-maplay.cc
@@ -172,7 +172,7 @@
if (range_violations)
{
- cerr << range_violations << " range violations have occured!\n";
-+ std::cerr << range_violations << " range violations have occured!\n";
++ std::cerr << range_violations << " range violations have occurred!\n";
if (stdout_mode)
- cerr << "If you notice these violations,\n";
+ std::cerr << "If you notice these violations,\n";
diff --git a/benchmarks/p5-Benchmark-Stopwatch/pkg-descr b/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
index da18320..4294a4f 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
+++ b/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
@@ -6,7 +6,7 @@ The stopwatch analogy is that at some point you get a new stopwatch
and start timing. Then you note certain events using lap. Finally you
stop the watch and then print out a summary.
-The summary shows all the events in order, what time they occured at,
+The summary shows all the events in order, what time they occurred at,
how long since the last lap and the percentage of the total time.
Hopefully this will give you a good idea of where your code is
spending most of its time.
diff --git a/chinese/p5-Encode-HanConvert/pkg-descr b/chinese/p5-Encode-HanConvert/pkg-descr
index 311a7be..4996de7 100644
--- a/chinese/p5-Encode-HanConvert/pkg-descr
+++ b/chinese/p5-Encode-HanConvert/pkg-descr
@@ -1,4 +1,4 @@
-This module is an attempt to solve most common problems occured in
+This module is an attempt to solve most common problems occurred in
Traditional vs. Simplified Chinese conversion, in an efficient,
flexible way, without resorting to external tools or modules.
diff --git a/devel/bsdcflow/pkg-descr b/devel/bsdcflow/pkg-descr
index 6056938..55d4096 100644
--- a/devel/bsdcflow/pkg-descr
+++ b/devel/bsdcflow/pkg-descr
@@ -1,5 +1,5 @@
cflow reads files as C or assembler program source and prints a graph
a graph of the function call hierarchy. Called functions are indented
-according to their caller-callee relationship, in the order of occurance.
+according to their caller-callee relationship, in the order of occurrence.
WWW: http://www.sysfault.org/projects
diff --git a/games/nonsense/files/nonsense.6 b/games/nonsense/files/nonsense.6
index a36569c..1611221 100644
--- a/games/nonsense/files/nonsense.6
+++ b/games/nonsense/files/nonsense.6
@@ -233,7 +233,7 @@ So, for instance,
{@A}
would be replaced with the current day of the week.
.It {@strftime format|number1|number2}
-Same as above, but uses the date/time that occured X seconds ago,
+Same as above, but uses the date/time that occurred X seconds ago,
where X is a random number between
.Ar number1
and
diff --git a/mail/spfval/pkg-descr b/mail/spfval/pkg-descr
index 20a4497..0314082 100644
--- a/mail/spfval/pkg-descr
+++ b/mail/spfval/pkg-descr
@@ -4,4 +4,4 @@ SPF records. Simply pass the validator a string and it will see if it validates
as an SPFv1 or SPF-Classic record.
If an error is found, it tries its best to report the error in question and the
-specific location in the record where the error occured.
+specific location in the record where the error occurred.
diff --git a/misc/xdelta/files/patch-configure b/misc/xdelta/files/patch-configure
index fa3368c..509a117 100644
--- a/misc/xdelta/files/patch-configure
+++ b/misc/xdelta/files/patch-configure
@@ -341,7 +341,7 @@
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
-+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
++ echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
diff --git a/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html b/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
index 23128f8..471f38d 100644
--- a/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
+++ b/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
@@ -21,7 +21,7 @@ href="http://net-snmp.sourceforge.net/">net-snmp</a>; package, provides
a convenient way to collect this information and export it by means of
SNMP protocol. It also allows one to specify the critical values for
the above parameters and automatically sets error flag to indicate the
-error occured and provides error message which describes it.
+error occurred and provides error message which describes it.
Using <code>snmpd</code> it is also possible to execute custom scripts
which allows to monitor parameters which are not available in standard
mibs.
diff --git a/net/csync2/files/pkg-install.in b/net/csync2/files/pkg-install.in
index afbe4f3..ae42495 100644
--- a/net/csync2/files/pkg-install.in
+++ b/net/csync2/files/pkg-install.in
@@ -21,7 +21,7 @@ create_cert() {
rm -f /tmp/csync2_ssl_cert.csr
if [ ${code} -ne 0 ]; then
- echo "csync2: OpenSSL error occured:"
+ echo "csync2: OpenSSL error occurred:"
echo
cat ${_errlog}
echo
diff --git a/net/netsed/files/patch-netsed.c b/net/netsed/files/patch-netsed.c
index cab0a91..ed5fc3d 100644
--- a/net/netsed/files/patch-netsed.c
+++ b/net/netsed/files/patch-netsed.c
@@ -20,7 +20,7 @@
+ ERR("be passed using HTTP-alike hex escape sequences (eg. CRLF -> %%0a%%0d).\n");
+ ERR("Single '%%' can be reached by using '%%%%'. Examples:\n\n");
+ ERR(" 's/andrew/mike/1' - replace 'andrew' with 'mike' (once)\n");
-+ ERR(" 's/andrew/mike' - replace all occurences of 'andrew' with 'mike'\n");
++ ERR(" 's/andrew/mike' - replace all occurrences of 'andrew' with 'mike'\n");
+ ERR(" 's/andrew/mike%%00' - replace 'andrew' with 'mike\\x00' (to keep orig. size)\n");
ERR(" 's/%%%%/%%2f/20' - replace '%%' with '/' in first 20 packets\n\n");
ERR("Rules are not working on cross-packet boundaries and are evaluated from\n");
diff --git a/net/ser/files/patch-modules::nathelper::nathelper.c b/net/ser/files/patch-modules::nathelper::nathelper.c
index e64495c..d85865e 100644
--- a/net/ser/files/patch-modules::nathelper::nathelper.c
+++ b/net/ser/files/patch-modules::nathelper::nathelper.c
@@ -1259,7 +1259,7 @@ $FreeBSD$
+ /*
+ * Having such data, but not at line beginning.
+ * Skip them and reiterate. ser_memmem() will find next
-+ * occurence.
++ * occurrence.
+ */
+ if (plimit - cp1 < 2)
+ return NULL;
diff --git a/ports-mgmt/managepkg/pkg-descr b/ports-mgmt/managepkg/pkg-descr
index 5689031..2c1cae7 100644
--- a/ports-mgmt/managepkg/pkg-descr
+++ b/ports-mgmt/managepkg/pkg-descr
@@ -1,5 +1,5 @@
This script runs though the complete ports tree without stopping after a make
-error occured.
+error occurred.
If you call make with any parameter in one of the directories of the ports tree
in FreeBSD the run will stop if make returns with a code bigger than zero. That
means, that it is (in opposite to NetBSD or OpenBSD impossible to run a echo
diff --git a/security/p5-Digest-Nilsimsa/pkg-descr b/security/p5-Digest-Nilsimsa/pkg-descr
index b477931..61c9294 100644
--- a/security/p5-Digest-Nilsimsa/pkg-descr
+++ b/security/p5-Digest-Nilsimsa/pkg-descr
@@ -1,4 +1,4 @@
-A nilsimsa signature is a statistic of n-gram occurance in a piece of text.
+A nilsimsa signature is a statistic of n-gram occurrence in a piece of text.
It is a 256 bit value usually represented in hex. This module is a wrapper
around nilsimsa implementation in C by cmeclax.
diff --git a/security/vlog/files/patch-curses.c b/security/vlog/files/patch-curses.c
index 7bb9e4c..4eb12a0 100644
--- a/security/vlog/files/patch-curses.c
+++ b/security/vlog/files/patch-curses.c
@@ -34,7 +34,7 @@
+ arrows move the window one line 0 scroll window to leftmost\n\
+ h,j,k,l in either direction. \n\
+ H,J,K,L Caps move faster. /,? search a regexp forward/backward\n\
-+ b,space back, forward 1 page n,N goto next/previous occurence\n\
++ b,space back, forward 1 page n,N goto next/previous occurrence\n\
+PgUp/Down these work on XFree only >,< goto next/previous day boundary\n\
+ ],[ goto next/previous marked line\n\
+--------- MISC KEYS ---------------- \n\
diff --git a/sysutils/boxbackup-devel/files/999.boxbackup.in b/sysutils/boxbackup-devel/files/999.boxbackup.in
index 989d62d..e620fa3 100644
--- a/sysutils/boxbackup-devel/files/999.boxbackup.in
+++ b/sysutils/boxbackup-devel/files/999.boxbackup.in
@@ -49,7 +49,7 @@ case "$monthly_boxbackup_compare_enable" in
# Return codes:
# 1 Comparison was exact
# 2 Differences were found
- # 3 An error occured
+ # 3 An error occurred
if [ $? -eq 2 ]; then
echo
echo "Differences were found. Please check the output."
diff --git a/sysutils/boxbackup/files/999.boxbackup.in b/sysutils/boxbackup/files/999.boxbackup.in
index 989d62d..e620fa3 100644
--- a/sysutils/boxbackup/files/999.boxbackup.in
+++ b/sysutils/boxbackup/files/999.boxbackup.in
@@ -49,7 +49,7 @@ case "$monthly_boxbackup_compare_enable" in
# Return codes:
# 1 Comparison was exact
# 2 Differences were found
- # 3 An error occured
+ # 3 An error occurred
if [ $? -eq 2 ]; then
echo
echo "Differences were found. Please check the output."
diff --git a/sysutils/su2/pkg-descr b/sysutils/su2/pkg-descr
index e36da0d..d14b985 100644
--- a/sysutils/su2/pkg-descr
+++ b/sysutils/su2/pkg-descr
@@ -12,7 +12,7 @@ than this. Regular users can put a .su2rc file in their home
directory to enable other users to become them. While this may sound
odd, it is sometimes useful to allow a number of users to masquerade
around with the uid of restricted accounts. One such example of this
-is a 'www' account which is a common occurance with the proliferation
+is a 'www' account which is a common occurrence with the proliferation
of the web. While the www user's password may be starred out to
disable direct logins, root could put a set of usernames into
~www/.su2rc to enable these users to 'become' www and do Web
diff --git a/textproc/mifluz/pkg-descr b/textproc/mifluz/pkg-descr
index d4061ec..a4af004 100644
--- a/textproc/mifluz/pkg-descr
+++ b/textproc/mifluz/pkg-descr
@@ -4,7 +4,7 @@ indexed text for the index. It is simple because it provides only
a few basic functionalities. It does not contain document parsers
(HTML, PDF etc...). It does not contain a full text query parser.
It does not provide result display functions or other user friendly
-stuff. It only provides functions to store word occurences and retrieve
+stuff. It only provides functions to store word occurrences and retrieve
them. The fact that it uses 50% of the size of the indexed text is
rather atypical. Most well known full text indexing systems only use
30%. The advantage GNU mifluz has over most full text indexing systems
diff --git a/textproc/modlogan/files/patch-cssfile-writting b/textproc/modlogan/files/patch-cssfile-writting
index a34c1d0..c5d1f3e 100644
--- a/textproc/modlogan/files/patch-cssfile-writting
+++ b/textproc/modlogan/files/patch-cssfile-writting
@@ -47,7 +47,7 @@ diff -u -u -r1.100 generate.c
+
+ ret = unlink(filename);
+ if(ret == 0 || (ret == -1 && errno == ENOENT)) {
-+ /* If no error occured or the file didn't existed: link it. */
++ /* If no error occurred or the file didn't existed: link it. */
+
+ ret = symlink(conf->cssfile, filename);
+ if (ret != 0) {
diff --git a/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch b/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
index 4a2c058..da5714e 100644
--- a/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
+++ b/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
@@ -2007,7 +2007,7 @@ diff -Nur httpd-2.2.3/server/mpm/experimental/peruser/peruser.c httpd-2.2.3-peru
+ SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */
+
+ if (status == APR_EGENERAL) {
-+ /* resource shortage or should-not-occur occured */
++ /* resource shortage or should-not-occur occurred */
+ clean_child_exit(1);
+ }
+ else if (status != APR_SUCCESS || die_now) {
diff --git a/www/apache22/files/mpm-itk-20110321-01 b/www/apache22/files/mpm-itk-20110321-01
index 25ad065..45f79a4 100644
--- a/www/apache22/files/mpm-itk-20110321-01
+++ b/www/apache22/files/mpm-itk-20110321-01
@@ -748,7 +748,7 @@ unchanged:
+ SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */
+
+ if (status == APR_EGENERAL) {
-+ /* resource shortage or should-not-occur occured */
++ /* resource shortage or should-not-occur occurred */
+ clean_child_exit(1);
+ }
+ else if (status != APR_SUCCESS) {
diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1
index a6e6e47..38dbaa4 100644
--- a/x11-fonts/fontconfig/files/fc-query.1
+++ b/x11-fonts/fontconfig/files/fc-query.1
@@ -39,7 +39,7 @@ Query \fIfont-file\fR for font faces.
.SH "RETURN CODES"
.PP
\fBfc-query\fR returns error code 0 for successful parsing,
-or 1 if any errors occured or if at least one font face could not be opened.
+or 1 if any errors occurred or if at least one font face could not be opened.
.SH "SEE ALSO"
.PP
\fBfc-scan\fR(1)
--
1.8.1.3
--- 0002-all-Correct-misspellings-of-the-word-occurrence.patch ends here ---
--- 0003-all-Correct-misspellings-of-the-word-resource.patch begins here ---
>From b781fa6e215e950d2e005dd0fcb6cdbf205cc122 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Wed, 23 Jan 2013 17:05:33 +0100
Subject: [PATCH 3/4] all: Correct misspellings of the word "resource".
---
audio/xwave/pkg-message | 2 +-
security/openssh-portable/files/openssh-lpk-5.8p2.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/xwave/pkg-message b/audio/xwave/pkg-message
index 87aa520..b063559 100644
--- a/audio/xwave/pkg-message
+++ b/audio/xwave/pkg-message
@@ -1,3 +1,3 @@
-If you run out of space for the temporary files, set the X ressource
+If you run out of space for the temporary files, set the X resource
XWave*tdir (either in /usr/X11R6/lib/X11/app-defaults/XWave or your
~/.Xdefaults) to a suitable directory.
diff --git a/security/openssh-portable/files/openssh-lpk-5.8p2.patch b/security/openssh-portable/files/openssh-lpk-5.8p2.patch
index 5ea0e10..b458932 100644
--- a/security/openssh-portable/files/openssh-lpk-5.8p2.patch
+++ b/security/openssh-portable/files/openssh-lpk-5.8p2.patch
@@ -838,7 +838,7 @@ diff -Nur -x '*.orig' -x '*.rej' ../openssh-5.8p2-orig/ldapauth.c ./ldapauth.c
+ return SUCCESS;
+}
+
-+/* must free allocated ressource */
++/* must free allocated resource */
+static char * ldap_build_host(char *host, int port) {
+ unsigned int size = strlen(host)+11;
+ char * h = (char *) calloc (size, sizeof(char));
--
1.8.1.3
--- 0003-all-Correct-misspellings-of-the-word-resource.patch ends here ---
--- 0004-all-Correct-several-typos.patch begins here ---
>From 8ac369b2954d52854393cc2f15905b48d738815d Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Tue, 15 Jan 2013 19:26:03 +0100
Subject: [PATCH 4/4] all: Correct several typos.
---
Tools/scripts/patchtool.py | 8 ++++----
lang/schemetoc/files/README.FreeBSD | 2 +-
sysutils/su2/pkg-descr | 2 +-
textproc/mifluz/pkg-descr | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
index fe18678..65d7b53 100755
--- a/Tools/scripts/patchtool.py
+++ b/Tools/scripts/patchtool.py
@@ -171,7 +171,7 @@ def getrelpath(path, wrksrc):
#
-# Generare a diff between saved and current versions of the file pointed by the
+# Generate a diff between saved and current versions of the file pointed by the
# wrksrc+path. Apply heuristics to locate saved version of the file in question
# and if it fails assume that file is new, so /dev/null is to be used as
# original file. Optionally save generated patch into `outfile' instead of
@@ -204,7 +204,7 @@ def gendiff(path, wrksrc, outfile = ''):
exitval = pipe.wait()
if exitval == 0: # No differences were found
retval = False
- retmsg = 'no differencies found between original and current ' \
+ retmsg = 'no differences found between original and current ' \
'version of "%s"' % fullpath
elif exitval == 1: # Some differences were found
if (outfile != ''):
@@ -229,7 +229,7 @@ def gendiff(path, wrksrc, outfile = ''):
#
# Automatically generate a name for a patch based on its path relative to
-# wrksrc. Use simple scheme to ensute 1-to-1 mapping between path and
+# wrksrc. Use simple scheme to ensure 1-to-1 mapping between path and
# patchname - replace all '_' with '__' and all '/' with '_'.
#
def makepatchname(path, patchdir = ''):
@@ -615,7 +615,7 @@ def generate(args, automatic, force, ignoremtime):
# is encountered, all patches that belong to the port are updated. If no
# arguments are supplied - current directory is assumed.
#
-# The procedure homours last modification times of the patchfile, file from
+# The procedure honours last modification times of the patchfile, file from
# which diff to be generated and `EXTRACT_COOKIE' file (usually
# ${WRKDIR}/.extract_cookie) to update only those patches that are really need
# to be updated.
diff --git a/lang/schemetoc/files/README.FreeBSD b/lang/schemetoc/files/README.FreeBSD
index 6877988..f05ffa3 100644
--- a/lang/schemetoc/files/README.FreeBSD
+++ b/lang/schemetoc/files/README.FreeBSD
@@ -10,7 +10,7 @@ The syntax of the scc compiler has been extended to automatically
use dynamic linking unless the -static flag is specified on the scc
command line.
-For compiling exectables on the command line from only object files
+For compiling executables on the command line from only object files
it has no method of knowing if you need the X library linked in,
and will by default not. So, if you are building an application
written for scheme->c which needs X support (such as ezd), you
diff --git a/sysutils/su2/pkg-descr b/sysutils/su2/pkg-descr
index d14b985..c0d1aa9 100644
--- a/sysutils/su2/pkg-descr
+++ b/sysutils/su2/pkg-descr
@@ -1,7 +1,7 @@
From the README:
su2 is a great program for anyone that has anything to do with
-system adiministration. su2 gives you the ability to masquerade with
+system administration. su2 gives you the ability to masquerade with
the UID of other users. You use own password to switch. Probably the
biggest benefit of su2 is that you retain your own customized shell
environment.
diff --git a/textproc/mifluz/pkg-descr b/textproc/mifluz/pkg-descr
index a4af004..a834a84 100644
--- a/textproc/mifluz/pkg-descr
+++ b/textproc/mifluz/pkg-descr
@@ -9,7 +9,7 @@ them. The fact that it uses 50% of the size of the indexed text is
rather atypical. Most well known full text indexing systems only use
30%. The advantage GNU mifluz has over most full text indexing systems
is that it is fully dynamic (update, delete, insert), uses only a
-controled amount of memory while resolving a query, has higher upper
+controlled amount of memory while resolving a query, has higher upper
limits and has a simple storage scheme. Consuming more disk space
allows all this.
--
1.8.1.3
--- 0004-all-Correct-several-typos.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1U480Q-0005bQ-18>