--- a/open-src/common/Makefile.inc Wed May 28 11:19:56 2014 -0700
+++ b/open-src/common/Makefile.inc Tue Jun 10 18:34:17 2014 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules commonly shared among X consolidation open source dirs
#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. 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"),
@@ -812,13 +812,13 @@
UPSTREAM_URL_xorg = http://www.x.org/
SOURCE_URL_xorg = $(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
# TPNO's for X.Org software & font batches
-ORACLE_TPNO_xorg = 11362
+ORACLE_TPNO_xorg = 18028
ORACLE_TPNO_xorg_fonts = 11716
UPSTREAM_xcb = The XCB Project
UPSTREAM_URL_xcb = http://xcb.freedesktop.org/
SOURCE_URL_xcb = http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
-ORACLE_TPNO_xcb = 4914
+ORACLE_TPNO_xcb = 18006
UPSTREAM_PROJECT_DEFAULT = $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
$(UPSTREAM_PROJECT_DEFAULT) UPSTREAM_PROJECT = xorg
--- a/open-src/driver/xf86-video-openchrome/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/driver/xf86-video-openchrome/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -30,7 +30,7 @@
UPSTREAM = The OpenChrome project
UPSTREAM_URL = http://www.openchrome.org/
UPSTREAM_SET = yes
-ORACLE_TPNO = 12031
+ORACLE_TPNO = 18004
ORACLE_TPNO_SET = yes
# Version number (used in path names)
--- a/open-src/font/deja-vu/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/font/deja-vu/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# Deja Vu Fonts Makefile
#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2014, Oracle and/or its affiliates. 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"),
@@ -36,7 +36,7 @@
MODULE_LICENSE = Bitstream Vera Fonts License
MODULE_LICENSE_SET = yes
MODULE_DESC = the DejaVu fonts
-ORACLE_TPNO = 12114
+ORACLE_TPNO = 18005
# Version number (used in path names)
MODULE_VERSION=2.33
--- a/open-src/lib/freetype/COPYING Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/freetype/COPYING Tue Jun 10 18:34:17 2014 -0700
@@ -1,4 +1,4 @@
-Portions of this software are copyright � 1996-2012 The FreeType
+Portions of this software are copyright © 1996-2012 The FreeType
Project <http://www.freetype.org/>. All rights reserved.
Redistribution of this software is made under the terms of The
@@ -104,7 +104,7 @@
encourage you to use the following text:
"""
- Portions of this software are copyright � <year> The FreeType
+ Portions of this software are copyright © <year> The FreeType
Project (www.freetype.org). All rights reserved.
"""
--- a/open-src/lib/freetype/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/freetype/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# Freetype 2.x font rendering library
#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. 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"),
@@ -58,7 +58,7 @@
MODULE_LICENSE = The FreeType Project License
MODULE_LICENSE_SET = yes
-ORACLE_TPNO = 9935
+ORACLE_TPNO = 18003
MODULE_DESC = the FreeType 2 font engine
# Library name used in man pages & spec files
--- a/open-src/lib/libdmx/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/libdmx/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -41,6 +41,7 @@
# Package metadata
ORACLE_TPNO = 14484
+ORACLE_TPNO_SET = yes
# Library name (used for specfiles/mapfiles)
LIBNAME=dmx
--- a/open-src/lib/xcb-util-image/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/xcb-util-image/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# xcb-util-image - Library of xcb utility functions for handling X images
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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"),
@@ -46,7 +46,7 @@
MODULE_DESC = the xcb-util-image library of xcb utility functions for handling X images
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
-ORACLE_TPNO = 5070
+ORACLE_TPNO = 18009
ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order
--- a/open-src/lib/xcb-util-keysyms/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/xcb-util-keysyms/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# xcb-util-keysyms - Library of xcb utility functions for handling X keysyms
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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"),
@@ -45,7 +45,7 @@
MODULE_DESC = the xcb-util-keysyms library of xcb utility functions for handling X keysyms
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
-ORACLE_TPNO = 5069
+ORACLE_TPNO = 18008
ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order
--- a/open-src/lib/xcb-util-wm/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/xcb-util-wm/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# xcb-util-wm - Library of xcb utility functions for Window Manager hints
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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"),
@@ -45,7 +45,7 @@
MODULE_DESC = the xcb-util-wm library of xcb utility functions for Window Manager hints
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
-ORACLE_TPNO = 5071
+ORACLE_TPNO = 18010
ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order
--- a/open-src/lib/xcb-util/Makefile Wed May 28 11:19:56 2014 -0700
+++ b/open-src/lib/xcb-util/Makefile Tue Jun 10 18:34:17 2014 -0700
@@ -2,7 +2,7 @@
#
# xcb-util - Library of xcb utility functions
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. 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"),
@@ -41,7 +41,7 @@
MODULE_DESC = the xcb-util library of xcb utility functions
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
-ORACLE_TPNO = 5068
+ORACLE_TPNO = 18007
ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order