[79597] branches/release_2_0

jmr at macports.org jmr at macports.org
Sun Jun 19 13:59:12 PDT 2011


Revision: 79597
          http://trac.macports.org/changeset/79597
Author:   jmr at macports.org
Date:     2011-06-19 13:59:11 -0700 (Sun, 19 Jun 2011)
Log Message:
-----------
merge r79593 from trunk:
 update copyright notices

Revision Links:
--------------
    http://trac.macports.org/changeset/79593

Modified Paths:
--------------
    branches/release_2_0/base/LICENSE
    branches/release_2_0/base/doc/macports.conf.5
    branches/release_2_0/base/doc/port.1
    branches/release_2_0/base/doc/portfile.7
    branches/release_2_0/base/doc/portgroup.7
    branches/release_2_0/base/m4/tcl.m4
    branches/release_2_0/base/portmgr/dmg/License.html
    branches/release_2_0/base/portmgr/dmg/postflight
    branches/release_2_0/base/portmgr/jobs/PortIndex2MySQL.tcl
    branches/release_2_0/base/portmgr/packaging/dpkgall.tcl
    branches/release_2_0/base/portmgr/packaging/mpkgall.tcl
    branches/release_2_0/base/portmgr/packaging/packageall.tcl
    branches/release_2_0/base/portmgr/packaging/rpmall.tcl
    branches/release_2_0/base/src/cregistry/entry.c
    branches/release_2_0/base/src/darwintracelib1.0/darwintrace.c
    branches/release_2_0/base/src/macports1.0/macports.tcl
    branches/release_2_0/base/src/macports1.0/macports_autoconf.tcl.in
    branches/release_2_0/base/src/macports1.0/macports_dlist.tcl
    branches/release_2_0/base/src/macports1.0/macports_fastload.tcl.in
    branches/release_2_0/base/src/macports1.0/macports_index.tcl
    branches/release_2_0/base/src/macports1.0/macports_util.tcl
    branches/release_2_0/base/src/macports1.0/tests/macports_dlist.tcl
    branches/release_2_0/base/src/package1.0/package.tcl
    branches/release_2_0/base/src/package1.0/portarchivefetch.tcl
    branches/release_2_0/base/src/package1.0/portdmg.tcl
    branches/release_2_0/base/src/package1.0/portdpkg.tcl
    branches/release_2_0/base/src/package1.0/portmdmg.tcl
    branches/release_2_0/base/src/package1.0/portmpkg.tcl
    branches/release_2_0/base/src/package1.0/portpkg.tcl
    branches/release_2_0/base/src/package1.0/portportpkg.tcl
    branches/release_2_0/base/src/package1.0/portrpm.tcl
    branches/release_2_0/base/src/package1.0/portsrpm.tcl
    branches/release_2_0/base/src/package1.0/portunarchive.tcl
    branches/release_2_0/base/src/pextlib1.0/Pextlib.c
    branches/release_2_0/base/src/pextlib1.0/base32cmd.c
    branches/release_2_0/base/src/pextlib1.0/base32cmd.h
    branches/release_2_0/base/src/pextlib1.0/fs-traverse.c
    branches/release_2_0/base/src/pextlib1.0/fs-traverse.h
    branches/release_2_0/base/src/pextlib1.0/md5cmd.c
    branches/release_2_0/base/src/pextlib1.0/md5cmd.h
    branches/release_2_0/base/src/pextlib1.0/md_wrappers.h
    branches/release_2_0/base/src/pextlib1.0/rmd160cmd.c
    branches/release_2_0/base/src/pextlib1.0/rmd160cmd.h
    branches/release_2_0/base/src/pextlib1.0/sha1cmd.c
    branches/release_2_0/base/src/pextlib1.0/sha1cmd.h
    branches/release_2_0/base/src/pextlib1.0/sha256cmd.c
    branches/release_2_0/base/src/pextlib1.0/sha256cmd.h
    branches/release_2_0/base/src/pextlib1.0/tty.c
    branches/release_2_0/base/src/pextlib1.0/tty.h
    branches/release_2_0/base/src/pextlib1.0/vercomp.c
    branches/release_2_0/base/src/pextlib1.0/vercomp.h
    branches/release_2_0/base/src/pkg_mkindex.sh.in
    branches/release_2_0/base/src/port/port.tcl
    branches/release_2_0/base/src/port1.0/fetch_common.tcl
    branches/release_2_0/base/src/port1.0/port.tcl
    branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in
    branches/release_2_0/base/src/port1.0/portactivate.tcl
    branches/release_2_0/base/src/port1.0/portbuild.tcl
    branches/release_2_0/base/src/port1.0/portchecksum.tcl
    branches/release_2_0/base/src/port1.0/portclean.tcl
    branches/release_2_0/base/src/port1.0/portconfigure.tcl
    branches/release_2_0/base/src/port1.0/portdeactivate.tcl
    branches/release_2_0/base/src/port1.0/portdepends.tcl
    branches/release_2_0/base/src/port1.0/portdestroot.tcl
    branches/release_2_0/base/src/port1.0/portdistcheck.tcl
    branches/release_2_0/base/src/port1.0/portdistfiles.tcl
    branches/release_2_0/base/src/port1.0/portextract.tcl
    branches/release_2_0/base/src/port1.0/portfetch.tcl
    branches/release_2_0/base/src/port1.0/portinstall.tcl
    branches/release_2_0/base/src/port1.0/portlivecheck.tcl
    branches/release_2_0/base/src/port1.0/portload.tcl
    branches/release_2_0/base/src/port1.0/portmain.tcl
    branches/release_2_0/base/src/port1.0/portmirror.tcl
    branches/release_2_0/base/src/port1.0/portpatch.tcl
    branches/release_2_0/base/src/port1.0/portstartupitem.tcl
    branches/release_2_0/base/src/port1.0/portsubmit.tcl
    branches/release_2_0/base/src/port1.0/porttrace.tcl
    branches/release_2_0/base/src/port1.0/portuninstall.tcl
    branches/release_2_0/base/src/port1.0/portunload.tcl
    branches/release_2_0/base/src/port1.0/portutil.tcl
    branches/release_2_0/base/src/portindex/portregister.pl
    branches/release_2_0/base/src/portindex/portsubmit.pl
    branches/release_2_0/base/src/registry2.0/portimage.tcl
    branches/release_2_0/base/src/registry2.0/portuninstall.tcl
    branches/release_2_0/base/src/registry2.0/receipt_flat.tcl
    branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl
    branches/release_2_0/base/src/registry2.0/registry.tcl
    branches/release_2_0/base/src/registry2.0/registry_autoconf.tcl.in
    branches/release_2_0/base/src/registry2.0/registry_util.tcl

