--- a/open-src/README Tue Nov 18 17:56:42 2008 -0800
+++ b/open-src/README Wed Nov 19 16:35:17 2008 -0800
@@ -271,6 +271,15 @@
- Additional command line arguments passed when calling make
by default_install
+EXTRA_LICENSES
+ - Additional files containing copyright & license information for this module,
+ beyond what's in LICENSE_FILE, such as subsets for specific packages.
+ Will be copied under their own names to $(PROTODIR)/licenses/<path>/
+ for use by include statements in package copyright.add files, where
+ path is the same as the directory & subdirectory the module source is in.
+ Files are looked for relative to module directory, include $(SOURCE_DIR)/
+ in the filename to look relative to the top-level source directory.
+
Optional, with non-empty default:
* Important, for these, to override the default values, you must not only
--- a/open-src/common/Makefile.inc Tue Nov 18 17:56:42 2008 -0800
+++ b/open-src/common/Makefile.inc Wed Nov 19 16:35:17 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.94 08/10/06
+# @(#)Makefile.inc 1.95 08/11/18
#
### Default rules
@@ -475,19 +475,25 @@
# and set LICENSE_FILE_SET=yes
# A file in the same directory as the Makefile takes precedence
# over one that is delivered in the package.
+# For additional license files, set EXTRA_LICENSE_FILES to a list of
+# licenses to copy
LICENSE_FILE_DEFAULT = $(LICENSE_FILE_SET:yes=$(POUND_SIGN))
$(LICENSE_FILE_DEFAULT) LICENSE_FILE=COPYING
install_license:
- @THIS_MODULE=`echo $(PWD) | sed 's|.*/open-src/||'` ; \
+ @ THIS_MODULE="$$(echo $(PWD) | sed 's|.*/open-src/||')" ; \
+ PS4="" ; set -x ; \
if [[ -f $(LICENSE_FILE) ]] ; then \
LICENSE_TO_COPY="$(LICENSE_FILE)" ; \
elif [[ -f $(SOURCE_DIR)/$(LICENSE_FILE) ]] ; then \
LICENSE_TO_COPY="$(SOURCE_DIR)/$(LICENSE_FILE)" ; \
fi ; \
if [[ "$${LICENSE_TO_COPY}" != "" ]] ; then \
- set -x ; \
mkdir -p $(LICENSE_DEST)/$${THIS_MODULE}/ ; \
cp -pf $${LICENSE_TO_COPY} \
$(LICENSE_DEST)/$${THIS_MODULE}/COPYING ; \
+ fi ; \
+ if [[ "$(EXTRA_LICENSES)" != "" ]] ; then \
+ mkdir -p $(LICENSE_DEST)/$${THIS_MODULE}/ ; \
+ cp -pf $(EXTRA_LICENSES) $(LICENSE_DEST)/$${THIS_MODULE} ; \
fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/COPYING.xorg-docs Wed Nov 19 16:35:17 2008 -0800
@@ -0,0 +1,77 @@
+XFree86 code without an explicit copyright is covered by the
+following copyright/license:
+
+ Copyright (C) 1994-2003 The XFree86 Project, Inc. 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 THE XFREE86
+ PROJECT 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 the XFree86
+ Project shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software
+ without prior written authorization from the XFree86 Project.
+
+ _________________________________________________________
+
+Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+ _________________________________________________________
+
+Copyright 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
+
+Permission is granted to make and distribute verbatim copies of this document
+provided the copyright notice and this permission notice are preserved on all
+copies.
+
+OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,
+Inc. Unix is a registered trademark of The Open Group. The `X' device and X
+Window System are trademarks of The Open Group. XFree86 is a trademark of
+The XFree86 Project. Linux is a registered trademark of Linus Torvalds.
+Intel is a registered trademark of Intel Corporation. 3Dlabs, GLINT, and
+Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
+3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
+active, Incorporated. Matrox is a registered trademark of Matrox Electronic
+Systems Ltd. ATI Rage and Radeon are registered trademarks of ATI Technolo-
+gies, Inc. All other trademarks mentioned are the property of their respec-
+tive owners.
+
--- a/open-src/xserver/xorg/Makefile Tue Nov 18 17:56:42 2008 -0800
+++ b/open-src/xserver/xorg/Makefile Wed Nov 19 16:35:17 2008 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.69 08/11/04
+# @(#)Makefile 1.70 08/11/18
#
# Build 32-bit or 64-bit?
@@ -78,6 +78,11 @@
BUILD_TARGETS=fix-xf1bpp $(XORGSERVER_BIN) $(BUILD_DIR)/mapfile-Xorg-externs
BUILD_TARGETS_SET=yes
+# Additional license files to install
+EXTRA_LICENSES = \
+ COPYING.Xprint-fonts \
+ COPYING.xorg-docs
+
# Need to regenerate autoconf/automake files after patching
AUTORECONF=yes
@@ -129,9 +134,6 @@
cp -p $(SOURCE_DIR)/hw/xfree86/os-support/bus/xf86Sbus.h $(PROTODIR)$(X11_INCLUDES_DIR)/xorg/xf86Sbus.h
mkdir -p $(PROTODIR)$(X11_DOC_DIR)
cp -p $(SOURCE_DIR)/hw/xfree86/doc/README.* $(PROTODIR)$(X11_DOC_DIR)/
- @THIS_MODULE=`echo $(PWD) | sed 's|.*/open-src/||'` ; \
- mkdir -p $(LICENSE_DEST)/$${THIS_MODULE}/ ; \
- cp -pf COPYING.Xprint-fonts $(LICENSE_DEST)/$${THIS_MODULE}/
# Install xorg-server.pc in 32-bit pkgconfig dir on SPARC too
install_pc:
--- a/packages/SUNWxorg-doc/copyright.add Tue Nov 18 17:56:42 2008 -0800
+++ b/packages/SUNWxorg-doc/copyright.add Wed Nov 19 16:35:17 2008 -0800
@@ -3,7 +3,7 @@
Files from the X.Org xserver package are covered by the following notice:
-include xserver/xorg/COPYING
+include xserver/xorg/COPYING.xorg-docs
--------------------------------------------------------------------