--- a/open-src/app/mesa-demos/Makefile	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/app/mesa-demos/Makefile	Thu Apr 06 22:27:29 2017 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, 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,11 @@
 GIT_URL=$(FDO_GIT_URL)/mesa/demos
 GIT_URL_SET=yes
 
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES= man/glxgears.1 man/glxinfo.1
+MODULE_STABILITY= Volatile
+MODULE_SUNTOUCH_MAN_FLAGS = -r '{__xorgversion__, "$(MODULE_NAME) $(MODULE_VERSION)"}'
+
 # Binaries built in tree
 DEMOS_DIR=$(BUILD_DIR)/src/xdemos
 GLXGEARS_BIN=$(DEMOS_DIR)/glxgears
@@ -110,10 +115,20 @@
 
 install_demos: $(INSTALL_DEPS)
 	mkdir -p $(DESTDIR)$(MODULE_BIN_DIR)$(BINSUBDIR)
-	cp -pf $(GLXGEARS_BIN) $(GLXINFO_BIN) $(DESTDIR)$(MODULE_BIN_DIR)$(BINSUBDIR)
+	$(INSTALL_SCRIPT) -m 0755 $(GLXGEARS_BIN) $(GLXINFO_BIN) \
+		$(DESTDIR)$(MODULE_BIN_DIR)$(BINSUBDIR)
+
+FIXED_MAN_PAGES = $(SUNTOUCHED_MANPAGES:%=$(SOURCE_DIR)/%)
+
+$(SOURCE_ADD_TARGET): $(FIXED_MAN_PAGES)
 
-install_man: 
+$(SOURCE_DIR)/man/%: $(SOURCE_DIR)/man
+	ln -sf ../../$(@F) $@
+
+$(SOURCE_DIR)/man: $(SOURCE_INIT_TARGET)
+	mkdir -p $@
+
+install_man: $(FIXED_MAN_TARGET)
 	mkdir -p $(DESTDIR)$(MODULE_MAN_DIR)/man1
-	cp -pf glxgears.1 glxinfo.1 $(DESTDIR)$(MODULE_MAN_DIR)/man1
-
-
+	$(INSTALL_SCRIPT) -m 0444 $(FIXED_MAN_PAGES) \
+		$(DESTDIR)$(MODULE_MAN_DIR)/man1

--- a/open-src/app/mesa-demos/glxgears.1	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/app/mesa-demos/glxgears.1	Thu Apr 06 22:27:29 2017 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\" Manual page created by The XFree86 Project, under this license:
 .\"
 .\" Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
@@ -26,7 +25,7 @@
 .\" dealings in this Software without prior written authorization from the 
 .\" XFree86 Project.
 .\"
-.TH GLXGEARS 1 Version\ 6.9.0 X.Org
+.TH GLXGEARS 1 __xorgversion__
 .SH NAME
 glxgears \- GLX version of the infamous "gears" GL demo.
 .SH SYNOPSIS
@@ -54,21 +53,3 @@
 glxinfo(1)
 .SH AUTHOR
 Ported to straight GLX by Brian Paul.
-.\" Begin Sun update
-.\"
-
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability 	pkg:/x11/demo/mesa-demos
-Interface Stability 	Volatile 
-.TE 
-.\" End Sun update

--- a/open-src/app/mesa-demos/glxinfo.1	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/app/mesa-demos/glxinfo.1	Thu Apr 06 22:27:29 2017 -0700
@@ -1,5 +1,3 @@
-'\" t
-.\"
 .\" Manual page created by The XFree86 Project, under this license:
 .\"
 .\" Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
@@ -29,7 +27,7 @@
 .\"
 .\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.5 2001/12/14 20:00:47 dawes Exp $
 .\"
-.TH GLXINFO 1 Version\ 6.9.0 X.Org
+.TH GLXINFO 1 __xorgversion__
 .SH NAME
 glxinfo \- display info about a GLX extension and OpenGL renderer.
 .SH SYNOPSIS
