--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/exception_lists/copyright Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2013, 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"),
+# 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 (including the next
+# paragraph) 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
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+############################################################################
+# This file lists which files in the X gate should not trigger a warning from
+# 'hg nits' or 'hg pbchk' about missing Oracle copyright notices
+
+# Use shell style pattern globbing for this file
+syntax: glob
+
+# Copyright/license notice templates, not full code files:
+open-src/common/license_files/*
+
+# Upstream license notices only:
+open-src/font/X11-font-license.txt
+open-src/*/*/COPYING
--- a/open-src/app/accessx/COPYING Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/accessx/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -1,24 +1,3 @@
-Copyright (c) 2008, 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"),
-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 (including the next
-paragraph) 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
-THE AUTHORS OR COPYRIGHT HOLDERS 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.
-
Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993
by Digital Equipment Corp., Maynard, MA
--- a/open-src/app/accessx/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/accessx/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -2,7 +2,7 @@
#
# accessx 1.x module Makefile
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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"),
@@ -28,6 +28,13 @@
# Package name used in tarballs
MODULE_NAME=accessx
+# Package metadata
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
+
+# Dates to show in Oracle copyright notice in pkg license file
+# Earliest & latest of the copyrights in the Oracle files in this pkg
+ORACLE_COPYRIGHT_YEARS = 1993, 2009
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/keyboard/accessx
MODULE_PKGNAME_SET=yes
--- a/open-src/app/dispswitch/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/dispswitch/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -28,6 +28,9 @@
# Package name used in tarballs
MODULE_NAME=dispswitch
+# Package metadata
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
+
# No upstream sources, only local sources
MODULE_VERSION=src
MODULE_LICENSE_DESC = portions of the xrandr utility
--- a/open-src/app/gfx-utils/COPYING Wed Jul 24 11:15:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Copyright (c) 1999, 2011, 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"),
-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 (including the next
-paragraph) 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
-THE AUTHORS OR COPYRIGHT HOLDERS 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.
--- a/open-src/app/gfx-utils/COPYING.ast Wed Jul 24 11:15:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/gfx-utils/COPYING.efb Wed Jul 24 11:15:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/gfx-utils/COPYING.mga Wed Jul 24 11:15:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/gfx-utils/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/gfx-utils/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -2,7 +2,7 @@
#
# SPARC graphics utilities modules (fbconfig & VTS) Makefile
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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"),
@@ -32,6 +32,14 @@
MODULE_PKGNAME=system/graphics/fbconfig
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
+
+# Dates to show in Oracle copyright notice in fbconfig pkg license file
+# Earliest & latest of the copyrights in the Oracle files in the base pkg
+ORACLE_COPYRIGHT_YEARS = 1999, 2011
+
# Package classification (override default)
MODULE_PKGCLASS=Drivers/Display
MODULE_PKGCLASS_SET=yes
@@ -84,9 +92,17 @@
EFB_LICENSE_FILE = $(MODULE_PKG_METADATA_DIR)-fbconfig-efb/$(LICENSE_FILE_NAME)
MGA_LICENSE_FILE = $(MODULE_PKG_METADATA_DIR)-fbconfig-mga/$(LICENSE_FILE_NAME)
-$(AST_LICENSE_FILE):= LICENSE_FILE = COPYING.ast
-$(EFB_LICENSE_FILE):= LICENSE_FILE = COPYING.efb
-$(MGA_LICENSE_FILE):= LICENSE_FILE = COPYING.mga
+$(AST_LICENSE_FILE):= DEVICE_NAME = ast
+$(EFB_LICENSE_FILE):= DEVICE_NAME = efb
+$(MGA_LICENSE_FILE):= DEVICE_NAME = mga
-$(EXTRA_LICENSE_FILES):= LICENSE_NAME = $(ORACLE_LICENSE_NAME)
-$(EXTRA_LICENSE_FILES):= LICENSE_APPEND = $(ORACLE_LICENSE_APPEND)
+# Module info to show in per-device pkg license files
+$(EXTRA_LICENSE_FILES):= MODULE_TPNO_NAME = fbconfig-$(DEVICE_NAME)
+$(EXTRA_LICENSE_FILES):= MODULE_TPNO_NAME_SET = YES
+$(EXTRA_LICENSE_FILES):= MODULE_DESC = fbconfig & VTS modules for graphics devices using the $(DEVICE_NAME) driver
+
+# Dates to show in Oracle copyright notice in per-device pkg license files
+$(AST_LICENSE_FILE):= ORACLE_COPYRIGHT_YEARS = 2009, 2011
+$(EFB_LICENSE_FILE):= ORACLE_COPYRIGHT_YEARS = 2006, 2009
+$(MGA_LICENSE_FILE):= ORACLE_COPYRIGHT_YEARS = 2006, 2012
+
--- a/open-src/app/installalias/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/installalias/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -34,6 +34,7 @@
# Package metadata
MODULE_LICENSE_DESC = portions of the libXfont library code
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
# No upstream sources, only local sources
MODULE_VERSION=src
--- a/open-src/app/mesa-demos/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/mesa-demos/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -29,6 +29,8 @@
UPSTREAM = The Mesa 3-D Graphics Library
UPSTREAM_URL = http://mesa3d.org/
UPSTREAM_SET = yes
+MODULE_DESC = the Mesa 3-D Graphics demo applications
+ORACLE_TPNO = 9926
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/demo/mesa-demos
--- a/open-src/app/mkcookie/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/mkcookie/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -34,6 +34,7 @@
# Package metadata
MODULE_LICENSE_DESC = portions of the xauth utility source code
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
# Dates to show in Oracle copyright notice in pkg license file
# Earliest & latest of the copyrights in the Oracle files in this pkg
--- a/open-src/app/xlswins/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/xlswins/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -34,6 +34,7 @@
# Package metadata
MODULE_DESC = the xlswins utility to list windows displayed on an X server
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
--- a/open-src/app/xmakemap/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/app/xmakemap/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -32,6 +32,8 @@
# Package metadata
MODULE_DESC = the xmakemap script to generate xmodmap files
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
# Dates to show in Oracle copyright notice in pkg license file
# Earliest & latest of the copyrights in the Oracle files in this pkg
--- a/open-src/common/Makefile.inc Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/common/Makefile.inc Tue Aug 06 23:22:35 2013 -0700
@@ -811,10 +811,14 @@
UPSTREAM_xorg = X.Org Foundation
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_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
UPSTREAM_PROJECT_DEFAULT = $(UPSTREAM_PROJECT_SET:yes=$(POUND_SIGN))
$(UPSTREAM_PROJECT_DEFAULT) UPSTREAM_PROJECT = xorg
@@ -825,6 +829,8 @@
$(UPSTREAM_DEFAULT) UPSTREAM_NOTFOUND = $(UPSTREAM_SET_YET:yes=$(POUND_SIGN))
$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM = $(UPSTREAM_$(UPSTREAM_PROJECT))
$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) UPSTREAM_URL = $(UPSTREAM_URL_$(UPSTREAM_PROJECT))
+ORACLE_TPNO_DEFAULT = $(ORACLE_TPNO_SET:yes=$(POUND_SIGN))
+$(UPSTREAM_NOTFOUND) $(SOURCE_URL_DEFAULT) $(ORACLE_TPNO_DEFAULT) ORACLE_TPNO = $(ORACLE_TPNO_$(UPSTREAM_PROJECT))
## Attributes files
@@ -901,29 +907,32 @@
$(LICENSE_CHOICE_DEFAULT) LICENSE_CHOICE=open
ORACLE_LICENSE_NAME_open = $(MIT_LICENSE_NAME)
-ORACLE_LICENSE_APPEND_open = $(MIT_LICENSE_FILE)
+ORACLE_LICENSE_INSERT_open = $(MIT_LICENSE_FILE)
ORACLE_LICENSE_NAME_Oracle = Oracle Copyright Notice
-ORACLE_LICENSE_APPEND_Oracle = # Nothing to append to copyright notice
+ORACLE_LICENSE_INSERT_Oracle = # Nothing to append to copyright notice
ORACLE_LICENSE_NAME = $(ORACLE_LICENSE_NAME_$(LICENSE_CHOICE))
-ORACLE_LICENSE_APPEND = $(ORACLE_LICENSE_APPEND_$(LICENSE_CHOICE))
+ORACLE_LICENSE_INSERT = $(ORACLE_LICENSE_INSERT_$(LICENSE_CHOICE))
# Use default license info unless MODULE_LICENSE = "Oracle"
LICENSE_NAME = $(MODULE_LICENSE)
LICENSE_PREPEND = $(MODULE_LICENSE_PREPEND)
-LICENSE_APPEND = $(MODULE_LICENSE_APPEND)
+LICENSE_INSERT = $(MODULE_LICENSE_INSERT)
LICENSE_OVERRIDE_1 = $(POUND_SIGN)$(MODULE_LICENSE)
LICENSE_OVERRIDE = $(LICENSE_OVERRIDE_1:$(POUND_SIGN)Oracle%=)
$(LICENSE_OVERRIDE) LICENSE_NAME = $(ORACLE_LICENSE_NAME)
-$(LICENSE_OVERRIDE) LICENSE_PREPEND = $(ORACLE_LICENSE_PREPEND)
-$(LICENSE_OVERRIDE) LICENSE_APPEND = $(ORACLE_LICENSE_APPEND)
+$(LICENSE_OVERRIDE) LICENSE_INSERT = $(ORACLE_LICENSE_INSERT)
+
+# Name to use in TPNO metadata & license file headers
+MODULE_TPNO_NAME_DEFAULT = $(MODULE_COMPILER_SET:yes=$(POUND_SIGN))
+$(MODULE_TPNO_NAME_DEFAULT) MODULE_TPNO_NAME = $(MODULE_NAME)
install_license: $(LICENSE_FILE_DEST)
METADATA_TARGETS += $(LICENSE_FILE_DEST)
-%/$(LICENSE_FILE_NAME): % $(SOURCE_TARGETS) $(LICENSE_PREPEND) $(LICENSE_APPEND)
+%/$(LICENSE_FILE_NAME): % $(SOURCE_TARGETS) $(LICENSE_PREPEND) $(LICENSE_INSERT)
@ $(START_CMD_ECHO) ; \
if [[ -f '$(LICENSE_FILE)' ]] ; then \
license_to_copy='$(LICENSE_FILE)' ; \
@@ -933,20 +942,17 @@
license_to_copy='/dev/null' ; \
fi ; \
if [[ -s "$${license_to_copy}" || -n '$(ORACLE_COPYRIGHT_YEARS)' ]] ; then \
- m='$(MODULE_NAME)' ; \
+ m='$(MODULE_TPNO_NAME)' ; \
if [[ '$(MODULE_VERSION)' != 'src' ]] ; then \
m+=' $(MODULE_VERSION)' ; \
fi ; \
print -n $$m | $(PRINT_IN_BOX) > $@ ; \
- if [[ -n '$(LICENSE_PREPEND)' ]] ; then \
- cat $(LICENSE_PREPEND) >> $@ ; \
- fi ; \
fi ; \
if [[ -n '$(ORACLE_COPYRIGHT_YEARS)' ]] ; then \
sed 's/@YEARS@/$(ORACLE_COPYRIGHT_YEARS)/' \
$(ORACLE_COPYRIGHT_TEMPLATE) >> $@ ; \
- if [[ -n '$(LICENSE_APPEND)' ]] ; then \
- cat $(LICENSE_APPEND) >> $@ ; \
+ if [[ -n '$(LICENSE_INSERT)' ]] ; then \
+ cat $(LICENSE_INSERT) >> $@ ; \
fi ; \
fi ; \
if [[ -n '$(MODULE_LICENSE_DESC)' ]] ; then \
@@ -963,11 +969,17 @@
contents="technology" ; \
fi ; \
print "This package may include $${contents} which may be subject to one or more of the following notices:\n" | fmt >> $@ ; \
+ if [[ -n '$(LICENSE_PREPEND)' ]] ; then \
+ cat $(LICENSE_PREPEND) >> $@ ; \
+ fi ; \
cat "$${license_to_copy}" >> $@ ; \
fi ; \
+ if [[ -n '$(LICENSE_APPEND)' ]] ; then \
+ cat $(LICENSE_APPEND) >> $@ ; \
+ fi ; \
if [[ -s $@ ]] ; then \
- license_attributes='license="$(LICENSE_NAME) ($(MODULE_NAME))"' ; \
- license_attributes+=' com.oracle.info.name="$(MODULE_NAME)"' ; \
+ license_attributes='license="$(LICENSE_NAME) ($(MODULE_TPNO_NAME))"' ; \
+ license_attributes+=' com.oracle.info.name="$(MODULE_TPNO_NAME)"' ; \
if [[ '$(MODULE_VERSION)' != 'src' ]] ; then \
license_attributes+=' com.oracle.info.version="$(MODULE_VERSION)"' ; \
fi ; \
--- a/open-src/font/Makefile.inc Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/Makefile.inc Tue Aug 06 23:22:35 2013 -0700
@@ -49,6 +49,26 @@
# Default module description for packages in this area
MODTYPE_DESC = the $(MODULE_NAME:font-%=%) fonts
+# Default TPNO & license text for X.Org fonts
+UPSTREAM_DEFAULT = $(UPSTREAM_SET:yes=$(POUND_SIGN))
+$(UPSTREAM_DEFAULT) ORACLE_TPNO = $(ORACLE_TPNO_xorg_fonts)
+$(UPSTREAM_DEFAULT) ORACLE_TPNO_SET = yes
+$(UPSTREAM_DEFAULT) XORG_FONT_LICENSE = ../X11-font-license.txt
+$(UPSTREAM_DEFAULT) ADD_LICENSE_HEADER = ../X11-font-license-add.txt
+$(UPSTREAM_DEFAULT) LICENSE_APPEND = $(ADD_LICENSE_FILES)
+
+# If font makefile contains AUTO_ADD_LICENSE = no, we just display the X.Org
+# font license, as there is no other attribution notice required for the
+# package. Otherwise we display the X11 license, plus a header and the
+# package's own COPYING file.
+ADD_LICENSE_YES = $(AUTO_ADD_LICENSE:no=$(POUND_SIGN))
+$(ADD_LICENSE_YES) ADD_LICENSE_NO = $(POUND_SIGN)
+
+$(UPSTREAM_DEFAULT)$(ADD_LICENSE_YES) MODULE_LICENSE_PREPEND = $(XORG_FONT_LICENSE)
+$(UPSTREAM_DEFAULT)$(ADD_LICENSE_YES) MODULE_LICENSE_PREPEND += $(ADD_LICENSE_HEADER)
+$(UPSTREAM_DEFAULT)$(ADD_LICENSE_NO) LICENSE_FILE = $(XORG_FONT_LICENSE)
+$(UPSTREAM_DEFAULT)$(ADD_LICENSE_NO) LICENSE_FILE_SET = yes
+
# Most font modules have no man pages
MODTYPE_SUNTOUCH_MAN_FLAGS=
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/X11-font-license-add.txt Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,5 @@
+ ------------------------------------------------------------------------
+
+Additional terms and/or notices apply to certain fonts within the X11 Fonts
+as follows:
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/X11-font-license.txt Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,28 @@
+The X11 Fonts are governed by the following license:
+
+Copyright (C) 1994 X Consortium
+
+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 THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the X Consor-
+tium.
+
+X Window System is a trademark of X Consortium, Inc.
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/adobe-utopia-100dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,3 @@
+Copyright (c) 1989 Adobe Systems Incorporated
+Utopia (R)
+Utopia is a registered trademark of Adobe Systems Incorporated
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/adobe-utopia-75dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,3 @@
+Copyright (c) 1989 Adobe Systems Incorporated
+Utopia (R)
+Utopia is a registered trademark of Adobe Systems Incorporated
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/adobe-utopia-type1/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,3 @@
+Copyright (c) 1989 Adobe Systems Incorporated
+Utopia (R)
+Utopia is a registered trademark of Adobe Systems Incorporated
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bh-100dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,25 @@
+(c) Copyright 1989 Oracle America, Inc. and/or its affiliates.
+Oracle design patents pending in the U.S. and foreign countries.
+OPEN LOOK is a trademark of AT&T. Used by written permission of
+the owners.
+
+(c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
+trademark of Bigelow & Holmes. Permission to use the Lucida
+trademark is hereby granted only in association with the images
+and fonts described in this file.
+
+ORACLE AMERICA, INC., AT&T, AND BIGELOW & HOLMES
+MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
+THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
+WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
+ORACLE AMERICA, INC., AT&T AND BIGELOW & HOLMES,
+SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
+WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. IN NO EVENT SHALL ORACLE AMERICA,
+INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
+SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bh-75dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,25 @@
+(c) Copyright 1989 Oracle America, Inc. and/or its affiliates.
+Oracle design patents pending in the U.S. and foreign countries.
+OPEN LOOK is a trademark of AT&T. Used by written permission of
+the owners.
+
+(c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
+trademark of Bigelow & Holmes. Permission to use the Lucida
+trademark is hereby granted only in association with the images
+and fonts described in this file.
+
+ORACLE AMERICA, INC., AT&T, AND BIGELOW & HOLMES
+MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
+THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
+WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
+ORACLE AMERICA, INC., AT&T AND BIGELOW & HOLMES,
+SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
+WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. IN NO EVENT SHALL ORACLE AMERICA,
+INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
+SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bh-lucidatypewriter-100dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,25 @@
+(c) Copyright 1989 Oracle America, Inc. and/or its affiliates.
+Oracle design patents pending in the U.S. and foreign countries.
+OPEN LOOK is a trademark of AT&T. Used by written permission of
+the owners.
+
+(c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
+trademark of Bigelow & Holmes. Permission to use the Lucida
+trademark is hereby granted only in association with the images
+and fonts described in this file.
+
+ORACLE AMERICA, INC., AT&T, AND BIGELOW & HOLMES
+MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
+THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
+WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
+ORACLE AMERICA, INC., AT&T AND BIGELOW & HOLMES,
+SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
+WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. IN NO EVENT SHALL ORACLE AMERICA,
+INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
+SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bh-lucidatypewriter-75dpi/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,25 @@
+(c) Copyright 1989 Oracle America, Inc. and/or its affiliates.
+Oracle design patents pending in the U.S. and foreign countries.
+OPEN LOOK is a trademark of AT&T. Used by written permission of
+the owners.
+
+(c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
+trademark of Bigelow & Holmes. Permission to use the Lucida
+trademark is hereby granted only in association with the images
+and fonts described in this file.
+
+ORACLE AMERICA, INC., AT&T, AND BIGELOW & HOLMES
+MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
+THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
+WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
+ORACLE AMERICA, INC., AT&T AND BIGELOW & HOLMES,
+SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
+WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. IN NO EVENT SHALL ORACLE AMERICA,
+INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
+SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
--- a/open-src/font/cursor-misc/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/cursor-misc/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -39,6 +39,7 @@
# Description to include in package metadata
MODULE_DESC = the X.Org cursor bitmap font
+AUTO_ADD_LICENSE = no
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/jis-misc/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/jis-misc/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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"),
@@ -27,8 +27,7 @@
MODULE_NAME=font-jis-misc
# Package metadata
-MODULE_LICENSE = Japanese Industrial Standard
-MODULE_LICENSE_SET = yes
+AUTO_ADD_LICENSE = no
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/micro-misc/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/micro-misc/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -27,8 +27,7 @@
MODULE_NAME=font-micro-misc
# Package metadata
-MODULE_LICENSE = Public domain
-MODULE_LICENSE_SET = yes
+AUTO_ADD_LICENSE = no
MODULE_DESC = the Micro bitmap font containing teeny, tiny glyphs
# pkg(5) name we deliver the files in (override default)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/misc-ethiopic/COPYING Tue Aug 06 23:22:35 2013 -0700
@@ -0,0 +1,22 @@
+Copyright:
+ This is the Ge'ez Frontiers Foundation's Zemen class font based on the
+ Goha-Tibeb HP LasterJet fonts and released under the MIT Licence.
+ True Type Artist:- Biruk Asrat.
+
+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 THE
+AUTHORS OR COPYRIGHT HOLDERS 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.
--- a/open-src/font/misc-misc/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/misc-misc/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -27,8 +27,7 @@
MODULE_NAME=font-misc-misc
# Package metadata
-MODULE_LICENSE = Public domain
-MODULE_LICENSE_SET = yes
+AUTO_ADD_LICENSE = no
MODULE_DESC = X.Org miscellaneous fonts in bitmap format
# Version number (used in path names)
--- a/open-src/font/sun-aliases/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/sun-aliases/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -28,8 +28,18 @@
MODTYPE_PKGHIER=system/font/xorg
MODTYPE_PKGHIER_SET=yes
+# Dates to show in Oracle copyright notice in pkg license file
+# Earliest & latest of the copyrights in the Oracle files in this pkg
+ORACLE_COPYRIGHT_YEARS = 1994, 2008
+LICENSE_FILE = NONE
+LICENSE_FILE_SET = yes
+
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
+UPSTREAM=NONE
+UPSTREAM_SET=yes
+UPSTREAM_PROJECT=NONE
+UPSTREAM_PROJECT_SET=yes
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
--- a/open-src/font/winitzki-cyrillic/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/font/winitzki-cyrillic/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -27,8 +27,7 @@
MODULE_NAME=font-winitzki-cyrillic
# Package metadata
-MODULE_LICENSE = Public domain
-MODULE_LICENSE_SET = yes
+AUTO_ADD_LICENSE = no
MODULE_DESC = Winitzki proof Bitmap font containing Cyrillic glyphs
# pkg(5) name we deliver the files in (override default)
--- a/open-src/lib/DPS/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/DPS/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -32,6 +32,7 @@
# Package metadata
MODULE_DESC = the Adobe Display Postscript (DPS) client libraries
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
# Sources were extracted from X11R6.9 source tree, but we don't want
# to download & unpack all that, and upstream isn't maintaining, so
--- a/open-src/lib/freeglut/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/freeglut/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -2,7 +2,7 @@
#
# FreeGLUT 2.6.0 Makefile
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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,6 +41,7 @@
UPSTREAM = The FreeGLUT Project
UPSTREAM_URL = http://freeglut.sourceforge.net/
UPSTREAM_SET = yes
+ORACLE_TPNO = 4509
# Download site for source
SOURCE_URL = $(SF_DOWNLOADS_URL)/freeglut/freeglut/$(SOURCE_TARBALL_NAME)
--- a/open-src/lib/libXaw4/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/libXaw4/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -2,7 +2,7 @@
#
# Xaw4 Makefile
#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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"),
@@ -33,6 +33,9 @@
MODULE_NAME=libXaw4
+# Package metadata
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/library/toolkit/libxaw4
MODULE_PKGNAME_SET=yes
--- a/open-src/lib/libXaw5/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/libXaw5/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -2,7 +2,7 @@
#
# Xaw5 Makefile
#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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"),
@@ -27,6 +27,9 @@
MODULE_NAME=libXaw5
+# Package metadata
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/library/toolkit/libxaw5
MODULE_PKGNAME_SET=yes
--- a/open-src/lib/xcb-util-image/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/xcb-util-image/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -46,6 +46,8 @@
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_SET = yes
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/xcb-util-keysyms/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/xcb-util-keysyms/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -45,6 +45,8 @@
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_SET = yes
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/xcb-util-renderutil/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/xcb-util-renderutil/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -45,6 +45,8 @@
MODULE_DESC = the xcb-util-renderutil library of xcb utility functions for the X Render Extension
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
+ORACLE_TPNO = 5072
+ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/xcb-util-wm/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/xcb-util-wm/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -45,6 +45,8 @@
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_SET = yes
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/lib/xcb-util/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/lib/xcb-util/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -41,6 +41,8 @@
MODULE_DESC = the xcb-util library of xcb utility functions
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
+ORACLE_TPNO = 5068
+ORACLE_TPNO_SET = yes
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/proto/sun-ext-protos/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/proto/sun-ext-protos/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -28,6 +28,7 @@
MODULE_NAME=sun-ext-protos
# No upstream sources for these files, since they're Solaris-specific
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
@@ -53,6 +54,8 @@
# Package metadata
MODULE_DESC = headers & documentation for X11 protocol extensions created by Sun
+MODULE_LICENSE = Oracle
+MODULE_LICENSE_SET = yes
# Dates to show in Oracle copyright notice in pkg license file
# Earliest & latest of the copyrights in the Oracle files in this pkg
--- a/open-src/xserver/xorg/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/xserver/xorg/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -308,7 +308,7 @@
XTSOL_LICENSE = $(XTSOL_PKG_METADATA_DIR)/$(LICENSE_FILE_NAME)
$(XTSOL_LICENSE):= LICENSE_NAME = $(ORACLE_LICENSE_NAME)
$(XTSOL_LICENSE):= LICENSE_FILE = COPYING.tsol
-$(XTSOL_LICENSE):= LICENSE_APPEND = $(ORACLE_LICENSE_APPEND)
+$(XTSOL_LICENSE):= LICENSE_INSERT = $(ORACLE_LICENSE_INSERT)
# Special compatibility links from /usr/X11/include to /usr/include
X11_INCLUDE_COMPAT_DIR = $(PROTODIR)/usr/X11/include
--- a/open-src/xserver/xserver-common/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/xserver/xserver-common/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -30,6 +30,7 @@
# Package metadata
MODULE_DESC = Xserver SMF & RBAC configuration files
+ORACLE_TPNO = $(ORACLE_TPNO_xorg)
# ARC cases that covered this module
# PSARC/2004/752 X Consolidation conversion to SMF
--- a/open-src/xserver/xvnc/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/open-src/xserver/xvnc/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -38,6 +38,7 @@
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
MODULE_LICENSE_DESC = portions of the TigerVNC software
+ORACLE_TPNO = 9801
# Version number (used in path names)
MODULE_VERSION=1.1.0
--- a/pkg/Makefile Wed Jul 24 11:15:16 2013 -0700
+++ b/pkg/Makefile Tue Aug 06 23:22:35 2013 -0700
@@ -227,7 +227,7 @@
# Default transformations to apply
PM_TRANSFORMS = $(PKG_BRANDING_TRANSFORMS) \
common_actions publish restart_fmri facets \
- licenses $(PDIR)/versions
+ $(PDIR)/versions
PM_INC = transforms
# Additional transforms for specific types of packages
--- a/pkg/transforms/licenses Wed Jul 24 11:15:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2010, 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"),
-# 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 (including the next
-# paragraph) 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
-# THE AUTHORS OR COPYRIGHT HOLDERS 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.
-#
-
-#
-# Assign human readable labels to default licenses
-#
-
-<transform license license="^GPLv2$" -> \
- set license "GNU General Public License 2.0 (GPL)" >
-
-<transform license license="^MIT$" -> \
- set license "MIT License" >
-