--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cdrtools/patches/fix-man-page.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -0,0 +1,24 @@
+Adjust references to magic(4) to be magic(5) in the mkisofs/mkisofs.8 man page.
+
+This patch should be sent upstream.
+
+--- cdrtools-3.01/mkisofs/mkisofs.8.orig	2016-04-20 07:34:14.517901344 -0700
++++ cdrtools-3.01/mkisofs/mkisofs.8	2016-04-20 07:35:06.243987484 -0700
+@@ -2674,7 +2674,7 @@
+ The format of the
+ .I magic
+ file is almost identical to the
+-.BR magic (4)
++.BR magic (5)
+ file used by the Linux
+ .BR file (1)
+ command - the routines for reading and decoding the
+@@ -2713,7 +2713,7 @@
+ .TE
+ .PP
+ The format of the file is described in the
+-.BR magic (4)
++.BR magic (5)
+ man page. The only difference here is that for each entry in the magic file, the
+ .I message
+ for the initial offset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cups/patches/fix-cups-lpd-man-page.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -0,0 +1,15 @@
+Adjust reference to inetconv(1M) to be inetconv(8) in the cups-lpd.8 man page.
+
+This patch should be sent upstream.
+
+--- man/cups-lpd.man.in.orig	2016-04-20 07:49:06.119469392 -0700
++++ man/cups-lpd.man.in	2016-04-20 07:49:28.518688055 -0700
+@@ -113,7 +113,7 @@
+ stray from this definition, remote status reporting to LPD
+ clients may be unreliable.
+ .SH SEE ALSO
+-\fIcups(1)\fR, \fIcupsd(8)\fR, \fIinetconv(1m)\fR,
++\fIcups(1)\fR, \fIcupsd(8)\fR, \fIinetconv(8)\fR,
+ \fIinetd(8)\fR, \fIxinetd(8)\fR,
+ .br
+ http://localhost:631/help

--- a/components/desktop/libgtkspell/files/libgtkspell.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/desktop/libgtkspell/files/libgtkspell.3	Wed Apr 20 19:46:50 2016 -0700
@@ -36,7 +36,7 @@
 .SH "SEE ALSO"
 .PP
 \fBenchant\fR(1),
-\fBattributes\fR(5),
+\fBattributes\fR(7),
 \fBgnome-interfaces\fR(5)
 .SH "NOTES"
 .PP

--- a/components/iftop/patches/02.iftop.8.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/iftop/patches/02.iftop.8.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -6,7 +6,7 @@
  
 +Solaris version of \fBiftop\fP support Solaris features like zone and vanity
 +naming. For example, you can specify the name of a renamed interface generated
-+by \fBdladm\fP(1M) for \fBiftop\fP.  Additionally \fBiftop\fP can also be
++by \fBdladm\fP(8) for \fBiftop\fP.  Additionally \fBiftop\fP can also be
 +executed in exclusive IP stack zones, for it only use IP interfaces, the
 +function and usage of \fBiftop\fP in exclusive IP stack zones are the same as
 +it in global zone. As the isolation feature of Solaris zones, you can not see

--- a/components/isc-dhcp/isc-dhcp.5	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/isc-dhcp/isc-dhcp.5	Wed Apr 20 19:46:50 2016 -0700
@@ -21,7 +21,7 @@
 .LP
 The services above (dhcpd and dhcrelay) are managed using the Service
 Management Facility (SMF) on Solaris, and should be administered by
-the svcadm(1M) command using  the following fault management resource
+the svcadm(8) command using  the following fault management resource
 identifiers (FMRIs):
 .sp
 .LP
@@ -35,7 +35,7 @@
 .sp
 .LP
 The following dhcpd service configuration properties can be viewed with
-svcprop(1M) and modified via svccfg(1M):
+svcprop(1) and modified via svccfg(8):
 .sp
 .ne 2
 .mk