Property Changed:
----------------
    branches/release_2_0/
    branches/release_2_0/base/
    branches/release_2_0/base/portmgr/fedora/macports.spec
    branches/release_2_0/base/src/pextlib1.0/sha2.c
    branches/release_2_0/base/src/pextlib1.0/sha2.h
    branches/release_2_0/base/src/pextlib1.0/sha256cmd.c
    branches/release_2_0/base/src/pextlib1.0/sha256cmd.h
    branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl


Property changes on: branches/release_2_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:79584,79586,79590-79592
   + /trunk:79584,79586,79590-79593


Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79592
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79593
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/LICENSE
===================================================================
--- branches/release_2_0/base/LICENSE	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/LICENSE	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,5 +1,5 @@
 Copyright (c) 2002 - 2003, Apple Inc.
-Copyright (c) 2004 - 2010, The MacPorts Project.
+Copyright (c) 2004 - 2011, The MacPorts Project.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/doc/macports.conf.5
===================================================================
--- branches/release_2_0/base/doc/macports.conf.5	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/doc/macports.conf.5	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,5 +1,6 @@
 .\" Copyright (c) 2005 Matt Anton <matt at opendarwin.org>
 .\" Copyright (c) 2007 Juan Manuel Palacios <jmpp at macports.org>
+.\" Copyright (c) 2007-2011 The MacPorts Project
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/doc/port.1
===================================================================
--- branches/release_2_0/base/doc/port.1	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/doc/port.1	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,6 +1,7 @@
 .\" port.1
 .\"
-.\" Copyright (c) 2002 Apple Computer, Inc.
+.\" Copyright (c) 2004-2011 The MacPorts Project
+.\" Copyright (c) 2002-2003 Apple Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -11,7 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Apple Computer, Inc. nor the names of its
+.\" 3. Neither the name of Apple Inc. nor the names of its
 .\"    contributors may be used to endorse or promote products derived from
 .\"    this software without specific prior written permission.
 .\"

