Use historical OS names as appropriate

Use "Mac OS X" for 10.0-10.7, "OS X" for 10.8-10.11, "macOS" for 10.12+. In the configure script check, direct the user to the Mac App Store to update the OS on 10.8 and later, instead of Software Update.
macports · Jun 8, 2018 · 334c703 · 334c703
1 parent 0ec949c
commit 334c703
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 29 deletions.
diff --git a/configure b/configure
@@ -2758,12 +2758,24 @@ case "$MACOSX_VERSION" in
     as_fn_error $? "This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/" "$LINENO" 5
     ;;
-  10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]|10.7.[0-4]|10.8.[0-4]|10.9.[0-4]|10.10.[0-4]|10.11.[0-5]|10.12.[0-5])
+  10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]|10.7.[0-4])
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is out of date" >&5
 $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please run Software Update to update it" >&5
 $as_echo "$as_me: WARNING: Please run Software Update to update it" >&2;}
     ;;
+  10.8.[0-4]|10.9.[0-4]|10.10.[0-4]|10.11.[0-5])
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of OS X is out of date" >&5
+$as_echo "$as_me: WARNING: This version of OS X is out of date" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use the Mac App Store to update it" >&5
+$as_echo "$as_me: WARNING: Please use the Mac App Store to update it" >&2;}
+    ;;
+  10.12.[0-5])
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of macOS is out of date" >&5
+$as_echo "$as_me: WARNING: This version of macOS is out of date" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use the Mac App Store to update it" >&5
+$as_echo "$as_me: WARNING: Please use the Mac App Store to update it" >&2;}
+    ;;
   10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*)
         ;;
   *)

diff --git a/configure.ac b/configure.ac
@@ -32,10 +32,18 @@ case "$MACOSX_VERSION" in
     AC_MSG_ERROR([This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/])
     ;;
-  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-4]]|10.9.[[0-4]]|10.10.[[0-4]]|10.11.[[0-5]]|10.12.[[0-5]])
+  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]])
     AC_MSG_WARN([This version of Mac OS X is out of date])
     AC_MSG_WARN([Please run Software Update to update it])
     ;;
+  10.8.[[0-4]]|10.9.[[0-4]]|10.10.[[0-4]]|10.11.[[0-5]])
+    AC_MSG_WARN([This version of OS X is out of date])
+    AC_MSG_WARN([Please use the Mac App Store to update it])
+    ;;
+  10.12.[[0-5]])
+    AC_MSG_WARN([This version of macOS is out of date])
+    AC_MSG_WARN([Please use the Mac App Store to update it])
+    ;;
   10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*)
     dnl Supported version
     ;;

diff --git a/doc/macports.conf.in b/doc/macports.conf.in
@@ -58,13 +58,13 @@ variants_conf       	@MPCONFIGDIR_EXPANDED@/variants.conf
 
 # CPU architecture to target. Supported values are "ppc", "ppc64",
 # "i386", and "x86_64". Defaults to:
-# - OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
-# - OS X 10.6 and later: "x86_64" on Intel 64, otherwise "i386".
+# - Mac OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
+# - Mac OS X 10.6 and later: "x86_64" on 64-bit Intel, otherwise "i386".
 #build_arch          	i386
 
 # Space-delimited list of CPU architectures to target when building
-# universal. Defaults to "i386 ppc" on OS X 10.5 and earlier and
-# "x86_64 i386" on OS X 10.6 and later.
+# universal. Defaults to "i386 ppc" on Mac OS X 10.5 and earlier and
+# "x86_64 i386" on Mac OS X 10.6 and later.
 universal_archs     	@UNIVERSAL_ARCHS@
 
 # Use ccache, a compiler cache for C, C++, Objective-C, and
@@ -158,7 +158,7 @@ universal_archs     	@UNIVERSAL_ARCHS@
 # - COLUMNS, LINES
 # Variables listed in extra_env are added to this list. This has no
 # default value; setting it is intended for advanced users and is
