<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/163752f5b7534d501189291be0a21249f7da28b3">https://github.com/macports/macports-base/commit/163752f5b7534d501189291be0a21249f7da28b3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 163752f5b7534d501189291be0a21249f7da28b3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 5 06:12:42 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Use "macOS" when OS version is unknown
</span>---
configure | 4 ++--
configure.ac | 2 +-
doc/macports.conf.in | 2 +-
doc/port-dmg.1 | 4 ++--
doc/port-dmg.1.txt | 4 ++--
doc/port-info.1 | 2 +-
doc/port-info.1.txt | 2 +-
doc/port-installed.1 | 2 +-
doc/port-installed.1.txt | 2 +-
doc/port-outdated.1 | 2 +-
doc/port-outdated.1.txt | 2 +-
doc/port-variants.1 | 4 ++--
doc/port-variants.1.txt | 6 +++---
doc/port.1 | 10 +++++-----
doc/port.1.txt | 10 +++++-----
doc/portfile.7 | 12 ++++++------
doc/portgroup.7 | 2 +-
doc/portgroup.7.txt | 2 +-
doc/porthier.7 | 4 ++--
m4/tcl.m4 | 2 +-
portmgr/ReleaseProcess.md | 4 ++--
src/cregistry/Makefile.in | 2 +-
src/cregistry/entry.c | 4 ++--
src/darwintracelib1.0/darwintrace.c | 8 ++++----
src/darwintracelib1.0/proc.c | 4 ++--
src/machista1.0/libmachista.c | 4 ++--
src/package1.0/portpkg.tcl | 8 ++++----
src/pextlib1.0/Pextlib.c | 10 +++++-----
src/pextlib1.0/adv-flock.c | 4 ++--
src/pextlib1.0/mktemp.c | 4 ++--
src/pextlib1.0/readline.c | 2 +-
src/pextlib1.0/strsed.c | 2 +-
src/port1.0/portmain.tcl | 6 +++---
src/port1.0/portutil.tcl | 4 ++--
34 files changed, 73 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 04e97bd..e3c7bdb 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2746,8 +2746,8 @@ fi
</span>
if test "x$SW_VERS" != "x"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Mac OS X version" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$as_echo_n "checking Mac OS X version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking macOS version" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$as_echo_n "checking macOS version... " >&6; }
</span> MACOSX_VERSION=`$SW_VERS -productVersion`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_VERSION" >&5
$as_echo "$MACOSX_VERSION" >&6; }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index f913dce..b30dabe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ AC_PATH_PROG(DEFAULTS, defaults)
</span> AC_PATH_PROG(XCODE_SELECT, xcode-select)
if test "x$SW_VERS" != "x"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(Mac OS X version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING(macOS version)
</span> MACOSX_VERSION=`$SW_VERS -productVersion`
AC_MSG_RESULT([$MACOSX_VERSION])
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/macports.conf.in b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f6252e0..3da33f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/macports.conf.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,7 @@ universal_archs @UNIVERSAL_ARCHS@
</span>
# Type of generated StartupItems.
# - launchd: Create StartupItems for use with launchd.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# - default: Create StartupItems for launchd on OS X and none on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - default: Create StartupItems for launchd on macOS and none on
</span> # other platforms.
# - none: Disable creation of StartupItems.
# This setting only applies when building ports from source.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-dmg.1 b/doc/port-dmg.1
</span><span style='display:block; white-space:pre;color:#808080;'>index ec84930..63884d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-dmg.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-dmg.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,9 @@ port-dmg, port-mdmg, port-pkg, port-mpkg \- Create binary archives of a port, an
</span> .fi
.SH "DESCRIPTION"
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-These commands create OS X\-native binary archives of a given port\&. Depending on the command, one of a \&.dmg disk image file, a \&.pkg, or \&.mpkg installer package is created\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These commands create macOS\-native binary archives of a given port\&. Depending on the command, one of a \&.dmg disk image file, a \&.pkg, or \&.mpkg installer package is created\&.
</span> .sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\fBport pkg\fR creates an OS X installer package that installs all files that belong to a given port\&. \fBport dmg\fR wraps this installer package in a disk image\&. In most cases you probably want to package a port and all its library and runtime dependencies in a single package suitable for binary distribution\&. \fBport pkg\fR and \fBport dmg\fR don\(cqt do that, so those are only useful if you are going to take care of the dependencies separately\&. \fBport mpkg\fR creates an \&.mpk [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\fBport pkg\fR creates a macOS installer package that installs all files that belong to a given port\&. \fBport dmg\fR wraps this installer package in a disk image\&. In most cases you probably want to package a port and all its library and runtime dependencies in a single package suitable for binary distribution\&. \fBport pkg\fR and \fBport dmg\fR don\(cqt do that, so those are only useful if you are going to take care of the dependencies separately\&. \fBport mpkg\fR creates an \&.mpk [...]
</span> .sp
On Mac OS X 10\&.6 and later, the generated installer packages are in \(lqflat\(rq format, such that wrapping them in a disk image is no longer necessary for online redistribution\&. Prior to Mac OS X 10\&.6, generated installer packages could not be used for online distribution without a wrapping disk image\&.
.sp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-dmg.1.txt b/doc/port-dmg.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 983543d..b8c22e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-dmg.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-dmg.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,11 @@ SYNOPSIS
</span>
DESCRIPTION
-----------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-These commands create OS X-native binary archives of a given port. Depending on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These commands create macOS-native binary archives of a given port. Depending on
</span> the command, one of a .dmg disk image file, a .pkg, or .mpkg installer package
is created.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*port pkg* creates an OS X installer package that installs all files that belong
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*port pkg* creates a macOS installer package that installs all files that belong
</span> to a given port. *port dmg* wraps this installer package in a disk image. In
most cases you probably want to package a port and all its library and runtime
dependencies in a single package suitable for binary distribution. *port pkg*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-info.1 b/doc/port-info.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 08e3963..fb50ffb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-info.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-info.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +129,7 @@ is specified\&.
</span> \fB\-\-platform\fR, \fB\-\-platforms\fR
.RS 4
List the platforms supported by a port\&. This field exists for historical reasons only\&. In modern MacPorts, this is always
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\fIdarwin\fR, i\&.e\&., OS X\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\fIdarwin\fR, i\&.e\&., macOS\&.
</span> .RE
.PP
\fB\-\-portdir\fR
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-info.1.txt b/doc/port-info.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e969fa..3b29e71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-info.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-info.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ The rest of the options affect which fields will be given in the output:
</span>
*--platform*, *--platforms*::
List the platforms supported by a port. This field exists for historical
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reasons only. In modern MacPorts, this is always 'darwin', i.e., OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reasons only. In modern MacPorts, this is always 'darwin', i.e., macOS.
</span>
*--portdir*::
Print the path to a port's directory relative to the port tree root.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-installed.1 b/doc/port-installed.1
</span><span style='display:block; white-space:pre;color:#808080;'>index c5d1bc7..c6099d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-installed.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-installed.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a
</span> .PP
\fB\-v\fR
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Print the platform at install time (i\&.e\&., your OS X version) and the architecture(s) of the installed port\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Print the platform at install time (i\&.e\&., your macOS version) and the architecture(s) of the installed port\&.
</span> .RE
.PP
\fB\-q\fR
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-installed.1.txt b/doc/port-installed.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ea10c3..8e1d906 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-installed.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-installed.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ section for an explanation of the active/inactive state.
</span> include::global-flags.txt[]
*-v*::
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Print the platform at install time (i.e., your OS X version) and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Print the platform at install time (i.e., your macOS version) and the
</span> architecture(s) of the installed port.
*-q*::
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-outdated.1 b/doc/port-outdated.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 13c674e..d3d147e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-outdated.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-outdated.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ due to an epoch increase (used in situations where the version number decreased,
</span> .sp -1
.IP \(bu 2.3
.\}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-due to an OS upgrade\&. MacPorts will consider ports built on a previous version of OS X outdated\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+due to an OS upgrade\&. MacPorts will consider ports built on a previous version of macOS outdated\&.
</span> .RE
.sp
The ports listed in \fBport outdated\fR are the ports that will be upgraded when you run
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-outdated.1.txt b/doc/port-outdated.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index c295670..f6e7609 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-outdated.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-outdated.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ could be
</span> - due to an epoch increase (used in situations where the version number
decreased, but the port still is newer than the previous one), or
- due to an OS upgrade. MacPorts will consider ports built on a previous
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version of OS X outdated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version of macOS outdated.
</span>
The ports listed in *port outdated* are the ports that will be upgraded when you
run
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-variants.1 b/doc/port-variants.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 3418a42..cf362b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-variants.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-variants.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ port-variants \- Print a list of variants with descriptions provided by a port
</span> .fi
.SH "DESCRIPTION"
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\fBport variants\fR prints a list of variants provided by the port(s) given on the command line\&. Variants allow users to select certain features when installing a certain port\&. For example, the gtk3 port provides two conflicting variants \fI+quartz\fR and \fI+x11\fR that select whether Gtk uses the X11 backend (which requires an X server) or the OS X\-native Quartz backend (which attempts to provide a more native OS X look and feel)\&. In addition, many ports feature an \fI+universal [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\fBport variants\fR prints a list of variants provided by the port(s) given on the command line\&. Variants allow users to select certain features when installing a certain port\&. For example, the gtk3 port provides two conflicting variants \fI+quartz\fR and \fI+x11\fR that select whether Gtk uses the X11 backend (which requires an X server) or the macOS\-native Quartz backend (which attempts to provide a more native macOS look and feel)\&. In addition, many ports feature an \fI+univers [...]
</span> .sp
\fBport variants\fR lists all variants by name and (if available) description\&. If variants depend on or conflict with other variants, this information is printed as a bulleted list for each variant\&.
.sp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ The output of \fBport variants\fR provides all available information on a port\(
</span> .nf
$> port variants gtk3 \-universal
gtk3 has the variants:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(+)quartz: Support for native Mac OS X graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(+)quartz: Enable native macOS graphics support
</span> * conflicts with x11
\-universal: Build for multiple architectures
[+]x11: Enable X11 support
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-variants.1.txt b/doc/port-variants.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 44e2e8b..2ef1ff1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-variants.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-variants.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,8 @@ DESCRIPTION
</span> command line. Variants allow users to select certain features when installing
a certain port. For example, the +gtk3+ port provides two conflicting variants
'+quartz' and '+x11' that select whether Gtk uses the X11 backend (which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-requires an X server) or the OS X-native Quartz backend (which attempts to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-provide a more native OS X look and feel). In addition, many ports feature an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+requires an X server) or the macOS-native Quartz backend (which attempts to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+provide a more native macOS look and feel). In addition, many ports feature an
</span> '+universal' variant that enables building of universal (i.e. multi-arch)
binaries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ variants. The +gtk3+ port can serve as a good example:
</span> ----
$> port variants gtk3 -universal
gtk3 has the variants:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(+)quartz: Support for native Mac OS X graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(+)quartz: Enable native macOS graphics support
</span> * conflicts with x11
-universal: Build for multiple architectures
[+]x11: Enable X11 support
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port.1 b/doc/port.1
</span><span style='display:block; white-space:pre;color:#808080;'>index f1d82f4..8cccf2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -526,7 +526,7 @@ Honor state files even if the Portfile was modified\&. This flag is called \-o b
</span> .PP
\-t
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Enable trace mode debug facilities on platforms that support it, currently only Mac OS X\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Enable trace mode debug facilities on platforms that support it, currently only macOS\&.
</span>
This feature is two\-folded\&. It consists in automatically detecting and reporting undeclared dependencies based on what files the port reads or what programs the port executes\&. In verbose mode, it will also report unused dependencies for each stage of the port installation\&. It also consists in forbidding and reporting file creation and file writes outside allowed directories (temporary directories and ${workpath})\&.
.RE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1258,26 +1258,26 @@ There are also actions for producing installable packages of ports:
</span> .PP
pkg
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Creates an OS X installer package of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Creates a macOS installer package of
</span> \fIportname\fR\&.
.RE
.PP
mpkg
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Creates an OS X installer metapackage of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Creates a macOS installer metapackage of
</span> \fIportname\fR
and its dependencies\&.
.RE
.PP
dmg
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Creates an internet\-enabled disk image containing an OS X package of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Creates an Internet\-enabled disk image containing a macOS package of
</span> \fIportname\fR\&.
.RE
.PP
mdmg
.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Creates an internet\-enabled disk image containing an OS X metapackage of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Creates an Internet\-enabled disk image containing a macOS metapackage of
</span> \fIportname\fR
and its dependencies\&.
.RE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port.1.txt b/doc/port.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ba9e33..e9429f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +178,7 @@ The port command recognizes several global flags and options.
</span>
-t::
Enable trace mode debug facilities on platforms that support it, currently
<span style='display:block; white-space:pre;background:#ffe0e0;'>- only Mac OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ only macOS.
</span> +
This feature is two-folded. It consists in automatically detecting and
reporting undeclared dependencies based on what files the port reads or what
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -650,17 +650,17 @@ PACKAGING ACTIONS
</span> There are also actions for producing installable packages of ports:
pkg::
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Creates an OS X installer package of 'portname'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Creates a macOS installer package of 'portname'.
</span>
mpkg::
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Creates an OS X installer metapackage of 'portname' and its dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Creates a macOS installer metapackage of 'portname' and its dependencies.
</span>
dmg::
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Creates an internet-enabled disk image containing an OS X package of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Creates an Internet-enabled disk image containing a macOS package of
</span> 'portname'.
mdmg::
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Creates an internet-enabled disk image containing an OS X metapackage of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Creates an Internet-enabled disk image containing a macOS metapackage of
</span> 'portname' and its dependencies.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/portfile.7 b/doc/portfile.7
</span><span style='display:block; white-space:pre;color:#808080;'>index f3ba370..084b8ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/portfile.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,7 +208,7 @@ Declares which platforms are supported by the port.
</span> .Dl platforms darwin
.It Ic supported_archs
The CPU architectures for which this port can be built. Archs currently
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not set,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported by macOS are: i386, ppc, ppc64, x86_64. If this option is not set,
</span> it is assumed that the port can build for all archs. If a port does not install
any architecture-specific files, use the special value noarch.
.br
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,7 +632,7 @@ Group for MacPorts installation (e.g.
</span> .Sy Type:
.Em read-only
.It Ic applications_dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Absolute path to the final location to install Mac OS X application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Absolute path to the final location to install macOS application
</span> bundles (.app directories).
.br
.Sy Type:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,7 +641,7 @@ bundles (.app directories).
</span> .Sy Default:
.Em /Applications/MacPorts
.It Ic frameworks_dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Absolute path to the final location to install Mac OS X framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Absolute path to the final location to install macOS framework
</span> bundles (.framework directories).
.br
.Sy Type:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1276,7 +1276,7 @@ use the vanilla compiler suites installed via MacPorts.
</span> .Sy Example:
.Dl configure.compiler llvm-gcc-4.2
.It Ic configure.sdk_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Mac OS X SDK version to build against.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS SDK version to build against.
</span> .br
.Sy Type:
.Em optional
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1492,7 +1492,7 @@ Test target to pass to
</span> .El
.Sh STARTUPITEM OPTIONS
If a port needs to run on system startup, it can use MacPorts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem keywords to install native OS X startup scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem keywords to install native macOS startup scripts.
</span> Startup scripts require user interaction after port installation
to activate them and instructions are given during port installs.
.Bl -tag -width lc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1827,7 +1827,7 @@ value lists which variants are enabled by default.
</span> .Sy Example:
.Dl default_variants +ssl +tcpd
.It Ic universal_variant
<span style='display:block; white-space:pre;background:#ffe0e0;'>-When using MacPorts on Mac OS X, a universal variant is defined and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When using MacPorts on macOS, a universal variant is defined and
</span> the default behavior is to configure ports with universal flags
(see the
.Ic UNIVERSAL TARGET HOOKS
<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 214f57c..14277d7 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;'>@@ -39,7 +39,7 @@ MacPorts defines the notion of PortGroup classes with the PortGroup command\&. T
</span> .sp
\fBPortGroup xcode\fR is here to easily port Xcode\-based opensource software\&. It handles configuration, build and destroot phases\&. It also defines some values for Xcode\-based software\&. A minimum Portfile using the \fBxcode PortGroup\fR class only defines the fetch and the checksum phases\&.
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Using \fBPortGroup xcode\fR is a way to make your port more robust to Xcode version updates as the PortGroup is tested against all supported Mac OS X and Xcode versions\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Using \fBPortGroup xcode\fR is a way to make your port more robust to Xcode version updates as the PortGroup is tested against all supported macOS and Xcode versions\&.
</span> .SS "XCODE PORTGROUP SUGAR"
.sp
Portfiles using \fBxcode PortGroup\fR do not need to define the following variables:
<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 d4840b0..5506d4a 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;'>@@ -33,7 +33,7 @@ for Xcode-based software. A minimum Portfile using the *xcode PortGroup* class
</span> only defines the fetch and the checksum phases.
Using *PortGroup xcode* is a way to make your port more robust to Xcode version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-updates as the PortGroup is tested against all supported Mac OS X and Xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+updates as the PortGroup is tested against all supported macOS and Xcode
</span> versions.
XCODE PORTGROUP SUGAR
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/porthier.7 b/doc/porthier.7
</span><span style='display:block; white-space:pre;color:#808080;'>index c6e29a4..4dcadb4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/porthier.7
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/porthier.7
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ archive libraries
</span> .It Pa libexec/
system daemons & system utilities (executed by other programs)
.It Pa Library/Frameworks/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Native Mac OS X Library Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Native macOS Library Frameworks
</span> .It Pa sbin/
system programs and administration utilities
.It Pa share/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,7 @@ directory for cgi executables
</span> .El
.El
.It Pa /Applications/MacPorts/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Native Mac OS X applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Native macOS applications
</span> .Pp
.El
.El
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/m4/tcl.m4 b/m4/tcl.m4
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ec1585..7d1a8db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/m4/tcl.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/m4/tcl.m4
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -733,7 +733,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
</span> # TK_SHLIB_LD_EXTRAS for the build of Tcl and Tk, but not recorded in the
# tclConfig.sh, since they are only used for the build
# of Tcl and Tk.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Examples: MacOS X records the library version and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Examples: macOS records the library version and
</span> # compatibility version in the shared library. But
# of course the Tcl version of this is only used for Tcl.
# LIB_SUFFIX - Specifies everything that comes after the "libfoo"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/ReleaseProcess.md b/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;color:#808080;'>index 990b95e..bd62b72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ done with the help of the infrastructure team.
</span>
### Create Release Packages and Disk Image(s) ###
<span style='display:block; white-space:pre;background:#ffe0e0;'>-The dmg is a Mac OS X disk image that contains a standalone installer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The dmg is a macOS disk image that contains a standalone installer,
</span> configured in the usual way, named in a consistent fashion and incorporating
the OS version for which it was built.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +197,7 @@ automated through a Makefile target or similar. A good way of validating the
</span> installer is to first create the destroot of the port and examine it for:
* Linking: libraries and binaries should not be linked against anything
<span style='display:block; white-space:pre;background:#ffe0e0;'>- that's not present by default on a vanilla Mac OS X installation +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that's not present by default on a vanilla macOS installation +
</span> developer tools, excluding even the MacPorts installation prefix; this can
be accomplished through the use of `otool -L`. Currently the libraries and
binaries in need of linking validation are:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/Makefile.in b/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index d6de279..3dc883b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ SQLEXT_OBJS = sqlext.o vercomp.o
</span>
include ../../Mk/macports.autoconf.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# required for strdup(3) on Linux and OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# required for strdup(3) on Linux and macOS
</span> CPPFLAGS+=-D_XOPEN_SOURCE=600
all:: ${STLIB_NAME} ${SQLEXT_NAME}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/entry.c b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c6f3f0..3851e4b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> /*
* entry.c
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2010-2011, 2014, 2017 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2010-2011, 2014, 2017-2018 The MacPorts Project
</span> * Copyright (c) 2007 Chris Pickel <sfiera@macports.org>
* All rights reserved.
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span> #include <config.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* required for asprintf(3) on OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* required for asprintf(3) on macOS */
</span> #define _DARWIN_C_SOURCE
/* required for asprintf(3) on Linux */
#define _GNU_SOURCE
<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 1f31048..650c094 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;'>@@ -1,8 +1,8 @@
</span> /*
* Copyright (c) 2005 Apple Inc. All rights reserved.
* Copyright (c) 2005-2006 Paul Guyot <pguyot@kallisys.net>,
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2006-2018 The MacPorts Project
</span> * All rights reserved.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2006-2015 The MacPorts Project
</span> *
* @APPLE_BSD_LICENSE_HEADER_START@
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -385,7 +385,7 @@ void __darwintrace_setup() {
</span> }
/* Set the close-on-exec flag as early as possible after the socket
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * creation. On OS X, there is no way to do this race-condition free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * creation. On macOS, there is no way to do this race-condition free
</span> * unless you synchronize around creation and fork(2) -- however,
* blocking in this function is not acceptable for darwintrace, because
* it could possibly run in a signal handler, leading to a deadlock.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,7 +523,7 @@ static void frecv(void *restrict buf, size_t size) {
</span> * SA_RESTART isn't set) and fread(3) may return short without giving us
* a way to know how many bytes have actually been read, i.e. without a way
* to do the call again. Because of this great API design and
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * implementation on OS X, we'll just use read(2) here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * implementation on macOS, we'll just use read(2) here. */
</span> int fd = fileno(__darwintrace_sock());
size_t count = 0;
while (count < size) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -558,7 +558,7 @@ static void fsend(const void *restrict buf, size_t size) {
</span> * SA_RESTART isn't set) and fwrite(3) may return short without giving us
* a way to know how many bytes have actually been written, i.e. without
* a way to do the call again. Because of this great API design and
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * implementation on OS X, we'll just use write(2) here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * implementation on macOS, we'll just use write(2) here. */
</span> int fd = fileno(__darwintrace_sock());
size_t count = 0;
while (count < size) {
<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 1566b30..32f8f5e 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;'>@@ -1,8 +1,8 @@
</span> /*
* Copyright (c) 2005 Apple Inc. All rights reserved.
* Copyright (c) 2005-2006 Paul Guyot <pguyot@kallisys.net>,
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2006-2018 The MacPorts Project
</span> * All rights reserved.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2006-2015 The MacPorts Project
</span> *
* @APPLE_BSD_LICENSE_HEADER_START@
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +210,7 @@ static inline int check_interpreter(const char *restrict path) {
</span> char buffer[MAXPATHLEN + 1 + 2];
ssize_t bytes_read;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Read the file for the interpreter. Fortunately, on OS X:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Read the file for the interpreter. Fortunately, on macOS:
</span> * The system guarantees to read the number of bytes requested if
* the descriptor references a normal file that has that many
* bytes left before the end-of-file, but in no other case.
<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 8a06fcf..c18d655 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;'>@@ -2,7 +2,7 @@
</span> * -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=c:et:sw=4:ts=4:sts=4:tw=100
* libmachista.c
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2011 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2011-2012, 2014, 2016-2018 The MacPorts Project
</span> * Copyright (c) 2011 Landon Fuller <landonf@macports.org>
* Copyright (c) 2011 Clemens Lang <cal@macports.org>
* All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span> #include <config.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* required for asprintf(3) on OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* required for asprintf(3) on macOS */
</span> #define _DARWIN_C_SOURCE
/* required for asprintf(3) on Linux */
#define _GNU_SOURCE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portpkg.tcl b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7315ef2..a8a9282 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# portpkg.tcl
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2005, 2007 - 2013, 2016 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2002 - 2003 Apple Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2005, 2007-2014, 2016-2018 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2002-2003 Apple Inc.
</span> # All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,7 +351,7 @@ proc portpkg::write_welcome_html {filename portname portversion portrevision lon
</span> <title>Install ${portname}</title>
</head>
<body>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<font face=\"Helvetica\"><b>Welcome to the ${portname} for Mac OS X Installer</b></font>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<font face=\"Helvetica\"><b>Welcome to the ${portname} for macOS Installer</b></font>
</span> <p>
<font face=\"Helvetica\">${long_description}</font>
<p>"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,7 +360,7 @@ proc portpkg::write_welcome_html {filename portname portversion portrevision lon
</span> puts $fd "<font face=\"Helvetica\"><a href=\"${homepage}\">${homepage}</a></font><p>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portversion}${portrevision_str} for Mac OS X. To get started, click Continue.</font>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portversion}${portrevision_str} for macOS. To get started, click Continue.</font>
</span> </body>
</html>"
<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 651f0d4..1a5420c 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;'>@@ -1,10 +1,10 @@
</span> /*
* Pextlib.c
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2002 - 2003 Apple Inc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2004 - 2005 Paul Guyot <pguyot@kallisys.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2002-2003 Apple Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2004-2005 Paul Guyot <pguyot@kallisys.net>
</span> * Copyright (c) 2004 Landon Fuller <landonf@macports.org>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2007 - 2017 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2007-2018 The MacPorts Project
</span> * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@
</span> /* required for vasprintf(3) on Linux */
#define _GNU_SOURCE
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* required for clearenv(3)/setenv(3)/unsetenv(3) on OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* required for clearenv(3)/setenv(3)/unsetenv(3) on macOS */
</span> #define _DARWIN_C_SOURCE
#include <sys/resource.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +268,7 @@ int ExistsgroupCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, T
</span> }
/* Find the first unused UID > 500
<span style='display:block; white-space:pre;background:#ffe0e0;'>- UIDs > 500 are visible on the login screen of OS X,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UIDs > 500 are visible on the macOS login screen,
</span> but UIDs < 500 are reserved by Apple */
int NextuidCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc UNUSED, Tcl_Obj *CONST objv[] UNUSED)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/adv-flock.c b/src/pextlib1.0/adv-flock.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ac74f5..b59a6cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/adv-flock.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/adv-flock.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> /*
* adv-flock.c
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2009 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2009, 2014-2018 The MacPorts Project
</span> * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@
</span>
#ifndef __APPLE__
/* needed to get struct sigaction on some platforms, but
<span style='display:block; white-space:pre;background:#ffe0e0;'>- hides flock on OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hides flock on macOS */
</span> #define _XOPEN_SOURCE 500L
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/mktemp.c b/src/pextlib1.0/mktemp.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 644779e..f072139 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/mktemp.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/mktemp.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> /*
* mktemp.c
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2009 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2009, 2014, 2016-2018 The MacPorts Project
</span> * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@
</span>
#ifndef __APPLE__
/* required for strdup(3)/mkdtemp(3) on Linux */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* hides mkdtemp(3) on OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* hides mkdtemp(3) on macOS */
</span> #define _XOPEN_SOURCE 700L
/* required for mktemp(3) if _XOPEN_SOURCE >= 600L on Linux */
#define _BSD_SOURCE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/readline.c b/src/pextlib1.0/readline.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e955f8e..006f28e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/readline.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/readline.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> #include <config.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* required for strdup(3) on Linux and OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* required for strdup(3) on Linux and macOS */
</span> #define _XOPEN_SOURCE 600L
#include <stdio.h>
<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 1de00a2..4aa2506 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;'>@@ -130,7 +130,7 @@
</span>
#include "strsed.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* required for strdup(3) on Linux and OS X */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* required for strdup(3) on Linux and macOS */
</span> #define _XOPEN_SOURCE 600L
/* we're using this on raw strings, no escape sequences allowed */
#define ESCAPED_STRING
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portmain.tcl b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dbd5bbf..345f829 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# portmain.tcl
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004 - 2005, 2007 - 2012 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2002 - 2003 Apple Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-2005, 2007-2018 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2002-2003 Apple Inc.
</span> # All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ ui_debug "OS [option os.platform]/[option os.version] ${macosx_version_text}arch
</span> default universal_variant {${use_configure}}
if {[option os.platform] eq "darwin" && [option os.subplatform] eq "macosx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we're on Mac OS X and can therefore build universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we're on macOS and can therefore build universal
</span> default os.universal_supported yes
} else {
default os.universal_supported no
<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 b1f9e3e..1c3b12f 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;'>@@ -3,7 +3,7 @@
</span> # Copyright (c) 2002-2003 Apple Inc.
# Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
# Copyright (c) 2006-2007 Markus W. Weissmann <mww@macports.org>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004-2017 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-2018 The MacPorts Project
</span> # All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2538,7 +2538,7 @@ proc PortGroup {group version} {
</span> proc get_portimage_name {} {
global subport version revision portvariants os.platform os.major portarchivetype
set ret "${subport}-${version}_${revision}${portvariants}.${os.platform}_${os.major}.[join [get_canonical_archs] -].${portarchivetype}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # should really look up NAME_MAX here, but it's 255 for all OS X so far
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # should really look up NAME_MAX here, but it's 255 for all macOS so far
</span> # (leave 10 chars for an extension like .rmd160 on the sig file)
if {[string length $ret] > 245 && ${portvariants} ne ""} {
# try hashing the variants
</pre><pre style='margin:0'>
</pre>