Modified: branches/release_2_0/base/doc/portfile.7
===================================================================
--- branches/release_2_0/base/doc/portfile.7	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/doc/portfile.7	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,6 +1,7 @@
 .\" portfile.7
 .\"
-.\" Copyright (c) 2002 Apple Computer, Inc.
+.\" Copyright (c) 2004-2011 The MacPorts Project
+.\" Copyright (c) 2002-2003 Apple Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -11,7 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Apple Computer, Inc. nor the names of its
+.\" 3. Neither the name of Apple Inc. nor the names of its
 .\"    contributors may be used to endorse or promote products derived from
 .\"    this software without specific prior written permission.
 .\"

Modified: branches/release_2_0/base/doc/portgroup.7
===================================================================
--- branches/release_2_0/base/doc/portgroup.7	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/doc/portgroup.7	2011-06-19 20:59:11 UTC (rev 79597)
@@ -11,7 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Apple Computer, Inc. nor the names of its
+.\" 3. Neither the name of The MacPorts Project nor the names of its
 .\"    contributors may be used to endorse or promote products derived from
 .\"    this software without specific prior written permission.
 .\"

Modified: branches/release_2_0/base/m4/tcl.m4
===================================================================
--- branches/release_2_0/base/m4/tcl.m4	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/m4/tcl.m4	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,5 +1,5 @@
 # This file is based on the tcl.m4 file distributed with Tcl 8.4
-# Portions Copyright (2003) Apple Computer, Inc.
+# Portions Copyright (2003) Apple Inc.
 #
 # Copyright and License for this file, copied verbatim from the official
 # Tcl distribution, follows:

Modified: branches/release_2_0/base/portmgr/dmg/License.html
===================================================================
--- branches/release_2_0/base/portmgr/dmg/License.html	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/dmg/License.html	2011-06-19 20:59:11 UTC (rev 79597)
@@ -15,7 +15,7 @@
 
     <body>
     
-        <p>Copyright (c) 2002 - 2003, Apple Computer, Inc.<br>Copyright (c) 2004 - 2010, The MacPorts Project.</p>
+        <p>Copyright (c) 2002 - 2003, Apple Inc.<br>Copyright (c) 2004 - 2011, The MacPorts Project.</p>
         <p>All rights reserved.</p>
         <p><br></p>
         
@@ -26,7 +26,7 @@
             <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li>
             <li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
             in the documentation and/or other materials provided with the distribution.</li>
-            <li>Neither the name of Apple Computer, Inc., The MacPorts Project nor the names of its contributors may be used to endorse or
+            <li>Neither the name of Apple Inc., The MacPorts Project nor the names of its contributors may be used to endorse or
             promote products derived from this software without specific prior written permission.</li>
         </ol>
         <p><br></p>

Modified: branches/release_2_0/base/portmgr/dmg/postflight
===================================================================
--- branches/release_2_0/base/portmgr/dmg/postflight	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/dmg/postflight	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,6 +1,7 @@
 #!/bin/bash
 # -*- coding: utf-8; mode: shell-script-mode; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=sh:et:sw=4:ts=4:sts=4
 #
+# Copyright (c) 2008-2011 The MacPorts Project
 # Copyright (c) 2002-2007 Juan Manuel Palacios <jmpp at macports.org>, The MacPorts Project.
 # All rights reserved.
 #
@@ -12,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple, Inc., The MacPorts Project nor the
+# 3. Neither the name of The MacPorts Project nor the
 #    names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #


Property changes on: branches/release_2_0/base/portmgr/fedora/macports.spec
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937
/branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323
/branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79592
/trunk/base/portmgr/fedora/macports.spec.in:30388-57826
/users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060
/users/perry/base-select/portmgr/fedora/macports.spec:44044-44692
   + /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937
/branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323
/branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79593
/trunk/base/portmgr/fedora/macports.spec.in:30388-57826
/users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060
/users/perry/base-select/portmgr/fedora/macports.spec:44044-44692

