<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/334c703e375c8536b291f45e648ac6e5e36ae3f0">https://github.com/macports/macports-base/commit/334c703e375c8536b291f45e648ac6e5e36ae3f0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 334c703e375c8536b291f45e648ac6e5e36ae3f0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 5 06:08:12 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Use historical OS names as appropriate
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use "Mac OS X" for 10.0-10.7, "OS X" for 10.8-10.11, "macOS" for 10.12+.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In the configure script check, direct the user to the Mac App Store to
</span><span style='display:block; white-space:pre;color:#404040;'> update the OS on 10.8 and later, instead of Software Update.
</span>---
configure | 14 +++++++++++++-
configure.ac | 10 +++++++++-
doc/macports.conf.in | 12 ++++++------
doc/port-dmg.1 | 2 +-
doc/port-dmg.1.txt | 8 ++++----
doc/port-platform.1 | 2 +-
doc/port-platform.1.txt | 6 +++---
portmgr/dmg/postflight.in | 2 +-
src/macports1.0/diagnose.tcl | 12 ++++++------
src/pextlib1.0/realpath.h | 4 ++--
src/port1.0/portutil.tcl | 2 +-
src/registry2.0/portimage.tcl | 4 ++--
12 files changed, 49 insertions(+), 29 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 e6980e5..04e97bd 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;'>@@ -2758,12 +2758,24 @@ case "$MACOSX_VERSION" in
</span> as_fn_error $? "This version of Mac OS X is not supported
Please upgrade at http://store.apple.com/" "$LINENO" 5
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]|10.7.[0-4])
</span> { $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;}
;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.8.[0-4]|10.9.[0-4]|10.10.[0-4]|10.11.[0-5])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of OS X is out of date" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$as_echo "$as_me: WARNING: This version of OS X is out of date" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use the Mac App Store to update it" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$as_echo "$as_me: WARNING: Please use the Mac App Store to update it" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.12.[0-5])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of macOS is out of date" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$as_echo "$as_me: WARNING: This version of macOS is out of date" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use the Mac App Store to update it" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$as_echo "$as_me: WARNING: Please use the Mac App Store to update it" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> 10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*)
;;
*)
<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 94e18c7..f913dce 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;'>@@ -32,10 +32,18 @@ case "$MACOSX_VERSION" in
</span> AC_MSG_ERROR([This version of Mac OS X is not supported
Please upgrade at http://store.apple.com/])
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]])
</span> AC_MSG_WARN([This version of Mac OS X is out of date])
AC_MSG_WARN([Please run Software Update to update it])
;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.8.[[0-4]]|10.9.[[0-4]]|10.10.[[0-4]]|10.11.[[0-5]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_WARN([This version of OS X is out of date])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_WARN([Please use the Mac App Store to update it])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.12.[[0-5]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_WARN([This version of macOS is out of date])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_WARN([Please use the Mac App Store to update it])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> 10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*|10.11*|10.12*|10.13*)
dnl Supported version
;;
<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 cf37d61..f6252e0 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;'>@@ -58,13 +58,13 @@ variants_conf @MPCONFIGDIR_EXPANDED@/variants.conf
</span>
# CPU architecture to target. Supported values are "ppc", "ppc64",
# "i386", and "x86_64". Defaults to:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# - OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - OS X 10.6 and later: "x86_64" on Intel 64, otherwise "i386".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - Mac OS X 10.5 and earlier: "ppc" on PowerPC, otherwise "i386".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - Mac OS X 10.6 and later: "x86_64" on 64-bit Intel, otherwise "i386".
</span> #build_arch i386
# Space-delimited list of CPU architectures to target when building
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# universal. Defaults to "i386 ppc" on OS X 10.5 and earlier and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "x86_64 i386" on OS X 10.6 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# universal. Defaults to "i386 ppc" on Mac OS X 10.5 and earlier and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "x86_64 i386" on Mac OS X 10.6 and later.
</span> universal_archs @UNIVERSAL_ARCHS@
# Use ccache, a compiler cache for C, C++, Objective-C, and
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@ universal_archs @UNIVERSAL_ARCHS@
</span> # - 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# unsupported. (Note that sudo(8) sanitizes its environment on OS X 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unsupported. (Note that sudo(8) sanitizes its environment on Mac OS X 10.5
</span> # and later, so it may have to be configured to pass the desired
# variables to MacPorts.)
#extra_env KEEP_THIS THIS_TOO
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +169,7 @@ universal_archs @UNIVERSAL_ARCHS@
</span> # "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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OS X 10.5 and later, so it may have to be configured to pass desired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Mac OS X 10.5 and later, so it may have to be configured to pass desired
</span> # variables to MacPorts.)
#proxy_override_env no
<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 ef60aea..ec84930 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;'>@@ -48,7 +48,7 @@ These commands create OS X\-native binary archives of a given port\&. Depending
</span> .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 \&.mpk [...]
.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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\&.
</span> .sp
All packages are placed in a port\(cqs work directory, which can be located using \fBport-work\fR(1)\&.
.if n \{\
<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 3de0a51..983543d 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;'>@@ -41,10 +41,10 @@ image that contains installer packages for each of the dependencies and is
</span> suitable for standalone redistribution. *port mdmg* wraps this .mpkg package in
a disk image.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-On OS X 10.6 and later, the generated installer packages are in ``flat'' format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-such that wrapping them in a disk image is no longer necessary for online
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-redistribution. Prior to OS X 10.6, generated installer packages could not be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-used for online distribution without a wrapping disk image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On Mac OS X 10.6 and later, the generated installer packages are in ``flat''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+format, such that wrapping them in a disk image is no longer necessary for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+online redistribution. Prior to Mac OS X 10.6, generated installer packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+could not be used for online distribution without a wrapping disk image.
</span>
All packages are placed in a port's work directory, which can be located using
man:port-work[1].
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-platform.1 b/doc/port-platform.1
</span><span style='display:block; white-space:pre;color:#808080;'>index 2300650..da5c49e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-platform.1
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-platform.1
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ port-platform \- Print the OS version for which MacPorts was built
</span> .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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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\&.
</span> .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\&.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/port-platform.1.txt b/doc/port-platform.1.txt
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d1c3b6..65b2fdd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/port-platform.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/port-platform.1.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ wiki:Migration[] instructions.
</span>
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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-example, this happened when Apple removed ``/usr/bin/gnutar'' from OS X with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-release of Mavericks. Since MacPorts keeps the path to its tar command in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a file, this change required rebuilding MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+example, this happened when Apple removed ``/usr/bin/gnutar'' with the release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+of OS X Mavericks. Since MacPorts keeps the path to its tar command in a file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+this change required rebuilding MacPorts.
</span>
include::global-flags.txt[]
<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 1427e9c..89fed17 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;'>@@ -167,7 +167,7 @@ function create_run_user {
</span> done
${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $NEXTUID
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These are implicitly added on Mac OSX Lion. AuthenticationAuthority
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are implicitly added on Mac OS X Lion. AuthenticationAuthority
</span> # 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
<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 43eea47..dddac39 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;'>@@ -1,11 +1,11 @@
</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
# diagnose.tcl
#
<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:#ffe0e0;'>-# Copyright (c) 2004 - 2006 Ole Guldberg Jensen <olegb@opendarwin.org>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004 - 2005 Robert Shaw <rshaw@opendarwin.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004 - 2014 The MacPorts Project
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-2006 Ole Guldberg Jensen <olegb@opendarwin.org>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-2005 Robert Shaw <rshaw@opendarwin.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-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;'>@@ -492,7 +492,7 @@ namespace eval diagnose {
</span> # None
if {${macports::macosx_version} eq "10.6"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- output "X11.app on OS X 10.6 systems"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output "X11.app on Mac OS X 10.6 systems"
</span>
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. \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/realpath.h b/src/pextlib1.0/realpath.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 04806cb..6cf9530 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/realpath.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/realpath.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> /*
* realpath.h
*
<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-2010, 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;'>@@ -41,7 +41,7 @@
</span> * realpath path
* Normalize path like file normalize does.
* Fixes a problem with Tcl installations affected by not defining HAVE_REALPATH (this is
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * the case with the Tcl in OS X shipped prior to 10.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the case with the Tcl in Mac OS X prior to 10.6)
</span> */
int RealpathCmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]);
<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 bff41cd..b1f9e3e 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;'>@@ -2306,7 +2306,7 @@ proc adduser {name args} {
</span> try {
exec -ignorestderr $dscl . -create /Users/${name} UniqueID ${uid}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These are implicitly added on Mac OSX Lion. AuthenticationAuthority
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are implicitly added on Mac OS X Lion. AuthenticationAuthority
</span> # 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
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 433cd6f..6d0c1a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- 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
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2004-2005, 2007-2011, 2014 The MacPorts Project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2004-2005, 2007-2018 The MacPorts Project
</span> # Copyright (c) 2004 Will Barton <wbb4@opendarwin.org>
# Copyright (c) 2002 Apple Inc.
# All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -700,7 +700,7 @@ proc _deactivate_contents {port imagefiles {force 0} {rollback 0}} {
</span> # 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # does not resolve symlinks on OS X < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # does not resolve symlinks on Mac OS X < 10.6
</span> set directory [realpath [::file dirname $file]]
lappend files [::file join $directory [::file tail $file]]
</pre><pre style='margin:0'>
</pre>