--- a/components/groff/Makefile	Wed Nov 19 13:37:23 2014 -0800
+++ b/components/groff/Makefile	Wed Nov 19 11:44:58 2014 -0800
@@ -69,6 +69,14 @@
 CONFIGURE_OPTIONS +=	CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 
+# Groff's manual section numbering is configurable.  Renumber the sections
+# during build to get the internal references substituted, and during install
+# to get them into the right directories.
+COMPONENT_BUILD_ARGS +=	man5ext=4
+COMPONENT_BUILD_ARGS +=	man7ext=5
+COMPONENT_INSTALL_ARGS +=	man5ext=4
+COMPONENT_INSTALL_ARGS +=	man7ext=5
+
 # Don't generate tmac wrappers for the Solaris troff macro packages.
 # Some man pages (such as groff.1) use long macro name definitions
 # which fail in compatibility mode. See:

--- a/components/groff/groff.p5m	Wed Nov 19 13:37:23 2014 -0800
+++ b/components/groff/groff.p5m	Wed Nov 19 11:44:58 2014 -0800
@@ -519,25 +519,25 @@
 file path=usr/share/man/man1/roff2x.1
 file path=usr/share/man/man1/tfmtodit.1
 file path=usr/share/man/man1/xtotroff.1
-file usr/share/man/man5/groff_font.5 path=usr/share/man/man4/groff_font.4
-file usr/share/man/man5/groff_out.5 path=usr/share/man/man4/groff_out.4
-file usr/share/man/man5/groff_tmac.5 path=usr/share/man/man4/groff_tmac.4
-file usr/share/man/man5/lj4_font.5 path=usr/share/man/man4/lj4_font.4
-file usr/share/man/man7/ditroff.7 path=usr/share/man/man5/ditroff.5
-file usr/share/man/man7/ditroff.7 path=usr/share/man/man5/groff.5
-file usr/share/man/man7/groff_char.7 path=usr/share/man/man5/groff_char.5
-file usr/share/man/man7/groff_diff.7 path=usr/share/man/man5/groff_diff.5
-file usr/share/man/man7/groff_hdtbl.7 path=usr/share/man/man5/groff_hdtbl.5
-file usr/share/man/man7/groff_man.7 path=usr/share/man/man5/groff_man.5
-file usr/share/man/man7/groff_mdoc.7 path=usr/share/man/man5/groff_mdoc.5
-file usr/share/man/man7/groff_me.7 path=usr/share/man/man5/groff_me.5
-file usr/share/man/man7/groff_mm.7 path=usr/share/man/man5/groff_mm.5
-file usr/share/man/man7/groff_mmse.7 path=usr/share/man/man5/groff_mmse.5
-file usr/share/man/man7/groff_mom.7 path=usr/share/man/man5/groff_mom.5
-file usr/share/man/man7/groff_ms.7 path=usr/share/man/man5/groff_ms.5
-file usr/share/man/man7/groff_trace.7 path=usr/share/man/man5/groff_trace.5
-file usr/share/man/man7/groff_www.7 path=usr/share/man/man5/groff_www.5
-file usr/share/man/man7/roff.7 path=usr/share/man/man5/roff.5
+file path=usr/share/man/man4/groff_font.4
+file path=usr/share/man/man4/groff_out.4
+file path=usr/share/man/man4/groff_tmac.4
+file path=usr/share/man/man4/lj4_font.4
+file path=usr/share/man/man5/ditroff.5
+file path=usr/share/man/man5/groff.5
+file path=usr/share/man/man5/groff_char.5
+file path=usr/share/man/man5/groff_diff.5
+file path=usr/share/man/man5/groff_hdtbl.5
+file path=usr/share/man/man5/groff_man.5
+file path=usr/share/man/man5/groff_mdoc.5
+file path=usr/share/man/man5/groff_me.5
+file path=usr/share/man/man5/groff_mm.5
+file path=usr/share/man/man5/groff_mmse.5
+file path=usr/share/man/man5/groff_mom.5
+file path=usr/share/man/man5/groff_ms.5
+file path=usr/share/man/man5/groff_trace.5
+file path=usr/share/man/man5/groff_www.5
+file path=usr/share/man/man5/roff.5
 license FDL license=FDLv1.3
 license COPYING license=GPLv3