--- a/open-src/README Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/README Tue Feb 19 19:23:47 2013 -0800
@@ -3,7 +3,7 @@
General Overview:
-----------------
This tree builds dozens of open source modules that are each released
-separately and delivered as source in seperate tarballs. These modules
+separately and delivered as source in separate tarballs. These modules
are organized in subdirectories based on the X.Org module list, though
modules from other sources are included as appropriate. For instance,
the application xterm is built in open-src/app/xterm, while the fontconfig
@@ -207,10 +207,32 @@
and for publication in opensolaris.arc_url metadata attributes in packages.
Must be in the format "ARC/year/case", such as "PSARC/2004/187".
+MODULE_DESC
+ - description of the module to be used in license notices or package metadata
+ It should be short, specific, concise text, identifying the technology
+ covered by the associated license(s). It should fit naturally in the
+ sentence "This package may contain XXX." For example, "XXX" might be
+ "the xset command" or "bzip2 compression software." When appropriate,
+ this may begin with "portions of" or another, more specific qualifying
+ clause.
+
+MODULE_LICENSE_DESC
+ - description of software covered by a particular license notice, overrides
+ MODULE_DESC if set.
+
MODULE_LICENSE_PREPEND, MODULE_LICENSE_APPEND
- Files to be added to the beginning or end of LICENSE_FILE when generating
the license notice placed in the package.
+ORACLE_COPYRIGHT_YEARS
+ - If an Oracle copyright notice should be added to a package to reflect
+ Oracle's modifications, then this should be the year string to include,
+ usually in the form "first, last", as in "1970, 2038". May be a single
+ year if modifications were all made in the same year.
+
+ORACLE_TPNO
+ - Third party license tracking number from Oracle's licensing database.
+
FIX_PC_FILES
- Names of pkgconfig .pc or .pc.in files in the module, which will be
"fixed" to add required -R flags for linking libraries with and remove
@@ -452,6 +474,7 @@
Optional, default is empty:
- MODTYPE_SUNTOUCH_MAN_FLAGS
+ - MODTYPE_DESC
- MODTYPE_SOURCE_DEPS
- MODTYPE_CONFIGURE_DEPS
- MODTYPE_BUILD_DEPS
@@ -646,7 +669,7 @@
=============================================================================
-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"),
--- a/open-src/app/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org application modules
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,9 @@
MODTYPE_PKGHIER=x11
MODTYPE_PKGHIER_SET=yes
+# Default module description for packages in this area
+MODTYPE_DESC = the $(MODULE_NAME) utility
+
### Include common definitions
include $(TOP)/open-src/common/Makefile.init
--- a/open-src/app/appres/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/appres/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# appres 1.x Makefile
+# appres - Utility to list Xt application resource database
#
-# 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/xt-resource-utilities
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the appres Xt application resource list utility
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/bdftopcf/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/bdftopcf/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# bdftopcf Makefile
+# bdftopcf - Utility to convert X font from BDF to PCF
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/font-utilities
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the bdftopcf font conversion utility
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/bitmap/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/bitmap/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# bitmap (XBM format) editor application
#
-# Copyright (c) 2008, 2012, 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=image/editor/bitmap
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the bitmap, bmtoa, and atobm utilities
# Package classification (override default)
MODULE_PKGCLASS=Applications/Graphics and Imaging
--- a/open-src/app/cmap_alloc/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-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.
--- a/open-src/app/cmap_alloc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/cmap_alloc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# cmap_alloc 1.x module Makefile
+# cmap_alloc - Utility to allocate default colormaps for non-default visuals
#
-# 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"),
@@ -32,6 +32,15 @@
MODULE_PKGNAME=x11/colormap-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the cmap_alloc colormap allocation utility
+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
+ORACLE_COPYRIGHT_YEARS = 1991, 2010
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/cmap_compact/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-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.
--- a/open-src/app/cmap_compact/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/cmap_compact/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# cmap_compact 1.x module Makefile
+# cmap_compact - colormap configuration utility
#
-# 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"),
@@ -32,6 +32,15 @@
MODULE_PKGNAME=x11/colormap-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the cmap_compact colormap configuration utility
+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
+ORACLE_COPYRIGHT_YEARS = 1990, 2011
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/dispswitch/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/dispswitch/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# dispswitch module Makefile
+# dispswitch - utility for changing display configuration upon hotkey press
#
-# Copyright (c) 2009, 2010, 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"),
@@ -30,10 +30,15 @@
# No upstream sources, only local sources
MODULE_VERSION=src
+MODULE_LICENSE_DESC = portions of the xrandr utility
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
ADDITIONAL_SOURCE_DIR=sun-src
+# 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 = 2008, 2010
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
--- a/open-src/app/editres/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/editres/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# editres 1.x Makefile
+# editres - Dynamic resource editor for X Toolkit applications
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xt-resource-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the editres application
+
# Version number (used in path names)
MODULE_VERSION=1.0.5
--- a/open-src/app/fbconsole/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/fbconsole/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# fbconsole Makefile
+# fbconsole - fallback console utility
#
-# 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"),
@@ -38,6 +38,11 @@
# Package metadata
MODULE_LICENSE = Oracle
MODULE_LICENSE_SET = yes
+MODULE_DESC = the fbconsole console fallback utility
+
+# 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 = 1992, 2005
# ARC cases that covered this module
MODULE_ARC_CASES = PSARC/1992/130 LSARC/2005/590
--- a/open-src/app/fbconsole/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1992, 2005, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/fslsfonts/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/fslsfonts/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# fslsfonts utility to list fonts available from an xfs font server
#
-# Copyright (c) 2008, 2012, 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/xfs/xfs-utilities
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the fslsfonts utility to list fonts from an xfs font server
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/fstobdf/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/fstobdf/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# fstobdf utility to retrieve bdf fonts from an xfs font server
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xfs/xfs-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the fstobdf utility to retrieve bdf fonts from an xfs font server
+
# Version number (used in path names)
MODULE_VERSION=1.0.5
--- a/open-src/app/iceauth/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/iceauth/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# iceauth 1.x Makefile
+# iceauth - Utility to manage ICE connection authentication data
#
-# 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"),
--- a/open-src/app/ico/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/ico/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# ico 1.x Makefile
+# ico - X11 demo animation of an icosahedron or other polyhedron
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/demo
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the ico X11 animation demo
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/installalias/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/installalias/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# installalias module Makefile
+# installalias - Utility to install X11 font aliases
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/font-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_LICENSE_DESC = portions of the libXfont library code
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/kbd_mode/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/kbd_mode/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# kbd_mode module Makefile
+# kbd_mode - utility to change the Solaris kernel key event reporting mode
#
-# 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"),
@@ -39,6 +39,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 1987, 2010
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/kbd_mode/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1987, 2010, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/lbxproxy/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/lbxproxy/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# lbxproxy 1.x Makefile
+# lbxproxy - Low Bandwidth X (LBX) proxy
#
-# 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"),
@@ -36,6 +36,9 @@
MODULE_PKGCLASS=Applications/Internet
MODULE_PKGCLASS_SET=yes
+# Package metadata
+MODULE_DESC = the Low Bandwidth X (LBX) proxy
+
# Version number (used in path names)
MODULE_VERSION=1.0.2
--- a/open-src/app/listres/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/listres/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# listres - Xt toolkit resource list utility
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xt-resource-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the listres Xt widget resource list utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/mkcookie/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/mkcookie/COPYING Tue Feb 19 19:23:47 2013 -0800
@@ -1,25 +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 1988 Massachusetts Institute of Technology
Permission to use, copy, modify, and distribute this software and its
--- a/open-src/app/mkcookie/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/mkcookie/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# mkcookie 1.x module Makefile
+# mkcookie - Utility to create xauth cookies
#
-# 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"),
@@ -32,6 +32,13 @@
MODULE_PKGNAME=x11/session/xauth
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_LICENSE_DESC = portions of the xauth utility source code
+
+# 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 = 1990, 2011
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/mkfontdir/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/mkfontdir/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# mkfontdir - legacy X11 core font metadata creation tool
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/font-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the mkfontdir X11 font metadata tool
+
# Version number (used in path names)
MODULE_VERSION=1.0.7
--- a/open-src/app/mkfontscale/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/mkfontscale/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# mkfontscale - legacy X11 core font metadata creation tool
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,9 @@
MODULE_PKGNAME=x11/font-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the mkfontscale legacy X11 scalable font metadata creation tool
+
# Version number (used in path names)
MODULE_VERSION=1.1.0
--- a/open-src/app/proxymngr/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/proxymngr/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# proxymngr 1.x Makefile
+# proxymngr - X11 proxy manager service
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/network/x11-network-proxies
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the X11 proxy manager service
+
# Package classification (override default)
MODULE_PKGCLASS=Applications/Internet
MODULE_PKGCLASS_SET=yes
--- a/open-src/app/rgb/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/rgb/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# rgb 1.x Makefile
+# rgb - X11 color name mapping list data and utility
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the X11 rgb color name mapping list data and utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/setxkbmap/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/setxkbmap/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# setxkbmap - utility for setting XKB layout & keymap options
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/keyboard/xkb-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the setxkbmap keyboard configuration utility
+
# Version number (used in path names)
MODULE_VERSION=1.3.0
--- a/open-src/app/showfont/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/showfont/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# showfont Makefile
+# showfont - utility to display data about a font from an X font server
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xfs/xfs-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the showfont font server data display utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/synergy/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/synergy/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# synergy application to share input devices across computers
#
-# 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"),
@@ -45,6 +45,7 @@
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
+MODULE_DESC = the Synergy mouse and keyboard sharing system
ORACLE_TPNO = 3822
# Version number (used in path names)
--- a/open-src/app/twm/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/twm/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# twm 1.x Makefile
+# twm - Tab Window Manager for the X Window System
#
-# 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=desktop/window-manager/twm
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the Tab Window Manager (twm)
# Version number (used in path names)
MODULE_VERSION=1.0.7
--- a/open-src/app/viewres/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/viewres/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# viewres 1.x Makefile
+# viewres - graphical class browser for Xt widget classes
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xt-resource-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the viewres Xt widget class browser
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/winsysck/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/winsysck/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# winsysck 1.x Makefile
+# winsysck - utility to check & report if a window system is in use
#
-# 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"),
@@ -36,6 +36,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 1990, 2008
+
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/winsysck/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1990, 2008, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/app/x11perf/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/x11perf/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# x11perf 1.x Makefile
+# x11perf - X11 server performance test program
#
-# 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"),
@@ -39,6 +39,9 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Package metadata
+MODULE_DESC = the x11perf performance test program for X11 servers
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=benchmark/x11perf
MODULE_PKGNAME_SET=yes
--- a/open-src/app/xauth/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xauth/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xauth - utility for managing cookies in .Xauthority files
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/session/$(MODULE_NAME)
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xauth utility for managing cookies in .Xauthority files
+
# Version number (used in path names)
MODULE_VERSION=1.0.7
--- a/open-src/app/xclipboard/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xclipboard/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xclipboard & xcutsel tools for clipboard & cut buffer manipulation
#
-# Copyright (c) 2008, 2012, 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"),
@@ -31,6 +31,7 @@
# Package classification (override default)
MODULE_PKGCLASS=Applications/Accessories
MODULE_PKGCLASS_SET=yes
+MODULE_DESC = the xclipboard & xcutsel utilities
# Version number (used in path names)
MODULE_VERSION=1.1.2
--- a/open-src/app/xcmsdb/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xcmsdb/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xcmsdb - Device Color Characterization utility
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xcmsdb Device Color Characterization utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xcolor/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Copyright 1995, 2001, 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/xcolor/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xcolor/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcolor 1.x Makefile
+# xcolor - utility to display used & available entries in PseudoColor colormaps
#
-# 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"),
@@ -32,6 +32,15 @@
MODULE_PKGNAME=x11/colormap-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xcolor colormap display program
+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
+ORACLE_COPYRIGHT_YEARS = 1995, 2001
+
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/xcompmgr/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xcompmgr/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xcompmgr - simple Composite Manager
#
-# 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"),
@@ -39,6 +39,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=desktop/window-manager/$(MODULE_NAME)
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the xcompmgr X compositing manager
# ARC cases that covered this module
# LSARC/2009/597 xcompmgr & transset
--- a/open-src/app/xdm/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xdm/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xdm Makefile
+# xdm - X Display Manager with support for XDMCP and host chooser
#
-# 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/display-manager/xdm
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the X Display Manager (xdm) server
# Version number (used in path names)
MODULE_VERSION=1.1.9
--- a/open-src/app/xdriinfo/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xdriinfo/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xdriinfo 1.x Makefile
+# xdriinfo - Utility to query configuration information of DRI drivers
#
-# 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"),
@@ -38,6 +38,9 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = compile-on-sparc.patch
+# Package metadata
+MODULE_DESC = the xdriinfo DRI driver query utility
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
--- a/open-src/app/xedit/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xedit/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xedit 1.x Makefile
+# xedit - simple Xaw-based text editor for X
#
-# 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"),
@@ -31,6 +31,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=editor/$(MODULE_NAME)
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the xedit text editor
# Package classification (override default)
MODULE_PKGCLASS=Development/Editors
--- a/open-src/app/xeyes/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xeyes/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xeyes 1.x Makefile
+# xeyes - googly eyes that watch your mouse cursor
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/demo
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xeyes X11 pointer tracking demo
+
# Version number (used in path names)
MODULE_VERSION=1.1.1
--- a/open-src/app/xfindproxy/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xfindproxy/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xfindproxy 1.x Makefile
+# xfindproxy - Utility to locate X11 proxy services
#
-# 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"),
@@ -36,6 +36,9 @@
MODULE_PKGCLASS=Applications/Internet
MODULE_PKGCLASS_SET=yes
+# Package metadata
+MODULE_DESC = the xfindproxy X11 proxy service locator utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.2
--- a/open-src/app/xfs/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xfs/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# xfs Makefile
+# xfs - X11 font server
#
# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
#
@@ -52,6 +52,13 @@
MODULE_PKGNAME=x11/xfs
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the X Font Server (xfs)
+
+# 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, 2010
+
# ARC cases that covered this module
# PSARC/2004/752 X Consolidation conversion to SMF
MODULE_ARC_CASES = PSARC/2004/752
--- a/open-src/app/xfsinfo/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xfsinfo/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xfsinfo Makefile
+# xfsinfo - Utility to display information about an X font server
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/xfs/xfs-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xfsinfo X font server query utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/xfwp/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xfwp/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xfwp 1.x Makefile
+# xfwp - X11 firewall proxy
#
-# 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"),
@@ -36,6 +36,9 @@
MODULE_PKGCLASS=Applications/Internet
MODULE_PKGCLASS_SET=yes
+# Package metadata
+MODULE_DESC = the X11 firewall proxy (xfwp)
+
# Version number (used in path names)
MODULE_VERSION=1.0.2
--- a/open-src/app/xgamma/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xgamma/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xgamma - monitor gamma correction setting application
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -43,6 +43,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xgamma monitor gamma correction setting application
+
# ARC cases that covered this module
# PSARC/2005/189 X client support for XFree86 extensions
MODULE_ARC_CASES = PSARC/2005/189
--- a/open-src/app/xgc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xgc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xgc 1.x Makefile
+# xgc - X11 core drawing primitives graphics demo & test program
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/demo
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xgc graphics demo
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/xhost/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xhost/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xhost - utility for mananging X server access control lists
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xhost utility for mananging X server access control lists
+
# Version number (used in path names)
MODULE_VERSION=1.0.5
--- a/open-src/app/xinit/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xinit/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xinit - starts a X server & session without a display manager
#
-# Copyright (c) 2008, 2012, 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"),
@@ -43,6 +43,7 @@
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/session/$(MODULE_NAME)
MODULE_PKGNAME_SET=yes
+MODULE_DESC = the xinit & startx utilities
# ARC cases that covered this module
# PSARC/2008/379 startx
--- a/open-src/app/xinput/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xinput/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xinput - input device management utility
#
-# 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"),
@@ -40,6 +40,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xinput input device management utility
+
# ARC cases that covered this module
# LSARC/2009/506 xinput program
MODULE_ARC_CASES = LSARC/2009/506
--- a/open-src/app/xkbprint/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xkbprint/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xkbprint 1.x Makefile
+# xkbprint - utility to print XKB keyboard layouts to PostScript printers/files
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/keyboard/xkb-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xkbprint utility to print XKB keyboard layouts
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/xkbutils/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xkbutils/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xkbutils 1.x Makefile
+# xkbutils - assorted XKB client programs
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/keyboard/xkb-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xkbutils clients for X11 Keyboard (XKB) extension
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/app/xlock/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlock/COPYING Tue Feb 19 19:23:47 2013 -0800
@@ -11,25 +11,3 @@
trade secrets or any patents by this file or any part thereof. In no
event will the author be liable for any lost revenue or profits or
other special, indirect and consequential damages.
-
-Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-Use is subject to license terms
-
-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/xlock/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlock/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xlock 1.x Makefile
+# xlock - manually activated screen lock program
#
-# 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,14 @@
# Package name used in tarballs
MODULE_NAME=xlock
+# Package metadata
+MODULE_DESC = the xlock screen lock program
+
+# 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 = 1988, 2011
+ORACLE_TPNO = 9808
+
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/xlogo/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlogo/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xlogo - simple application to display the X Window System logo
#
-# Copyright (c) 2008, 2012, 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"),
@@ -43,6 +43,9 @@
MODULE_PKGNAME=x11/demo
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xlogo application to display the X Window System logo
+
# ARC cases that covered this module
# PSARC/2008/177 xlogo update to X11R7
MODULE_ARC_CASES = PSARC/2008/177
--- a/open-src/app/xlsatoms/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlsatoms/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xlsatoms - utility to list atoms defined on a given X server
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xlsatoms utility to list atoms defined on a given X server
+
# Version number (used in path names)
MODULE_VERSION=1.1.1
--- a/open-src/app/xlsclients/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlsclients/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xlsclients 1.x Makefile
+# xlsclients - utility to list clients connected to a given X server
#
-# 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"),
@@ -32,6 +32,10 @@
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
+
+# Package metadata
+MODULE_DESC = the xlsclients utility to list clients connected to a given X server
+
# Version number (used in path names)
MODULE_VERSION=1.1.2
--- a/open-src/app/xlsfonts/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Copyright 1989, 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.
--- a/open-src/app/xlsfonts/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlsfonts/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xlsfonts - utility to list X11 core protocol fonts available from an X server
#
-# Copyright (c) 2008, 2012, 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,9 @@
# Package name used in tarballs
MODULE_NAME=xlsfonts
+# Package metadata
+MODULE_DESC = the xlsfonts utility to list X11 core protocol fonts available from an X server
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xlswins/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xlswins/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xlswins Makefile
+# xlswins - utility to list windows displayed on an X server
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xlswins utility to list windows displayed on an X server
+
# No upstream sources for these files, since they're Solaris-specific
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/xmag/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xmag/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,6 @@
###############################################################################
#
-# xmag 1.x 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 +26,9 @@
# Package name used in tarballs
MODULE_NAME=xmag
+# Package metadata
+MODULE_DESC = the xmag screen magnification utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xmag_multivis/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xmag_multivis/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,6 @@
###############################################################################
#
-# xmag-multivis 1.x 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"),
@@ -32,6 +30,9 @@
MODULE_PKGNAME=x11/xmag
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the multiple visual version of xmag screen magnification utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xmakemap/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xmakemap/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# xmakemap script to generate xmodmap files from current keyboard settings
+#
+# 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 +30,13 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xmakemap script to generate xmodmap files
+
+# 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 = 1992, 2011
+
# No upstream sources for these files, since they're Sun created
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/app/xmodmap/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xmodmap/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xmodmap - X11 keyboard/mouse mapping configuration utility
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xmodmap X11 keyboard/mouse mapping configuration utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.7
--- a/open-src/app/xpr/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xpr/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xpr - utility to print xwd window dump images
#
-# Copyright (c) 2008, 2012, 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-window-dump
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xpr utility to print xwd window dump images
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xprop/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xprop/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
##############################################################################
#
-# xprop 1.x Makefile
+# xprop - utility to display X11 window and font properties
#
-# 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,9 @@
# Package name used in tarballs
MODULE_NAME=xprop
+# Package metadata
+MODULE_DESC = the xprop utility to display X11 window and font properties
+
# Version number (used in path names)
MODULE_VERSION=1.2.1
--- a/open-src/app/xrandr/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xrandr/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xrandr 1.x Makefile
+# xrandr - utility to configure screen sizes and layout via XRANDR extension
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -39,6 +39,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xrandr utility to configure screen sizes and layout
+
# ARC cases that covered this module
# PSARC/2005/189 X client support for XFree86 extensions
MODULE_ARC_CASES = PSARC/2005/189
--- a/open-src/app/xrdb/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xrdb/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xrdb 1.x Makefile
+# xrdb - X server resource database utility
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xrdb X server resource database utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.9
--- a/open-src/app/xrefresh/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xrefresh/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xrefresh 1.x Makefile
+# xrefresh - utility to force redraw of an X screen
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xrefresh X screen update utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/app/xset/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xset/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,6 @@
###############################################################################
#
-# xset 1.x 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"),
@@ -43,6 +41,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xset X server configuration utility
+
# ARC cases that covered this module
# PSARC 1999/188 - FBPM (Frame Buffer Power Management) Extension
MODULE_ARC_CASES = PSARC/1999/188
--- a/open-src/app/xsetroot/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xsetroot/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xsetroot 1.x Makefile
+# xsetroot - X11 root window parameter (background, cursor) setting utility
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/x11-server-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xsetroot X11 root window settings utility
+
# Version number (used in path names)
MODULE_VERSION=1.1.0
--- a/open-src/app/xstdcmap/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xstdcmap/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xstdcmap 1.x Makefile
+# xstdcmap - X standard colormap utility
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/colormap-utilities
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xstdcmap X11 standard colormap utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.2
--- a/open-src/app/xterm/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xterm/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xterm Makefile
+# xterm - terminal emulator for X
#
-# 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"),
@@ -44,6 +44,8 @@
UPSTREAM = Thomas Dickey
UPSTREAM_URL = http://invisible-island.net/xterm/
UPSTREAM_SET = yes
+MODULE_DESC = the xterm terminal emulator application
+ORACLE_TPNO = 9811
# Version number (used in path names)
MODULE_VERSION=271
--- a/open-src/app/xvinfo/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xvinfo/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xvinfo 1.x Makefile
+# xvinfo - utility to display X-Video extension adaptor information
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -38,6 +38,9 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
+# Package metadata
+MODULE_DESC = the xvinfo utility to display X-Video extension adaptor information
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
--- a/open-src/app/xwd/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xwd/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xwd - X window dump utility to take screen shots
#
-# Copyright (c) 2008, 2012, 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"),
@@ -43,6 +43,9 @@
MODULE_PKGNAME=x11/x11-window-dump
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xwd screen shot utility
+
# ARC cases that covered this module
# PSARC/2008/107 xwd -silent
MODULE_ARC_CASES = PSARC/2008/107
--- a/open-src/app/xwininfo/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xwininfo/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xwininfo Makefile
+# xwininfo - X11 client to list information about windows from other clients
#
-# 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"),
@@ -32,6 +32,9 @@
MODULE_PKGNAME=x11/diagnostic/x11-info-clients
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xwininfo X11 window information utility
+
# Version number (used in path names)
MODULE_VERSION=1.1.2
--- a/open-src/app/xwud/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/app/xwud/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xwud - simple application to display window dump images saved by xwd
#
-# Copyright (c) 2008, 2012, 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"),
@@ -43,6 +43,9 @@
MODULE_PKGNAME=x11/x11-window-dump
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = the xwud viewer application for xwd images
+
# ARC cases that covered this module
# PSARC/2008/108 xwud -dumpheader & -scale
MODULE_ARC_CASES = PSARC/2008/108
--- a/open-src/common/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/common/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules commonly shared among X consolidation open source dirs
#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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"),
@@ -68,7 +68,7 @@
# Package manifest file
PKG_SRC_DIR = $(TOP)/pkg
PKG_MANIFEST_DIR = $(PKG_SRC_DIR)/manifests
-PKG_LICENSE_DIR = $(PKG_SRC_DIR)/license_files
+PKG_LICENSE_DIR = $(TOP)/open-src/common/license_files
MODULE_PKG_MANIFEST_NAME_CMD = print $(MODULE_PKGNAME) | tr '/' '-'
MODULE_PKG_MANIFEST_NAME = $(MODULE_PKG_MANIFEST_NAME_CMD:sh)
MODULE_PKG_MANIFEST = $(PKG_MANIFEST_DIR)/$(MODULE_PKG_MANIFEST_NAME).p5m
@@ -680,9 +680,6 @@
$(PERL) $(TOP)/open-src/common/set-elf-comments.pl \
$(ELF_COMMENTS_FLAGS) $(SOURCE_DIR)
-# Help generate templates for package manifests
-DEFAULT_LICENSE=$(PKG_LICENSE_DIR)/cr_Oracle $(PKG_LICENSE_DIR)/lic_X11
-
MANIFEST_DEST=$(PWD)/tmp-proto-$(MACH)
MANIFEST_TMP=$(PWD)/tmp.p5m
@@ -704,9 +701,10 @@
$(PERL) $(TOP)/open-src/common/pkg-manifest-generate.pl \
input_manifest='$(MODULE_PKG_MANIFEST)' \
exception_manifest='$(PKG_SRC_DIR)/exceptions-validate_pkg.p5m' \
- manifest_license='$(PKG_LICENSE_DIR)/cr_Oracle' \
+ manifest_license='$(PKG_LICENSE_DIR)/cr_Oracle.tmpl' \
manifest_license='$(PKG_LICENSE_DIR)/lic_X11' \
pkg_name='$(MODULE_PKGNAME)' \
+ summary='$(MODULE_DESC)' \
source_dir='$(SOURCE_DIRNAME)' \
arch_64='$(ARCH64)' subdir_64='$(SUBDIR64)' \
proto_area='$(MANIFEST_DEST)' \
@@ -879,9 +877,12 @@
LICENSE_FILE_DEFAULT = $(LICENSE_FILE_SET:yes=$(POUND_SIGN))
$(LICENSE_FILE_DEFAULT) LICENSE_FILE=COPYING
+# Oracle copyright notice template
+ORACLE_COPYRIGHT_TEMPLATE=$(PKG_LICENSE_DIR)/cr_Oracle.tmpl
+
# Default is the MIT/X11 license
MIT_LICENSE_NAME = MIT License
-MIT_LICENSE_FILE = $(PKG_SRC_DIR)/license_files/lic_X11
+MIT_LICENSE_FILE = $(PKG_LICENSE_DIR)/lic_X11
MODULE_LICENSE_DEFAULT = $(MODULE_LICENSE_SET:yes=$(POUND_SIGN))
$(MODULE_LICENSE_DEFAULT) MODULE_LICENSE = $(MIT_LICENSE_NAME)
@@ -890,22 +891,8 @@
# from for easier viewing/cross-referencing. The format of this header is
# common to all Solaris consolidations, so should not be changed without
# coordination.
-DEFAULT_LICENSE_PREPEND = $(LICENSE_FILE_DEST).head
-DEFAULT_LICENSE_PREPEND_FILE = $(LICENSE_FILE_NAME).head
-
PRINT_IN_BOX = perl -n -e '$$border = "-" x length($$_) ; printf "--%s--\n- %s -\n--%s--\n\n", $$border, $$_, $$border'
-%/$(DEFAULT_LICENSE_PREPEND_FILE): %
- @ $(START_CMD_ECHO) ; \
- m='$(MODULE_NAME)' ; \
- if [[ '$(MODULE_VERSION)' != 'src' ]] ; then \
- m+=' $(MODULE_VERSION)' ; \
- fi ; \
- print -n $$m | $(PRINT_IN_BOX) > $@
- if [[ -n '$(ORACLE_TPNO)' && '$(LICENSE_CHOICE)' == 'Oracle' ]] ; then \
- print 'Oracle Internal Tracking Number $(ORACLE_TPNO)\n' >> $@ ; \
- fi
-
# Some packages contain only code that Oracle owns all the rights to.
# For these, Makefile.options.oracle.com chooses to omit the license
# notice when Oracle is building its distros. Everyone else gets the
@@ -920,13 +907,11 @@
ORACLE_LICENSE_APPEND_Oracle = # Nothing to append to copyright notice
ORACLE_LICENSE_NAME = $(ORACLE_LICENSE_NAME_$(LICENSE_CHOICE))
-ORACLE_LICENSE_PREPEND = # Nothing to prepend to copyright notice
ORACLE_LICENSE_APPEND = $(ORACLE_LICENSE_APPEND_$(LICENSE_CHOICE))
# Use default license info unless MODULE_LICENSE = "Oracle"
LICENSE_NAME = $(MODULE_LICENSE)
-LICENSE_PREPEND = $(DEFAULT_LICENSE_PREPEND)
-LICENSE_PREPEND += $(MODULE_LICENSE_PREPEND)
+LICENSE_PREPEND = $(MODULE_LICENSE_PREPEND)
LICENSE_APPEND = $(MODULE_LICENSE_APPEND)
LICENSE_OVERRIDE_1 = $(POUND_SIGN)$(MODULE_LICENSE)
@@ -940,14 +925,59 @@
%/$(LICENSE_FILE_NAME): % $(SOURCE_TARGETS) $(LICENSE_PREPEND) $(LICENSE_APPEND)
@ $(START_CMD_ECHO) ; \
- if [[ -f "$(LICENSE_FILE)" ]] ; then \
- license_to_copy="$(LICENSE_FILE)" ; \
- elif [[ -f "$(SOURCE_DIR)/$(LICENSE_FILE)" ]] ; then \
- license_to_copy="$(SOURCE_DIR)/$(LICENSE_FILE)" ; \
+ if [[ -f '$(LICENSE_FILE)' ]] ; then \
+ license_to_copy='$(LICENSE_FILE)' ; \
+ elif [[ -f '$(SOURCE_DIR)/$(LICENSE_FILE)' ]] ; then \
+ license_to_copy='$(SOURCE_DIR)/$(LICENSE_FILE)' ; \
+ else \
+ license_to_copy='/dev/null' ; \
+ fi ; \
+ if [[ -s "$${license_to_copy}" || -n '$(ORACLE_COPYRIGHT_YEARS)' ]] ; then \
+ m='$(MODULE_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) >> $@ ; \
+ fi ; \
fi ; \
- if [[ -n "$${license_to_copy}" ]] ; then \
- cat $(LICENSE_PREPEND) "$${license_to_copy}" $(LICENSE_APPEND) > "$@" ; \
- print 'license $(LICENSE_FILE_NAME) license="$(LICENSE_NAME) ($(MODULE_NAME))"' > "[email protected]" ; \
+ if [[ -n '$(MODULE_LICENSE_DESC)' ]] ; then \
+ license_desc='$(MODULE_LICENSE_DESC)' ; \
+ elif [[ -n '$(MODULE_DESC)' ]] ; then \
+ license_desc='$(MODULE_DESC)' ; \
+ else \
+ license_desc='$(MODTYPE_DESC)' ; \
+ fi ; \
+ if [[ -s "$${license_to_copy}" ]] ; then \
+ if [[ -n "$${license_desc}" ]] ; then \
+ contents="$${license_desc}," ; \
+ else \
+ contents="technology" ; \
+ fi ; \
+ print "This package may include $${contents} which may be subject to one or more of the following notices:\n" | fmt >> $@ ; \
+ cat "$${license_to_copy}" >> $@ ; \
+ fi ; \
+ if [[ -s $@ ]] ; then \
+ license_attributes='license="$(LICENSE_NAME) ($(MODULE_NAME))"' ; \
+ license_attributes+=' com.oracle.info.name="$(MODULE_NAME)"' ; \
+ if [[ '$(MODULE_VERSION)' != 'src' ]] ; then \
+ license_attributes+=' com.oracle.info.version="$(MODULE_VERSION)"' ; \
+ fi ; \
+ license_attributes+=" com.oracle.info.description=\"$${license_desc}\"" ; \
+ if [[ -n '$(ORACLE_TPNO)' && '$(LICENSE_CHOICE)' == 'Oracle' ]] ; then \
+ license_attributes+=' com.oracle.info.tpno="$(ORACLE_TPNO)"' ; \
+ fi ; \
+ print 'license $(LICENSE_FILE_NAME)' "$${license_attributes}" > [email protected] ; \
+ else \
+ print '*** $@ is empty' ; \
fi
install_metadata: $(METADATA_TARGETS)
--- a/open-src/common/Makefile.options.oracle.com Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/common/Makefile.options.oracle.com Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# X build options for Oracle Solaris -*- Makefile -*-
#
-# Copyright (c) 2010, 2012, 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"),
@@ -43,10 +43,6 @@
LICENSE_CHOICE = Oracle
LICENSE_CHOICE_SET = yes
-# When packages contain code covered by GPL/LGPL, Oracle prepends to the GPL
-# a notice specifying the version Oracle is publishing the software under.
-GPL_CHOICE_FILE = $(PKG_SRC_DIR)/license_files/gpl_choice_Oracle
-
# Xserver configuration options for vendor name & support URL
# The vendor name needs to include "X.Org Foundation" for software
# like cairo that does strstr on VendorName to detect servers built
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/license_files/cr_Oracle.tmpl Tue Feb 19 19:23:47 2013 -0800
@@ -0,0 +1,2 @@
+Copyright (c) @YEARS@, Oracle and/or its affiliates. All rights reserved.
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/license_files/lic_X11 Tue Feb 19 19:23:47 2013 -0800
@@ -0,0 +1,19 @@
+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/common/pkg-manifest-generate.pl Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/common/pkg-manifest-generate.pl Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
#! /usr/perl5/bin/perl
#
-# Copyright (c) 2010, 2012, 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"),
@@ -34,6 +34,7 @@
use strict;
use warnings;
+use POSIX qw(strftime);
my %options;
@@ -129,6 +130,9 @@
my $manifest_license_listref = required_option_list
('manifest_license', 'when not merging with existing manifest.');
+ # substitute the current year for @YEARS@ in the license template
+ my $current_year = strftime '%Y', localtime;
+
foreach my $lf (@{$options{'manifest_license'}}) {
open my $LICENSE, '<', $lf or die "Cannot open manifest_license $lf: $!\n";
while (my $ll = <$LICENSE>) {
@@ -136,6 +140,7 @@
if ($ll !~ m{^\#}) {
$ll = '# ' . $ll;
}
+ $ll =~ s{\@YEARS\@}{$current_year};
push @manifest_header, $ll;
}
close $LICENSE;
@@ -156,7 +161,11 @@
'value="XXX: Please provide a descriptive paragraph for the package."';
my $pkg_summary = '';
+ if (exists $options{'summary'}) {
+ $pkg_summary = $options{'summary'}->[0];
+ }
+ if ($pkg_summary =~ m{^\s*$}) {
SDIR: foreach my $sdir (@{$options{'source_dir'}}) {
foreach my $bdir (glob("build-*/$sdir")) {
# First try looking in a README file for a short summary
@@ -209,6 +218,7 @@
}
}
}
+ }
}
if ($pkg_summary eq '') {
--- a/open-src/data/ogl-select/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/data/ogl-select/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/data/ogl-select/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# ogl-select - Solaris SMF service to choose between OpenGL implementations
+#
+# Copyright (c) 2004, 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"),
@@ -37,11 +39,16 @@
MODULE_ARC_CASES = LSARC/2005/700
# Package metadata
+MODULE_DESC = the ogl-select service
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
+ORACLE_COPYRIGHT_YEARS = 2004, 2010
+
# No upstream sources for these files, since they're Solaris-specific
-MODULE_VERSION=NONE
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
SOURCE_TARGETS=
--- a/open-src/data/rasterfile/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1989, 1994, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/data/rasterfile/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/data/rasterfile/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2009, 2010, 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"),
@@ -35,8 +35,12 @@
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
+ORACLE_COPYRIGHT_YEARS = 1989, 1994
+
# No upstream sources for these files, since they're Solaris-specific
-MODULE_VERSION=NONE
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
--- a/open-src/data/workspace-patterns/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/data/workspace-patterns/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/data/workspace-patterns/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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,8 +28,12 @@
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
+ORACLE_COPYRIGHT_YEARS = 1993
+
# No upstream sources for these files, since they're Solaris-specific
-MODULE_VERSION=NONE
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
--- a/open-src/data/xbitmaps/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/data/xbitmaps/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# X Window System standard bitmaps
+#
+# Copyright (c) 2006, 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"),
@@ -26,6 +28,9 @@
# Package name used in tarballs
MODULE_NAME=xbitmaps
+# Package metadata
+MODULE_DESC = bitmap images from X.Org
+
# Version number (used in path names)
MODULE_VERSION=1.1.1
--- a/open-src/data/xcursor-themes/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/data/xcursor-themes/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# xcursor-themes: X.Org default X11 cursor themes
+#
+# Copyright (c) 2007, 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"),
@@ -25,6 +27,9 @@
# Package name used in tarballs
MODULE_NAME=xcursor-themes
+# Package metadata
+MODULE_DESC = cursor themes from X.Org
+
# Version number (used in path names)
MODULE_VERSION=1.0.3
--- a/open-src/doc/xorg-docs/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/doc/xorg-docs/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -26,6 +26,9 @@
# Package name used in tarballs
MODULE_NAME=xorg-docs
+# Package metadata
+MODULE_DESC = X.Org documentation for the X Window System
+
# Version number (used in path names)
MODULE_VERSION=1.7
--- a/open-src/doc/xorg-sgml-doctools/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/doc/xorg-sgml-doctools/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -30,6 +30,9 @@
MODULE_PKGTAIL=xorg-docs
MODULE_PKGTAIL_SET=yes
+# Package metadata
+MODULE_DESC = stylesheets and other data files used to generate X.Org documentation
+
# Version number (used in path names)
MODULE_VERSION=1.11
--- a/open-src/driver/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/driver/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to all X.Org drivers
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -52,6 +52,9 @@
$(MODULE_PKGCLASS_DEFAULT) MODULE_PKGCLASS=$(MODULE_PKGCLASS_$(DRIVER_CLASS))
$(MODULE_PKGCLASS_DEFAULT) MODULE_PKGCLASS_SET=yes
+# Default module description for packages in this area
+MODTYPE_DESC = the $(MODULE_NAME) driver
+
# Additional command line options to GNU autoconf configure script
MODTYPE_CONFIG_OPTS = \
--docdir='$(X11_DOC_DIR)' \
--- a/open-src/driver/efb/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/driver/efb/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# efb Makefile
+# efb driver for Sun XVR-100 & XVR-300 boards (based on ATI Radeon)
#
-# Copyright (c) 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"),
@@ -31,6 +31,11 @@
# Version number (used in path names)
MODULE_VERSION=6.8.0
+# 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 = 2008, 2009
+MODULE_LICENSE_DESC = portions of the ATI Radeon graphics driver from X.Org
+
# Checksums for upstream tarball
TARBALL_MD5 = 3c97c7925ebf4162eeb3463e23adc0e3
TARBALL_SHA1 = b6974237b6ae9b45b32fc37f31a3fee7358230d3
--- a/open-src/driver/xf86-input-hotkey/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/driver/xf86-input-hotkey/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/driver/xf86-input-hotkey/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,6 @@
###############################################################################
#
-# xf86-input-keyboard 1.x 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"),
@@ -31,6 +29,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 2009, 2010
+
# Version number (used in path names)
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/driver/xf86-video-ast/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/driver/xf86-video-ast/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,9 @@
###############################################################################
#
-# xf86-video-ast 1.x Makefile
+# xf86-video-ast - Xorg driver for ASpeed Technologies graphics devices
+# (such as found in some Sun/Oracle server ILOMs)
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -45,6 +46,10 @@
# Regenerate Makefile.in's from Makefile.am's after patching them
AUTORECONF=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 = 2009, 2012
+
# Man pages to apply Sun footer to & attributes to list
#SUNTOUCHED_MANPAGES=man/*.man
MODULE_STABILITY=Volatile
--- a/open-src/driver/xf86-video-openchrome/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/driver/xf86-video-openchrome/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,7 +1,6 @@
+###############################################################################
#
-# xf86-video-openchrome 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"),
@@ -31,6 +30,7 @@
UPSTREAM = The OpenChrome project
UPSTREAM_URL = http://www.openchrome.org/
UPSTREAM_SET = yes
+ORACLE_TPNO = 12031
# Version number (used in path names)
MODULE_VERSION=0.3.1
--- a/open-src/driver/xf86-video-r128/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- Precision Insight, Inc., Cedar Park, Texas, and
- VA Linux Systems Inc., Fremont, California.
-
-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 on 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
-NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-SYSTEMS AND/OR THEIR SUPPLIERS 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 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
-
-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, and
-that the name of Marc Aurele La France not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission. Marc Aurele La France makes no representations
-about the suitability of this software for any purpose. It is provided
-"as-is" without express or implied warranty.
-
-MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, 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.
--- a/open-src/driver/xf86-video-trident/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-Copyright 1992-2003 by Alan Hourihane, North Wales, UK.
-
-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, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, 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.
-
-Copyright 1997-2003, 2006 by Alan Hourihane, North Wales, UK.
-Copyright (c) 2006, Jesse Barnes <[email protected]>
-
-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, and that the name of the authors not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. The authors make no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, 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.
--- a/open-src/font/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org font modules
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -46,6 +46,9 @@
$(MODULE_PKGCLASS_DEFAULT) MODULE_PKGCLASS=System/Fonts
MODULE_PKGCLASS_SET = yes
+# Default module description for packages in this area
+MODTYPE_DESC = the $(MODULE_NAME:font-%=%) fonts
+
# Most font modules have no man pages
MODTYPE_SUNTOUCH_MAN_FLAGS=
--- a/open-src/font/adobe-100dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/adobe-100dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -36,5 +36,8 @@
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=100dpi
+# Description to include in package metadata
+MODULE_DESC = 100dpi bitmap versions of Adobe PostScript core font set
+
### Include common rulesets
include ../Makefile.bdf
--- a/open-src/font/adobe-75dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/adobe-75dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -36,5 +36,8 @@
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=75dpi
+# Description to include in package metadata
+MODULE_DESC = 75dpi bitmap versions of Adobe PostScript core font set
+
### Include common rulesets
include ../Makefile.bdf
--- a/open-src/font/adobe-utopia-100dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/adobe-utopia-100dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Adobe Utopia Font License
MODULE_LICENSE_SET = yes
+MODULE_DESC = Adobe Utopia fonts in 100dpi bitmap format
# Version number (used in path names)
MODULE_VERSION = 1.0.4
--- a/open-src/font/adobe-utopia-75dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/adobe-utopia-75dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Adobe Utopia Font License
MODULE_LICENSE_SET = yes
+MODULE_DESC = Adobe Utopia fonts in 75dpi bitmap format
# Version number (used in path names)
MODULE_VERSION = 1.0.4
--- a/open-src/font/adobe-utopia-type1/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/adobe-utopia-type1/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Adobe Utopia Font License
MODULE_LICENSE_SET = yes
+MODULE_DESC = Adobe Utopia fonts in PostScript Type1 format
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/font/xorg/xorg-core
--- a/open-src/font/alias/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/alias/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 6d25f64796fef34b53b439c2e9efa562
TARBALL_SHA1 = 96b0aa38f88a54ef32ab85d3eef6f29b0437f70d
+# Description to include in package metadata
+MODULE_DESC = Font name aliases for X.Org bitmap fonts
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/arabic-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/arabic-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = cc0726e4a277d6ed93b8e09c1f195470
TARBALL_SHA1 = 322ae41e74deea8de11fa077fd0e0191927a667c
+# Description to include in package metadata
+MODULE_DESC = Arabic Newspaper bitmap font
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bh-100dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-100dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Lucida Fonts Legal Notice
MODULE_LICENSE_SET = yes
+MODULE_DESC = 100dpi bitmap versions of Lucida fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/bh-75dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-75dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Lucida Fonts Legal Notice
MODULE_LICENSE_SET = yes
+MODULE_DESC = 75dpi bitmap versions of Lucida fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/bh-lucidatypewriter-100dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-lucidatypewriter-100dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Bigelow & Holmes Copyright
MODULE_LICENSE_SET = yes
+MODULE_DESC = 100dpi bitmap versions of Lucida Typewriter fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/bh-lucidatypewriter-75dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-lucidatypewriter-75dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Bigelow & Holmes Copyright
MODULE_LICENSE_SET = yes
+MODULE_DESC = 75dpi bitmap versions of Lucida Typewriter fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/bh-ttf/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-ttf/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Luxi fonts license
MODULE_LICENSE_SET = yes
+MODULE_DESC = the Luxi fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/bh-type1/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bh-type1/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Luxi fonts license
MODULE_LICENSE_SET = yes
+MODULE_DESC = PostScript Type1 versions of Luxi fonts
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/font/xorg/xorg-core
--- a/open-src/font/bitstream-100dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bitstream-100dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 6b223a54b15ecbd5a1bc52312ad790d8
TARBALL_SHA1 = 138376f8683c09b9068c7c124842a7af9f0fcc2e
+# Description to include in package metadata
+MODULE_DESC = 100dpi bitmap versions of Bitstream Charter & Terminal fonts
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bitstream-75dpi/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bitstream-75dpi/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = d7c0588c26fac055c0dd683fdd65ac34
TARBALL_SHA1 = 975e9f7872483394ebd87610f8bbc924d99bea34
+# Description to include in package metadata
+MODULE_DESC = 75dpi bitmap versions of Bitstream Charter & Terminal fonts
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bitstream-type1/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bitstream-type1/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Bitstream Charter font license
MODULE_LICENSE_SET = yes
+MODULE_DESC = Type1 versions of Bitstream Charter & Courier fonts
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/font/xorg/xorg-core
--- a/open-src/font/bitstream-vera/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/bitstream-vera/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Bitstream Vera Fonts Makefile
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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"),
@@ -35,6 +35,8 @@
MODULE_LICENSE = Bitstream Vera Fonts License
MODULE_LICENSE_SET = yes
+MODULE_DESC = the Bitstream Vera fonts
+ORACLE_TPNO = 12112
# Version number (used in path names)
MODULE_VERSION=1.10
--- a/open-src/font/cronyx-cyrillic/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/cronyx-cyrillic/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = e452b94b59b9cfd49110bb49b6267fba
TARBALL_SHA1 = e5af8c2e8fb23955808a08bd38728ab3ad284d61
+# Description to include in package metadata
+MODULE_DESC = Cronyx bitmap fonts containing Cyrillic glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/cursor-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/cursor-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 3e0069d4f178a399cffe56daa95c2b63
TARBALL_SHA1 = 1649271129bbeff3aeee70a9da87a8e5e59162c1
+# Description to include in package metadata
+MODULE_DESC = the X.Org cursor bitmap font
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/dec-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/dec-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 6e7c5108f1b16d7a1c7b2c9760edd6e5
TARBALL_SHA1 = a748d35b8b0241abd3e1d85f80da318b529a74d0
+# Description to include in package metadata
+MODULE_DESC = DEC bitmap fonts containing mouse cursor pointer glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/deja-vu/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/deja-vu/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Deja Vu Fonts Makefile
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -35,6 +35,8 @@
MODULE_LICENSE = Bitstream Vera Fonts License
MODULE_LICENSE_SET = yes
+MODULE_DESC = the DejaVu fonts
+ORACLE_TPNO = 12114
# Version number (used in path names)
MODULE_VERSION=2.33
--- a/open-src/font/encodings/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/encodings/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -30,6 +30,9 @@
MODULE_PKGNAME=x11/library/libfontenc
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = data files for libfontenc to map font encodings between character sets
+
# Version number (used in path names)
MODULE_VERSION = 1.0.4
--- a/open-src/font/google-droid/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/google-droid/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Droid Fonts Makefile
#
-# Copyright (c) 2009, 2010, 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"),
@@ -35,6 +35,8 @@
MODULE_LICENSE = Apache License, Version 2.0
MODULE_LICENSE_SET = yes
+MODULE_DESC = the Droid font families
+ORACLE_TPNO = 12030
# Version number (used in path names)
MODULE_VERSION=2010.02.24
--- a/open-src/font/ibm-type1/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/ibm-type1/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = IBM/MIT X Consortium Courier Typefont agreement
MODULE_LICENSE_SET = yes
+MODULE_DESC = Postscript Type 1 version of IBM Courier fonts
# pkg(5) name we deliver the files in (override default)
--- a/open-src/font/liberation/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/liberation/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Liberation Fonts Makefile
#
-# Copyright (c) 2008, 2012, 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"),
@@ -36,6 +36,8 @@
MODULE_LICENSE = Liberation Font Software License Agreement
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
+MODULE_DESC = the Liberation fonts
+ORACLE_TPNO = 9925
# Version number (used in path names)
MODULE_VERSION=1.07.2
@@ -57,11 +59,12 @@
SOURCE_PATCHES= # None
# License file
-LICENSE_FILE=License.txt
+LICENSE_FILE = pkg-license.txt
LICENSE_FILE_SET=yes
+MODULE_ADD_INSTALL_TARGETS = $(SOURCE_DIR)/$(LICENSE_FILE)
TTF_FONT_FILES= \
- $(LICENSE_FILE) \
+ License.txt \
LiberationMono-Bold.ttf \
LiberationMono-BoldItalic.ttf \
LiberationMono-Italic.ttf \
@@ -91,10 +94,11 @@
### Include common rulesets
include ../Makefile.ttf
-# Additional license file
-install_license: $(MODULE_PKG_METADATA_DIR)/license_GPL
+# Generate a combined license file
+$(LICENSE_FILE_DEST): $(SOURCE_DIR)/$(LICENSE_FILE)
-$(MODULE_PKG_METADATA_DIR)/license_GPL: $(SOURCE_DATA_DIR)/COPYING
+$(SOURCE_DIR)/$(LICENSE_FILE): $(SOURCE_TARGETS)
rm -f $@
- cp -pf $(SOURCE_DATA_DIR)/COPYING $@
- print 'license license_GPL license="GPLv2"' > $(LICENSE_ATTR_FILE)
+ fmt $(SOURCE_DIR)/License.txt > $@
+ print '\n________________________________________________________________________________\n' >> $@
+ cat $(SOURCE_DIR)/COPYING >> $@
--- a/open-src/font/micro-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/micro-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Public domain
MODULE_LICENSE_SET = yes
+MODULE_DESC = the Micro bitmap font containing teeny, tiny glyphs
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/font/xorg/xorg-core
--- a/open-src/font/misc-cyrillic/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/misc-cyrillic/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Mixed
MODULE_LICENSE_SET = yes
+MODULE_DESC = X.Org fixed width bitmap fonts containing Cyrillic glyphs
# pkg(5) name we deliver the files in (override default)
MODULE_PKGTAIL=xorg/cyrillic
--- a/open-src/font/misc-meltho/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/misc-meltho/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Meltho fonts license
MODULE_LICENSE_SET = yes
+MODULE_DESC = the Meltho Syriac fonts
# Version number (used in path names)
MODULE_VERSION = 1.0.3
--- a/open-src/font/misc-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/misc-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Public domain
MODULE_LICENSE_SET = yes
+MODULE_DESC = X.Org miscellaneous fonts in bitmap format
# Version number (used in path names)
MODULE_VERSION = 1.1.2
--- a/open-src/font/mutt-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/mutt-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 56b0296e8862fc1df5cdbb4efe604e86
TARBALL_SHA1 = 245d3041d9138b7e4a00858228adad2de304043b
+# Description to include in package metadata
+MODULE_DESC = ClearlyU fonts in bitmap format for various languages
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/schumacher-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/schumacher-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -36,5 +36,8 @@
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=misc
+# Description to include in package metadata
+MODULE_DESC = Schumacher fonts in bitmap format
+
### Include common rulesets
include ../Makefile.bdf
--- a/open-src/font/screen-cyrillic/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/screen-cyrillic/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 6f3fdcf2454bf08128a651914b7948ca
TARBALL_SHA1 = de1f0226f74d7e4d3ee9ab0b9c87478ab2a7db30
+# Description to include in package metadata
+MODULE_DESC = Screen Fixed bitmap fonts containing Cyrillic glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/sony-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/sony-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = beef61a9b0762aba8af7b736bb961f86
TARBALL_SHA1 = 8d0dd87148283c8ac8c5ac37906b12fab5ddb1d8
+# Description to include in package metadata
+MODULE_DESC = Sony bitmap fonts containing Japanese glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/sun-aliases/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/sun-aliases/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2012, 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"),
@@ -29,7 +29,7 @@
MODTYPE_PKGHIER_SET=yes
# No upstream sources for these files, since they're Solaris-specific
-MODULE_VERSION=NONE
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
--- a/open-src/font/sun-misc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/sun-misc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -37,5 +37,8 @@
TARBALL_MD5 = 948f2e07810b4f31195185921470f68d
TARBALL_SHA1 = 6a72602557bb5dfe46c1ee3b56658aeed1e04f9d
+# Description to include in package metadata
+MODULE_DESC = OpenLook bitmap fonts containing icon & mouse cursor pointer glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/util/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/util/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2012, 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"),
@@ -56,5 +56,8 @@
MODULE_LDFLAGS=$(PROG_LDFLAGS)
MODULE_ADD_BUILD_TARGETS=set-elf-comments
+# Description to include in package metadata
+MODULE_DESC = X.Org font package creation/installation utilities
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/winitzki-cyrillic/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/winitzki-cyrillic/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -29,6 +29,7 @@
# Package metadata
MODULE_LICENSE = Public domain
MODULE_LICENSE_SET = yes
+MODULE_DESC = Winitzki proof Bitmap font containing Cyrillic glyphs
# pkg(5) name we deliver the files in (override default)
MODULE_PKGTAIL=xorg/cyrillic
--- a/open-src/font/xfree86-type1/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/font/xfree86-type1/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -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"),
@@ -43,6 +43,9 @@
# Extra configure flags
MODULE_CONFIG_OPTS=
+# Description to include in package metadata
+MODULE_DESC = PostScript Type1 font containing mouse cursor pointer glyphs
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/lib/DPS/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/DPS/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# DPS 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"),
@@ -30,6 +30,9 @@
MODULE_NAME=DPS
+# Package metadata
+MODULE_DESC = the Adobe Display Postscript (DPS) client libraries
+
# Sources were extracted from X11R6.9 source tree, but we don't want
# to download & unpack all that, and upstream isn't maintaining, so
# we just have a local copy here.
--- a/open-src/lib/DPS/sun-src/libdps/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/DPS/sun-src/libdps/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# libdps 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"),
@@ -307,3 +307,5 @@
clean ::
${RM} $(DERIVED_FILES) .sort .ttt .att psops.h dpsops.h *% *.o
+
+.NO_PARALLEL: $(DERIVED_FILES) $(MOTIFOBJS) $(OBJS)
--- a/open-src/lib/DPS/sun-src/libdpstk/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/DPS/sun-src/libdpstk/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
-###############################################################################
+##############################################################################
#
# libdpstk 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"),
@@ -121,3 +121,5 @@
XDPSpwraps.o: XDPSpwraps.h
XDPSshare.o: XDPSswraps.h
XDPSswraps.o: XDPSswraps.h
+
+.NO_PARALLEL: $(DERIVED_FILES) $(MOTIFOBJS) $(OBJS)
--- a/open-src/lib/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org library modules
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,9 @@
MODTYPE_PKGHIER=x11/library
MODTYPE_PKGHIER_SET=yes
+# Default module description for packages in this area
+MODTYPE_DESC = the $(MODULE_NAME) library
+
### Include common definitions
include $(TOP)/open-src/common/Makefile.init
--- a/open-src/lib/fontconfig/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/fontconfig/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# Fontconfig 2.x Makefile
+# Fontconfig - Font configuration and customization library
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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,9 @@
# Package name used in tarballs
MODULE_NAME=fontconfig
+# Package metadata
+MODULE_DESC = the FontConfig font configuration and customization library
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/library/fontconfig
MODULE_PKGNAME_SET=yes
@@ -52,6 +55,7 @@
UPSTREAM = fontconfig
UPSTREAM_URL = http://fontconfig.org/
UPSTREAM_SET = yes
+ORACLE_TPNO = 12113
# Version number (used in path names)
MODULE_VERSION=2.8.0
--- a/open-src/lib/freetype/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/freetype/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# Freetype 2.x Makefile
+# Freetype 2.x font rendering library
#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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"),
@@ -58,6 +58,8 @@
MODULE_LICENSE = The FreeType Project License
MODULE_LICENSE_SET = yes
+ORACLE_TPNO = 9935
+MODULE_DESC = the FreeType 2 font engine
# Library name used in man pages & spec files
LIBNAME=freetype
--- a/open-src/lib/libICE/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libICE/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# libICE - Inter-Client Exchange library
#
-# Copyright (c) 2008, 2012, 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,9 @@
# Package name used in tarballs
MODULE_NAME=libICE
+# Package metadata
+MODULE_DESC = the X11 Inter-Client Exchange library (libICE)
+
# Version number (used in path names)
MODULE_VERSION=1.0.8
--- a/open-src/lib/libX11/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libX11/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2012, 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"),
@@ -96,6 +96,10 @@
# Library name (used for specfiles/mapfiles)
LIBNAME=X11
+# 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 = 1986, 2012
+
# ARC cases that covered this module
# PSARC/1992/077 X11/R5 Xlib API
MODULE_ARC_CASES = PSARC/1992/077
--- a/open-src/lib/libXtsol/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libXtsol/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# Xtsol 1.x Makefile
+# libXtsol - client library for TSOL extension for Solaris Trusted Extensions
#
-# 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"),
@@ -36,6 +36,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 2004, 2007
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/lib/libXtsol/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/lib/libdga/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libdga/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# libdga Makefile (for Xsun SUN_DGA extension)
#
-# 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"),
@@ -31,6 +31,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 1993, 2004
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/lib/libdga/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1993, 2004, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/lib/libdrm/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libdrm/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -29,6 +29,7 @@
UPSTREAM = Direct Rendering Infrastructure project
UPSTREAM_URL = http://dri.freedesktop.org/
UPSTREAM_SET = yes
+ORACLE_TPNO = 9900
# Version number (used in path names)
MODULE_VERSION=2.4.39
--- a/open-src/lib/libfontenc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libfontenc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# libfontenc - font encoding table parser & mapping library
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,9 @@
# Package name used in tarballs
MODULE_NAME=libfontenc
+# Package metadata
+MODULE_DESC = the libfontenc font encoding table parser & mapping library
+
# Version number (used in path names)
MODULE_VERSION=1.1.1
--- a/open-src/lib/liblbxutil/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/liblbxutil/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,7 +1,8 @@
###############################################################################
-# lbxutil 1.x Makefile
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# liblbxutil - Low Bandwidth X implementation private library
+#
+# 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"),
@@ -35,6 +36,9 @@
MODULE_PKGCLASS=Applications/Internet
MODULE_PKGCLASS_SET=yes
+# Package metadata
+MODULE_DESC = the liblbxutil Low Bandwidth X implementation private library
+
# Version number (used in path names)
MODULE_VERSION=1.1.0
@@ -49,7 +53,7 @@
LIBNAME=lbxutil
# Man pages to apply Sun footer to & attributes to list
-#LIB_STABILITY=Committed
+#LIB_STABILITY=Project Private
#LIB_MAN_SUFFIX=3lbxutil
### Include common definitions
--- a/open-src/lib/libowconfig/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libowconfig/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# libowconfig Makefile
+# libowconfig - library for reading & writing Xsun OWconfig files
#
-# Copyright (c) 2009, 2010, 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"),
@@ -34,6 +34,10 @@
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
+ORACLE_COPYRIGHT_YEARS = 1993, 1996
+
# No upstream sources, only local sources
MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
--- a/open-src/lib/libowconfig/sun-src/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 1993, 1996, Oracle and/or its affiliates. All rights reserved.
--- a/open-src/lib/libpciaccess/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libpciaccess/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# libpciaccess Makefile
+# libpciaccess - generic PCI access software library & scanpci utility
#
-# Copyright (c) 2008, 2012, 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"),
@@ -54,6 +54,8 @@
MODULE_PREFIX=/usr
MODULE_PREFIX_SET=yes
+# Package metadata
+MODULE_DESC = the libpciaccess library and scanpci utility
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=diagnostic/scanpci
MODULE_PKGNAME_SET=yes
--- a/open-src/lib/libxcb/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/libxcb/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb library Makefile
+# xcb - Lighter weight X11 client libraries
#
-# Copyright (c) 2010, 2012, 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"),
@@ -38,6 +38,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the XCB family of X11 client libraries
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/lib/mesa/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/mesa/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -34,6 +34,8 @@
MODULE_LICENSE = Mesa License (Mixed: MIT, LGPLv2, others)
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
+MODULE_DESC = the Mesa 3-D Graphics Libraries
+ORACLE_TPNO = 9926
# ARC cases that covered this module
# LSARC/2005/109 MESA, Open Source OpenGL clone
--- a/open-src/lib/pixman/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/pixman/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# pixman Makefile
+# Pixman: The pixel-manipulation library for X and Cairo.
#
-# Copyright (c) 2008, 2012, 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"),
@@ -52,6 +52,9 @@
MODULE_PREFIX=/usr
MODULE_PREFIX_SET=yes
+# Package metadata
+MODULE_DESC = the pixman pixel-manipulation library
+
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=library/graphics/pixman
MODULE_PKGNAME_SET=yes
--- a/open-src/lib/xcb-util-image/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/xcb-util-image/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb-util-image Makefile
+# xcb-util-image - Library of xcb utility functions for handling X images
#
-# 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"),
@@ -43,6 +43,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the xcb-util-image library of xcb utility functions for handling X images
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/lib/xcb-util-keysyms/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/xcb-util-keysyms/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb-util-keysyms Makefile
+# xcb-util-keysyms - Library of xcb utility functions for handling X keysyms
#
-# 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"),
@@ -42,6 +42,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the xcb-util-keysyms library of xcb utility functions for handling X keysyms
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/lib/xcb-util-renderutil/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/xcb-util-renderutil/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb-util-renderutil Makefile
+# xcb-util-renderutil - Library of xcb utility functions for X Render Extension
#
-# Copyright (c) 2011, 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"),
@@ -42,6 +42,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the xcb-util-renderutil library of xcb utility functions for the X Render Extension
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/lib/xcb-util-wm/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/xcb-util-wm/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb-util-wm Makefile
+# xcb-util-wm - Library of xcb utility functions for Window Manager hints
#
-# 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"),
@@ -42,6 +42,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the xcb-util-wm library of xcb utility functions for Window Manager hints
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/lib/xcb-util/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/lib/xcb-util/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,8 +1,8 @@
###############################################################################
#
-# xcb-util Makefile
+# xcb-util - Library of xcb utility functions
#
-# Copyright (c) 2010, 2012, 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"),
@@ -38,6 +38,7 @@
MODULE_ARC_CASES = PSARC/2010/109
# Package metadata
+MODULE_DESC = the xcb-util library of xcb utility functions
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
--- a/open-src/proto/bigreqsproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/bigreqsproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for BIG-REQUESTS extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/compositeproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/compositeproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for COMPOSITE extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/damageproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/damageproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -42,5 +42,8 @@
# LSARC/2007/421 X Damage Extension Version 1.1
MODULE_ARC_CASES += LSARC/2007/421
+# Package metadata
+MODULE_DESC = headers & documentation for DAMAGE extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/dmxproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/dmxproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2010, 2012, 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"),
@@ -35,6 +35,7 @@
# Package metadata
ORACLE_TPNO = 3811
+MODULE_DESC = headers & documentation for DMX extension to the X11 protocol
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/dri2proto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/dri2proto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# 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"),
@@ -35,5 +35,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for DRI2 extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/evieproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/evieproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -40,5 +40,8 @@
# LSARC/2002/312 XEvIE
MODULE_ARC_CASES = LSARC/2002/312
+# Package metadata
+MODULE_DESC = headers & documentation for XEVIE extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/fixesproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/fixesproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -42,5 +42,8 @@
# PSARC/2006/702 XFixes 4.0
MODULE_ARC_CASES += PSARC/2006/702
+# Package metadata
+MODULE_DESC = headers & documentation for XFIXES extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/fontsproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/fontsproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for font support in the X Window System
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/glproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/glproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for GLX extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/inputproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/inputproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for XInputExtension extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/kbproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/kbproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= 5077065.patch
+# Package metadata
+MODULE_DESC = headers & documentation for XKEYBOARD extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/pmproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/pmproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for the X11 Proxy Management Protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/printproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/printproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# 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"),
@@ -39,5 +39,8 @@
# pkg-config files that need to have -R added
FIX_PC_FILES=printproto.pc.in
+# Package metadata
+MODULE_DESC = headers & documentation for PRINT extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/randrproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/randrproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -46,5 +46,8 @@
# PSARC/2012/318 X Resize, Rotate and Reflect (RandR) 1.4
MODULE_ARC_CASES += PSARC/2012/318
+# Package metadata
+MODULE_DESC = headers & documentation for RANDR extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/recordproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/recordproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for RECORD extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/renderproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/renderproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for RENDER extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/resourceproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/resourceproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -40,5 +40,8 @@
# LSARC/2003/686 X-Resource Extension
MODULE_ARC_CASES = LSARC/2003/686
+# Package metadata
+MODULE_DESC = headers & documentation for RESOURCE extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/scrnsaverproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/scrnsaverproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for MIT-SCREEN-SAVER extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/sun-ext-protos/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/sun-ext-protos/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -51,6 +51,13 @@
FIX_PC_FILES=
FIX_PC_FILES_SET=yes
+# Package metadata
+MODULE_DESC = headers & documentation for X11 protocol extensions created by Sun
+
+# 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 = 1990, 2011
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/videoproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/videoproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for XVideo extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/x11proto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/x11proto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -42,6 +42,9 @@
# PSARC/2001/108 X11 Over IPv6
MODULE_ARC_CASES = PSARC/2001/108
+# Package metadata
+MODULE_DESC = headers & documentation for the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xcbproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xcbproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# xcbproto Makefile
#
-# Copyright (c) 2010, 2012, 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"),
@@ -27,6 +27,14 @@
# Package name used in tarballs
MODULE_NAME=xcb-proto
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/library/libxcb
+MODULE_PKGNAME_SET=yes
+
+# Package classification (override default)
+MODULE_PKGCLASS=System/X11
+MODULE_PKGCLASS_SET=yes
+
# Version number (used in path names)
MODULE_VERSION=1.7.1
@@ -40,6 +48,7 @@
# Package metadata
UPSTREAM_PROJECT = xcb
UPSTREAM_PROJECT_SET = yes
+MODULE_DESC = X Window System protocol descriptions used by xcb
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES += xia.patch,-p1
--- a/open-src/proto/xcmiscproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xcmiscproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -37,5 +37,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for XC-MISC extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xextproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xextproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,5 +41,8 @@
# PSARC/2011/213 X Synchronization Extension version 3.1
MODULE_ARC_CASES = PSARC/2011/213
+# Package metadata
+MODULE_DESC = headers & documentation for miscellaneous extensions to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xf86dgaproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xf86dgaproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for XF86DGA extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xf86driproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xf86driproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
+# Package metadata
+MODULE_DESC = headers & documentation for XFree86-DRI extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xf86miscproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xf86miscproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -40,5 +40,8 @@
# PSARC/2005/189 X client support for XFree86 extensions
MODULE_ARC_CASES = PSARC/2005/189
+# Package metadata
+MODULE_DESC = headers & documentation for XF86MISC extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xf86vidmodeproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xf86vidmodeproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -40,5 +40,8 @@
# PSARC/2005/189 X client support for XFree86 extensions
MODULE_ARC_CASES = PSARC/2005/189
+# Package metadata
+MODULE_DESC = headers & documentation for XFree86-VidModeExtension extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/xineramaproto/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/proto/xineramaproto/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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"),
@@ -36,5 +36,8 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= Xsun-extended-proto.patch
+# Package metadata
+MODULE_DESC = headers & documentation for XINERAMA extension to the X11 protocol
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/util/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org utility modules
#
-# 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"),
@@ -32,6 +32,9 @@
MODTYPE_PKGHIER=developer/build
MODTYPE_PKGHIER_SET=yes
+# Default module description for packages in this area
+MODTYPE_DESC = the $(MODULE_NAME) utility
+
# Package classification - must be a valid value recognized by pkg gui
MODULE_PKGCLASS_DEFAULT = $(MODULE_PKGCLASS_SET:yes=$(POUND_SIGN))
$(MODULE_PKGCLASS_DEFAULT) MODULE_PKGCLASS=Development/X11
--- a/open-src/util/build-tools/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/build-tools/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 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"),
@@ -28,6 +28,15 @@
SOURCE_TARBALL_NAME_SET = yes
ACTUAL_SOURCE_DIR = ../../sun-src
+# Package metadata
+MODULE_DESC = custom tools used for building Solaris X11 consolidation
+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
+ORACLE_COPYRIGHT_YEARS = 2008, 2012
+
# No configure script to run
CONFIGURE_TARGETS =
CONFIGURE_TARGETS_SET = yes
--- a/open-src/util/compat-links/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/compat-links/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# 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"),
@@ -33,6 +33,15 @@
MODULE_PKGNAME=x11/compatibility/links-xorg
MODULE_PKGNAME_SET=yes
+# Package metadata
+MODULE_DESC = compatibility links for X11 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
+ORACLE_COPYRIGHT_YEARS = 2004, 2010
+
# Package classification (override default)
MODULE_PKGCLASS=System/X11
MODULE_PKGCLASS_SET=yes
@@ -44,7 +53,7 @@
MODULE_ARC_CASES += PSARC/2008/405
# No sources
-MODULE_VERSION=NONE
+MODULE_VERSION=src
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
--- a/open-src/util/imake/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/imake/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
#
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+# imake - Legacy X11 build configuration and makefile generation tool
+#
+# 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"),
@@ -26,6 +28,9 @@
# Package name used in tarballs
MODULE_NAME=imake
+# Package metadata
+MODULE_DESC = the imake makefile generation tool
+
# Version number (used in path names)
MODULE_VERSION=1.0.5
--- a/open-src/util/makedepend/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/makedepend/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,8 @@
###############################################################################
+#
+# makedepend - create dependencies in makefiles
#
-# Copyright (c) 2008, 2012, 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"),
@@ -30,6 +32,9 @@
MODULE_PKGCLASS=Development/C
MODULE_PKGCLASS_SET=yes
+# Package metadata
+MODULE_DESC = the makedepend makefile dependency generation utility
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/util/xorg-cf-files/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/util/xorg-cf-files/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2012, 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"),
@@ -30,6 +30,9 @@
MODULE_PKGTAIL=imake
MODULE_PKGTAIL_SET=yes
+# Package metadata
+MODULE_DESC = X.Org platform configuration files for imake
+
# Version number (used in path names)
MODULE_VERSION=1.0.4
--- a/open-src/xserver/Makefile.inc Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/xserver/Makefile.inc Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to all xserver build trees
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -38,6 +38,10 @@
### Include common definitions
include $(TOP)/open-src/common/Makefile.init
+# 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, 2012
+
# Patches shared between Xorg & Xvnc builds
XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list
--- a/open-src/xserver/xorg/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/xserver/xorg/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Xorg server Makefile
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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,9 @@
# Package name used in tarballs
MODULE_NAME=xorg-server
+# Package metadata
+MODULE_DESC = portions of the X.Org X server software
+
# Version number (used in path names) - set in open-src/common/Makefile.init
MODULE_VERSION=$(XORGSERVER_VERS)
--- a/open-src/xserver/xserver-common/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/xserver/xserver-common/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2010, 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"),
@@ -28,6 +28,9 @@
MODULE_NAME = xserver-common
+# Package metadata
+MODULE_DESC = Xserver SMF & RBAC configuration files
+
# ARC cases that covered this module
# PSARC/2004/752 X Consolidation conversion to SMF
MODULE_ARC_CASES = PSARC/2004/752
@@ -51,6 +54,10 @@
INSTALL_TARGETS = install_common
INSTALL_TARGETS_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 = 2004, 2011
+
# Compatibility links from /usr/X11/bin to /usr/bin
MODULE_X11_BINCOMPAT_LINKS = X Xserver
--- a/open-src/xserver/xvnc/COPYING Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/xserver/xvnc/COPYING Tue Feb 19 19:23:47 2013 -0800
@@ -5,12 +5,6 @@
--------------------------------------------------------------------
-Source code for this software, including the modifications to the original
-source files, may be found on the OpenSolaris web site at:
- http://www.opensolaris.org/os/community/x_win/
-
---------------------------------------------------------------------
-
TigerVNC Source Distribution for Unix platforms
===============================================
--- a/open-src/xserver/xvnc/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/open-src/xserver/xvnc/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -4,7 +4,7 @@
# Based on Fedora's tigervnc.spec revision 1.20 from
# http://cvs.fedoraproject.org/viewvc/rpms/tigervnc/devel/tigervnc.spec
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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"),
@@ -37,6 +37,7 @@
MODULE_LICENSE = GPLv2
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
+MODULE_LICENSE_DESC = portions of the TigerVNC software
# Version number (used in path names)
MODULE_VERSION=1.1.0
--- a/pkg/Makefile Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/Makefile Tue Feb 19 19:23:47 2013 -0800
@@ -2,7 +2,7 @@
#
# Makefile for X Consolidation packages
#
-# Copyright (c) 2010, 2012, 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"),
@@ -132,6 +132,16 @@
### Additional metadata generation
+$(PROTOMETA)/%/:
+ $(PKGDEBUG)mkdir -p $@
+
+# Generate default copyright notice for packages without contents
+$(PROTOMETA)/%/cr_Oracle: $(PDIR)/%.p5m $(PROTOMETA)/%/
+ $(PKGDEBUG)gsed -n -e '/# Copyright .* Oracle/ {' \
+ -e 's/^# //' -e 'p' -e 'q' -e'}' $< > $@
+
+SYNTH_LICENSES = $(SYNTH_PKGS:%=$(PROTOMETA)/%/cr_Oracle)
+
# This should eventually move into pkg publication
FONT_MANIFESTS :sh= (cd manifests; print system-font-*.p5m)
@@ -408,21 +418,24 @@
$(RM) -r $(PKGDEST)
### Package publication to repo
-PUB_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.pub) $(PKGS:%=$(PDIR)/%.pub)
+PUB_PKGS = $(SYNTH_PKGS:%=$(PDIR)/%.pub) $(PKGS:%=$(PDIR)/%.pub)
+PUB_SYNTH_PKGS = $(SYNTH_MANIFESTS:%.p5m=$(PDIR)/%.pub)
publish_pkgs: $(PKGDEST) $(PDIR)/gendeps $(PDIR)/checkmf $(PUB_PKGS)
$(PUB_PKGS): $(PKGDEST) $(PDIR)/gendeps $(PDIR)/checkmf
-$(PDIR)/%.pub: $(PKGDEST) $(PDIR)/gendeps $(PDIR)/%.res
+$(PDIR)/%.pub: $(PKGDEST) $(PDIR)/gendeps $(PDIR)/%.res
$(PKGDEBUG) if [ -s $(@:%.pub=%.res) ]; then \
print "## Publishing $(@F:%.pub=%) to proto repository"; \
pkgsend -s $(PKGDEST) publish -d $(PKGROOT) \
- -d license_files -d $(PROTOMETA)/$(@F:%.pub=%) \
+ -d $(PROTOMETA)/$(@F:%.pub=%) \
--fmri-in-manifest --no-index --no-catalog -T '*.py' \
$(@:%.pub=%.res) > /dev/null; \
fi; \
$(TOUCH) $(@)
+$(PUB_SYNTH_PKGS): $(SYNTH_LICENSES)
+
### Repo finalization
install: repository-metadata
--- a/pkg/X-all.p5m Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/X-all.p5m Tue Feb 19 19:23:47 2013 -0800
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -27,3 +27,4 @@
value="This group package installs all packages from the X Window System consolidation."
set name=info.classification \
value="org.opensolaris.category.2008:Meta Packages/Group Packages"
+license cr_Oracle license="Oracle Copyright Notice"
--- a/pkg/X-incorporation.p5m Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/X-incorporation.p5m Tue Feb 19 19:23:47 2013 -0800
@@ -1,5 +1,5 @@
#
-# 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"),
@@ -28,3 +28,4 @@
set name=pkg.depend.install-hold value=core-os.X
set name=info.classification \
value="org.opensolaris.category.2008:Meta Packages/Incorporations"
+license cr_Oracle license="Oracle Copyright Notice"
--- a/pkg/license_files/cr_Oracle Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
--- a/pkg/license_files/gpl_choice_Oracle Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
--- a/pkg/license_files/lic_X11 Wed Feb 13 13:20:49 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-
-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/pkg/manifests/terminal-resize.p5m Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/manifests/terminal-resize.p5m Tue Feb 19 19:23:47 2013 -0800
@@ -1,4 +1,4 @@
-# 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"),
@@ -19,6 +19,12 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
+
+# Override license info description from xterm Makefile for this subset
+<transform set name=com.oracle.info.description -> \
+ edit value (.*) "the resize utility from \1" >
+
+
set name=pkg.fmri value=pkg:/terminal/resize@0.__version:xterm__
set name=pkg.summary \
value="resize - adjust terminal settings to current window size"
--- a/pkg/merge-metadata.pl Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/merge-metadata.pl Tue Feb 19 19:23:47 2013 -0800
@@ -1,6 +1,6 @@
#! /usr/perl5/bin/perl
#
-# Copyright (c) 2010, 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"),
@@ -33,12 +33,15 @@
use diagnostics;
my %attributes = ();
+my %licenses = ();
while (my $in = <>) {
chomp $in;
if ($in =~ m{^set name=(\S+) value="(.*)"$}) {
my ($name, $value) = ($1, $2);
$attributes{$name}->{$value} = 1;
+ } elsif ($in =~ m{^license }) {
+ $licenses{$in} = 1;
} else {
# Pass through other lines unchanged
print $in, "\n";
@@ -52,3 +55,25 @@
}
print "\n";
}
+
+# If there's just one license for the whole package, we promote some of the
+# license attributes to be package level attributes.
+# If there's more than one license, and not all licenses are the same,
+# just pass all the lines through as we got them.
+
+my $license_count = scalar(keys %licenses);
+my $license_lines = join("\n", sort keys %licenses);
+if ($license_count == 1) {
+ while ($license_lines =~
+ s{^(license\s+.*?)\s+
+ (com\.oracle\.info\.(?:name|version|description|tpno))="([^"]*)"
+ (.*)}{$1$4\nset name=$2 value="$3"}gmx)
+ {
+ # all the work is done in the while (...) statement
+ }
+ # if no description is provided, copy the pkg.summary for it
+ $license_lines =~
+ s{set name=com.oracle.info.description value=""}
+ {<transform set name=pkg.summary -> emit set name=com.oracle.info.description value=%{pkg.summary}>};
+}
+print "\n", $license_lines, "\n";
--- a/pkg/transforms/defaults Wed Feb 13 13:20:49 2013 -0800
+++ b/pkg/transforms/defaults Tue Feb 19 19:23:47 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2012, 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"),
@@ -56,12 +56,3 @@
<transform legacy -> default category "system">
# This is set to the final version number delivered as SVR4 format
<transform legacy -> default version "6.9.0.5.11.14300,REV=0.2010.06.21">
-
-#
-# These aren't really transforms, but are valid defaults for
-# current packages, but not the renamed/obsolete ones, which is
-# why they're in this file instead of common_actions
-#
-
-license cr_Oracle license="Oracle Copyright Notice"
-