Use "macOS" when OS version is unknown

configure

@@ -2746,8 +2746,8 @@ fi
 
 
 if test "x$SW_VERS" != "x"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Mac OS X version" >&5
-$as_echo_n "checking Mac OS X version... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking macOS version" >&5
+$as_echo_n "checking macOS version... " >&6; }
   MACOSX_VERSION=`$SW_VERS -productVersion`
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_VERSION" >&5
 $as_echo "$MACOSX_VERSION" >&6; }

configure.ac

@@ -22,7 +22,7 @@ AC_PATH_PROG(DEFAULTS, defaults)
 AC_PATH_PROG(XCODE_SELECT, xcode-select)
 
 if test "x$SW_VERS" != "x"; then
-  AC_MSG_CHECKING(Mac OS X version)
+  AC_MSG_CHECKING(macOS version)
   MACOSX_VERSION=`$SW_VERS -productVersion`
   AC_MSG_RESULT([$MACOSX_VERSION])
 fi

doc/macports.conf.in

@@ -127,7 +127,7 @@ universal_archs     	@UNIVERSAL_ARCHS@
 
 # Type of generated StartupItems.
 # - launchd: Create StartupItems for use with launchd.
-# - default: Create StartupItems for launchd on OS X and none on
+# - default: Create StartupItems for launchd on macOS and none on
 #   other platforms.
 # - none: Disable creation of StartupItems.
 # This setting only applies when building ports from source.

doc/port-dmg.1

@@ -44,9 +44,9 @@ port-dmg, port-mdmg, port-pkg, port-mpkg \- Create binary archives of a port, an
 .fi
 .SH "DESCRIPTION"
 .sp
-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\&.
+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\&.
 .sp
-\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 \&.mpkg installer image that contains installer packages for each of the dependencies and is suitable for standalone redistribution\&. \fBport mdmg\fR wraps this \&.mpkg package in a disk image\&.
+\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 \&.mpkg installer image that contains installer packages for each of the dependencies and is suitable for standalone redistribution\&. \fBport mdmg\fR wraps this \&.mpkg package in a disk image\&.
 .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

doc/port-dmg.1.txt

@@ -27,11 +27,11 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-These commands create OS X-native binary archives of a given port. Depending on
+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.
 
-*port pkg* creates an OS X installer package that installs all files that belong
+*port pkg* creates a macOS installer package that installs all files that belong
 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*

doc/port-info.1

@@ -129,7 +129,7 @@ is specified\&.
 \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
-\fIdarwin\fR, i\&.e\&., OS X\&.
+\fIdarwin\fR, i\&.e\&., macOS\&.
 .RE
 .PP
 \fB\-\-portdir\fR

doc/port-info.1.txt

@@ -88,7 +88,7 @@ The rest of the options affect which fields will be given in the output:
 
 *--platform*, *--platforms*::
     List the platforms supported by a port. This field exists for historical
-    reasons only. In modern MacPorts, this is always 'darwin', i.e., OS X.
+    reasons only. In modern MacPorts, this is always 'darwin', i.e., macOS.
 
 *--portdir*::
     Print the path to a port's directory relative to the port tree root.

doc/port-installed.1

@@ -38,7 +38,7 @@ Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a
 .PP
 \fB\-v\fR
 .RS 4
-Print the platform at install time (i\&.e\&., your OS X version) and the architecture(s) of the installed port\&.
+Print the platform at install time (i\&.e\&., your macOS version) and the architecture(s) of the installed port\&.
 .RE
 .PP
 \fB\-q\fR

doc/port-installed.1.txt

@@ -26,7 +26,7 @@ section for an explanation of the active/inactive state.
 include::global-flags.txt[]
 
 *-v*::
-    Print the platform at install time (i.e., your OS X version) and the
+    Print the platform at install time (i.e., your macOS version) and the
     architecture(s) of the installed port.
 
 *-q*::

doc/port-outdated.1

