--- a/exception_lists/packaging	Tue May 06 17:30:25 2014 -0700
+++ b/exception_lists/packaging	Tue May 06 18:40:28 2014 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -52,6 +52,7 @@
 # Obsolete man pages
 usr/share/man/man5/Consortium.5
 usr/share/man/man5/XProjectTeam.5
+usr/share/man/man5/Xprint.5
 
 # Upstream ati man pages don't apply to efb driver on sparc
 usr/share/man/man7/ati.7       	        sparc

--- a/open-src/app/accessx/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/accessx/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# accessx 1.x module Makefile
+# accessx accessibility feature configuration utility Makefile
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,7 @@
 BUILD_TYPES=32
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES= # None
+SUNTOUCHED_MANPAGES= accessx.1
 MODULE_STABILITY=Committed
 
 # No configure script to run

--- a/open-src/app/cmap_alloc/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/cmap_alloc/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # cmap_alloc - Utility to allocate default colormaps for non-default visuals
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,7 +48,7 @@
 ADDITIONAL_SOURCE_DIR=sun-src
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES= # None
+SUNTOUCHED_MANPAGES=cmap_alloc.1
 MODULE_STABILITY=Committed
 
 # No configure script to run

--- a/open-src/app/cmap_alloc/sun-src/cmap_alloc.1	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/cmap_alloc/sun-src/cmap_alloc.1	Tue May 06 18:40:28 2014 -0700
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1991, 1994, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1991, 2014, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -18,7 +18,7 @@
 .\" 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.
-.TH cmap_alloc 1 "18 March 1992"
+.TH cmap_alloc 1 "2 May 2014"
 .IX cmap_alloc "" "\f3cmap_alloc\f1(1) \(em colormap utility" ""
 .IX "color" "defa" "color" "default colormap allocation \(em \f3cmap_alloc\f1(1)" ""
 .SH NAME
@@ -61,7 +61,7 @@
 .SM RGB_DEFAULT_MAP
 property on the root window of the display.  Clients that need to access
 non-default dynamic visuals should search this property using 
-.SM XGetRBGColormaps()
+.SM XGetRGBColormaps(3x11)
 for a suitable colormap to use. 
 .SH OPTIONS
 .IP "\f3\-display \fIdisplay:n.screen\f1" 1i
@@ -93,6 +93,7 @@
 .IP "\f3\-help\f1" 1i
 Print out a short usage message and exit.
 .SH "SEE ALSO"
+.BR XGetRGBColormaps (3x11),
 .BR xstdcmap (1) ,
 .BR cmap_compact (1)
 .sp

--- a/open-src/app/cmap_compact/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/cmap_compact/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # cmap_compact - colormap configuration utility
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,7 +48,7 @@
 ADDITIONAL_SOURCE_DIR=sun-src
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES= # None
+SUNTOUCHED_MANPAGES= cmap_compact.1
 MODULE_STABILITY=Committed
 
 # No configure script to run

--- a/open-src/app/winsysck/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/winsysck/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # winsysck - utility to check & report if a window system is in use
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -49,6 +49,10 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=winsysck.man
+MODULE_STABILITY=Obsolete
+
 # No configure script, so pass usual environment to build/install instead
 CONFIGURE_TARGETS=
 CONFIGURE_TARGETS_SET=yes

--- a/open-src/app/winsysck/sun-src/winsysck.man	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/winsysck/sun-src/winsysck.man	Tue May 06 18:40:28 2014 -0700
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1990, 2014, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -18,7 +18,7 @@
 .\" 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.
-.TH winsysck 1 "15 February 2010"
+.TH winsysck 1 "2 May 2014"
 .IX "winsysck" "" "\f3winsysck\f1(1) \(em check window protocols" ""
 .IX "window" "check" "window" "check system protocols \(em \f3winsysck\f1(1)" ""
 .SH NAME
@@ -153,7 +153,11 @@
 .LP
 There is no way to determine whether a SunView connection is
 actually connected to an X11/NeWS server with SunView
-compatability enabled or to a SunView server.
+compatibility enabled or to a SunView server.
+.LP
+winsysck assumes that no system running this version of __distroname__
+could be running SunView, NeWS, or X11/NeWS, so doesn't bother checking
+for anything but X11.
 .SH BUGS
 .LP
 None known.

--- a/open-src/app/xcolor/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xcolor/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xcolor - utility to display used & available entries in PseudoColor colormaps
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -61,7 +61,7 @@
 MODULE_LDFLAGS = $(ZDISCARD_UNUSED_DEP)
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=# None
+SUNTOUCHED_MANPAGES=xcolor.1
 MODULE_STABILITY=Committed
 
 # Compatibility links from /usr/X11/bin to /usr/bin

--- a/open-src/app/xedit/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xedit/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xedit - simple Xaw-based text editor for X
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -45,10 +45,10 @@
 TARBALL_SHA1 = 2003a467a44120fe52703d122b537142dc25c8c3
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
+SOURCE_PATCHES = man-tbl-markup.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
+SUNTOUCHED_MANPAGES=man/xedit.man
 MODULE_STABILITY=Committed
 
 # Compatibility links from /usr/X11/bin to /usr/bin

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xedit/man-tbl-markup.patch	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,57 @@
+From b79cac135ca7b788892ff199231be2bfce62a4a3 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sat, 3 May 2014 00:21:27 -0700
+Subject: [PATCH:xedit] Fix man page tbl markup
+
+'\" t is needed to work with Solaris man/nroff commands
+Other changes fix issues found on all platforms
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ man/xedit.man |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/man/xedit.man b/man/xedit.man
+index 197a782..07cbf7e 100644
+--- a/man/xedit.man
++++ b/man/xedit.man
+@@ -1,4 +1,4 @@
+-.\" t
++'\" t
+ .\" $XConsortium: xedit.man,v 1.23 94/04/17 20:43:39 matt Exp $
+ .\" Copyright (c) 1994  X Consortium
+ .\"
+@@ -95,8 +95,8 @@ Ctrl-k	Kill To End Of Line
+ Meta-d	Delete Next Word
+ Ctrl-l	Redraw Display
+ Meta-D	Kill Word
+-Ctrl-m	Newline	Meta-h
+-Delete Previous Word
++Ctrl-m	Newline
++Meta-h	Delete Previous Word
+ Ctrl-n	Next Line
+ Meta-H	Backward Kill Word
+ Ctrl-o	Newline And Backup
+@@ -114,8 +114,8 @@ Ctrl-v	Next Page
+ Meta-Shift Delete	Kill Previous Word
+ Ctrl-w	Kill Selection	
+ Meta-Backspace	Delete Previous Word
+-Ctrl-y	Unkill	Meta-Shift Backspace
+-Kill Previous Word
++Ctrl-y	Unkill
++Meta-Shift Backspace	Kill Previous Word
+ Ctrl-z	Scroll One Line Up
+ Meta-z	Scroll One Line Down
+ Ctrl-_	Undo
+@@ -134,7 +134,7 @@ Button 2 Down	Insert Current Selection (paste)
+ Button 3 Down	Extend Current Selection
+ Button 3 Motion	Adjust Selection
+ Button 3 Up	End Selection (cut)
+-.fi
++.TE
+ .sp
+ 
+ .SH LINE EDIT MODE
+-- 
+1.7.9.2
+

--- a/open-src/app/xfs/fsadmin.1	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xfs/fsadmin.1	Tue May 06 18:40:28 2014 -0700
@@ -1,6 +1,6 @@
 '\" te
 .\"
-.\" "Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+.\" "Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved.
 .\" 
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@
 .\" or other dealings in this Software without prior written authorization
 .\" of the copyright holder.
 .\"
-.TH fsadmin 1 "2 Jul 2010"
+.TH fsadmin 1 "2 May 2014"
 .IX "fsadmin" "" "\f3fsadmin\f1(1) \(em administration utility for font server" ""
 .IX "font server" "admin" "font server" " administration utility \(em \f3fsadmin\f1(1)"
 .SH NAME
@@ -92,7 +92,8 @@
 cw(2.750000i)| cw(2.750000i)
 lw(2.750000i)| lw(2.750000i).
 ATTRIBUTE TYPE^ATTRIBUTE VALUE