@@ -94,8 +94,8 @@
 .sp
 .LP
 The following dhcrelay options are available as
-service configuration properties and can be viewed with svcprop(1M)
-and modified via svccfg(1M):
+service configuration properties and can be viewed with svcprop(1)
+and modified via svccfg(8):
 .sp
 .ne 2
 .mk
@@ -256,4 +256,4 @@
 .SH SEE ALSO
 .sp
 .LP
-svccfg(1M), svcprop(1), svcadm(1M), dhcpd(8), dhcrelay(8)
+svccfg(8), svcprop(1), svcadm(8), dhcpd(8), dhcrelay(8)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libpcap/patches/fix-man-page.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -0,0 +1,24 @@
+Adjust references to usermod(1M) to be usermod(8) in the pcap.3pcap man page.
+
+This patch should be sent upstream.
+
+--- libpcap-1.7.4/pcap.3pcap.in.orig	2016-04-20 08:29:21.594024650 -0700
++++ libpcap-1.7.4/pcap.3pcap.in	2016-04-20 08:29:44.364454401 -0700
+@@ -244,7 +244,7 @@
+ that privilege to the user's
+ .B defaultpriv
+ key with the
+-.B usermod (1M)
++.B usermod (8)
+ command.
+ .TP
+ .B Under HP-UX with DLPI:
+@@ -915,7 +915,7 @@
+ 1.0 APIs are available and use them only if they are.
+ .SH SEE ALSO
+ autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
+-usermod(1M)
++usermod(8)
+ .SH AUTHORS
+ The original authors of libpcap are:
+ .LP

--- a/components/libsigsegv/man3/sigsegv.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/libsigsegv/man3/sigsegv.3	Wed Apr 20 19:46:50 2016 -0700
@@ -182,4 +182,4 @@
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5), \fBsigsegv_install_handler, \fBsigsegv_deinstall_handler\fR(3), \fBsigsegv_init\fR(3), \fBsigsegv_register\fR(3), \fBsigsegv_unregister\fR(3), \fBsigsegv_dispatch\fR(3), \fBstackoverflow_install_handler\fR(3), \fBstackoverflow_deinstall_handler\fR(3)
+\fBattributes\fR(7), \fBsigsegv\fR(3), \fBstandards\fR(7), \fBsigsegv_install_handler, \fBsigsegv_deinstall_handler\fR(3), \fBsigsegv_init\fR(3), \fBsigsegv_register\fR(3), \fBsigsegv_unregister\fR(3), \fBsigsegv_dispatch\fR(3), \fBstackoverflow_install_handler\fR(3), \fBstackoverflow_deinstall_handler\fR(3)

--- a/components/libsigsegv/man3/sigsegv_install_handler.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/libsigsegv/man3/sigsegv_install_handler.3	Wed Apr 20 19:46:50 2016 -0700
@@ -72,4 +72,4 @@
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
+\fBattributes\fR(7), \fBsigsegv\fR(3), \fBstandards\fR(7)

--- a/components/libsigsegv/man3/sigsegv_register.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/libsigsegv/man3/sigsegv_register.3	Wed Apr 20 19:46:50 2016 -0700
@@ -99,4 +99,4 @@
 .SH SEE ALSO
 .sp
 .LP
-\fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
+\fBattributes\fR(7), \fBsigsegv\fR(3), \fBstandards\fR(7)

--- a/components/libsigsegv/man3/stackoverflow_install_handler.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/libsigsegv/man3/stackoverflow_install_handler.3	Wed Apr 20 19:46:50 2016 -0700
@@ -73,4 +73,4 @@
 .SH SEE ALSO
 .sp
 .LP
-\fattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
+\fBattributes\fR(7), \fBsigsegv\fR(3), \fBstandards\fR(7)