Modified: branches/release_2_0/base/portmgr/jobs/PortIndex2MySQL.tcl
===================================================================
--- branches/release_2_0/base/portmgr/jobs/PortIndex2MySQL.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/jobs/PortIndex2MySQL.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -9,7 +9,7 @@
 # $Id$
 #
 # Copyright (c) 2007 Juan Manuel Palacios, The MacPorts Project.
-# Copyright (c) 2003 Apple Computer, Inc.
+# Copyright (c) 2003 Apple Inc.
 # Copyright (c) 2002 Kevin Van Vechten. 
 # All rights reserved.
 #
@@ -21,7 +21,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- branches/release_2_0/base/portmgr/packaging/dpkgall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/packaging/dpkgall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,9 +2,10 @@
 # dpkgbuild.tcl
 # $Id$
 #
+# Copyright (c) 2009-2011 The MacPorts Project
 # Copyright (c) 2004 Landon Fuller <landonf at macports.org>
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/portmgr/packaging/mpkgall.tcl
===================================================================
--- branches/release_2_0/base/portmgr/packaging/mpkgall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/packaging/mpkgall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/portmgr/packaging/packageall.tcl
===================================================================
--- branches/release_2_0/base/portmgr/packaging/packageall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/packaging/packageall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # packageall.tcl
 # $Id$
 #
+# Copyright (c) 2009-2011 The MacPorts Project
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/portmgr/packaging/rpmall.tcl
===================================================================
--- branches/release_2_0/base/portmgr/packaging/rpmall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/portmgr/packaging/rpmall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,9 +2,10 @@
 # rpmall.tcl
 # $Id$
 #
+# Copyright (c) 2009-2011 The MacPorts Project
 # Copyright (c) 2003 Benjamin Reed <ranger at befunk.com>
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/cregistry/entry.c
===================================================================
--- branches/release_2_0/base/src/cregistry/entry.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/cregistry/entry.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,6 +2,7 @@
  * entry.c
  * $Id$
  *
+ * Copyright (c) 2010-2011 The MacPorts Project
  * Copyright (c) 2007 Chris Pickel <sfiera at macports.org>
  * All rights reserved.
  *

Modified: branches/release_2_0/base/src/darwintracelib1.0/darwintrace.c
===================================================================
--- branches/release_2_0/base/src/darwintracelib1.0/darwintrace.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/darwintracelib1.0/darwintrace.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005 Apple Inc. All rights reserved.
  * Copyright (c) 2005-2006 Paul Guyot <pguyot at kallisys.net>,
  * All rights reserved.
  *
@@ -16,7 +16,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  * 

Modified: branches/release_2_0/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,10 +2,11 @@
 # macports.tcl
 # $Id$
 #
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 - 2003 Apple Inc.
 # Copyright (c) 2004 - 2005 Paul Guyot, <pguyot at kallisys.net>.
 # Copyright (c) 2004 - 2006 Ole Guldberg Jensen <olegb at opendarwin.org>.
 # Copyright (c) 2004 - 2005 Robert Shaw <rshaw at opendarwin.org>
+# Copyright (c) 2004 - 2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -16,7 +17,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports_autoconf.tcl.in	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports_autoconf.tcl.in	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # macports-autoconf.tcl.in
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2006 - 2009, 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/macports1.0/macports_dlist.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports_dlist.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports_dlist.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,8 +1,9 @@
 # macports1.0/macports_dlist.tcl
 # $Id$
 #
+# Copyright (c) 2004-2005, 2007, 2009, 2011 The MacPorts Project
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/macports1.0/macports_fastload.tcl.in
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports_fastload.tcl.in	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports_fastload.tcl.in	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # macports_fastload.tcl.in
 # $Id$
 #
-# Copyright (c) 2004 Paul Guyot, The MacPorts Project.
+# Copyright (c) 2005-2007, 2009-2010 The MacPorts Project
+# Copyright (c) 2004-2005 Paul Guyot, The MacPorts Project.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/macports1.0/macports_index.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports_index.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports_index.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,7 +1,7 @@
 # macports_index.tcl
 # $Id$
 #
-# Copyright (c) 2004 Apple Computer, Inc.
+# Copyright (c) 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/macports1.0/macports_util.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports_util.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/macports_util.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -12,7 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/macports1.0/tests/macports_dlist.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/tests/macports_dlist.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/macports1.0/tests/macports_dlist.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,6 +2,7 @@
 # macports1.0/test_dlist.tcl
 # $Id$
 #
