<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/13b4fc42766bfb15fe6aa7b8e5aa1364dc632158">https://github.com/macports/macports-base/commit/13b4fc42766bfb15fe6aa7b8e5aa1364dc632158</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 13b4fc42 Fix typos
</span>13b4fc42 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13b4fc42766bfb15fe6aa7b8e5aa1364dc632158
</span>Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
AuthorDate: Sun Jan 2 11:57:09 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> Fix typos
</span>---
doc/INTERNALS | 2 +-
doc/port-selfupdate.1 | 2 +-
doc/port-selfupdate.1.txt | 2 +-
doc/port-space.1 | 2 +-
doc/port-space.1.txt | 2 +-
doc/portgroup.7 | 2 +-
doc/portgroup.7.txt | 2 +-
portmgr/dmg/postflight.in | 2 +-
portmgr/rsync.repos | 2 +-
src/cregistry/file.c | 4 ++--
src/cregistry/sql.c | 2 +-
src/cregistry/vercomp.c | 2 +-
src/darwintracelib1.0/darwintrace.c | 2 +-
src/darwintracelib1.0/proc.c | 2 +-
src/machista1.0/Makefile.in | 2 +-
src/machista1.0/libmachista.c | 2 +-
src/machista1.0/libmachista.h | 4 ++--
src/machista1.0/tests/libmachista-test.c | 2 +-
src/machista1.0/tests/test.tcl | 2 +-
src/macports1.0/diagnose.tcl | 2 +-
src/macports1.0/macports.tcl | 8 ++++----
src/macports1.0/macports_dlist.tcl | 4 ++--
src/macports1.0/macports_util.tcl | 2 +-
src/macports1.0/reclaim.tcl | 2 +-
src/macports1.0/tests/macports.test | 2 +-
src/pextlib1.0/Pextlib.c | 2 +-
src/pextlib1.0/curl.c | 2 +-
src/pextlib1.0/fs-traverse.c | 2 +-
src/pextlib1.0/sha2.c | 2 +-
src/pextlib1.0/strsed.c | 6 +++---
src/pextlib1.0/system.c | 4 ++--
src/pextlib1.0/tracelib.c | 4 ++--
src/pextlib1.0/vercomp.c | 2 +-
src/pextlib1.0/xinstall.c | 2 +-
src/port/port.tcl | 10 +++++-----
src/port1.0/portconfigure.tcl | 4 ++--
src/port1.0/portutil.tcl | 2 +-
src/port1.0/tests/portutil.test | 4 ++--
src/programs/daemondo/main.c | 6 +++---
src/registry2.0/receipt_sqlite.tcl | 2 +-
src/upgrade_sources_conf_default.tcl.in | 2 +-
tests/test/case-insensitive-deactivate/DESCRIPTION | 2 +-
tests/test/library.tcl.in | 4 ++--
43 files changed, 62 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/INTERNALS b/doc/INTERNALS
</span><span style='display:block; white-space:pre;color:#808080;'>index a7d2c860..b6afabb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/INTERNALS
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/INTERNALS
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ The MacPorts system is composed of three TCL libraries:
</span>
These three TCL libraries are grouped as TCL "packages". They allow
for complex versioning and have a provide/require model of use, making
<span style='display:block; white-space:pre;background:#ffe0e0;'>-them well suited for maintaining a backwards compatable ports system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+them well suited for maintaining a backwards compatible ports system.
</span>
The "macports" TCL Library provides a public API into the MacPorts
system. Any external application wishing to manipulate a port can
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-selfupdate.1 b/doc/port-selfupdate.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 6285dd50..46701bd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-selfupdate.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-selfupdate.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ To find out what went wrong, re\-run
</span> \fBselfupdate\fR
with the
\fB\-d\fR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-flag\&. This will allow you to see all output generated by the build system\&. Look for the first occurance of \(lqerror\(rq\&. If you cannot figure out what\(cqs wrong on your own, feel free to ask on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+flag\&. This will allow you to see all output generated by the build system\&. Look for the first occurrence of \(lqerror\(rq\&. If you cannot figure out what\(cqs wrong on your own, feel free to ask on
</span> \m[blue]\fBthe macports\-users mailing list\fR\m[]\&\s-2\u[2]\d\s+2
and attach the output generated by
.sp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-selfupdate.1.txt b/doc/port-selfupdate.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index f78aaa0d..2c21ea6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-selfupdate.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-selfupdate.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ Error installing new MacPorts base: command execution failed
</span> +
To find out what went wrong, re-run *selfupdate* with the *-d* flag. This will
allow you to see all output generated by the build system. Look for the first
<span style='display:block; white-space:pre;background:#ffe0e0;'>-occurance of ``error''. If you cannot figure out what's wrong on your own, feel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+occurrence of ``error''. If you cannot figure out what's wrong on your own, feel
</span> free to ask on mailto:macports-users@lists.macports.org[the macports-users
mailing list] and attach the output generated by
+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-space.1 b/doc/port-space.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a73af91..648facea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-space.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-space.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ port-space \- Show the disk usage of the given ports
</span> .sp
By default, \fBport space\fR will print a line with the size in an appropriate unit followed by the name of a port for each port given on the command line (or expanded from a pseudo\-port expression given; see \fBport\fR(1) for more info on pseudo\-port expressions)\&. The last line of output will contain a total\&.
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-If you are only interested in the total of all ports (e\&.g\&. if you want to get the total amount of space used by your installed ports) use the \fB\-\-total\fR flag\&. If you want to sort the output by file size, you can pipe the results of \fBport space\fR to \fBsort \-n\fR\&. Since \fBport space\fR defauts to using a suitable unit, you should specify a unit to allow for meaningful numeric sorting, e\&.g\&. \fBport space \-\-units KiB\fR to get all output in KiB\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If you are only interested in the total of all ports (e\&.g\&. if you want to get the total amount of space used by your installed ports) use the \fB\-\-total\fR flag\&. If you want to sort the output by file size, you can pipe the results of \fBport space\fR to \fBsort \-n\fR\&. Since \fBport space\fR defaults to using a suitable unit, you should specify a unit to allow for meaningful numeric sorting, e\&.g\&. \fBport space \-\-units KiB\fR to get all output in KiB\&.
</span> .SH "OPTIONS"
.PP
\fB\-\-total\fR*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-space.1.txt b/doc/port-space.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c6ea89f..ad409fb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-space.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-space.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ pseudo-port expressions). The last line of output will contain a total.
</span> If you are only interested in the total of all ports (e.g. if you want to get
the total amount of space used by your installed ports) use the *--total* flag.
If you want to sort the output by file size, you can pipe the results of *port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-space* to *sort -n*. Since *port space* defauts to using a suitable unit, you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+space* to *sort -n*. Since *port space* defaults to using a suitable unit, you
</span> should specify a unit to allow for meaningful numeric sorting, e.g. *port space
--units KiB* to get all output in KiB.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/portgroup.7 b/doc/portgroup.7
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b45f182..bfebade1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/portgroup.7
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/portgroup.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -405,7 +405,7 @@ T}
</span> \fBPortGroup gnustep\fR is here to easily port GNUstep\-based opensource software using the GNU objective\- C runtime\&. It handles configuration, build and destroot phases\&. It also defines some values for GNUstep\-based software\&. A minimum Portfile using the \fBgnustep PortGroup\fR class only defines the fetch and the checksum phases\&.
.SS "GNUSTEP FILESYSTEM LAYOUTS"
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gnustep also supports both the traditionnal gnustep file layout and the new fhs file layout\&. However, the ports themselves do not necessarily support both\&. The Portfiles have access to many procedures in dealing with these two layouts:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gnustep also supports both the traditional gnustep file layout and the new fhs file layout\&. However, the ports themselves do not necessarily support both\&. The Portfiles have access to many procedures in dealing with these two layouts:
</span> .PP
set_gnustep_make
.RS 4
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/portgroup.7.txt b/doc/portgroup.7.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 5506d4a9..88ce189b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/portgroup.7.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/portgroup.7.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,7 +209,7 @@ checksum phases.
</span>
GNUSTEP FILESYSTEM LAYOUTS
~~~~~~~~~~~~~~~~~~~~~~~~~~
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gnustep also supports both the traditionnal gnustep file layout and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gnustep also supports both the traditional gnustep file layout and
</span> the new fhs file layout. However, the ports themselves do not necessarily
support both. The Portfiles have access to many procedures in dealing with these
two layouts:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/dmg/postflight.in b/portmgr/dmg/postflight.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 7232a979..37f90ae6 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/dmg/postflight.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/dmg/postflight.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@ function update_macports {
</span> # which hints that we've already tweaked it and therefore already backed it up.
function write_setting () {
if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_BASESTRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Backing up your ${HOME}/.${CONF_FILE} shell confguration file as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX} before adapting it for MacPorts."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Backing up your ${HOME}/.${CONF_FILE} shell configuration file as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX} before adapting it for MacPorts."
</span> /bin/cp -fp "${HOME}/.${CONF_FILE}" "${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}" || {
echo "An attempt to backup your original configuration file failed! Please set your MacPorts compatible environment manually."
update_macports
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/rsync.repos b/portmgr/rsync.repos
</span><span style='display:block; white-space:pre;color:#808080;'>index cc7a796c..4bec8e92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/rsync.repos
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/rsync.repos
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> # (relative to ${RSYNCROOT}: dpupdate1 --> release).
#
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Futhermore the ${RSYNCROOT}/trunk path must also hold a (relative) `dports'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Furthermore the ${RSYNCROOT}/trunk path must also hold a (relative) `dports'
</span> # symlink to `../release/ports', so that a sync operation against
# `dpupdate/ports' for the ports tree works on legacy MacPorts installations
# (DarwinPorts namespace). Overall, the ${RSYNCROOT} skeleton should look like:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/file.c b/src/cregistry/file.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 20fa77a9..89231ceb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/file.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/file.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,9 +95,9 @@ static int reg_stmt_to_file(void* userdata, void** file, void* stmt,
</span> * Opens an existing file in the registry.
*
* @param [in] reg registry to open entry in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [in] id port id in the dabatase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param [in] id port id in the database
</span> * @param [in] name file path in the database
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [out] errPtr on error, a description of the error that occures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @param [out] errPtr on error, a description of the error that occurs
</span> * @return the file if success, NULL if failure
*/
reg_file* reg_file_open(reg_registry* reg, char* id, char* name,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/sql.c b/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 06a43520..04ec1ede 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +293,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> return 0;
}
if (r != SQLITE_ROW) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* an error occured querying */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* an error occurred querying */
</span> break;
}
if (NULL == (version = (const char *)sqlite3_column_text(stmt, 0))) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/vercomp.c b/src/cregistry/vercomp.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ce9d21e7..280e056e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/vercomp.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/vercomp.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +155,7 @@ static int vercmp (const char *versionA, int lengthA, const char *versionB,
</span> }
/* If both pointers are null, all alphanumeric
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * characters were identical and only seperating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * characters were identical and only separating
</span> * characters differed. According to RPM, these
* version strings are equal */
if (ptrA == endA && ptrB == endB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/darwintrace.c b/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 4719bedf..d71af50f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,7 +315,7 @@ static void __darwintrace_get_filemap() {
</span> #endif
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * ensure we have a filemap present; this might be called simultanously
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ensure we have a filemap present; this might be called simultaneously
</span> * from multiple threads and needs to work without leaking and in a way
* that ensures a filemap has been set before any of the calls return. We
* achieve that by using non-blocking synchronization. Blocking
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/proc.c b/src/darwintracelib1.0/proc.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d0fa5cf..7144faa3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/proc.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/proc.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,7 +232,7 @@ static inline int check_interpreter(const char *restrict path) {
</span> strsep(&interp_end, " \t");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* check the iterpreter against the sandbox */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* check the interpreter against the sandbox */
</span> if (!__darwintrace_is_in_sandbox(interp, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
return ENOENT;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/Makefile.in b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ab8d2cd..61f179c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ tests/libmachista-test: tests/libmachista-test.c libmachista.h libmachista.o has
</span> # (which didn't matter, since libSystem.B.dylib was still universal on those).
#
# The if expression below is basically the equivalent from aclocal.m4 for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# UNIVERSAL_ARCHS, except that we're always forcing some kind of universiality.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# UNIVERSAL_ARCHS, except that we're always forcing some kind of universality.
</span> tests/%${SHLIB_SUFFIX}:
ifeq (darwin,@OS_PLATFORM@)
${SHLIB_LD} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/libmachista.c b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 33512dcb..cead31c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,7 +509,7 @@ int macho_parse_file(macho_handle_t *handle, const char *filepath, const macho_t
</span> ret = MACHO_EMEM;
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* An error occured, free mt */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* An error occurred, free mt */
</span> free_macho_t((macho_t *)*res);
*res = NULL;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/libmachista.h b/src/machista1.0/libmachista.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fae942a..ca56c10e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/libmachista.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/libmachista.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ typedef struct macho_loadcmd {
</span> macho_loadcmd_t's (NULL if there's no further element) */
} macho_loadcmd_t;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/** Stucture describing an architecture within a Mach-O file */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/** Structure describing an architecture within a Mach-O file */
</span> typedef struct macho_arch {
char *mat_install_name; /* install name of the library or NULL if none */
char *mat_rpath; /* rpath of the binary of NULL if none */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +122,7 @@ const char *macho_get_arch_name(cpu_type_t cputype);
</span>
/**
* Parses the Mach-O file indicated by filepath and writes a pointer to a macho_t describing the
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mach-O file into the location idicated by res. Returns MACHO_SUCCESS on success or any of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Mach-O file into the location indicated by res. Returns MACHO_SUCCESS on success or any of the
</span> * following error codes on error:
*
* code description errno set?
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/tests/libmachista-test.c b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f70fc93..fe00d0f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,7 +243,7 @@ error_out:
</span> */
static void forked_test_handle(void) {
macho_handle_t *handle = macho_create_handle();
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool result = check(handle != NULL, "Error creating handle (epxected non-NULL, but was NULL)");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool result = check(handle != NULL, "Error creating handle (expected non-NULL, but was NULL)");
</span> macho_destroy_handle(handle);
exit(!result);
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/tests/test.tcl b/src/machista1.0/tests/test.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 355f888f..0ab28bcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/tests/test.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/tests/test.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ for {set i 0} {$i < $argc} {incr i} {
</span> set a [$a cget -next]
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "An error occured: [machista::strerror [lindex $rlist 0]]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts "An error occurred: [machista::strerror [lindex $rlist 0]]"
</span> }
}
machista::destroy_handle $h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b0dc79f6..8caae34a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -576,7 +576,7 @@ namespace eval diagnose {
</span>
proc check_xcode {config_options} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checks to see if the currently installed version of Xcode works with the curent OS version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Checks to see if the currently installed version of Xcode works with the current OS version.
</span> #
# Args:
# config_options - The associative array containing all options in the config files
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 40d7a242..c5a6f9e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3911,7 +3911,7 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> ui_error "port lookup failed: $eMessage"
return 1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # argh! port doesnt exist!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # argh! port doesn't exist!
</span> if {$result eq ""} {
ui_warn "No port $portname found in the index."
return 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4681,7 +4681,7 @@ proc macports::diagnose_main {opts} {
</span> ##
# Run reclaim if necessary
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# @return 0 on success, 1 if an exception occured during the execution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @return 0 on success, 1 if an exception occurred during the execution
</span> # of reclaim, 2 if the execution was aborted on user request.
proc macports::reclaim_check_and_run {} {
if {[macports::ui_isset ports_quiet]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4793,7 +4793,7 @@ proc macports::get_actual_cxx_stdlib {binaries} {
</span> # ID load command of binaries should be check for sanity. This is mostly
# useful for maintainers.
# @return 0 if report-only mode is enabled, no ports are broken, or the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# rebuilds finished successfully. 1 if an exception occured during the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# rebuilds finished successfully. 1 if an exception occurred during the
</span> # execution of rev-upgrade, 2 if the execution was aborted on user
# request.
proc macports::revupgrade {opts} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5687,7 +5687,7 @@ proc macports::shellescape {arg} {
</span> ##
# Given a list of maintainers as recorded in a Portfile, return a list of lists
# in [key value ...] format describing all maintainers. Valid keys are 'email'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# which denotes a maintainer's email address, 'github', which preceeds the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which denotes a maintainer's email address, 'github', which precedes the
</span> # GitHub username of the maintainer and 'keyword', which contains a special
# maintainer keyword such as 'openmaintainer' or 'nomaintainer'.
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_dlist.tcl b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f5c726a1..994ce7c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ package provide macports_dlist 1.0
</span> # requirements.
# Conceptually a dlist is an ordered list of ditem elements.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The order perserves the dependency hierarchy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The order preserves the dependency hierarchy.
</span>
# A dlist is an ordinary TCL list.
# A ditem should be created with the [ditem_create] procedure,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,7 +275,7 @@ proc dlist_get_next {dlist statusdict} {
</span> # should return {-1, 0, 1}
# handler - the handler to invoke on each ditem
# canfail - If 1, then progress will not stop when a failure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# occures; if 0, then dlist_eval will return on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# occurs; if 0, then dlist_eval will return on the
</span> # first failure
# selector - the selector for determining eligibility
# reason_var - variable name to return failure reason in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_util.tcl b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 69efd067..11eba140 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ namespace eval macports_util {
</span> # Given a list of maintainers as recorded in a Portfile, return a list of
# lists in [key value ...] format describing all maintainers. Valid keys
# are 'email' which denotes a maintainer's email address, 'github', which
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # preceeds the GitHub username of the maintainer and 'keyword', which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # precedes the GitHub username of the maintainer and 'keyword', which
</span> # contains a special maintainer keyword such as 'openmaintainer' or
# 'nomaintainer'.
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/reclaim.tcl b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fd21859..b5562e70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@
</span> # TODO:
# Finished:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add ui_debug statments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Add ui_debug statements
</span> # Catch some error-prone areas.
# Remove the useless/structure comments and add actual docstrings.
# Add copyright notice
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/tests/macports.test b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 02556116..4b9eb398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -499,7 +499,7 @@ test mportshutdown {
</span>
} -body {
if {[mportshutdown] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: errors occured"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: errors occurred"
</span> }
set res ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/Pextlib.c b/src/pextlib1.0/Pextlib.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a5420c2..0a745f85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/Pextlib.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/Pextlib.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,7 +511,7 @@ static int fileIsBinaryCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int
</span>
path = Tcl_GetString(objv[1]);
if (-1 == lstat(path, &st)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* an error occured */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* an error occurred */
</span> Tcl_SetErrno(errno);
Tcl_ResetResult(interp);
Tcl_AppendResult(interp, "lstat(", path, "):", (char *)Tcl_PosixError(interp), NULL);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/curl.c b/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index a49d30d1..ebdbe90b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,7 +504,7 @@ CurlFetchCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[])
</span> /* a CURLOPT_ACCEPT_ENCODING of "" means to let cURL write the
* Accept-Encoding header for you, based on what the library
* was compiled to support.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * A value of NULL disables all attemps at decompressing responses.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * A value of NULL disables all attempts at decompressing responses.
</span> */
#ifdef _CURL_ENCODING
theCurlCode = curl_easy_setopt(theHandle, _CURL_ENCODING, acceptEncoding);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/fs-traverse.c b/src/pextlib1.0/fs-traverse.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c0b7122..1b44d44b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/fs-traverse.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/fs-traverse.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +207,7 @@ do_traverse(Tcl_Interp *interp, int flags, char * CONST *targets, Tcl_Obj *varna
</span> }
case FTS_F: /* regular file */
case FTS_SL: /* symbolic link */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case FTS_SLNONE: /* symbolic link with non-existant target */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case FTS_SLNONE: /* symbolic link with non-existent target */
</span> case FTS_DEFAULT: /* file type not otherwise handled (e.g., fifo) */
{
Tcl_Obj *rpath, *path;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/sha2.c b/src/pextlib1.0/sha2.c
</span><span style='display:block; white-space:pre;color:#808080;'>index b13b0fa1..44702307 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/sha2.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/sha2.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@
</span> * Please make sure that your system defines BYTE_ORDER. If your
* architecture is little-endian, make sure it also defines
* LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * equivilent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * equivalent.
</span> *
* If your system does not define the above, then you can do so by
* hand like this:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/strsed.c b/src/pextlib1.0/strsed.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 4aa2506f..d8455f48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/strsed.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/strsed.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,7 +343,7 @@ int *range;
</span>
/*
* Get the action.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * s = substitue and g = global.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * s = substitute and g = global.
</span> * anything else is invalid.
*
* If one of these is present, the next char is the delimiter.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1255,7 +1255,7 @@ int who;
</span> * and so on.
*
* This function will remember two strings and will return
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * the next charcter in the range specified by 'who'. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the next character in the range specified by 'who'. This
</span> * makes the building of the transliteration table above
* a trivial loop.
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1362,7 +1362,7 @@ int who;
</span> int size;
{
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Get 'size' bytes of memeory one way or another.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Get 'size' bytes of memory one way or another.
</span> *
* The 'mem_slots' array holds currently allocated hunks.
* If we can use one that's already in use then do so, otherwise
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/system.c b/src/pextlib1.0/system.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f32bb82..7de5bbba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/system.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/system.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,7 +608,7 @@ int SystemCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Ob
</span> if (event != NULL)
SystemCmd_Event_SetSignaled(callback, event, interrupted_by);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set errorCode [list POSIX SIG <SIGNAME> <signal descripton>] */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* set errorCode [list POSIX SIG <SIGNAME> <signal description>] */
</span> Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("POSIX", -1));
Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("SIG", -1));
Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj(Tcl_SignalId(interrupted_by), -1));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -626,7 +626,7 @@ int SystemCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Ob
</span> if (event != NULL)
SystemCmd_Event_SetSignaled(callback, event, WTERMSIG(ret));
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set errorCode [list CHILDKILLED <pid> <SIGNAME> <signal descripton>] */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* set errorCode [list CHILDKILLED <pid> <SIGNAME> <signal description>] */
</span> Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("CHILDKILLED", -1));
Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewWideIntObj(pid));
Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj(Tcl_SignalId(WTERMSIG(ret)), -1));
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/tracelib.c b/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;color:#808080;'>index d21efa1c..fa96dfd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -833,7 +833,7 @@ static int TracelibRunCmd(Tcl_Interp *in) {
</span> /* new data is available, and its processing tells us to
* close the socket */
|| (!process_line(res_kevents[i].ident))) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* an error occured or process_line suggested closing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* an error occurred or process_line suggested closing
</span> * this socket */
close(res_kevents[i].ident);
/* closing the socket will automatically remove it from the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -905,7 +905,7 @@ static int TracelibRunCmd(Tcl_Interp *in) {
</span> // We found a PID for the remote side
peerpid_list_enqueue(s, peer_pid);
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Error occured, process has probably already terminated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Error occurred, process has probably already terminated
</span> close(s);
continue;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/vercomp.c b/src/pextlib1.0/vercomp.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ba28e6b2..c7f7eba7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/vercomp.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/vercomp.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@ static int vercmp (const char *versionA, const char *versionB) {
</span> }
/* If both pointers are null, all alphanumeric
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * characters were identical and only seperating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * characters were identical and only separating
</span> * characters differed. According to RPM, these
* version strings are equal */
if (*ptrA == '\0' && *ptrB == '\0')
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/xinstall.c b/src/pextlib1.0/xinstall.c
</span><span style='display:block; white-space:pre;color:#808080;'>index d03f5dd6..7dcdf9f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/xinstall.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/xinstall.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1032,7 +1032,7 @@ strip(const char *to_name)
</span>
/*
* install_dir --
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * build directory heirarchy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * build directory hierarchy
</span> */
int
install_dir(Tcl_Interp *interp, char *path)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 121abf78..e0a11ceb 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4744,7 +4744,7 @@ proc process_cmd { argv } {
</span> }
# Parse options that will be unique to this action
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # (to avoid abiguity with -variants and a default port, either -- must be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (to avoid ambiguity with -variants and a default port, either -- must be
</span> # used to terminate option processing, or the pseudo-port current must be specified).
if {[catch {parse_options $action ui_options global_options} result]} {
ui_debug $::errorInfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4855,7 +4855,7 @@ proc complete_action { text state } {
</span> }
proc attempt_completion { text word start end } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If the word starts with '~', or contains '.' or '/', then use the build-in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If the word starts with '~', or contains '.' or '/', then use the built-in
</span> # completion to complete the word
if { [regexp {^~|[/.]} $word] } {
return ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4864,7 +4864,7 @@ proc attempt_completion { text word start end } {
</span> # Decide how to do completion based on where we are in the string
set prefix [string range $text 0 [expr {$start - 1}]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If only whitespace characters preceed us, or if the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If only whitespace characters precede us, or if the
</span> # previous non-whitespace character was a ;, then we're
# an action (the first word of a command)
if { [regexp {(^\s*$)|(;\s*$)} $prefix] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5224,7 +5224,7 @@ namespace eval portclient::progress {
</span> set barWidth [expr {entier($width) - $percentageWidth - 2}]
# Map the range (0, $total) to (0, 4 * $width) where $width is the maximum
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # numebr of characters to be printed for the progress bar. Multiply the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # number of characters to be printed for the progress bar. Multiply the
</span> # upper bound with 8 because we have 8 sub-states per character.
set barProgress [expr {entier(round(($current * $barWidth * 8) / $total))}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5397,7 +5397,7 @@ namespace eval portclient::questions {
</span> # @param time
# The amount of time for which a timeout is to occur.
# @param def
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The default action to be taken in the occurence of a timeout.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The default action to be taken in the occurrence of a timeout.
</span> proc ui_timeout {def timeout} {
fconfigure stdin -blocking 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 61c12c09..03162f36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -676,7 +676,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> proc portconfigure::configure_get_developer_dir {} {
global use_xcode developer_dir
set cltpath "/Library/Developer/CommandLineTools"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume that the existence of libxcselect indiciates the earliest version of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assume that the existence of libxcselect indicates the earliest version of
</span> # macOS that places CLT in /Library/Developer/CommandLineTools
# If port is Xcode-dependent or CommandLineTools directory is invalid, set to developer_dir
if {[tbool use_xcode]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1088,7 +1088,7 @@ proc portconfigure::get_apple_compilers_xcode_version {} {
</span> global xcodeversion
# https://developer.apple.com/library/content/releasenotes/DeveloperTools/RN-Xcode/Chapters/Introduction.html
# https://developer.apple.com/library/content/documentation/CompilerTools/Conceptual/LLVMCompilerOverview/index.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 3.2 relase notes (Link?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 3.2 release notes (Link?)
</span> # About Xcode 3.1 Tools (about_xcode_tools_3.1.pdf, Link?)
# About Xcode 3.2 (about_xcode_3.2.pdf, Link?)
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f5efff0..06de7e5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -473,7 +473,7 @@ proc command_exec {args} {
</span> # TODO: move that to the system native call?
# Save the environment.
array set saved_env [array get env]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the overriden variables from the portfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set the overridden variables from the portfile.
</span> array set env [array get ${varprefix}.env_array]
# Call the command.
set fullcmdstring "$command_prefix $cmdstring $command_suffix"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portutil.test b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 75dd3a22..d07123ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portutil.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +112,7 @@ test option {
</span>
test exists {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Exists unit test. Checks for existance of a Portfile option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exists unit test. Checks for existence of a Portfile option.
</span> } -body {
set vara a
if {[exists vara] != 1} {return "FAIL: option exists but not detected"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +168,7 @@ test options {
</span> Options unit test.
} -body {
options date
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[date macports] != "macports"} {return "FAIL: incorect options"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[date macports] != "macports"} {return "FAIL: incorrect options"}
</span> return "Options successful."
} -result "Options successful."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/programs/daemondo/main.c b/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;color:#808080;'>index f3ac1b19..1ce29677 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,9 +223,9 @@ DoHelp(void)
</span> "escape or quote the ';' to protect it from special handling by your shell.\n"
"\n"
"daemondo runs in one of two modes: (1) If no stop-cmd is given, daemondo\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "executes start-cmd asyncronously, and tracks the process id; that process id\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "executes start-cmd asynchronously, and tracks the process id; that process id\n"
</span> "is used to signal the daemon for later stop and/or restart. (2) If stop-cmd\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "is given, then both start-cmd and stop-cmd are issued syncronously, and are\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "is given, then both start-cmd and stop-cmd are issued synchronously, and are\n"
</span> "assumed to do all the work of controlling the daemon. In such cases there is\n"
"no process id to track. In either mode, restart-cmd, if present, is used to\n"
"restart the daemon. If in mode 1, restart-cmd must not disrupt the process id.\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,7 +360,7 @@ DeletePreexistingPidFile(void)
</span> if (pid != -1) {
if (unlink(pidFile)) {
if (verbosity >= 3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LogMessage("Error %d while trying to cleanup prexisting pidfile %s\n", errno, pidFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogMessage("Error %d while trying to cleanup preexisting pidfile %s\n", errno, pidFile);
</span> } else {
if (verbosity >= 3)
LogMessage("Deleted preexisting pidfile %s\n", pidFile);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/receipt_sqlite.tcl b/src/registry2.0/receipt_sqlite.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 74f9a47f..c1f44c96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/receipt_sqlite.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/receipt_sqlite.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +180,7 @@ proc port_registered {name} {
</span> # @param property
# Name of the property to retrieve.
# @return Return value depends on the property queried. Returns 0 if an error
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# occured while trying to access the property (but note that 0 may be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# occurred while trying to access the property (but note that 0 may be
</span> # a perfectly valid value for the key you're querying).
proc property_retrieve {ref property} {
switch $property {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/upgrade_sources_conf_default.tcl.in b/src/upgrade_sources_conf_default.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 7086b02d..8053d5e9 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/upgrade_sources_conf_default.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/upgrade_sources_conf_default.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> #
# For an rsync: repository, if it is the standard MacPorts one and not
# already tagged, then make it default, if another wasn't already default.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For a file:// respository, if it is an svn checkout from the MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For a file:// repository, if it is an svn checkout from the MacPorts
</span> # server, then make it default if another hasn't already been tagged.
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/case-insensitive-deactivate/DESCRIPTION b/tests/test/case-insensitive-deactivate/DESCRIPTION
</span><span style='display:block; white-space:pre;color:#808080;'>index a240c997..1438a73d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/case-insensitive-deactivate/DESCRIPTION
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/case-insensitive-deactivate/DESCRIPTION
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> This test checks for case-insensitive port names. From Portfile.in it
generates a Portfile which is installed with a lowercase name (casesensitive)
and uninstalled with a CamelCase name (CaseSensitivE). The install/uninstall
<span style='display:block; white-space:pre;background:#ffe0e0;'>-is verified by the existance/absence of the '/tmp/macports-tests/opt/local/var/test/case'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is verified by the existence/absence of the '/tmp/macports-tests/opt/local/var/test/case'
</span> file.
There are 2 test cases. One to install a port and the other to uninstall.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/library.tcl.in b/tests/test/library.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 20e5e80b..714f4d21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/library.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/library.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ proc port_uninstall {{name "current"}} {
</span> return $result
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Returns the line containint a given string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Returns the line containing a given string
</span> # from a given file, or -1 if nothing is found.
proc get_line {filename lookup} {
set fp [open $filename r]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ proc get_line {filename lookup} {
</span> return -1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This proc contains all the steps necesary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This proc contains all the steps necessary
</span> # to install a port and save the output to a file.
# Needed for the majority of regression tests.
proc initial_setup {} {
</pre><pre style='margin:0'>
</pre>