17 files changed, 33 insertions, 47 deletions
diff --git a/lib/libX11/COPYING b/lib/libX11/COPYING
index b065516e4..77d1ff78f 100644
--- a/lib/libX11/COPYING
+++ b/lib/libX11/COPYING
@@ -13,8 +13,7 @@ to that file.
 
 Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett
 Copyright © 2009 Red Hat, Inc.
-Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates.
-All rights reserved.
+Copyright (c) 1990-1992, 1999, 2000, 2004, 2009, 2010, 2015, 2017, Oracle and/or its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -228,35 +227,6 @@ PERFORMANCE OF THIS SOFTWARE.
 
 		----------------------------------------
 
-
-Copyright (c) 1995 David E. Wexelblat.  All rights reserved
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of David E. Wexelblat shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from David E. Wexelblat.
-
-		----------------------------------------
-
 Copyright 1990, 1991 by OMRON Corporation
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -940,3 +910,19 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+		----------------------------------------
+
+Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
diff --git a/lib/libX11/modules/im/ximcp/imDefIc.c b/lib/libX11/modules/im/ximcp/imDefIc.c
index d552aa9e7..354c7f084 100644
--- a/lib/libX11/modules/im/ximcp/imDefIc.c
+++ b/lib/libX11/modules/im/ximcp/imDefIc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1991, 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1991, 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/modules/im/ximcp/imTrX.c b/lib/libX11/modules/im/ximcp/imTrX.c
index ec2567520..ca7189805 100644
--- a/lib/libX11/modules/im/ximcp/imTrX.c
+++ b/lib/libX11/modules/im/ximcp/imTrX.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/modules/im/ximcp/imTrans.c b/lib/libX11/modules/im/ximcp/imTrans.c
index 232f8165f..571f6ad5b 100644
--- a/lib/libX11/modules/im/ximcp/imTrans.c
+++ b/lib/libX11/modules/im/ximcp/imTrans.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/modules/im/ximcp/imTransR.c b/lib/libX11/modules/im/ximcp/imTransR.c
index 50b549e71..b089ad776 100644
--- a/lib/libX11/modules/im/ximcp/imTransR.c
+++ b/lib/libX11/modules/im/ximcp/imTransR.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/nls/compose-check.pl b/lib/libX11/nls/compose-check.pl
index 399bfa99c..9e52f1b40 100644
--- a/lib/libX11/nls/compose-check.pl
+++ b/lib/libX11/nls/compose-check.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright 2009 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/Host.c b/lib/libX11/src/Host.c
index e2b7d57d7..49fab3937 100644
--- a/lib/libX11/src/Host.c
+++ b/lib/libX11/src/Host.c
@@ -34,7 +34,7 @@ X Window System is a trademark of The Open Group.
 */
 
 /*
- * Copyright 2004 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/LiHosts.c b/lib/libX11/src/LiHosts.c
index 315e4dbb4..5ba60be8c 100644
--- a/lib/libX11/src/LiHosts.c
+++ b/lib/libX11/src/LiHosts.c
@@ -34,7 +34,7 @@ X Window System is a trademark of The Open Group.
 */
 
 /*
- * Copyright 2004 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/reallocarray.h b/lib/libX11/src/reallocarray.h
index ee38ebf8d..fc720d089 100644
--- a/lib/libX11/src/reallocarray.h
+++ b/lib/libX11/src/reallocarray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XDefaultIMIF.c b/lib/libX11/src/xlibi18n/XDefaultIMIF.c
index 74e79759e..f985eb594 100644
--- a/lib/libX11/src/xlibi18n/XDefaultIMIF.c
+++ b/lib/libX11/src/xlibi18n/XDefaultIMIF.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XDefaultOMIF.c b/lib/libX11/src/xlibi18n/XDefaultOMIF.c
index 2946f48d2..e86666283 100644
--- a/lib/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/lib/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimTrInt.h b/lib/libX11/src/xlibi18n/XimTrInt.h
index bceab9886..375cde25f 100644
--- a/lib/libX11/src/xlibi18n/XimTrInt.h
+++ b/lib/libX11/src/xlibi18n/XimTrInt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimTrX.h b/lib/libX11/src/xlibi18n/XimTrX.h
index 198d5fa5f..52fea04a2 100644
--- a/lib/libX11/src/xlibi18n/XimTrX.h
+++ b/lib/libX11/src/xlibi18n/XimTrX.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimTrans.h b/lib/libX11/src/xlibi18n/XimTrans.h
index 8c3aa829a..975495cdb 100644
--- a/lib/libX11/src/xlibi18n/XimTrans.h
+++ b/lib/libX11/src/xlibi18n/XimTrans.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimintP.h b/lib/libX11/src/xlibi18n/XimintP.h
index 14a7e6d5a..674da0295 100644
--- a/lib/libX11/src/xlibi18n/XimintP.h
+++ b/lib/libX11/src/xlibi18n/XimintP.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1991, 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1991, 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XlcSL.c b/lib/libX11/src/xlibi18n/XlcSL.c
index b8b3967d9..362cf4f4b 100644
--- a/lib/libX11/src/xlibi18n/XlcSL.c
+++ b/lib/libX11/src/xlibi18n/XlcSL.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/lcInit.c b/lib/libX11/src/xlibi18n/lcInit.c
index e3092f77d..552b8210d 100644
--- a/lib/libX11/src/xlibi18n/lcInit.c
+++ b/lib/libX11/src/xlibi18n/lcInit.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),