@@ -81,21 +79,3 @@
 Brian Paul
 .br
 Modifications for XFree86 added by Mark Paton
-.\" Begin Sun update
-.\"
-
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability 	pkg:/x11/demo/mesa-demos
-Interface Stability 	Volatile 
-.TE 
-.\" End Sun update

--- a/open-src/app/xfs/Makefile	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/app/xfs/Makefile	Thu Apr 06 22:27:29 2017 -0700
@@ -2,7 +2,7 @@
 #
 # xfs - X11 font server
 #
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2017, 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,7 +41,7 @@
 SOURCE_PATCHES += config-warning.patch
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/xfs.man
+SUNTOUCHED_MANPAGES=man/xfs.man man/fsadmin.1
 MODULE_STABILITY=Committed
 
 # pkg(5) name we deliver the files in (override default)
@@ -89,11 +89,17 @@
 	mkdir -p $(PROTODIR)$(X11_SMF_MANIFEST_DIR)
 	$(INSTALL_SCRIPT) -m 0444 xfs.xml $(PROTODIR)$(X11_SMF_MANIFEST_DIR)
 
-install_fsadmin:
+$(SOURCE_ADD_TARGET): $(SOURCE_DIR)/man/fsadmin.1
+
+$(SOURCE_DIR)/man/fsadmin.1: $(SOURCE_INIT_TARGET)
+	ln -sf ../../fsadmin.1 $@
+
+install_fsadmin: $(FIXED_MAN_TARGET)
 	mkdir -p $(PROTODIR)$(MODULE_SBIN_DIR) \
 		$(PROTODIR)$(MODULE_MAN_DIR)/man1
 	$(INSTALL_SCRIPT) -m 0755 fsadmin $(PROTODIR)$(MODULE_SBIN_DIR)/fsadmin
-	$(INSTALL_SCRIPT) -m 0444 fsadmin.1 $(PROTODIR)$(MODULE_MAN_DIR)/man1/
+	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/man/fsadmin.1 \
+		$(PROTODIR)$(MODULE_MAN_DIR)/man1/
 
 # Special compatibility link from /usr/X11/bin/fsadmin to /usr/sbin/fsadmin
 install: $(X11_BINCOMPAT_DIR)/fsadmin

--- a/open-src/app/xfs/fsadmin.1	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/app/xfs/fsadmin.1	Thu Apr 06 22:27:29 2017 -0700
@@ -1,7 +1,6 @@
-'\" te
 .\"
-.\" "Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved.
-.\" 
+.\" "Copyright (c) 1994, 2017, 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
@@ -11,7 +10,7 @@
 .\" copyright notice(s) and this permission notice appear in all copies of
 .\" the Software and that both the above copyright notice(s) and this
 .\" permission notice appear in supporting documentation.
-.\" 
+.\"
 .\" 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
@@ -21,13 +20,13 @@
 .\" 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.
-.\" 
+.\"
 .\" Except as contained in this notice, the name of a copyright holder
 .\" shall not be used in advertising or otherwise to promote the sale, use
 .\" or other dealings in this Software without prior written authorization
 .\" of the copyright holder.
 .\"
-.TH fsadmin 1 "2 May 2014"
+.TH fsadmin 1 "5 Apr 2017"
 .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
