--- a/components/ncurses/ncurses.p5m Fri Aug 26 07:11:27 2016 -0700
+++ b/components/ncurses/ncurses.p5m Fri Aug 26 09:16:11 2016 -0700
@@ -24,6 +24,11 @@
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+# ncurses-04-manpages.patch adjusts section 1m man pages to be in section 8.
+# If the upstream bug is ever fixed (and the patch is removed), this transform
+# should be updated or removed.
+<transform file path=(.+)/man/man8/(.+).8$ -> \
+ set action.hash %<1>/man/man1/%<2>.1m>
<transform file path=(.+)/man/man3x/(.+).3x$ -> \
set action.hash %<1>/man/man3/%<2>.3x>
set name=pkg.fmri \
@@ -82,13 +87,8 @@
link path=usr/gnu/lib/libpanel.so.5 target=libpanel.so.5.7
file path=usr/gnu/lib/libpanel.so.5.7
link path=usr/gnu/lib/terminfo target=../share/terminfo
-file path=usr/gnu/share/man/man1/captoinfo.1m
file path=usr/gnu/share/man/man1/clear.1
-file path=usr/gnu/share/man/man1/infocmp.1m
-file path=usr/gnu/share/man/man1/infotocap.1m
link path=usr/gnu/share/man/man1/reset.1 target=tset.1
-file path=usr/gnu/share/man/man1/tic.1m
-file path=usr/gnu/share/man/man1/toe.1m
file path=usr/gnu/share/man/man1/tput.1
file path=usr/gnu/share/man/man1/tset.1
link path=usr/gnu/share/man/man3x/COLOR_PAIR.3x target=curs_color.3x
@@ -796,6 +796,11 @@
file path=usr/gnu/share/man/man5/term.5
file path=usr/gnu/share/man/man5/terminfo.5
file path=usr/gnu/share/man/man7/term.7
+file path=usr/gnu/share/man/man8/captoinfo.8
+file path=usr/gnu/share/man/man8/infocmp.8
+file path=usr/gnu/share/man/man8/infotocap.8
+file path=usr/gnu/share/man/man8/tic.8
+file path=usr/gnu/share/man/man8/toe.8
file path=usr/gnu/share/tabset/std
file path=usr/gnu/share/tabset/stdcrt
file path=usr/gnu/share/tabset/vt100
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ncurses/patches/ncurses-04-manpages.patch Fri Aug 26 09:16:11 2016 -0700
@@ -0,0 +1,165 @@
+Normalize the five man pages that are in section 1m, adjusting them to
+be in section 8. (It's noted that Ubuntu delivered these man pages in
+section 1.)
+
+This problem will be reported upstream as ncurses 6.0 (the latest released
+version) still has these five man pages in section 1m.
+
+--- ncurses-5.7/man/captoinfo.1m.orig 2016-08-26 07:44:49.953454368 +0000
++++ ncurses-5.7/man/captoinfo.1m 2016-08-26 07:46:07.341702464 +0000
[email protected]@ -27,8 +27,8 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.22 2007/06/02 20:40:07 tom Exp $
+-.TH @[email protected] 1M ""
++.\" $Id: captoinfo.8,v 1.22 2007/06/02 20:40:07 tom Exp $
++.TH @[email protected] 8 ""
+ .ds n 5
+ .ds d @[email protected]
+ .SH NAME
[email protected]@ -171,13 +171,13 @@
+ capabilities \fImeml\fR (memory lock) and \fImemu\fR (memory unlock).
+ These will be discarded with a warning message.
+ .SH NOTES
+-This utility is actually a link to \[email protected]@\fR(1M), running in \fI-I\fR mode.
++This utility is actually a link to \[email protected]@\fR(8), running in \fI-I\fR mode.
+ You can use other \[email protected]@\fR options such as \fB-f\fR and \fB-x\fR.
+ .PP
+ The trace option is not identical to SVr4's. Under SVr4, instead of following
+ the \fB-v\fR with a trace level n, you repeat it n times.
+ .SH SEE ALSO
+-\[email protected]@\fR(1M),
++\[email protected]@\fR(8),
+ \fBcurses\fR(3X),
+ \fBterminfo\fR(\*n)
+ .PP
+--- ncurses-5.7/man/infocmp.1m.orig 2016-08-26 07:44:49.959388607 +0000
++++ ncurses-5.7/man/infocmp.1m 2016-08-26 07:46:31.079494941 +0000
[email protected]@ -27,8 +27,8 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp $
+-.TH @[email protected] 1M ""
++.\" $Id: infocmp.8,v 1.44 2006/12/24 18:16:31 tom Exp $
++.TH @[email protected] 8 ""
+ .ds n 5
+ .ds d @[email protected]
+ .SH NAME
[email protected]@ -413,12 +413,12 @@
+ Actual BSD curses versions will have a more restricted set. To see only the
+ 4.4BSD set, use \fB-r\fR \fB-RBSD\fR.
+ .SH BUGS
+-The \fB-F\fR option of \[email protected]@\fR(1M) should be a \[email protected]@\fR(1M) mode.
++The \fB-F\fR option of \[email protected]@\fR(8) should be a \[email protected]@\fR(8) mode.
+ .SH SEE ALSO
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
+ \fBcurses\fR(3X),
+ \fBterminfo\fR(\*n).
+ .PP
+--- ncurses-5.7/man/infotocap.1m.orig 2016-08-26 07:44:49.965292183 +0000
++++ ncurses-5.7/man/infotocap.1m 2016-08-26 07:46:47.540521425 +0000
[email protected]@ -27,8 +27,8 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp $
+-.TH @[email protected] 1M ""
++.\" $Id: infotocap.8,v 1.8 2006/12/24 20:13:56 tom Exp $
++.TH @[email protected] 8 ""
+ .ds n 5
+ .ds d @[email protected]
+ .SH NAME
[email protected]@ -63,8 +63,8 @@
+ You can use other \[email protected]@\fR options such as \fB-f\fR and \fB-x\fR.
+ .SH SEE ALSO
+ \fBcurses\fR(3X),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
+ \fBterminfo\fR(\*n)
+ .PP
+ This describes \fBncurses\fR
+--- ncurses-5.7/man/tic.1m.orig 2016-08-26 07:44:49.967894400 +0000
++++ ncurses-5.7/man/tic.1m 2016-08-26 07:47:03.736647461 +0000
[email protected]@ -26,8 +26,8 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp $
+-.TH @[email protected] 1M ""
++.\" $Id: tic.8,v 1.44 2006/12/24 17:59:11 tom Exp $
++.TH @[email protected] 8 ""
+ .ds n 5
+ .ds d @[email protected]
+ .SH NAME
[email protected]@ -92,7 +92,7 @@
+ .TP
+ \fB-C\fR
+ Force source translation to termcap format. Note: this differs from the \fB-C\fR
+-option of \[email protected]@\fR(1M) in that it does not merely translate capability
++option of \[email protected]@\fR(8) in that it does not merely translate capability
+ names, but also translates terminfo strings to termcap format. Capabilities
+ that are not translatable are left in the entry under their terminfo names
+ but commented out with two preceding dots.
[email protected]@ -314,10 +314,10 @@
+ \fB\*d/?/*\fR
+ Compiled terminal description database.
+ .SH SEE ALSO
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
+ \fBcurses\fR(3X),
+ \fBterminfo\fR(\*n).
+ .PP
+--- ncurses-5.7/man/toe.1m.orig 2016-08-26 07:44:49.969668744 +0000
++++ ncurses-5.7/man/toe.1m 2016-08-26 07:47:18.430574121 +0000
[email protected]@ -26,8 +26,8 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.21 2008/01/05 20:57:16 tom Exp $
+-.TH @[email protected] 1M ""
++.\" $Id: toe.8,v 1.21 2008/01/05 20:57:16 tom Exp $
++.TH @[email protected] 8 ""
+ .ds n 5
+ .ds d @[email protected]
+ .SH NAME
[email protected]@ -80,7 +80,7 @@
+ specifies that (verbose) output be written to standard error,
+ showing \fBtoe\fR's progress.
+ The optional parameter \fIn\fR is a number from 1 to 10,
+-interpreted as for \[email protected]@\fR(1M).
++interpreted as for \[email protected]@\fR(8).
+ .TP
+ \fB-V\fR
+ reports the version of ncurses which was used in this program,
[email protected]@ -90,10 +90,10 @@
+ \fB\*d/?/*\fR
+ Compiled terminal description database.
+ .SH SEE ALSO
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
+-\[email protected]@\fR(1M),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
++\[email protected]@\fR(8),
+ \fBcurses\fR(3X),
+ \fBterminfo\fR(\*n).
+ .PP