+# Copyright (c) 2007 The MacPorts Project
 # Copyright (c) 2003 Kevin Van Vechten <kevin at opendarwin.org>
 
 # Test suite for macports_dlist package.

Modified: branches/release_2_0/base/src/package1.0/package.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/package.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/package.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # package.tcl
 # $Id$
 #
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2004, 2007-2008, 2010 The MacPorts Project
+# Copyright (c) 2002-2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portarchivefetch.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portarchivefetch.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (c) 2002 - 2003 Apple Inc.
-# Copyright (c) 2004-2010 The MacPorts Project
+# Copyright (c) 2004 - 2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/src/package1.0/portdmg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portdmg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portdmg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portdmg.tcl
 # $Id$
 #
-# Copyright (c) 2003 Apple Computer, Inc.
+# Copyright (c) 2007, 2009-2011  The MacPorts Project
+# Copyright (c) 2003, 2005 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portdpkg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portdpkg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portdpkg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portdpkg.tcl
 # $Id$
 #
+# Copyright (c) 2005, 2007, 2009, 2011 The MacPorts Project
 # Copyright (c) 2004 Landon Fuller <landonf at macports.org>
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portmdmg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portmdmg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portmdmg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portmdmg.tcl
 # $Id$
 #
-# Copyright (c) 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007-2011 The MacPorts Project
+# Copyright (c) 2003-2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portmpkg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portmpkg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portmpkg.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portpkg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portpkg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portpkg.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portportpkg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portportpkg.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portportpkg.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portportpkg.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2004 Apple Computer, Inc.
+# Copyright (c) 2002 - 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portrpm.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portrpm.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portrpm.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portrpm.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005 - 2007, 2009 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portsrpm.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portsrpm.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portsrpm.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portsrpm.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2007, 2009, 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portunarchive.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/package1.0/portunarchive.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portunarchive.tcl
 # $Id$
 #
+# Copyright (c) 2005, 2007-2011 The MacPorts Project
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/Pextlib.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/Pextlib.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
  * Pextlib.c
  * $Id$
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * Copyright (c) 2004 - 2005 Paul Guyot <pguyot at kallisys.net>
  * Copyright (c) 2004 Landon Fuller <landonf at macports.org>
  * All rights reserved.
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/base32cmd.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/base32cmd.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/base32cmd.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/base32cmd.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/base32cmd.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/base32cmd.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/fs-traverse.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/fs-traverse.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/fs-traverse.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -5,7 +5,7 @@
  * Find files and execute arbitrary expressions on them.
  * Author: Jordan K. Hubbard, Kevin Ballard, Rainer Mueller
  *
- * Copyright (c) 2004 Apple Computer, Inc.
+ * Copyright (c) 2004 Apple Inc.
  * Copyright (c) 2010 The MacPorts Project
  * All rights reserved.
  *
@@ -17,7 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/fs-traverse.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/fs-traverse.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/fs-traverse.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
  * fs-traverse.h
  * $Id$
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/md5cmd.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/md5cmd.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/md5cmd.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
  * md5cmd.c
  * $Id$
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2004 - 2005, 2009, 2011 The MacPorts Project
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/md5cmd.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/md5cmd.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/md5cmd.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
  * md5cmd.h
  * $Id$
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/md_wrappers.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/md_wrappers.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/md_wrappers.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/rmd160cmd.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/rmd160cmd.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/rmd160cmd.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,6 +2,7 @@
  * rmd160cmd.c
  * $Id$
  *
+ * Copyright (c) 2006, 2009-2011 The MacPorts Project
  * Copyright (c) 2005 Paul Guyot <pguyot at kallisys.net>.
  * All rights reserved.
  *
@@ -13,7 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/rmd160cmd.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/rmd160cmd.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/rmd160cmd.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/sha1cmd.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/sha1cmd.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/sha1cmd.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,8 @@
  * $Id$
  * Copied from md5cmd.c 20040903 EH
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2004 - 2005, 2009 - 2011 The MacPorts Project
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/sha1cmd.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/sha1cmd.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/sha1cmd.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,7 @@
  * $Id$
  * Copied from md5cmd.h 20040903 EH
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 


Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79592
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692
   + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79593
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692


Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79592
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692
   + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79593
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692