--- a/components/mrtg/Solaris/mrtg-traffic-sum.1	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/mrtg/Solaris/mrtg-traffic-sum.1	Wed Apr 20 19:46:50 2016 -0700
@@ -57,7 +57,7 @@
 Tobias Oetiker <[email protected]>
 .SH ATTRIBUTES
 .sp
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .TS
 tab() box;
@@ -70,7 +70,7 @@
 _
 Interface StabilityUncommitted
 _
-StandardSee \fBstandards\fR(5).
+StandardSee \fBstandards\fR(7).
 .TE
 
 .SH SEE ALSO

--- a/components/mrtg/Solaris/rateup.1	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/mrtg/Solaris/rateup.1	Wed Apr 20 19:46:50 2016 -0700
@@ -63,7 +63,7 @@
 Dave Rand <[email protected]>, Alexandre Steinberg <[email protected]>
 .SH ATTRIBUTES
 .sp
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .TS
 tab() box;
@@ -76,7 +76,7 @@
 _
 Interface StabilityUncommitted
 _
-StandardSee \fBstandards\fR(5).
+StandardSee \fBstandards\fR(7).
 .TE
 
 .SH SEE ALSO

--- a/components/open-fabrics/rds-tools/patches/001-rds-tools-solaris_port.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/open-fabrics/rds-tools/patches/001-rds-tools-solaris_port.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -689,7 +689,7 @@
 +.SH DESCRIPTION
 +.PP
 +rds-ping is used to test whether a remote node is reachable over RDS.
-+Its interface is designed to operate pretty much the standard ping(1M) 
++Its interface is designed to operate pretty much the standard ping(8) 
  utility, even though the way it works is pretty different.
 -.Pp
 -.Nm rds-ping

--- a/components/openssh/patches/003-last_login.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/openssh/patches/003-last_login.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -9,7 +9,7 @@
 #
 # OpenSSH normally updates lastlog when users login and reads lastlog to
 # determine the last login time of the user however on Solaris the
-# pam_unix_session(5) module handles both of these tasks so we compile
+# pam_unix_session(7) module handles both of these tasks so we compile
 # OpenSSH with --disable-lastlog to disable all lastlog references.
 # This means the sshd_config option of PrintLastLog is now ignored and
 # can't be changed so we update sshd's configuration parsing to flag
@@ -24,7 +24,7 @@
  in interactively.
 -The default is
 -.Dq yes .
-+On Solaris this option is always ignored since pam_unix_session(5)
++On Solaris this option is always ignored since pam_unix_session(7)
 +reports the last login time.
  .It Cm PrintMotd
  Specifies whether
@@ -35,7 +35,7 @@
  .Sh SEE ALSO
 -.Xr sshd 8
 +.Xr sshd 8 ,
-+.Xr pam_unix_session 5
++.Xr pam_unix_session 7
  .Sh AUTHORS
  OpenSSH is a derivative of the original and free
  ssh 1.2.12 release by Tatu Ylonen.

--- a/components/openusb/files/libopenusb.3lib	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/openusb/files/libopenusb.3lib	Wed Apr 20 19:46:50 2016 -0700
@@ -34,7 +34,7 @@
 .in -40n
 .SH "ATTRIBUTES"
 .PP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 .TS
 tab() allbox;
@@ -49,7 +49,7 @@
 .sp
 .SH "SEE ALSO"
 .PP
-\fBintro\fR(3), \fBlibusb\fR(3LIB), \fBattributes\fR(5)
+\fBintro\fR(3), \fBlibusb\fR(3LIB), \fBattributes\fR(7)
 .PP
 \fIhttp://openusb\&.sourceforge\&.net\fR
 

--- a/components/pflogd/patches/001-solaris.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/pflogd/patches/001-solaris.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -144,8 +144,8 @@
 -.Xr pflog 4 ,
  .Xr pf.conf 5 ,
 -.Xr newsyslog 8 ,
-+.Xr privileges 5 ,
-+.Xr smf 5 ,
++.Xr privileges 7 ,
++.Xr smf 7 ,
  .Xr tcpdump 8
  .Sh HISTORY
  The