-Availability^pkg:/x11/xfs
+Availability^x11/xfs
+Interface Stability^Committed
 .TE
 .sp
 .SH SEE ALSO

--- a/open-src/app/xkbutils/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xkbutils/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xkbutils - assorted XKB client programs
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -46,8 +46,8 @@
 SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=# None
-MODULE_STABILITY=Committed
+SUNTOUCHED_MANPAGES = man/xkbbell.man man/xkbvleds.man man/xkbwatch.man
+MODULE_STABILITY = Uncommitted
 
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = xkbbell xkbvleds xkbwatch

--- a/open-src/app/xlock/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xlock/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xlock - manually activated screen lock program
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -42,8 +42,9 @@
 SOURCE_TARBALL_NAME_SET=yes
 ADDITIONAL_SOURCE_DIR=sun-src
 
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES= xlock.1
+MODULE_STABILITY=Committed
 
 # Haven't made sure it's 64-bit clean yet, so continue building 32-bit for now
 BUILD_TYPES_SET=yes

--- a/open-src/app/xlswins/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/app/xlswins/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xlswins - utility to list windows displayed on an X server
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -46,8 +46,8 @@
 SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES= # None
-MODULE_STABILITY=Committed
+SUNTOUCHED_MANPAGES = xlswins.1
+MODULE_STABILITY = Obsolete
 
 # ARC cases that covered this module
 # PSARC/1992/173 - Update MIT-based Clients to X11R5 Level

--- a/open-src/common/suntouch-manpages.pl	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/common/suntouch-manpages.pl	Tue May 06 18:40:28 2014 -0700
@@ -1,7 +1,7 @@
 #!/usr/perl5/bin/perl -w
 
 #
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,14 @@
 #
 #
 
-# Updates manual pages to include standard Sun man page sections
+# Updates manual pages to include standard Solaris man page sections
 #
 # Arguments:
 #	-a '{attribute, value}, ...' - add entries to Attributes section table
 #	-o '{attribute, value}, ...' - override previous entries in
 #					Attributes section table
 #	-l libname		     - add library line to synopsis
+#	-c libname		     - add pkgconfig line to synopsis
 #	-p path			     - add path to command in synopsis
 #	-r '{text, replacement}'     - replace text with replacement
 
@@ -42,12 +43,14 @@
 my @overrides;
 my @replacements;
 my $library;
+my $pkgconfig;
 my $synpath;
 
 my $result = GetOptions('a|attribute=s' => \@attributes,
 			'o|override=s'  => \@overrides,
 			'r|replace=s'	=> \@replacements,
 			'l|library=s'	=> \$library,
+			'c|pkg-config=s' => \$pkgconfig,
 			'p|path=s'	=> \$synpath);
 
 my $add_attributes = 0;
@@ -67,10 +70,16 @@
 
 my $add_library_to_synopsis = 0;
 