Modified: branches/release_2_0/base/src/pextlib1.0/sha256cmd.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/sha256cmd.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/sha256cmd.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
  * sha256cmd.c
  * $Id$
  *
- * Copyright (c) 2009 The MacPorts Project
+ * Copyright (c) 2009, 2011 The MacPorts Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 


Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79592
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692
   + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79593
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692

Modified: branches/release_2_0/base/src/pextlib1.0/sha256cmd.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/sha256cmd.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/sha256cmd.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of The MacPorts Project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 


Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79592
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692
   + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79593
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692

Modified: branches/release_2_0/base/src/pextlib1.0/tty.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/tty.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/tty.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -5,6 +5,7 @@
  *
  * Author: Rainer Mueller <raimue at macports.org>
  *
+ * Copyright (c) 2009 The MacPorts Project
  * Copyright (c) 2008 Rainer Mueller <raimue at macports.org>
  * All rights reserved.
  *
@@ -16,7 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its
+ * 3. Neither the name of The MacPorts Project nor the names of its
  *    contributors may be used to endorse or promote products derived from
  *    this software without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/tty.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/tty.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/tty.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -16,7 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its
+ * 3. Neither the name of The MacPorts Project nor the names of its
  *    contributors may be used to endorse or promote products derived from
  *    this software without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/vercomp.c
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/vercomp.c	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/vercomp.c	2011-06-19 20:59:11 UTC (rev 79597)
@@ -5,7 +5,7 @@
  *
  * Author: Landon Fuller <landonf at macports.org>
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * Copyright (c) 2004 Landon Fuller <landonf at macports.org>
  * All rights reserved.
  *
@@ -17,7 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its
+ * 3. Neither the name of Apple Inc. nor the names of its
  *    contributors may be used to endorse or promote products derived from
  *    this software without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pextlib1.0/vercomp.h
===================================================================
--- branches/release_2_0/base/src/pextlib1.0/vercomp.h	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pextlib1.0/vercomp.h	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,7 @@
  * $Id$
  * Author: Landon Fuller <landonf at macports.org>
  *
- * Copyright (c) 2002 - 2003 Apple Computer, Inc.
+ * Copyright (c) 2002 - 2003 Apple Inc.
  * Copyright (c) 2004 Landon Fuller
  * All rights reserved.
  *
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+ * 3. Neither the name of Apple Inc. nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 

Modified: branches/release_2_0/base/src/pkg_mkindex.sh.in
===================================================================
--- branches/release_2_0/base/src/pkg_mkindex.sh.in	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/pkg_mkindex.sh.in	2011-06-19 20:59:11 UTC (rev 79597)
@@ -12,7 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port/port.tcl
===================================================================
--- branches/release_2_0/base/src/port/port.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port/port.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -5,9 +5,9 @@
 # port.tcl
 # $Id$
 #
-# Copyright (c) 2002-2007 The MacPorts Project.
+# Copyright (c) 2004-2011 The MacPorts Project
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002-2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -18,7 +18,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/fetch_common.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/fetch_common.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/fetch_common.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (c) 2002 - 2003 Apple Inc.
-# Copyright (c) 2004-2010 The MacPorts Project
+# Copyright (c) 2004 - 2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/src/port1.0/port.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/port.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/port.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # port.tcl
 # $Id$
 #
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in
===================================================================
--- branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,7 +1,8 @@
 # port_autoconf.tcl.in
 # $Id$
 #
-# Copyright (c) 2002 - 2004 Apple Computer, Inc.
+# Copyright (c) 2005 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portactivate.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portactivate.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portactivate.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portactivate.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007, 2009-2011 The MacPorts Project
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portbuild.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portbuild.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portbuild.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portbuild.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2007 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portchecksum.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portchecksum.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portchecksum.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portchecksum.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2004 Apple Computer, Inc.
+# Copyright (c) 2002 - 2004 Apple Inc.
 # Copyright (c) 2004 - 2005 Paul Guyot <pguyot at kallisys.net>
+# Copyright (c) 2006-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portclean.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portclean.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portclean.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portclean.tcl
 # $Id$
 #