-# unsupported. (Note that sudo(8) sanitizes its environment on OS X 10.5
+# unsupported. (Note that sudo(8) sanitizes its environment on Mac OS X 10.5
 # and later, so it may have to be configured to pass the desired
 # variables to MacPorts.)
 #extra_env           	KEEP_THIS THIS_TOO
@@ -169,7 +169,7 @@ universal_archs     	@UNIVERSAL_ARCHS@
 # "yes", MacPorts uses proxy_*, then Network Preferences, then the
 # environment. (Note that Network Preferences does not have a setting
 # for rsync proxies. Also note that sudo(8) sanitizes its environment on
-# OS X 10.5 and later, so it may have to be configured to pass desired
+# Mac OS X 10.5 and later, so it may have to be configured to pass desired
 # variables to MacPorts.)
 #proxy_override_env  	no
 

diff --git a/doc/port-dmg.1 b/doc/port-dmg.1
@@ -48,7 +48,7 @@ These commands create OS X\-native binary archives of a given port\&. Depending
 .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\&.
 .sp
-On 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 OS X 10\&.6, generated installer packages could not be used for online distribution without a wrapping disk image\&.
+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
 All packages are placed in a port\(cqs work directory, which can be located using \fBport-work\fR(1)\&.
 .if n \{\

diff --git a/doc/port-dmg.1.txt b/doc/port-dmg.1.txt
@@ -41,10 +41,10 @@ image that contains installer packages for each of the dependencies and is
 suitable for standalone redistribution. *port mdmg* wraps this .mpkg package in
 a disk image.
 
-On OS X 10.6 and later, the generated installer packages are in ``flat'' format,
-such that wrapping them in a disk image is no longer necessary for online
-redistribution. Prior to OS X 10.6, generated installer packages could not be
-used for online distribution without a wrapping disk image.
+On Mac OS X 10.6 and later, the generated installer packages are in ``flat''
+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.
 
 All packages are placed in a port's work directory, which can be located using
 man:port-work[1].

diff --git a/doc/port-platform.1 b/doc/port-platform.1
@@ -30,7 +30,7 @@ port-platform \- Print the OS version for which MacPorts was built
 .sp
 This command prints the version of your operating system used to configure and build MacPorts\&. This value is used to detect OS updates and refer users to the \m[blue]\fBMigration\fR\m[]\&\s-2\u[1]\d\s+2 instructions\&.
 .sp
-Since MacPorts picks up a number of paths at configure\-time and uses them later on, changes in the operating system can break a MacPorts installation\&. For example, this happened when Apple removed \(lq/usr/bin/gnutar\(rq from OS X with the release of Mavericks\&. Since MacPorts keeps the path to its tar command in a file, this change required rebuilding MacPorts\&.
+Since MacPorts picks up a number of paths at configure\-time and uses them later on, changes in the operating system can break a MacPorts installation\&. For example, this happened when Apple removed \(lq/usr/bin/gnutar\(rq with the release of OS X Mavericks\&. Since MacPorts keeps the path to its tar command in a file, this change required rebuilding MacPorts\&.
 .SH "GLOBAL OPTIONS"
 .sp
 Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a description of global port options\&.

diff --git a/doc/port-platform.1.txt b/doc/port-platform.1.txt
@@ -19,9 +19,9 @@ wiki:Migration[] instructions.
 
 Since MacPorts picks up a number of paths at configure-time and uses them later
 on, changes in the operating system can break a MacPorts installation. For
-example, this happened when Apple removed ``/usr/bin/gnutar'' from OS X with the
-release of Mavericks. Since MacPorts keeps the path to its tar command in
-a file, this change required rebuilding MacPorts.
+example, this happened when Apple removed ``/usr/bin/gnutar'' with the release
+of OS X Mavericks. Since MacPorts keeps the path to its tar command in a file,
+this change required rebuilding MacPorts.
 
 
 include::global-flags.txt[]

diff --git a/portmgr/dmg/postflight.in b/portmgr/dmg/postflight.in
@@ -167,7 +167,7 @@ function create_run_user {
         done
         ${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $NEXTUID
 
-        # These are implicitly added on Mac OSX Lion.  AuthenticationAuthority
+        # These are implicitly added on Mac OS X Lion.  AuthenticationAuthority
         # causes the user to be visible in the Users & Groups Preference Pane,
         # and the others are just noise, so delete them.
         # https://trac.macports.org/ticket/30168

diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
@@ -1,11 +1,11 @@
 # -*- 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
 # diagnose.tcl
 #
-# Copyright (c) 2002 - 2003 Apple Inc.
-# Copyright (c) 2004 - 2005 Paul Guyot, <pguyot@kallisys.net>.
-# Copyright (c) 2004 - 2006 Ole Guldberg Jensen <olegb@opendarwin.org>.
-# Copyright (c) 2004 - 2005 Robert Shaw <rshaw@opendarwin.org>
-# Copyright (c) 2004 - 2014 The MacPorts Project
+# Copyright (c) 2002-2003 Apple Inc.
+# Copyright (c) 2004-2005 Paul Guyot, <pguyot@kallisys.net>.
+# Copyright (c) 2004-2006 Ole Guldberg Jensen <olegb@opendarwin.org>.
+# Copyright (c) 2004-2005 Robert Shaw <rshaw@opendarwin.org>
+# Copyright (c) 2004-2014, 2016-2018 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -492,7 +492,7 @@ namespace eval diagnose {
         #           None
 
         if {${macports::macosx_version} eq "10.6"} {
-            output "X11.app on OS X 10.6 systems"
+            output "X11.app on Mac OS X 10.6 systems"
 
             if {[file exists /Applications/X11.app]} {
                 ui_error "it seems you have Mac OS X 10.6 installed, and are using X11 from \"X11.app\". This has been known to cause issues. \

diff --git a/src/pextlib1.0/realpath.h b/src/pextlib1.0/realpath.h
@@ -1,7 +1,7 @@
 /*
  * realpath.h
  *
- * Copyright (c) 2009 The MacPorts Project.
+ * Copyright (c) 2009-2010, 2016, 2018 The MacPorts Project.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
  * realpath path
  *	Normalize path like file normalize does.
  *  Fixes a problem with Tcl installations affected by not defining HAVE_REALPATH (this is
- *	the case with the Tcl in OS X shipped prior to 10.6)
+ *  the case with the Tcl in Mac OS X prior to 10.6)
  */
 int RealpathCmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
 

diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
@@ -2306,7 +2306,7 @@ proc adduser {name args} {
         try {
             exec -ignorestderr $dscl . -create /Users/${name} UniqueID ${uid}
 
-            # These are implicitly added on Mac OSX Lion.  AuthenticationAuthority
+            # These are implicitly added on Mac OS X Lion.  AuthenticationAuthority
             # causes the user to be visible in the Users & Groups Preference Pane,
             # and the others are just noise, so delete them.
             # https://trac.macports.org/ticket/30168

diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
@@ -1,7 +1,7 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # portimage.tcl
 #
-# Copyright (c) 2004-2005, 2007-2011, 2014 The MacPorts Project
+# Copyright (c) 2004-2005, 2007-2018 The MacPorts Project
 # Copyright (c) 2004 Will Barton <wbb4@opendarwin.org>
 # Copyright (c) 2002 Apple Inc.
 # All rights reserved.
@@ -700,7 +700,7 @@ proc _deactivate_contents {port imagefiles {force 0} {rollback 0}} {
             # match and activate will say that some file exists but doesn't
             # belong to any port.
             # The custom realpath proc is necessary because file normalize
-            # does not resolve symlinks on OS X < 10.6
+            # does not resolve symlinks on Mac OS X < 10.6
             set directory [realpath [::file dirname $file]]
             lappend files [::file join $directory [::file tail $file]]