[152743] trunk/dports/_resources/port1.0/group
ryandesign at macports.org
ryandesign at macports.org
Thu Sep 15 16:09:26 PDT 2016
Revision: 152743
https://trac.macports.org/changeset/152743
Author: ryandesign at macports.org
Date: 2016-09-15 16:09:26 -0700 (Thu, 15 Sep 2016)
Log Message:
-----------
Portgroups: replace "Mac OS X" and "OS X" with "macOS"
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/app-1.0.tcl
trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl
trunk/dports/_resources/port1.0/group/cxx11-1.0.tcl
trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
Modified: trunk/dports/_resources/port1.0/group/app-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/app-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/app-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -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
# $Id$
#
-# Copyright (c) 2011-2013, 2015 The MacPorts Project
+# Copyright (c) 2011-2013, 2015-2016 The MacPorts Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
# This PortGroup helps create an application bundle the user can open from the
# Finder or the Dock. This is useful for ports that install a program built
# with an SDK like SDL or Qt that, when launched, causes an icon to appear in
-# the Dock and opens a proper Mac OS X GUI, but that do not build their own
+# the Dock and opens a proper macOS GUI, but that do not build their own
# app bundle to easily launch it.
Modified: trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -108,7 +108,7 @@
# from Leopard to Snow Leopard and has not reinstalled all ports.
} elseif {${file_archs} != ${build_arch}} {
ui_error ""
- ui_error "Did you upgrade to a new version of Mac OS X? If so, please see"
+ ui_error "Did you upgrade to a new version of macOS? If so, please see"
ui_error ""
ui_error " https://trac.macports.org/wiki/Migration"
ui_error ""
Modified: trunk/dports/_resources/port1.0/group/cxx11-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cxx11-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/cxx11-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -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
# $Id$
#
-# Copyright (c) 2015 The MacPorts Project
+# Copyright (c) 2015-2016 The MacPorts Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
if {${os.major} < 13} {
ui_error "Please follow the instructions on https://trac.macports.org/wiki/LibcxxOnOlderSystems."
- ui_error "After adding the required options to macports.conf, essentially reinstall all ports like you would when switching OS X versions."
+ ui_error "After adding the required options to macports.conf, reinstall all ports like you would when switching macOS versions."
ui_error "Follow step 3 on https://trac.macports.org/wiki/Migration in order to do this."
}
Modified: trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -48,7 +48,7 @@
#
# * 'wxWidgets-3.0-libcxx'
# A workaround to make software written in C++11 (but without other C++
-# dependencies) work on OS X < 10.9. This is just wxWidgets 3.0
+# dependencies) work on macOS < 10.9. This is just wxWidgets 3.0
# compiled against libc++ even where libstdc++ is default. See also
# https://trac.macports.org/wiki/LibcxxOnOlderSystems
#
@@ -198,8 +198,8 @@
pre-fetch {
# 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
- ui_error "${wxWidgets.port} cannot be built on Mac OS X >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
- return -code return "wxWidgets-2.8 cannot be built on Mac OS X >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
+ ui_error "${wxWidgets.port} cannot be built on macOS >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
+ return -code return "wxWidgets-2.8 cannot be built on macOS >= 10.7 with Xcode >= 4.4; please use port wxWidgets-3.0 or wxgtk-2.8 instead"
} else {
# 10.7
if {${os.major} == 11} {
@@ -227,8 +227,8 @@
wxWidgets.port "wxWidgets-3.0"
if {${os.major} < 9} {
pre-fetch {
- ui_error "${wxWidgets.port} requires Mac OS X 10.5 or later."
- return -code error "incompatible Mac OS X version"
+ ui_error "${wxWidgets.port} requires macOS 10.5 or later."
+ return -code error "incompatible macOS version"
}
}
} elseif {${args} eq "wxPython-3.0"} {
@@ -237,8 +237,8 @@
wxWidgets.port "wxPython-3.0"
if {${os.major} < 9} {
pre-fetch {
- ui_error "${wxWidgets.port} requires Mac OS X 10.5 or later."
- return -code error "incompatible Mac OS X version"
+ ui_error "${wxWidgets.port} requires macOS 10.5 or later."
+ return -code error "incompatible macOS version"
}
}
# ugly workaround to allow some C++11-only applications to be built on < 10.9
@@ -248,8 +248,8 @@
wxWidgets.port "wxWidgets-3.0-libcxx"
if {${os.major} < 9} {
pre-fetch {
- ui_error "${wxWidgets.port} requires Mac OS X 10.5 or later."
- return -code error "incompatible Mac OS X version"
+ ui_error "${wxWidgets.port} requires macOS 10.5 or later."
+ return -code error "incompatible macOS version"
}
}
# temporary development version of wxWidgets 3.0.x
@@ -259,8 +259,8 @@
wxWidgets.port "wxWidgets-3.0-devel"
if {${os.major} < 9} {
pre-fetch {
- ui_error "${wxWidgets.port} requires Mac OS X 10.5 or later."
- return -code error "incompatible Mac OS X version"
+ ui_error "${wxWidgets.port} requires macOS 10.5 or later."
+ return -code error "incompatible macOS version"
}
}
# preliminary support for wxWidgets 3.1/3.2
@@ -270,8 +270,8 @@
wxWidgets.port "wxWidgets-3.1"
if {${os.major} < 11} {
pre-fetch {
- ui_error "${wxWidgets.port} requires Mac OS X 10.7 or later."
- return -code error "incompatible Mac OS X version"
+ ui_error "${wxWidgets.port} requires macOS 10.7 or later."
+ return -code error "incompatible macOS version"
}
}
} else {
Modified: trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -4,6 +4,7 @@
# $Id$
#
# Copyright (c) 2005 Paul Guyot <pguyot at kallisys.net>,
+# Copyright (c) 2005-2012, 2014-2016 The MacPorts Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -194,7 +195,7 @@
# Check that xcode is installed.
if {[set ${command}.cmd] eq "none"} {
return -code error "This port requires 'xcodebuild', which \
- couldn't be found (not Mac OS X?)"
+ couldn't be found (not macOS?)"
}
set cmdstring ""
Modified: trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl 2016-09-15 23:06:35 UTC (rev 152742)
+++ trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl 2016-09-15 23:09:26 UTC (rev 152743)
@@ -38,7 +38,7 @@
# minimum_xcodeversions {darwin_major minimum_xcodeversion}
#
# where darwin_major is the major version of the underlying Darwin OS (e.g. 9
-# for Mac OS X 10.5 Leopard) and minimum_xcodeversion is the minimum version
+# for macOS Leopard) and minimum_xcodeversion is the minimum version
# of Xcode the port requires (e.g. 3.1).
options minimum_xcodeversions
@@ -57,7 +57,7 @@
return -code error "unable to find Xcode"
}
if {[vercmp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
- ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
+ ui_error "On macOS ${macosx_version}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
ui_error "See https://guide.macports.org/chunked/installing.xcode.html for download links."
return -code error "incompatible Xcode version"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160915/f2d79636/attachment-0001.html>
More information about the macports-changes
mailing list