+# Copyright (c) 2005-2007, 2009-2011 The MacPorts Project
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portconfigure.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portconfigure.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portconfigure.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2007 - 2011 The MacPorts Project
 # Copyright (c) 2007 Markus W. Weissmann <mww at macports.org>
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portdeactivate.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portdeactivate.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portdeactivate.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portdeactivate.tcl
 # $Id$
 #
-# Copyright (c) 2010 The MacPorts Project
+# Copyright (c) 2010-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/src/port1.0/portdepends.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portdepends.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portdepends.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portdepends.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007-2009 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portdestroot.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portdestroot.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portdestroot.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2002 - 2003 Apple Inc.
 # Copyright (c) 2004 - 2005 Robert Shaw <rshaw at opendarwin.org>
+# Copyright (c) 2004-2005, 2007-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portdistcheck.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portdistcheck.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portdistcheck.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,6 +3,7 @@
 #
 # $Id$
 #
+# Copyright (c) 2007-2011 The MacPorts Project
 # Copyright (c) 2005-2006 Paul Guyot <pguyot at kallisys.net>,
 # All rights reserved.
 #
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its
+# 3. Neither the name of The MacPorts Project nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #    this software without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portdistfiles.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portdistfiles.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portdistfiles.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portdistfiles.tcl
 # $Id$
 #
-# Copyright (c) 2008 MacPorts Project
+# Copyright (c) 2008-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portextract.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portextract.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portextract.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portextract.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2005, 2007-2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # Copyright (c) 2007 Markus W. Weissmann <mww at macports.org>
 # All rights reserved.
 #
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portfetch.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portfetch.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portfetch.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2004 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portinstall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portinstall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,8 +2,9 @@
 # portinstall.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2002 - 2004 Apple Inc.
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
+# Copyright (c) 2005, 2007 - 2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portlivecheck.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portlivecheck.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,8 @@
 #
 # $Id$
 #
-# Copyright (c) 2005-2006 Paul Guyot <pguyot at kallisys.net>,
+# Copyright (c) 2007-2011 The MacPorts Project
+# Copyright (c) 2005-2007 Paul Guyot <pguyot at kallisys.net>,
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its
+# 3. Neither the name of The MacPorts Project nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #    this software without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portload.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portload.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portload.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portsubmit.tcl
 # $Id$
 #
-# Copyright (c) 2007 MacPorts Project
+# Copyright (c) 2007, 2009, 2011 The MacPorts Project
 # Copyright (c) 2007 James D. Berry
 # All rights reserved.
 #
@@ -14,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portmain.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portmain.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portmain.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2004 - 2005, 2007 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portmirror.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portmirror.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portmirror.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,6 +3,7 @@
 #
 # $Id$
 #
+# Copyright (c) 2007-2011 The MacPorts Project
 # Copyright (c) 2006 Paul Guyot <pguyot at kallisys.net>,
 # All rights reserved.
 #
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its
+# 3. Neither the name of The MacPorts Project nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #    this software without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portpatch.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portpatch.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portpatch.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portpatch.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
+# Copyright (c) 2004, 2006-2007, 2009-2011 The MacPorts Project
+# Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portstartupitem.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portstartupitem.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portstartupitem.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,7 +3,7 @@
 #
 # $Id$
 #
-# Copyright (c) 2004-2007 MacPorts Project
+# Copyright (c) 2004-2011 The MacPorts Project
 # Copyright (c) 2006-2007 James D. Berry
 # Copyright (c) 2004,2005 Markus W. Weissman <mww at macports.org>
 # All rights reserved.
@@ -17,7 +17,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its
+# 3. Neither the name of The MacPorts Project nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #    this software without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portsubmit.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portsubmit.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portsubmit.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,8 @@
 # portsubmit.tcl
 # $Id$
 #
-# Copyright (c) 2002 - 2004 Apple Computer, Inc.
+# Copyright (c) 2007 - 2011 The MacPorts Project
+# Copyright (c) 2002 - 2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/porttrace.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/porttrace.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -15,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its
+# 3. Neither the name of The MacPorts Project nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #    this software without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/port1.0/portuninstall.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portuninstall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portuninstall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portuninstall.tcl
 # $Id$
 #