@@ -71,7 +71,7 @@ due to an epoch increase (used in situations where the version number decreased,
 .sp -1
 .IP \(bu 2.3
 .\}
-due to an OS upgrade\&. MacPorts will consider ports built on a previous version of OS X outdated\&.
+due to an OS upgrade\&. MacPorts will consider ports built on a previous version of macOS outdated\&.
 .RE
 .sp
 The ports listed in \fBport outdated\fR are the ports that will be upgraded when you run

doc/port-outdated.1.txt

@@ -23,7 +23,7 @@ could be
  - 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
-   version of OS X outdated.
+   version of macOS outdated.
     
 The ports listed in *port outdated* are the ports that will be upgraded when you
 run

doc/port-variants.1

@@ -30,7 +30,7 @@ port-variants \- Print a list of variants with descriptions provided by a port
 .fi
 .SH "DESCRIPTION"
 .sp
-\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\fR variant that enables building of universal (i\&.e\&. multi\-arch) binaries\&.
+\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+universal\fR variant that enables building of universal (i\&.e\&. multi\-arch) binaries\&.
 .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
@@ -60,7 +60,7 @@ The output of \fBport variants\fR provides all available information on a port\(
 .nf
 $> port variants gtk3 \-universal
 gtk3 has the variants:
-(+)quartz: Support for native Mac OS X graphics
+(+)quartz: Enable native macOS graphics support
      * conflicts with x11
   \-universal: Build for multiple architectures
 [+]x11: Enable X11 support

doc/port-variants.1.txt

@@ -19,8 +19,8 @@ DESCRIPTION
 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
-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
+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
 '+universal' variant that enables building of universal (i.e. multi-arch)
 binaries.
 
@@ -53,7 +53,7 @@ variants. The +gtk3+ port can serve as a good example:
 ----
 $> port variants gtk3 -universal
 gtk3 has the variants:
-(+)quartz: Support for native Mac OS X graphics
+(+)quartz: Enable native macOS graphics support
      * conflicts with x11
   -universal: Build for multiple architectures
 [+]x11: Enable X11 support

doc/port.1

@@ -526,7 +526,7 @@ Honor state files even if the Portfile was modified\&. This flag is called \-o b
 .PP
 \-t
 .RS 4
-Enable trace mode debug facilities on platforms that support it, currently only Mac OS X\&.
+Enable trace mode debug facilities on platforms that support it, currently only macOS\&.
 
 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
@@ -1258,26 +1258,26 @@ There are also actions for producing installable packages of ports:
 .PP
 pkg
 .RS 4
-Creates an OS X installer package of
+Creates a macOS installer package of
 \fIportname\fR\&.
 .RE
 .PP
 mpkg
 .RS 4
-Creates an OS X installer metapackage of
+Creates a macOS installer metapackage of
 \fIportname\fR
 and its dependencies\&.
 .RE
 .PP
 dmg
 .RS 4
-Creates an internet\-enabled disk image containing an OS X package of
+Creates an Internet\-enabled disk image containing a macOS package of
 \fIportname\fR\&.
 .RE
 .PP
 mdmg
 .RS 4
-Creates an internet\-enabled disk image containing an OS X metapackage of
+Creates an Internet\-enabled disk image containing a macOS metapackage of
 \fIportname\fR
 and its dependencies\&.
 .RE

doc/port.1.txt

@@ -178,7 +178,7 @@ The port command recognizes several global flags and options.
 
 -t::
     Enable trace mode debug facilities on platforms that support it, currently
-    only Mac OS X.
+    only macOS.
     +
     This feature is two-folded. It consists in automatically detecting and
     reporting undeclared dependencies based on what files the port reads or what
@@ -650,17 +650,17 @@ PACKAGING ACTIONS
 There are also actions for producing installable packages of ports:
 
 pkg::
-    Creates an OS X installer package of 'portname'.
+    Creates a macOS installer package of 'portname'.
 
 mpkg::
-    Creates an OS X installer metapackage of 'portname' and its dependencies.
+    Creates a macOS installer metapackage of 'portname' and its dependencies.
 
 dmg::
-    Creates an internet-enabled disk image containing an OS X package of
+    Creates an Internet-enabled disk image containing a macOS package of
     'portname'.
 
 mdmg::
-    Creates an internet-enabled disk image containing an OS X metapackage of
+    Creates an Internet-enabled disk image containing a macOS metapackage of
     'portname' and its dependencies.
 
 

doc/portfile.7

@@ -208,7 +208,7 @@ Declares which platforms are supported by the port.
 .Dl platforms darwin
 .It Ic supported_archs
 The CPU architectures for which this port can be built. Archs currently
-supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not set,
+supported by macOS are: i386, ppc, ppc64, x86_64. If this option is not set,
 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
@@ -632,7 +632,7 @@ Group for MacPorts installation (e.g.
 .Sy Type:
 .Em read-only
 .It Ic applications_dir
-Absolute path to the final location to install Mac OS X application
+Absolute path to the final location to install macOS application
 bundles (.app directories).
 .br
 .Sy Type:
@@ -641,7 +641,7 @@ bundles (.app directories).
 .Sy Default:
 .Em /Applications/MacPorts
 .It Ic frameworks_dir
-Absolute path to the final location to install Mac OS X framework
+Absolute path to the final location to install macOS framework
 bundles (.framework directories).
 .br
 .Sy Type:
@@ -1276,7 +1276,7 @@ use the vanilla compiler suites installed via MacPorts.
 .Sy Example:
 .Dl configure.compiler llvm-gcc-4.2
 .It Ic configure.sdk_version
-Mac OS X SDK version to build against.
+macOS SDK version to build against.
 .br 
 .Sy Type:
 .Em optional
@@ -1492,7 +1492,7 @@ Test target to pass to
 .El
 .Sh STARTUPITEM OPTIONS
 If a port needs to run on system startup, it can use MacPorts
-startupitem keywords to install native OS X startup scripts.
+startupitem keywords to install native macOS startup scripts.
 Startup scripts require user interaction after port installation
 to activate them and instructions are given during port installs.
 .Bl -tag -width lc
@@ -1827,7 +1827,7 @@ value lists which variants are enabled by default.
 .Sy Example:
 .Dl default_variants +ssl +tcpd
 .It Ic universal_variant
-When using MacPorts on Mac OS X, a universal variant is defined and
+When using MacPorts on macOS, a universal variant is defined and
 the default behavior is to configure ports with universal flags
 (see the
 .Ic UNIVERSAL TARGET HOOKS

doc/portgroup.7

@@ -39,7 +39,7 @@ MacPorts defines the notion of PortGroup classes with the PortGroup command\&. T
 .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
-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\&.
+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\&.
 .SS "XCODE PORTGROUP SUGAR"
 .sp
 Portfiles using \fBxcode PortGroup\fR do not need to define the following variables:

doc/portgroup.7.txt

@@ -33,7 +33,7 @@ for Xcode-based software. A minimum Portfile using the *xcode PortGroup* class
 only defines the fetch and the checksum phases.
 
 Using *PortGroup xcode* 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
+updates as the PortGroup is tested against all supported macOS and Xcode
 versions.
 
 XCODE PORTGROUP SUGAR

doc/porthier.7

@@ -53,7 +53,7 @@ archive libraries
 .It Pa libexec/
 system daemons & system utilities (executed by other programs)
 .It Pa Library/Frameworks/
-Native Mac OS X Library Frameworks
+Native macOS Library Frameworks
 .It Pa sbin/
 system programs and administration utilities
 .It Pa share/
@@ -126,7 +126,7 @@ directory for cgi executables
 .El
 .El
 .It Pa /Applications/MacPorts/
-Native Mac OS X applications
+Native macOS applications
 .Pp
 .El
 .El

m4/tcl.m4

@@ -733,7 +733,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
 #  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. 
-#                       Examples: MacOS X records the library version and
+#                       Examples: macOS records the library version and
 #                       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"