--- a/components/pflogd/patches/002-smf.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/pflogd/patches/002-smf.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -50,9 +50,9 @@
 -does not disassociate from the controlling terminal.
 +instance with the specified name. If additional options are used to specify
 +configuration, it is stored into the
-+.Xr smf 5
++.Xr smf 7
 +repository. Default values are used for
-+.Xr smf 5
++.Xr smf 7
 +properties unless overriden by a command-line option. The exception is
 +pflog/interface (set to equal the instance name) and pflog/logfile
 +(set to a file with name equal to the instance name followed by the
@@ -66,9 +66,9 @@
 +Shows/changes the configuration of the given
 +.Nm
 +instance in
-+.Xr smf 5
++.Xr smf 7
 +repository. Attributes specified by additional options are placed into the
-+.Xr smf 5
++.Xr smf 7
 +repository.
  .It Fl d Ar delay
  Time in seconds to delay between automatic flushes of the file.
@@ -120,14 +120,14 @@
 +The
 +.Nm
 +daemon must be started as an
-+.Xr smf 5
++.Xr smf 7
 +service with the following FMRI:
 +.Bd -literal -offset indent
 +svc:/network/firewall/pflog
 +.Ed
 +.Pp
 +Command line options described above are set via the following
-+.Xr smf 5
++.Xr smf 7
 +properties.
 +.Bl -tag -width "pflog/interface" -offset 3n -compact
 +.It pflog/delay
@@ -186,10 +186,10 @@
 +privilege that is required for using
 +.Xr bpf 7d
 +to read packets. See
-+.Xr privileges 5
++.Xr privileges 7
 +for details.
 +The service start method uses
-+.Xr dladm 1M
++.Xr dladm 8
 +to create capture link if it does not exist already.
 +.Pp
 +To configure the

--- a/components/php-common/php.1.sunman	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/php-common/php.1.sunman	Wed Apr 20 19:46:50 2016 -0700
@@ -30,7 +30,7 @@
 required; an Apache 2.4 server module is included in the web/php-56 package.
 Apache 2.2 support is not provided with PHP 5.6 in Solaris.
 .SH ATTRIBUTES
-See attributes(5) for descriptions of the  following  attributes:
+See attributes(7) for descriptions of the  following  attributes:
 .sp
 .TS
 box;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pkgbuild/patches/fix-man-pages.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -0,0 +1,65 @@
+Adjust reference to attributes(5) to be attributes(7) in the pkgbuild.1,
+pkgtool.1 and spectool.1 man pages.
+
+This patch should be sent upstream.
+
+--- pkgbuild-1.3.105/doc/pkgbuild.1.orig	2016-04-20 09:23:29.152475566 -0700
++++ pkgbuild-1.3.105/doc/pkgbuild.1	2016-04-20 09:23:46.151702633 -0700
+@@ -152,7 +152,7 @@
+ 
+ .SH ATTRIBUTES
+ 
+-See \fBattributes\fR(5) for descriptions of the following attributes:
++See \fBattributes\fR(7) for descriptions of the following attributes:
+ 
+ .TS
+ box;
+@@ -169,7 +169,7 @@
+ 
+ Spec file description in /usr/share/doc/pkgbuild/spec-files.txt
+ 
+-\fBattributes\fR(5), \fBpkgtool\fR(1), \fBspectool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
++\fBattributes\fR(7), \fBpkgtool\fR(1), \fBspectool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
+ 
+ .SH NOTES
+ 
+--- pkgbuild-1.3.105/doc/pkgtool.1.orig	2016-04-20 09:48:22.091081082 -0700
++++ pkgbuild-1.3.105/doc/pkgtool.1	2016-04-20 09:48:45.699934158 -0700
+@@ -264,7 +264,7 @@
+ 
+ .SH ATTRIBUTES
+ 
+-See \fBattributes\fR(5) for descriptions of the following attributes:
++See \fBattributes\fR(7) for descriptions of the following attributes:
+ 
+ .TS
+ box;
+@@ -281,7 +281,7 @@
+ 
+ Spec file description in /usr/share/doc/pkgbuild/spec-files.txt
+ 
+-\fBattributes\fR(5), \fBpkgbuild\fR(1), \fBspectool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
++\fBattributes\fR(7), \fBpkgbuild\fR(1), \fBspectool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
+ 
+ .SH NOTES
+ 
+--- pkgbuild-1.3.105/doc/spectool.1.orig	2016-04-20 09:48:09.082323294 -0700
++++ pkgbuild-1.3.105/doc/spectool.1	2016-04-20 09:48:56.338792549 -0700
+@@ -209,7 +209,7 @@
+ 
+ .SH ATTRIBUTES
+ 
+-See \fBattributes\fR(5) for descriptions of the following attributes:
++See \fBattributes\fR(7) for descriptions of the following attributes:
+ 
+ .TS
+ box;
+@@ -226,7 +226,7 @@
+ 
+ Spec file description in /usr/share/doc/pkgbuild/spec-files.txt
+ 
+-\fBattributes\fR(5), \fBpkgbuild\fR(1), \fBpkgtool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
++\fBattributes\fR(7), \fBpkgbuild\fR(1), \fBpkgtool\fR(1), \fBpkg\fR(5), \fBpkgmk\fR(1)
+ 
+ .SH NOTES
+ 

--- a/components/popt/files/libpopt.3	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/popt/files/libpopt.3	Wed Apr 20 19:46:50 2016 -0700
@@ -1157,7 +1157,7 @@
 .SH ""
 .PP
 \fBgetopt\fR(3),
-\fBattributes\fR(5)
+\fBattributes\fR(7)
 .SH ""
 .PP
 Updated by Erwann Chenede, Sun Microsystems Inc\&., 2003\&. Written by Erik

--- a/components/ptp/patches/01-zone.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/ptp/patches/01-zone.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -25,7 +25,7 @@
 -interface which is providing hardware assistance to ptpd.
 -Vice versa, ptpd cannot get hardware assistance from an
 -interfac which has pre-existing vnic(s).
-+Solaris does not allow ptpd to run inside a zones(5).
++Solaris does not allow ptpd to run inside a zones(7).
  
  .SH SEE ALSO
  svcs(1), svcadm(1M), attributes(5), smf(5)

--- a/components/rsync/patches/rsync.1.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/rsync/patches/rsync.1.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -2617,7 +2617,7 @@
  
  .PP 
 -\fBrsyncd.conf\fP(5)
-+\fBrsyncd.conf\fP(5), \fBacl\fP(5)
++\fBrsyncd.conf\fP(5), \fBacl\fP(7)
  .PP 
  .SH "BUGS"
  

--- a/components/snort/patches/snort.8.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/snort/patches/snort.8.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -1,9 +1,11 @@
 Fix the comments w.r.t. configuration file usage with the -T option.
+This change has been submitted upstream.
 
-The changes have been submitted upstream.
+Adjust the reference to "networks(4)" to be "networks(5)".
+This change should be sent upstream.
 
---- snort.8.orig	2014-09-25 07:44:55.175565999 -0700
-+++ snort.8	2014-09-26 11:19:43.998692220 -0700
+--- snort.8.orig	2016-04-20 10:13:29.946194815 -0700
++++ snort.8	2016-04-20 10:14:01.254235607 -0700
 @@ -339,8 +339,7 @@
  indicating that everything is ready to proceed.  This is a good
  switch to use if daemon mode is going to be used, it verifies that
@@ -14,3 +16,12 @@
  .I config-file.
  .IP "-u user"
  Change the user/UID Snort runs under to
+@@ -603,7 +602,7 @@
+ .IP "\fBdst net \fInet\fR"
+ True if the IP destination address of the packet has a network
+ number of \fInet\fP. \fINet\fP may be either a name from /etc/networks
+-or a network number (see \fInetworks(4)\fP for details).
++or a network number (see \fInetworks(5)\fP for details).
+ .IP "\fBsrc net \fInet\fR"
+ True if the IP source address of the packet has a network
+ number of \fInet\fP.

--- a/components/stdcxx/Solaris/libstdcxx4.3lib	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/stdcxx/Solaris/libstdcxx4.3lib	Wed Apr 20 19:46:50 2016 -0700
@@ -117,7 +117,7 @@
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp
@@ -142,5 +142,5 @@
 ISO/IEC 14882:2003 -- International Standard for Information Systems -- Programming Language C++
 .sp
 .LP
-setlocale(3C), catopen(3C), catclose(3C), locale(5), standards(5).
+setlocale(3C), catopen(3C), catclose(3C), locale(7), standards(7).
 

--- a/components/tcpdump/Makefile	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/tcpdump/Makefile	Wed Apr 20 19:46:50 2016 -0700
@@ -39,6 +39,9 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+# Rebuild the configure script so the man pages are normalized.
+COMPONENT_PREP_ACTION = (cd $(@D); autoconf);
+
 # fix my alignment issues instead of falling over on sparc
 studio_ALIGN.sparc.64=-xmemalign=16i
 CONFIGURE_OPTIONS.sparc += ac_cv___attribute__=no

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcpdump/patches/fix-man-pages.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -0,0 +1,24 @@
+In Solaris 12, we will be normalizing man pages. See PSARC 2015/428.
+This means that what was section 4, is now section 5 and what was in
+section 5 is now in section 7. But currently only for Solaris 12.
+
+This patch should eventually be sent upstream, but for that to happen
+it will need to be reworked into a form that will be acceptable for
+all versions of Solaris. Until then, we are just using this Solaris 12
+specific patch.
+
+--- tcpdump-4.7.4/configure.in.orig	2016-04-20 10:28:53.794215793 -0700
++++ tcpdump-4.7.4/configure.in	2016-04-20 10:29:23.681239586 -0700
+@@ -942,12 +942,6 @@
+ 
+ solaris*)
+ 	V_GROUP=sys
+-
+-	#
+-	# Use System V conventions for man pages.
+-	#
+-	MAN_FILE_FORMATS=4
+-	MAN_MISC_INFO=5
+ 	;;
+ esac
+ 