-# Copyright (c) 2010 The MacPorts Project
+# Copyright (c) 2010-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: branches/release_2_0/base/src/port1.0/portunload.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portunload.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portunload.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,7 +2,7 @@
 # portsubmit.tcl
 # $Id$
 #
-# Copyright (c) 2007 MacPorts Project
+# Copyright (c) 2007, 2009, 2011 The MacPorts Project
 # Copyright (c) 2007 James D. Berry
 # All rights reserved.
 #
@@ -14,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portutil.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/port1.0/portutil.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,9 +2,10 @@
 # portutil.tcl
 # $Id$
 #
+# Copyright (c) 2002-2003 Apple Inc.
 # Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
-# Copyright (c) 2006, 2007 Markus W. Weissmann <mww at macports.org>
+# Copyright (c) 2006-2007 Markus W. Weissmann <mww at macports.org>
+# Copyright (c) 2004-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #

Modified: branches/release_2_0/base/src/portindex/portregister.pl
===================================================================
--- branches/release_2_0/base/src/portindex/portregister.pl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/portindex/portregister.pl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (c) 2003-2004 Apple Computer, Inc.
+# Copyright (c) 2003-2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/portindex/portsubmit.pl
===================================================================
--- branches/release_2_0/base/src/portindex/portsubmit.pl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/portindex/portsubmit.pl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (c) 2003-2004 Apple Computer, Inc.
+# Copyright (c) 2003-2004 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/portimage.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/portimage.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,6 +2,7 @@
 # portimage.tcl
 # $Id$
 #
+# Copyright (c) 2004-2005, 2007-2011 The MacPorts Project
 # Copyright (c) 2004 Will Barton <wbb4 at opendarwin.org>
 # Copyright (c) 2002 Apple Inc.
 # All rights reserved.

Modified: branches/release_2_0/base/src/registry2.0/portuninstall.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/portuninstall.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/portuninstall.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -2,6 +2,7 @@
 # portuninstall.tcl
 # $Id$
 #
+# Copyright (c) 2004-2005, 2008-2011 The MacPorts Project
 # Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
 #

Modified: branches/release_2_0/base/src/registry2.0/receipt_flat.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/receipt_flat.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/receipt_flat.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,9 +1,10 @@
 # receipt_flat.tcl
 # $Id$
 #
+# Copyright (c) 2005, 2007-2009 The MacPorts Project
 # Copyright (c) 2004 Will Barton <wbb4 at opendarwin.org>
 # Copyright (c) 2004 Paul Guyot, The MacPorts Project.
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +15,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,7 +1,7 @@
 # receipt_sqlite.tcl
 # $Id$
 #
-# Copyright (c) 2010 The MacPorts Project
+# Copyright (c) 2010-2011 The MacPorts Project
 # Copyright (c) 2004 Will Barton <wbb4 at opendarwin.org>
 # Copyright (c) 2002 Apple Inc.
 # All rights reserved.


Property changes on: branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79592
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
   + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79593
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692

Modified: branches/release_2_0/base/src/registry2.0/registry.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/registry.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/registry.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -1,7 +1,8 @@
 # registry.tcl
 #
+# Copyright (c) 2004-2005, 2007-2010 The MacPorts Project
 # Copyright (c) 2004 Will Barton <wbb4 at opendarwin.org>
-# Copyright (c) 2002 Apple Computer, Inc.
+# Copyright (c) 2002 Apple Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of Apple Inc. nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/registry2.0/registry_autoconf.tcl.in
===================================================================
--- branches/release_2_0/base/src/registry2.0/registry_autoconf.tcl.in	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/registry_autoconf.tcl.in	2011-06-19 20:59:11 UTC (rev 79597)
@@ -12,7 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+# 3. Neither the name of The MacPorts Project nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 # 

Modified: branches/release_2_0/base/src/registry2.0/registry_util.tcl
===================================================================
--- branches/release_2_0/base/src/registry2.0/registry_util.tcl	2011-06-19 20:44:54 UTC (rev 79596)
+++ branches/release_2_0/base/src/registry2.0/registry_util.tcl	2011-06-19 20:59:11 UTC (rev 79597)
@@ -3,6 +3,7 @@
 # $Id$
 #
 # Copyright (c) 2007 Chris Pickel
+# Copyright (c) 2010-2011 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110619/df64db95/attachment-0001.html>


More information about the macports-changes mailing list