-if (defined($library)) {
+if (defined($library) && $library ne '') {
   $add_library_to_synopsis = 1;
 }
 
+my $add_pkgconfig_to_synopsis = 0;
+if (defined($pkgconfig) && $pkgconfig ne '') {
+  $add_pkgconfig_to_synopsis = 1;
+}
+
+
 my $add_path_to_synopsis = 0;
 
 if (defined($synpath)) {
@@ -128,6 +137,16 @@
 	print OUT ".nf\n",
 	  q(\fBcc\fR [ \fIflag\fR\&.\&.\&. ] \fIfile\fR\&.\&.\&. \fB\-l),
 	    $library, q(\fR [ \fIlibrary\fR\&.\&.\&. ]), "\n.fi\n";
+	if ($add_pkgconfig_to_synopsis) {
+	    print OUT ( 
+		".sp\n",
+		".nf\n",
+		q(\fBcc\fR [ \fIflag\fR\&.\&.\&. ] `pkg-config --cflags ),
+		$pkgconfig,
+		q(` \fIfile\fR\&.\&.\&. `pkg-config --libs ),
+	        $pkgconfig,
+		"\` \n.fi\n");
+	}
       }
       elsif ($add_path_to_synopsis) {
 	$nextline = <IN>;
@@ -151,7 +170,7 @@
   my ($attributes_ref, $overrides_ref) = @_;
 
   my $attributes_table = q{
-.\\" Begin Sun update
+.\\" Begin Oracle Solaris update
 .SH "ATTRIBUTES"
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -163,7 +182,7 @@
 <attributes>
 .TE
 .sp
-.\\" End Sun update
+.\\" End Oracle Solaris update
 };
 
   my $attribute_entries = "";

--- a/open-src/data/rasterfile/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/data/rasterfile/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -43,6 +43,11 @@
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
 SOURCE_TARBALL_NAME_SET=yes
+ADDITIONAL_SOURCE_DIR=sun-src
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=rasterfile.4
+MODULE_STABILITY=Committed
 
 CONFIGURE_TARGETS =
 CONFIGURE_TARGETS_SET=yes
@@ -60,7 +65,7 @@
 INCDIR=$(DESTDIR)/usr/include/pixrect
 MANDIR=$(DESTDIR)/usr/share/man/man4
 
-install_files:
+install_files: $(UNPACK_TARGET) $(INSTALL_DEPS)
 	mkdir -p $(INCDIR) $(MANDIR)
-	cp -pf rasterfile.h $(INCDIR)
-	cp -pf rasterfile.4 $(MANDIR)
+	ginstall -m 0444 $(SOURCE_DIR)/rasterfile.h $(INCDIR)
+	ginstall -m 0444 $(SOURCE_DIR)/rasterfile.4 $(MANDIR)

--- a/open-src/data/rasterfile/rasterfile.4	Tue May 06 17:30:25 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1994, 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.
-.TH rasterfile 4 "29 March 1994"
-.IX "images" "ras" "images" "rasterfile image format \(em \f3rasterfile\f1(4)"
-.IX "rasterfile" "" "\f3rasterfile\f1(4) \(em raster image format file " ""
-.SH NAME
-rasterfile \- Sun's file format for raster images
-.SH SYNOPSIS
-.B #include <pixrect/rasterfile.h>
-.SH DESCRIPTION
-.LP
-A rasterfile is composed of three parts:
-first, a header containing 8 integers;
-second, a (possibly empty) set of colormap values;
-and third, the pixel image, stored a line at
-a time, in increasing
-.I y
-order.  The image is layed out in the file
-as in a memory pixrect.  Each line of the
-image is rounded up to the nearest 16 bits.
-.IX "rasterfile"
-.LP
-The header is defined by the following structure:
-.LP
-.RS
-.nf
-struct rasterfile {
-	int	ras_magic;
-	int	ras_width;
-	int	ras_height;
-	int	ras_depth;
-	int	ras_length;
-	int	ras_type;
-	int	ras_maptype;
-	int	ras_maplength;
-};
-.fi
-.ft R
-.RE
-.LP
-The
-.I ras_magic
-field always contains the following constant:
-.IP
-.B #define	\s-1RAS_MAGIC\s0	0x59a66a95
-.LP
-The
-.IR ras_width ,
-.IR ras_height ,
-and
-.I ras_depth
-fields contain the image's width and height in pixels,
-and its depth in bits per pixel, respectively.
-The depth is either 1 or 8, corresponding
-to standard frame buffer depths.  The
-.I ras_length
-field contains the length in bytes of the image data.
-For an unencoded image, this number is
-computable from the
-.IR ras_width ,
-.IR ras_height ,
-and
-.I ras_depth
-fields, but for an encoded image it must be explicitly stored in
-order to be available without decoding the image itself.
-Note: the length of the header and of
-the (possibly empty)
-colormap values are not included in the value of the
-.I ras_length
-field; it is only the image data length.
-For historical reasons, files of type
-.SM RT_OLD
-will usually have a 0 in the
-.I ras_length
-field, and software expecting to encounter such files
-should be prepared to compute the actual
-image data length if needed.  The
-.I ras_maptype
-and
-.I ras_maplength
-fields contain the type and length in
-bytes of the colormap values, respectively.  If
-.I ras_maptype
-is not
-.SM RMT_NONE
-and the
-.I ras_maplength
-is not 0, then the colormap values are the
-.I ras_maplength
-bytes immediately after the header.
-These values are either uninterpreted
-bytes (usually with the
-.I ras_maptype
-set to
-.SM RMT_RAW\s0)
-or the equal length red, green and blue
-vectors, in that order (when the
-.I ras_maptype
-is
-.SM RMT_EQUAL_RGB\s0).
-In the latter case, the
-.I ras_maplength
-must be three times the size in bytes
-of any one of the vectors.

--- a/open-src/data/rasterfile/rasterfile.h	Tue May 06 17:30:25 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/* Copyright (c) 1989, 1991, 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.
- */ 
-
-
-/*
- * Description of header for files containing raster images
- */
-
-#ifndef _rasterfile_h
-#define _rasterfile_h
-
-struct rasterfile {
-	int	ras_magic;		/* magic number */
-	int	ras_width;		/* width (pixels) of image */
-	int	ras_height;		/* height (pixels) of image */
-	int	ras_depth;		/* depth (1, 8, or 24 bits) of pixel */
-	int	ras_length;		/* length (bytes) of image */
-	int	ras_type;		/* type of file; see RT_* below */
-	int	ras_maptype;		/* type of colormap; see RMT_* below */
-	int	ras_maplength;		/* length (bytes) of following map */
-	/* color map follows for ras_maplength bytes, followed by image */
-};
-#define	RAS_MAGIC	0x59a66a95
-
-	/* Sun supported ras_type's */
-#define RT_OLD		0	/* Raw pixrect image in 68000 byte order */
-#define RT_STANDARD	1	/* Raw pixrect image in 68000 byte order */
-#define RT_BYTE_ENCODED	2	/* Run-length compression of bytes */
-#define RT_FORMAT_RGB	3	/* XRGB or RGB instead of XBGR or BGR */
-#define RT_FORMAT_TIFF	4	/* tiff <-> standard rasterfile */
-#define RT_FORMAT_IFF	5	/* iff (TAAC format) <-> standard rasterfile */
-#define RT_EXPERIMENTAL 0xffff	/* Reserved for testing */
-
-	/* Sun registered ras_maptype's */
-#define RMT_RAW		2
-	/* Sun supported ras_maptype's */
-#define RMT_NONE	0	/* ras_maplength is expected to be 0 */
-#define RMT_EQUAL_RGB	1	/* red[ras_maplength/3],green[],blue[] */
-
-/*
- * NOTES:
- * 	Each line of the image is rounded out to a multiple of 16 bits.
- *   This corresponds to the rounding convention used by the memory pixrect
- *   package (/usr/include/pixrect/memvar.h) of the SunWindows system.
- *	The ras_encoding field (always set to 0 by Sun's supported software)
- *   was renamed to ras_length in release 2.0.  As a result, rasterfiles
- *   of type 0 generated by the old software claim to have 0 length; for
- *   compatibility, code reading rasterfiles must be prepared to compute the
- *   true length from the width, height, and depth fields.
- */
-
-#endif /*!_rasterfile_h*/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/data/rasterfile/sun-src/rasterfile.4	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,122 @@
+.\" Copyright (c) 1994, 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.
+.TH rasterfile 4 "29 March 1994"
+.IX "images" "ras" "images" "rasterfile image format \(em \f3rasterfile\f1(4)"
+.IX "rasterfile" "" "\f3rasterfile\f1(4) \(em raster image format file " ""
+.SH NAME
+rasterfile \- Sun's file format for raster images
+.SH SYNOPSIS
+.B #include <pixrect/rasterfile.h>
+.SH DESCRIPTION
+.LP
+A rasterfile is composed of three parts:
+first, a header containing 8 integers;
+second, a (possibly empty) set of colormap values;
+and third, the pixel image, stored a line at
+a time, in increasing
+.I y
+order.  The image is layed out in the file
+as in a memory pixrect.  Each line of the
+image is rounded up to the nearest 16 bits.
+.IX "rasterfile"
+.LP
+The header is defined by the following structure:
+.LP
+.RS
+.nf
+struct rasterfile {
+	int	ras_magic;
+	int	ras_width;
+	int	ras_height;
+	int	ras_depth;
+	int	ras_length;
+	int	ras_type;
+	int	ras_maptype;
+	int	ras_maplength;
+};
+.fi
+.ft R
+.RE
+.LP
+The
+.I ras_magic
+field always contains the following constant:
+.IP
+.B #define	\s-1RAS_MAGIC\s0	0x59a66a95
+.LP
+The
+.IR ras_width ,
+.IR ras_height ,
+and
+.I ras_depth
+fields contain the image's width and height in pixels,
+and its depth in bits per pixel, respectively.
+The depth is either 1 or 8, corresponding
+to standard frame buffer depths.  The
+.I ras_length
+field contains the length in bytes of the image data.
+For an unencoded image, this number is
+computable from the
+.IR ras_width ,
+.IR ras_height ,
+and
+.I ras_depth
+fields, but for an encoded image it must be explicitly stored in
+order to be available without decoding the image itself.
+Note: the length of the header and of
+the (possibly empty)
+colormap values are not included in the value of the
+.I ras_length
+field; it is only the image data length.
+For historical reasons, files of type
+.SM RT_OLD
+will usually have a 0 in the
+.I ras_length
+field, and software expecting to encounter such files
+should be prepared to compute the actual
+image data length if needed.  The
+.I ras_maptype
+and
+.I ras_maplength
+fields contain the type and length in
+bytes of the colormap values, respectively.  If
+.I ras_maptype
+is not
+.SM RMT_NONE
+and the
+.I ras_maplength
+is not 0, then the colormap values are the
+.I ras_maplength
+bytes immediately after the header.
+These values are either uninterpreted
+bytes (usually with the
+.I ras_maptype
+set to
+.SM RMT_RAW\s0)
+or the equal length red, green and blue
+vectors, in that order (when the
+.I ras_maptype
+is
+.SM RMT_EQUAL_RGB\s0).
+In the latter case, the
+.I ras_maplength
+must be three times the size in bytes
+of any one of the vectors.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/data/rasterfile/sun-src/rasterfile.h	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,71 @@
+/* Copyright (c) 1989, 1991, 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.
+ */ 
+
+
+/*
+ * Description of header for files containing raster images
+ */
+
+#ifndef _rasterfile_h
+#define _rasterfile_h
+
+struct rasterfile {
+	int	ras_magic;		/* magic number */
+	int	ras_width;		/* width (pixels) of image */
+	int	ras_height;		/* height (pixels) of image */
+	int	ras_depth;		/* depth (1, 8, or 24 bits) of pixel */
+	int	ras_length;		/* length (bytes) of image */
+	int	ras_type;		/* type of file; see RT_* below */
+	int	ras_maptype;		/* type of colormap; see RMT_* below */
+	int	ras_maplength;		/* length (bytes) of following map */
+	/* color map follows for ras_maplength bytes, followed by image */
+};
+#define	RAS_MAGIC	0x59a66a95
+
+	/* Sun supported ras_type's */
+#define RT_OLD		0	/* Raw pixrect image in 68000 byte order */
+#define RT_STANDARD	1	/* Raw pixrect image in 68000 byte order */
+#define RT_BYTE_ENCODED	2	/* Run-length compression of bytes */
+#define RT_FORMAT_RGB	3	/* XRGB or RGB instead of XBGR or BGR */
+#define RT_FORMAT_TIFF	4	/* tiff <-> standard rasterfile */
+#define RT_FORMAT_IFF	5	/* iff (TAAC format) <-> standard rasterfile */
+#define RT_EXPERIMENTAL 0xffff	/* Reserved for testing */
+
+	/* Sun registered ras_maptype's */
+#define RMT_RAW		2
+	/* Sun supported ras_maptype's */
+#define RMT_NONE	0	/* ras_maplength is expected to be 0 */
+#define RMT_EQUAL_RGB	1	/* red[ras_maplength/3],green[],blue[] */
+
+/*
+ * NOTES:
+ * 	Each line of the image is rounded out to a multiple of 16 bits.
+ *   This corresponds to the rounding convention used by the memory pixrect
+ *   package (/usr/include/pixrect/memvar.h) of the SunWindows system.
+ *	The ras_encoding field (always set to 0 by Sun's supported software)
+ *   was renamed to ras_length in release 2.0.  As a result, rasterfiles
+ *   of type 0 generated by the old software claim to have 0 length; for
+ *   compatibility, code reading rasterfiles must be prepared to compute the
+ *   true length from the width, height, and depth fields.
+ */
+
+#endif /*!_rasterfile_h*/

--- a/open-src/font/util/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/font/util/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -63,5 +63,10 @@
 # Description to include in package metadata
 MODULE_DESC = X.Org font package creation/installation utilities
 
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/bdftruncate.man man/ucs2any.man
+MODULE_STABILITY=Volatile
+MODULE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/bin/
+
 ### Include common rulesets
 include ../Makefile.inc

--- a/open-src/lib/Makefile.inc	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/Makefile.inc	Tue May 06 18:40:28 2014 -0700
@@ -1,6 +1,6 @@
 # -*- Makefile -*- rules common to most X.Org library modules
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -46,7 +46,13 @@
 # Changes to apply to man pages
 MODULE_MTLEVEL_DEFAULT	= $(MODULE_MTLEVEL_SET:yes=$(POUND_SIGN))
 $(MODULE_MTLEVEL_DEFAULT)	MODULE_MTLEVEL=See XInitThreads(3X11)
-MODTYPE_SUNTOUCH_MAN_FLAGS= -l $(LIBNAME) -a '{MT-Level, $(MODULE_MTLEVEL)}'
+MODULE_PKGCONFIG_MAN_DEFAULT	= $(MODULE_PKGCONFIG_MAN_SET:yes=$(POUND_SIGN))
+$(MODULE_PKGCONFIG_MAN_DEFAULT)	MODULE_PKGCONFIG_MAN = $(FIX_PC_FILES:%.pc.in=%)
+LIB_SUNTOUCH_DEFAULTS	= -a '{MT-Level, $(MODULE_MTLEVEL)}'
+LIB_SUNTOUCH_DEFAULTS	+= --library='$(LIBNAME)'
+LIB_SUNTOUCH_DEFAULTS	+= --pkg-config='$(MODULE_PKGCONFIG_MAN)'
+MODTYPE_SUNTOUCH_DEFAULT = $(OVERRIDE_LIB_SUNTOUCH_DEFAULT:yes=$(POUND_SIGN))
+$(MODTYPE_SUNTOUCH_DEFAULT) MODTYPE_SUNTOUCH_MAN_FLAGS = $(LIB_SUNTOUCH_DEFAULTS)
 
 # Flags to build & link libraries with
 MODTYPE_CPPFLAGS=$(LIB_CPPFLAGS)

--- a/open-src/lib/libX11/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libX11/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -36,6 +36,7 @@
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
+	man-tbl-markup.patch,-p1 \
 	1234757.patch,-p1 \
 	4010755.patch,-p1 \
 	4614834.patch,-p1 \
@@ -117,6 +118,8 @@
 SUNTOUCHED_MANPAGES=man/*.man man/xkb/*.man
 MODULE_STABILITY=Committed
 LIB_MAN_SUFFIX=3x11
+MODULE_PKGCONFIG_MAN=x11
+MODULE_PKGCONFIG_MAN_SET=yes
 
 # Command line options to GNU autoconf configure script
 MODULE_CONFIG_OPTS = --enable-xthreads --enable-loadable-i18n \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/man-tbl-markup.patch	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,262 @@
+From b2296b20a1abf8f3753fbddef97f4831a292409c Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sun, 4 May 2014 11:23:17 -0700
+Subject: [PATCH:libX11] XCreateGC.man: simplify table to work with Solaris
+ tbl
+
+Having every table cell be a text diversion (T{...T}) was too much for
+Solaris tbl to handle, and thus "man XCreateGC" would print the error
+/usr/man/man3x11/XCreateGC.3x11: line 402: Too many text block diversions
+tbl quits
+and not display the table of mask bits or any text in the man page after
+that table.   Since the #define column doesn't need special handling,
+making it not use text diversions brings the table under the tbl limit.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ man/XCreateGC.man |   94 ++++++++++++++---------------------------------------
+ 1 file changed, 24 insertions(+), 70 deletions(-)
+
+diff --git a/man/XCreateGC.man b/man/XCreateGC.man
+index de0d039..5f021a7 100644
+--- a/man/XCreateGC.man
++++ b/man/XCreateGC.man
+@@ -247,173 +247,127 @@ The
+ .ZN XGCValues
+ structure contains:
+ .LP
+-.LP
+ /\&* GC attribute value mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(.75i).
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCFunction
+ T}	T{
+ (1L<<0)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCPlaneMask
+ T}	T{
+ (1L<<1)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCForeground
+ T}	T{
+ (1L<<2)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCBackground
+ T}	T{
+ (1L<<3)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCLineWidth
+ T}	T{
+ (1L<<4)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCLineStyle
+ T}	T{
+ (1L<<5)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCCapStyle
+ T}	T{
+ (1L<<6)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCJoinStyle
+ T}	T{
+ (1L<<7)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCFillStyle
+ T}	T{
+ (1L<<8)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCFillRule
+ T}	T{
+ (1L<<9)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCTile
+ T}	T{
+ (1L<<10)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCStipple
+ T}	T{
+ (1L<<11)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCTileStipXOrigin
+ T}	T{
+ (1L<<12)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCTileStipYOrigin
+ T}	T{
+ (1L<<13)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCFont
+ T}	T{
+ (1L<<14)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCSubwindowMode
+ T}	T{
+ (1L<<15)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCGraphicsExposures
+ T}	T{
+ (1L<<16)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCClipXOrigin
+ T}	T{
+ (1L<<17)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCClipYOrigin
+ T}	T{
+ (1L<<18)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCClipMask
+ T}	T{
+ (1L<<19)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCDashOffset
+ T}	T{
+ (1L<<20)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCDashList
+ T}	T{
+ (1L<<21)
+ T}
+-T{
+-\&#define
+-T}	T{
++\&#define	T{
+ .ZN GCArcMode
+ T}	T{
+ (1L<<22)
+ T}
+ .TE
+ .IN "XGCValues" "" "@DEF@"
++.LP
+ .Ds 0
+ /\&* Values */
+ 
+-- 
+1.7.9.2
+
+From 6575a906e98888a13d772692ca9df4dd01d153cf Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sun, 4 May 2014 11:54:59 -0700
+Subject: [PATCH:libX11] Add missing .TE tags to end tables in Xkb man pages
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ man/xkb/XkbSetIgnoreLockMods.man     |    1 +
+ man/xkb/XkbSetServerInternalMods.man |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/man/xkb/XkbSetIgnoreLockMods.man b/man/xkb/XkbSetIgnoreLockMods.man
+index e3dd33d..635c7ba 100644
+--- a/man/xkb/XkbSetIgnoreLockMods.man
++++ b/man/xkb/XkbSetIgnoreLockMods.man
+@@ -187,6 +187,7 @@ XkbNamesMask	names	(1L<<4)
+ XkbCompatMapMask	compat	(1L<<5)
+ XkbGeometryMask	geom	(1L<<6)
+ XkbAllComponentsMask	All Fields	(0x7f)
++.TE
+ .SH "SEE ALSO"
+ .BR XkbGetControls (__libmansuffix__),
+ .BR XkbGetNames (__libmansuffix__),
+diff --git a/man/xkb/XkbSetServerInternalMods.man b/man/xkb/XkbSetServerInternalMods.man
+index 93ede9b..666e59f 100644
+--- a/man/xkb/XkbSetServerInternalMods.man
++++ b/man/xkb/XkbSetServerInternalMods.man
+@@ -191,6 +191,7 @@ XkbNamesMask	names	(1L<<4)
+ XkbCompatMapMask	compat	(1L<<5)
+ XkbGeometryMask	geom	(1L<<6)
+ XkbAllComponentsMask	All Fields	(0x7f)
++.TE
+ .SH "SEE ALSO"
+ .BR XkbGetControls (__libmansuffix__),
+ .BR XkbGetNames (__libmansuffix__),
+-- 
+1.7.9.2
+

--- a/open-src/lib/libXmu/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libXmu/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # libXmu - miscellaneous utility functions based on libX11 & libXt
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -43,8 +43,10 @@
 LIBNAME=Xmu
 
 # Man pages to apply Sun footer to & attributes to list
-#SUNTOUCHED_MANPAGES= no man pages in upstream package
+SUNTOUCHED_MANPAGES= man/*.3*
 MODULE_STABILITY=Committed
+MODULE_PKGCONFIG_MAN=xmu
+MODULE_PKGCONFIG_MAN_SET=yes
 LIB_MAN_SUFFIX=3xmu
 
 # ARC cases that covered this module
@@ -89,7 +91,7 @@
 	$(CP) $(SOURCE_DIR)/include/X11/Xmu/XmuSolaris.h \
 	       $(SOURCE_DIR)/include/X11/Xmu/WhitePoint.h \
 		$(PROTODIR)$(X11_INCLUDES_DIR)/X11/Xmu
-	$(CP) $(ADDITIONAL_SOURCE_DIR)/*.3xmu $(MANDIR)
+	$(CP) $(SOURCE_DIR)/man/*.3xmu $(MANDIR)
 
 # Metadata for libxmuu package
 LIBXMUU_PKG_METADATA_DIR      = $(PROTOMETA)/x11-library-libxmuu

--- a/open-src/lib/libXmu/sun-src/XSolarisCheckColormapEquivalence.3xmu	Tue May 06 17:30:25 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-.\"
-.\" Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.TH XSolarisCheckColormapEquivalence 3Xmu "29 Aug 2011" "X Version 11" "XLIB FUNCTIONS"
-.SH NAME
-XSolarisCheckColormapEquivalence \- determines if two visuals are colormap
-equivalent
-.SH SYNOPSIS
-.LP
-cc [ flag ... ] file ... -lXmu  [ library ... ]
-.br
-#include <X11/Xmu/XmuSolaris.h>
-.LP
-Bool XSolarisCheckColormapEquivalence\^(
-.br
-      Display *\fIdisplay\f1\^,
-.br
-      int \fIscreen\f1\^,
-.br
-      Visual *\fIvisual1\f1\^,
-.br
-      Visual *\fIvisual2\f1\^);
-.LP
-.SH ARGUMENTS
-.IP \fIdisplay\f1 1i
-Specifies the connection to the X server. 
-.IP \fIscreen\f1 1i
-An integer specifying the screen on which the visuals are to be searched. 
-.IP \fIvisual1\f1 1i
-Specifies the first visual type supported on the screen.
-If the visual type is not one supported by the screen, 
-a
-.B BadMatch
-error results. 
-.IP \fIvisual2\f1 1i
-Specifies the second visual type supported on the screen.
-If the visual type is not one supported by the screen, 
-a
-.B BadMatch
-error results. 
-.SH DESCRIPTION
-This function returns True if the two Visuals are Colormap Equivalent,
-otherwise it returns False.
-.LP
-Colormap Equivalence is a minor relaxation of the X protocol supported by the
-.BR Xsun (1)
-X server on Solaris 10 and earlier releases.
-Two Visuals are Colormap Equivalent if it is possible
-to use a Colormap created with one of the Visuals as the Colormap of a Window 
-in the other Visual. This is useful on a system that supports Visuals that
-differ only in their OpenGL (GLX) Attributes.
-.LP
-For example, to avoid colormap flashing, when creating a window with
-a Visual that is in the same depth as the RootWindow, use the Default Colormap.
-In standard X, this is only possible if the Visual is the DefaultVisual. 
-With Colormap Equivalence the requirement is relaxed.
-.LP
-To use this function, an application should link with libXmu.
-.SH EXAMPLES
-.nh
-You may be able to avoid creating a new colormap by using the following code:
-.LP
-.RS
-.ft B
-.nf
-        if (!XSolarisCheckColormapEquivalence(dpy, screen, 
-	                      vi->visual, DefaultVisual(dpy, screen)) {
-            attributes.colormap = XCreateColormap(dpy, root,
-                                vi->visual, AllocNone);
-            valuemask = CWColormap;
-        }
-        window = XCreateWindow(dpy, root, 0, 0, 500, 500, 0,
-                        vi->depth, CopyFromParent, vi->visual,
-                        valuemask, &attributes);
-.fi
-.ft
-.RE
-.SH SEE ALSO
-.BR XCreateWindow (3X11),
-.BR glXGetConfig (3gl).
-

--- a/open-src/lib/libXmu/sun-src/XSolarisGetVisualGamma.3xmu	Tue May 06 17:30:25 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-.\"
-.\" Copyright (c) 1994, 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.
-.\"
-.TH XSolarisGetVisualGamma 3Xmu "11 Jan 2008" "X Version 11" "XLIB FUNCTIONS"
-.SH NAME
-XSolarisGetVisualGamma \- obtain gamma information for a visual
-.SH SYNOPSIS
-.LP
-cc [ flag ... ] file ... -lXmu  [ library ... ]
-.br
-#include <X11/Xmu/XmuSolaris.h>
-.LP
-Status
-.br
-XSolarisGetVisualGamma\^(\^Display *\fIdisplay\f1, int \fIscreen_number\f1, 
-.br
-.in +1.75i
-Visual *\fIvisual\f1, double *\fIgamma\f1\^);
-.in -1.75i
-.SH ARGUMENTS
-.IP \fIdisplay\f1 1i
-Specifies the connection to the X server.
-.IP \fIscreen_number\f1 1i
-Specifies the number of the screen.
-.IP \fIvisual\f1 1i
-Specifies the visual.
-.IP \fIgamma\f1 1i
-Returns the gamma value for the specified visual.
-.SH DESCRIPTION
-The
-.B XSolarisGetVisualGamma
-function returns the gamma value of a specified visual.  This value is
-the exponent of the power function describing the intensity response
-of colors displayed using that visual.  This is the intensity response
-of the entire path from the frame buffer pixel store through the
-monitor.  The equation of the intensity response is:
-.PP
-.in +0.5i
-\fIIntensityOut\f1 = (\fIFramebufferColor\f1)**\fIgamma\f1
-.in -0.5i
-.PP
-(i.e. the color in the frame buffer raised to the power of gamma).
-.LP
-\fIFramebufferColor\f1 refers to the the RGB values stored in the frame buffer
-pixel store and processed by any color mapping LUTs that are in the output path.
-.LP
-Gamma correction is necessary because of the way color intensities are
-perceived by the human eye.  Without gamma correction, the eye
-interprets changes to the color intensity incorrectly.  Small changes
-to low intensity light appear to have more effect than the equivalent
-change to higher intensity light.  This distorts the appearance of
-graphical entities which depend on accurate color, such as images,
-anti-aliased lines and transparent polygons.
-.LP
-Gamma correction results in a linear mapping between color values and
-percieved intensity.  Gamma corrected visuals are also called linear
-visuals for this reason.  Linear visuals have a gamma value of 1.0.
-.LP
-Note: the term "gamma" used here refers the mapping applied along the entire
-path (that is, the value percieved by the end user), not merely the exponent
-of the gamma correction function.
-.LP
-The gamma value returned defines the color-to-intensity mapping for all
-three channels: red, green, and blue.
-.LP
-A status of \f3Success\f1
-is returned if the function was able to determine the gamma successfully.
-If a request failure occured while calling the function, a \f3BadAccess \f1
-error code is returned.  If there is an internal inconsistency (e.g. the gamma 
-value for one of the color channels is different from the others) a 
-\f3BadMatch\f1 error code is returned.  Whenever an error code is returned, 
-the argument \fIgamma\f1 is left untouched.
-.LP
-The gamma value returned represents the best information available on the
-intensity response of the visual.  Depending on the device, it may or may
-not include the actual monitor characteristics (some devices have no way
-of determining the type of monitor so they may assume a default monitor
-gamma).  As such, it represents the system's "best guess" about the intensity
-response.  Since this function gets its information from the same property
-used by Solaris color managment systems, if more accurate information on the 
-monitor response is configured or calibrated through these systems,
-this function will return a more accurate value for gamma.
-.LP
-If the intensity mapping is not a power function, the returned gamma value
-may only be approximate.  This should usually happen only when the device
-gamma correction has been incorrectly configured.
-.LP
-To use this function, an application should link with \f3libXmu\f1.
-.SH SEE ALSO
-.TZ OWPG
-.br
-(Visuals and Display Devices chapter)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXmu/sun-src/man/XSolarisCheckColormapEquivalence.3xmu	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,98 @@
+.\"
+.\" Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
+.TH XSolarisCheckColormapEquivalence 3Xmu "29 Aug 2011" "X Version 11" "XLIB FUNCTIONS"
+.SH NAME
+XSolarisCheckColormapEquivalence \- determines if two visuals are colormap
+equivalent
+.SH SYNOPSIS
+.LP
+#include <X11/Xmu/XmuSolaris.h>
+.LP
+Bool XSolarisCheckColormapEquivalence\^(
+.br
+      Display *\fIdisplay\f1\^,
+.br
+      int \fIscreen\f1\^,
+.br
+      Visual *\fIvisual1\f1\^,
+.br
+      Visual *\fIvisual2\f1\^);
+.LP
+.SH ARGUMENTS
+.IP \fIdisplay\f1 1i
+Specifies the connection to the X server. 
+.IP \fIscreen\f1 1i
+An integer specifying the screen on which the visuals are to be searched. 
+.IP \fIvisual1\f1 1i
+Specifies the first visual type supported on the screen.
+If the visual type is not one supported by the screen, 
+a
+.B BadMatch
+error results. 
+.IP \fIvisual2\f1 1i
+Specifies the second visual type supported on the screen.
+If the visual type is not one supported by the screen, 
+a
+.B BadMatch
+error results. 
+.SH DESCRIPTION
+This function returns True if the two Visuals are Colormap Equivalent,
+otherwise it returns False.
+.LP
+Colormap Equivalence is a minor relaxation of the X protocol supported by the
+.BR Xsun (1)
+X server on Solaris 10 and earlier releases.
+Two Visuals are Colormap Equivalent if it is possible
+to use a Colormap created with one of the Visuals as the Colormap of a Window 
+in the other Visual. This is useful on a system that supports Visuals that
+differ only in their OpenGL (GLX) Attributes.
+.LP
+For example, to avoid colormap flashing, when creating a window with
+a Visual that is in the same depth as the RootWindow, use the Default Colormap.
+In standard X, this is only possible if the Visual is the DefaultVisual. 
+With Colormap Equivalence the requirement is relaxed.
+.LP
+To use this function, an application should link with libXmu.
+.SH EXAMPLES
+.nh
+You may be able to avoid creating a new colormap by using the following code:
+.LP
+.RS
+.ft B
+.nf
+        if (!XSolarisCheckColormapEquivalence(dpy, screen, 
+	                      vi->visual, DefaultVisual(dpy, screen)) {
+            attributes.colormap = XCreateColormap(dpy, root,
+                                vi->visual, AllocNone);
+            valuemask = CWColormap;
+        }
+        window = XCreateWindow(dpy, root, 0, 0, 500, 500, 0,
+                        vi->depth, CopyFromParent, vi->visual,
+                        valuemask, &attributes);
+.fi
+.ft
+.RE
+.SH SEE ALSO
+.BR XCreateWindow (3X11),
+.BR glXGetConfig (3gl).
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXmu/sun-src/man/XSolarisGetVisualGamma.3xmu	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,109 @@
+.\"
+.\" Copyright (c) 1994, 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.
+.\"
+.TH XSolarisGetVisualGamma 3Xmu "11 Jan 2008" "X Version 11" "XLIB FUNCTIONS"
+.SH NAME
+XSolarisGetVisualGamma \- obtain gamma information for a visual
+.SH SYNOPSIS
+.LP
+#include <X11/Xmu/XmuSolaris.h>
+.LP
+Status
+.br
+XSolarisGetVisualGamma\^(\^Display *\fIdisplay\f1, int \fIscreen_number\f1, 
+.br
+.in +1.75i
+Visual *\fIvisual\f1, double *\fIgamma\f1\^);
+.in -1.75i
+.SH ARGUMENTS
+.IP \fIdisplay\f1 1i
+Specifies the connection to the X server.
+.IP \fIscreen_number\f1 1i
+Specifies the number of the screen.
+.IP \fIvisual\f1 1i
+Specifies the visual.
+.IP \fIgamma\f1 1i
+Returns the gamma value for the specified visual.
+.SH DESCRIPTION
+The
+.B XSolarisGetVisualGamma
+function returns the gamma value of a specified visual.  This value is
+the exponent of the power function describing the intensity response
+of colors displayed using that visual.  This is the intensity response
+of the entire path from the frame buffer pixel store through the
+monitor.  The equation of the intensity response is:
+.PP
+.in +0.5i
+\fIIntensityOut\f1 = (\fIFramebufferColor\f1)**\fIgamma\f1
+.in -0.5i
+.PP
+(i.e. the color in the frame buffer raised to the power of gamma).
+.LP
+\fIFramebufferColor\f1 refers to the the RGB values stored in the frame buffer
+pixel store and processed by any color mapping LUTs that are in the output path.
+.LP
+Gamma correction is necessary because of the way color intensities are
+perceived by the human eye.  Without gamma correction, the eye
+interprets changes to the color intensity incorrectly.  Small changes
+to low intensity light appear to have more effect than the equivalent
+change to higher intensity light.  This distorts the appearance of
+graphical entities which depend on accurate color, such as images,
+anti-aliased lines and transparent polygons.
+.LP
+Gamma correction results in a linear mapping between color values and
+percieved intensity.  Gamma corrected visuals are also called linear
+visuals for this reason.  Linear visuals have a gamma value of 1.0.
+.LP
+Note: the term "gamma" used here refers the mapping applied along the entire
+path (that is, the value percieved by the end user), not merely the exponent
+of the gamma correction function.
+.LP
+The gamma value returned defines the color-to-intensity mapping for all
+three channels: red, green, and blue.
+.LP
+A status of \f3Success\f1
+is returned if the function was able to determine the gamma successfully.
+If a request failure occured while calling the function, a \f3BadAccess \f1
+error code is returned.  If there is an internal inconsistency (e.g. the gamma 
+value for one of the color channels is different from the others) a 
+\f3BadMatch\f1 error code is returned.  Whenever an error code is returned, 
+the argument \fIgamma\f1 is left untouched.
+.LP
+The gamma value returned represents the best information available on the
+intensity response of the visual.  Depending on the device, it may or may
+not include the actual monitor characteristics (some devices have no way
+of determining the type of monitor so they may assume a default monitor
+gamma).  As such, it represents the system's "best guess" about the intensity
+response.  Since this function gets its information from the same property
+used by Solaris color managment systems, if more accurate information on the 
+monitor response is configured or calibrated through these systems,
+this function will return a more accurate value for gamma.
+.LP
+If the intensity mapping is not a power function, the returned gamma value
+may only be approximate.  This should usually happen only when the device
+gamma correction has been incorrectly configured.
+.LP
+To use this function, an application should link with \f3libXmu\f1.
+.SH SEE ALSO
+.TZ OWPG
+.br
+(Visuals and Display Devices chapter)

--- a/open-src/lib/libXpm/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libXpm/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # libXpm - library for handling XPM format images
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -45,10 +45,20 @@
 # Library name
 LIBNAME=Xpm
 
+# Merge in additional sources from sun-src directory
+ADDITIONAL_SOURCE_DIR=sun-src
+
 # man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/cxpm.man man/sxpm.man
+SUNTOUCHED_MANPAGES=man/cxpm.man man/sxpm.man man/libXpm.3lib
 MODULE_STABILITY=Uncommitted
+MODULE_MTLEVEL=Unsafe
+MODULE_MTLEVEL_SET=yes
 LIB_MAN_SUFFIX=3
+# Don't want to add MT-Level & -l flags to cxpm & sxpm command man pages
+OVERRIDE_LIB_SUNTOUCH_DEFAULT=yes
+# But do want to add them to the libXpm man page
+MODULE_SUNTOUCH_MAN_FLAGS= $(SUNTOUCH_MAN_FLAGS_$(@F:%.$(FIXED_MAN_SUFFIX)=%))
+SUNTOUCH_MAN_FLAGS_libXpm.3lib = $(LIB_SUNTOUCH_DEFAULTS)
 
 # Link shared library with version mapfile
 MODULE_LD_SHARED_OPTIONS = -M $(PWD)/mapfile-vers
@@ -75,14 +85,22 @@
 
 include ../Makefile.inc
 
+3LIB_MAN_DIR = $(X11_MAN_DIR)/man3lib
+
 install-docs: $(PROTODIR)$(MODULE_DOC_DIR)/xpm.ps
+install-docs: $(PROTODIR)$(3LIB_MAN_DIR)/libXpm.3lib
 
 $(PROTODIR)$(MODULE_DOC_DIR)/xpm.ps: $(INSTALL_DEPS) $(PROTODIR)$(MODULE_DOC_DIR)
 	-rm -f $@
 	gzcat $(SOURCE_DIR)/doc/xpm.PS.gz > $@
 
+$(PROTODIR)$(3LIB_MAN_DIR)/libXpm.3lib: $(INSTALL_DEPS) $(PROTODIR)$(3LIB_MAN_DIR)
+	ginstall -m 0444 $(SOURCE_DIR)/man/libXpm.3lib $@
+
 PO_FILES = $(SOURCE_DIR)/cxpm/cxpm.po $(SOURCE_DIR)/sxpm/sxpm.po
 
-install-po: $(INSTALL_DEPS)
-	mkdir -p $(PROTODIR)$(X11_LC_MESSAGES_DIR)
-	$(INSTALL_SCRIPT) -m 0444 $(PO_FILES) $(PROTODIR)$(X11_LC_MESSAGES_DIR)
+install-po: $(INSTALL_DEPS) $(PROTODIR)$(X11_LC_MESSAGES_DIR)
+	ginstall -m 0444 $(PO_FILES) $(PROTODIR)$(X11_LC_MESSAGES_DIR)
+
+$(PROTODIR)$(3LIB_MAN_DIR) $(PROTODIR)$(X11_LC_MESSAGES_DIR):
+	mkdir -p $@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXpm/sun-src/man/libXpm.3lib	Tue May 06 18:40:28 2014 -0700
@@ -0,0 +1,56 @@
+'\" t
+.\"
+.\" Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" 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.
+.\"
+.TH libXpm 3LIB "2 May 2014" __xorgversion__
+.SH NAME
+libXpm \- X Pixmap (XPM) image file format library
+.SH SYNOPSIS
+.LP
+.nf
+#include <X11/xpm.h>
+
+.SH DESCRIPTION
+.LP
+.B libXpm
+provides functions to read, write, and display images in the X Pixmap (XPM)
+format.
+.LP
+Documentation of the libXpm API may be found in the XPM Manual, delivered
+in
+.BR /usr/share/doc/libXpm/xpm.ps .
+
+.SH FILES
+.TP 30
+.B /usr/lib/libXpm.so.4
+32-bit shared object
+.TP 30
+.B /usr/lib/64/libXpm.so.4
+64-bit shared object
+.TP 30
+.B /usr/share/doc/libXpm/xpm.ps
+XPM Manual
+
+.SH SEE ALSO
+.LP
+.BR cxpm (1),
+.BR sxpm (1)

--- a/open-src/lib/libdmx/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libdmx/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # Xlib-based client library for Distributed Multihead X (DMX) extension
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,6 +48,7 @@
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
 MODULE_STABILITY=Volatile
+LIB_MAN_SUFFIX=3dmx
 
 # pkg-config files to update
 FIX_PC_FILES=dmx.pc.in

--- a/open-src/lib/libdrm/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libdrm/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -71,8 +71,12 @@
 
 # Man pages to apply Sun footer to & attributes to list
 #SUNTOUCHED_MANPAGES=*.man
-#MODULE_STABILITY=Volatile
-#LIB_MAN_SUFFIX=3drm
+MODULE_STABILITY = Volatile
+LIB_MAN_SUFFIX = 3
+MODULE_MTLEVEL=Unknown
+MODULE_MTLEVEL_SET=yes
+MODULE_PKGCONFIG_MAN=libdrm
+MODULE_PKGCONFIG_MAN_SET=yes
 
 # pkg-config files that need to be updated
 FIX_PC_FILES=libdrm.pc.in intel/libdrm_intel.pc.in libkms/libkms.pc.in \
@@ -99,10 +103,18 @@
 MOVED_PC_FILES = $(PC_FILES:%=$(PROTODIR)/$(PKGCONFIG_DIR)/%)
 XSERVER_PC_DIR = $(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)/pkgconfig
 
-install-gen: $(MOVED_PC_FILES)
+install-gen: $(MOVED_PC_FILES) install_fixed_manpages
 
 $(PROTODIR)/$(PKGCONFIG_DIR)/%.pc: $(PROTODIR)/$(XSERVER_PC_DIR)/%.pc
 	-rm -f $@
 	mv $< $@
 
 $(PC_FILES:%=$(PROTODIR)/$(XSERVER_PC_DIR)/%): default_install
+
+# Need to apply suntouch changes to man pages generated during build
+MANDIR = $(PROTODIR)$(X11_MAN_DIR)
+install_fixed_manpages: default_install
+	$(PERL) $(TOP)/open-src/common/suntouch-manpages.pl \
+		$(SUNTOUCH_MAN_FLAGS) $(SOURCE_DIR)/man/*.{3,7}
+	ginstall -m 0444 $(SOURCE_DIR)/man/*.3 $(MANDIR)/man3
+	ginstall -m 0444 $(SOURCE_DIR)/man/*.7 $(MANDIR)/man7

--- a/open-src/lib/libxcb/16702043.patch	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libxcb/16702043.patch	Tue May 06 18:40:28 2014 -0700
@@ -57,8 +57,8 @@
  
 -STATIC_MANS = man/xcb-examples.3 man/xcb-requests.3
 -BUILT_MANS = man/xcb_*.3
-+STATIC_MANS = 
-+BUILT_MANS = man/xcb_*.3xcb
++STATIC_MANS = # handled in Solaris Makefile
++BUILT_MANS = # handled in Solaris Makefile
  man_MANS = $(STATIC_MANS) $(BUILT_MANS)
  EXTRA_DIST = $(STATIC_MANS)
  

--- a/open-src/lib/libxcb/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/lib/libxcb/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # xcb - Lighter weight X11 client libraries
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -54,8 +54,10 @@
 LIBNAME=xcb
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=src/man/*
+SUNTOUCHED_MANPAGES= src/man/xcb-examples.3 src/man/xcb-requests.3
 MODULE_STABILITY=Volatile
+MODULE_MTLEVEL=Safe
+MODULE_MTLEVEL_SET=yes
 LIB_MAN_SUFFIX=3xcb
 
 MODULE_LD_OPTIONS = $(ZDISCARD_UNUSED_DEP) -lc
@@ -103,10 +105,15 @@
 include ../Makefile.inc
 
 # Additional files we need to install
-CP = cp -pf
 MANDIR = $(PROTODIR)$(X11_MAN_DIR)/man3xcb
 
+# Need to apply suntouch changes to man pages generated during build
 install_solaris_exts: $(INSTALL_DEPS)
+	$(PERL) $(TOP)/open-src/common/suntouch-manpages.pl \
+		$(SUNTOUCH_MAN_FLAGS) $(SOURCE_DIR)/src/man/*.3xcb
 	mkdir -p $(MANDIR)
-	$(CP) $(SOURCE_DIR)/src/man/xcb-examples.3 $(MANDIR)/xcb-examples.3xcb
-	$(CP) $(SOURCE_DIR)/src/man/xcb-requests.3 $(MANDIR)/xcb-requests.3xcb
+	ginstall -m 0444 $(SOURCE_DIR)/src/man/xcb-examples.3 \
+		$(MANDIR)/xcb-examples.3xcb
+	ginstall -m 0444 $(SOURCE_DIR)/src/man/xcb-requests.3 \
+		$(MANDIR)/xcb-requests.3xcb
+	ginstall -m 0444 $(SOURCE_DIR)/src/man/*.3xcb $(MANDIR)/

--- a/open-src/xserver/xorg/Makefile	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/xserver/xorg/Makefile	Tue May 06 18:40:28 2014 -0700
@@ -2,7 +2,7 @@
 #
 # Xorg server Makefile
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -90,7 +90,13 @@
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES= \
 	man/Xserver.man \
+	hw/dmx/config/man/xdmxconfig.man \
+	hw/dmx/config/man/vdltodmx.man \
+	hw/dmx/config/man/dmxtodmx.man \
+	hw/dmx/man/Xdmx.man \
 	hw/kdrive/ephyr/man/Xephyr.man \
+	hw/xfree86/exa/man/exa.man \
+	hw/xfree86/fbdevhw/man/fbdevhw.man \
 	hw/xfree86/utils/man/cvt.man \
 	hw/xfree86/utils/man/gtf.man \
 	hw/xfree86/man/Xorg.man \
@@ -108,6 +114,9 @@
 SUNTOUCH_MAN_FLAGS_Xvfb = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xvfb)}'
 SUNTOUCH_MAN_FLAGS_Xdmx = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xdmx)}'
 SUNTOUCH_MAN_FLAGS_Xserver = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xserver-common)}'
+SUNTOUCH_MAN_FLAGS_xdmxconfig = $(SUNTOUCH_MAN_FLAGS_Xdmx)
+SUNTOUCH_MAN_FLAGS_vdltodmx = $(SUNTOUCH_MAN_FLAGS_Xdmx)
+SUNTOUCH_MAN_FLAGS_dmxtodmx = $(SUNTOUCH_MAN_FLAGS_Xdmx)
 
 # Binary built in tree
 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg

--- a/open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgconfig.1	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgconfig.1	Tue May 06 18:40:28 2014 -0700
@@ -1,5 +1,6 @@
+'\" t
 .\"
-.\" Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -21,7 +22,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\"
-.TH xorgconfig 1 "24 Jun 2009"
+.TH xorgconfig 1 "2 May 2014"
 .SH NAME
 .PP
 xorgconfig, xorgcfg \- generate an xorg.conf file
@@ -47,7 +48,7 @@
 data it generates automatically is logged in /var/log/Xorg.0.log
 and may be copied to an xorg.conf file for customization.
 .IP " * "
-/usr/X11/bin/Xorg -configure, when the server is not already running,
+/usr/bin/Xorg -configure, when the server is not already running,
 will provide a sample configuration file for the currently detected
 hardware in the system.
 .IP " * "
@@ -71,6 +72,18 @@
 .SH FILES
 .IP /etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi
 Default system configuration for input devices
+.SH "ATTRIBUTES"
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+.TS
+allbox;
+cw(2.750000i)| cw(2.750000i)
+lw(2.750000i)| lw(2.750000i).
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
+Availability	None
+Interface Stability	Obsolete
+.TE
+.sp
 .SH "SEE ALSO"
 .IR Xorg (1),
 .IR xorg.conf (4),

--- a/open-src/xserver/xserver-common/Xnest.1	Tue May 06 17:30:25 2014 -0700
+++ b/open-src/xserver/xserver-common/Xnest.1	Tue May 06 18:40:28 2014 -0700
@@ -1,5 +1,6 @@
+'\" t
 .\"
-.\" Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -21,7 +22,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\"
-.TH Xnest 1 "24 Jun 2009"
+.TH Xnest 1 "5 May 2014"
 .SH NAME
 .PP
 Xnest \- a nested X server
@@ -54,6 +55,18 @@
 than the older Xnest server did, and avoid several limitations of the Xnest
 server that were due to Xnest's reliance on passing most requests through to
 the underlying server.
+.SH "ATTRIBUTES"
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+.TS
+allbox;
+cw(2.750000i)| cw(2.750000i)
+lw(2.750000i)| lw(2.750000i).
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
+Availability	None
+Interface Stability	Obsolete
+.TE
+.sp
 .SH "SEE ALSO"
 .IR Xephyr (1),
 .IR Xvnc (1),

--- a/pkg/manifests/x11-documentation-xorg-docs.p5m	Tue May 06 17:30:25 2014 -0700
+++ b/pkg/manifests/x11-documentation-xorg-docs.p5m	Tue May 06 18:40:28 2014 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -67,7 +67,6 @@
 file path=usr/share/man/man5/X11.5
 file path=usr/share/man/man5/XOrgFoundation.5
 file path=usr/share/man/man5/XStandards.5
-file path=usr/share/man/man5/Xprint.5
 file path=usr/share/man/man5/Xsecurity.5
 file path=usr/share/pkgconfig/xorg-sgml-doctools.pc
 dir  path=usr/share/sgml/X11

--- a/pkg/manifests/x11-library-libdmx.p5m	Tue May 06 17:30:25 2014 -0700
+++ b/pkg/manifests/x11-library-libdmx.p5m	Tue May 06 18:40:28 2014 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,21 +31,22 @@
 link path=usr/lib/libdmx.so target=libdmx.so.1
 file path=usr/lib/libdmx.so.1
 file path=usr/lib/pkgconfig/dmx.pc
-file path=usr/share/man/man3/DMX.3
-file path=usr/share/man/man3/DMXAddInput.3
-file path=usr/share/man/man3/DMXAddScreen.3
-file path=usr/share/man/man3/DMXChangeDesktopAttributes.3
-file path=usr/share/man/man3/DMXChangeScreensAttributes.3
-file path=usr/share/man/man3/DMXForceWindowCreation.3
-file path=usr/share/man/man3/DMXGetDesktopAttributes.3
-file path=usr/share/man/man3/DMXGetInputAttributes.3
-file path=usr/share/man/man3/DMXGetInputCount.3
-file path=usr/share/man/man3/DMXGetScreenAttributes.3
-file path=usr/share/man/man3/DMXGetScreenCount.3
-file path=usr/share/man/man3/DMXGetWindowAttributes.3
-file path=usr/share/man/man3/DMXQueryExtension.3
-file path=usr/share/man/man3/DMXQueryVersion.3
-file path=usr/share/man/man3/DMXRemoveInput.3
-file path=usr/share/man/man3/DMXRemoveScreen.3
-file path=usr/share/man/man3/DMXSync.3
+dir  path=usr/share/man/man3dmx
+file path=usr/share/man/man3dmx/DMX.3dmx
+file path=usr/share/man/man3dmx/DMXAddInput.3dmx
+file path=usr/share/man/man3dmx/DMXAddScreen.3dmx
+file path=usr/share/man/man3dmx/DMXChangeDesktopAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXChangeScreensAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXForceWindowCreation.3dmx
+file path=usr/share/man/man3dmx/DMXGetDesktopAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXGetInputAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXGetInputCount.3dmx
+file path=usr/share/man/man3dmx/DMXGetScreenAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXGetScreenCount.3dmx
+file path=usr/share/man/man3dmx/DMXGetWindowAttributes.3dmx
+file path=usr/share/man/man3dmx/DMXQueryExtension.3dmx
+file path=usr/share/man/man3dmx/DMXQueryVersion.3dmx
+file path=usr/share/man/man3dmx/DMXRemoveInput.3dmx
+file path=usr/share/man/man3dmx/DMXRemoveScreen.3dmx
+file path=usr/share/man/man3dmx/DMXSync.3dmx
 

--- a/pkg/manifests/x11-library-libxpm.p5m	Tue May 06 17:30:25 2014 -0700
+++ b/pkg/manifests/x11-library-libxpm.p5m	Tue May 06 18:40:28 2014 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -46,4 +46,5 @@
 file path=usr/share/locale/C/LC_MESSAGES/sxpm.po
 file path=usr/share/man/man1/cxpm.1
 file path=usr/share/man/man1/sxpm.1
+file path=usr/share/man/man3lib/libXpm.3lib
 depend type=require fmri=pkg:/x11/header/x11-protocols facet.devel=true