--- a/open-src/common/Makefile.inc Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/common/Makefile.inc Thu Aug 01 23:39:25 2013 -0700
@@ -923,7 +923,6 @@
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_INSERT = $(ORACLE_LICENSE_INSERT)
# Name to use in TPNO metadata & license file headers
@@ -948,9 +947,6 @@
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)/' \
@@ -973,6 +969,9 @@
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 \
--- a/open-src/font/Makefile.inc Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/Makefile.inc Thu Aug 01 23:39:25 2013 -0700
@@ -50,11 +50,24 @@
MODTYPE_DESC = the $(MODULE_NAME:font-%=%) fonts
# Default TPNO & license text for X.Org fonts
-$(UPSTREAM_SET:yes=$(POUND_SIGN)) ORACLE_TPNO = $(ORACLE_TPNO_xorg_fonts)
-$(UPSTREAM_SET:yes=$(POUND_SIGN)) ORACLE_TPNO_SET = yes
-$(UPSTREAM_SET:yes=$(POUND_SIGN)) LICENSE_FILE = ../X11-font-license.txt
-$(UPSTREAM_SET:yes=$(POUND_SIGN)) LICENSE_FILE_SET = yes
-$(UPSTREAM_SET:yes=$(POUND_SIGN)) LICENSE_APPEND = $(SOURCE_DIR)/COPYING
+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 Thu Aug 01 23:39:25 2013 -0700
@@ -0,0 +1,5 @@
+ ------------------------------------------------------------------------
+
+Additional terms and/or notices apply to certain fonts within the X11 Fonts
+as follows:
+
--- a/open-src/font/X11-font-license.txt Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/X11-font-license.txt Thu Aug 01 23:39:25 2013 -0700
@@ -26,8 +26,3 @@
X Window System is a trademark of X Consortium, Inc.
- ------------------------------------------------------------------------
-
-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/adobe-utopia-100dpi/COPYING Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/cursor-misc/Makefile Thu Aug 01 23:39:25 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 Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/jis-misc/Makefile Thu Aug 01 23:39:25 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 Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/micro-misc/Makefile Thu Aug 01 23:39:25 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 Thu Aug 01 23:39:25 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 Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/misc-misc/Makefile Thu Aug 01 23:39:25 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/winitzki-cyrillic/Makefile Thu Aug 01 20:14:46 2013 -0700
+++ b/open-src/font/winitzki-cyrillic/Makefile Thu Aug 01 23:39:25 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)