@@ -36,7 +35,7 @@
 .PP
 .B /usr/sbin/fsadmin
 [
-.B \-e 
+.B \-e
 |
 .B \-d
 |
@@ -47,16 +46,16 @@
 .B fsadmin
 is a font server administration utility.
 .B fsadmin
-allows users to control whether or not the X11 font server, \fBxfs\fR(1), is 
+allows users to control whether or not the X11 font server, \fBxfs\fR(1), is
 started automatically by
-.BR inetd (1M).
+.BR inetd (8).
 If no options are present
 .B fsadmin
 will display the current status of the font server.
 .SH OPTIONS
 .TP 8
 .B \-e
-enable: configure 
+enable: configure
 .B inetd
 to start the font server automatically
 .TP 8
@@ -66,40 +65,27 @@
 to not start the font server automatically
 .TP 8
 .B \-usage
-display list of options for 
+display list of options for
 .B fsadmin
 .SH "NOTES"
 .PP
-The \fBxfs\fR service is managed by the service management facility, 
-\fBsmf\fR(5), under the service identifier:
+The \fBxfs\fR service is managed by the service management facility,
+\fBsmf\fR(7), under the service identifier:
 .PP
 .nf
 svc:/application/x11/xfs
 .fi
 .PP
-Administrative actions on this service, such as enabling, disabling, or 
-requesting restart, can be performed using \fBsvcadm\fR(1M)\&. Responsibility 
-for initiating and restarting this service is delegated to \fBinetd\fR(1M)\&.
-Use \fBinetadm\fR(1M) to make configuration changes and to view configuration 
-information for this service\&. The service\&'s status can be queried using 
+Administrative actions on this service, such as enabling, disabling, or
+requesting restart, can be performed using \fBsvcadm\fR(8)\&. Responsibility
+for initiating and restarting this service is delegated to \fBinetd\fR(8)\&.
+Use \fBinetadm\fR(8) to make configuration changes and to view configuration
+information for this service\&. The service\&'s status can be queried using
 the \fBsvcs\fR(1) command\&.
-.SH "ATTRIBUTES"
-.PP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-.TS
-tab(^) allbox;
-cw(2.750000i)| cw(2.750000i)
-lw(2.750000i)| lw(2.750000i).
-ATTRIBUTE TYPE^ATTRIBUTE VALUE
-Availability^x11/xfs
-Interface Stability^Committed
-.TE
-.sp
 .SH SEE ALSO
 .PP
 .BR xfs (1),
-.BR inetadm (1M),
-.BR inetd (1M),
-.BR smf (5),
-.BR X11 (5)
+.BR inetadm (8),
+.BR inetd (8),
+.BR smf (7),
+.BR X11 (7)

--- a/open-src/lib/fontconfig/libfontconfig.3lib	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/lib/fontconfig/libfontconfig.3lib	Thu Apr 06 22:27:29 2017 -0700
@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2003, 2017, 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"),
@@ -23,7 +23,7 @@
 .\"
 .\" This man page created by Sun to document stability level & license
 .\"
-.TH libfontconfig 3lib "2 Jul 2010"
+.TH libfontconfig 3lib "5 Apr 2017"
 .SH NAME
 libfontconfig \- font configuration API
 .SH SYNOPSIS
@@ -155,7 +155,7 @@
 .PD
 .SH ATTRIBUTES
 See
-.BR attributes (5)
+.BR attributes (7)
 for descriptions of the following attributes:
 .sp
 .TS

--- a/open-src/lib/libXaw/libXaw.3lib	Sat Mar 18 12:58:26 2017 -0700
+++ b/open-src/lib/libXaw/libXaw.3lib	Thu Apr 06 22:27:29 2017 -0700
@@ -1,6 +1,6 @@
 '\" t
 .\"
-.\" Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2012, 2017, 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"),
@@ -22,7 +22,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\"
-.TH libXaw 3lib "13 Feb 2015" "X Version 11"
+.TH libXaw 3lib "5 Apr 2017" "X Version 11"
 .SH NAME
 libXaw \- X Athena Widgets
 .SH DESCRIPTION
@@ -57,7 +57,7 @@
 library.
 
 .SH "ATTRIBUTES"
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .TS
 allbox;
@@ -77,9 +77,9 @@
 
 .SH NOTES
 libXaw is provided for the benefit of existing software written to use
-this library.  For writing new software, it is recommended that a
+this library.  For writing new software, it is strongly recommended that a
 modern toolkit, such as
-.BR libgtk-x11-2.0 "(3), " 
+.BR libgtk-3 "(3lib), "
 is used instead, to provide required features such as full
 internationalization and accessibility support, antialiased text,
 modern rendering engines, and better integration with the desktop.