--- a/components/tcsh/patches/001.man.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/tcsh/patches/001.man.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -179,7 +179,7 @@
 +csh(1), emacs(1), ls(1), newgrp(1), sh(1), stty(1), su(8),
 +tset(1B), vi(1), X(7), access(2), execve(2), fork(2), killpg(3C),
 +pipe(2), setrlimit(2), sigvec(3UCB), stat(2), umask(2), vfork(2), wait(2),
-+malloc(3C), setlocale(3C), tty(7D), a.out(4), terminfo(5), environ(5),
++malloc(3C), setlocale(3C), tty(7D), a.out(4), terminfo(5), environ(7),
 +termio(7I), Introduction to the C Shell
  .SH VERSION
  This manual documents tcsh 6.19.00 (Astron) 2015-05-21.

--- a/components/trousers/patches/man_man8_tcsd.8.in.patch	Wed Apr 20 14:58:30 2016 -0700
+++ b/components/trousers/patches/man_man8_tcsd.8.in.patch	Wed Apr 20 19:46:50 2016 -0700
@@ -75,7 +75,7 @@
 +.SH "NOTES"
 +.sp
 +.LP
-+The \fBtcsd\fR service is managed by the service management facility, \fBsmf\fR(5), under
++The \fBtcsd\fR service is managed by the service management facility, \fBsmf\fR(7), under
 +the service identifier:
 +.sp
 +.in +2