Upgrade to 1.22.2; STAGEify

Approved by:	beat (mentor)

5 files changed, 221 insertions, 149 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 71c9d0fe67e0..670b72801daa 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	groff
-PORTVERSION=	1.21
-PORTREVISION=	3
+PORTVERSION=	1.22.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
@@ -16,7 +15,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GHOSTSCRIPT_RUN= yes
+USE_GHOSTSCRIPT= yes
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk
@@ -36,22 +35,11 @@ OPTIONS_DEFAULT=	X11
 CONFLICTS=	ja-groff-[0-9]*
 
 INFO=	groff
-MAN1=	addftinfo.1 afmtodit.1 chem.1 eqn.1 eqn2graph.1 gdiffmk.1 \
-	grap2graph.1 grn.1 grodvi.1 groff.1 groffer.1 grog.1 grohtml.1 \
-	grolbp.1 grolj4.1 grops.1 grotty.1 hpftodit.1 indxbib.1 lkbib.1 \
-	lookbib.1 mmroff.1 neqn.1 nroff.1 pdfroff.1 pfbtops.1 pic.1 \
-	pic2graph.1 preconv.1 refer.1 roff2dvi.1 roff2html.1 roff2pdf.1 \
-	roff2ps.1 roff2text.1 roff2x.1 soelim.1 tbl.1 tfmtodit.1 troff.1
-MAN5=	groff_font.5 groff_out.5 groff_tmac.5 lj4_font.5
-MAN7=	ditroff.7 groff.7 groff_char.7 groff_diff.7 groff_hdtbl.7 \
-	groff_man.7 groff_mdoc.7 groff_me.7 groff_mm.7 groff_mmse.7 \
-	groff_mom.7 groff_ms.7 groff_trace.7 groff_www.7 roff.7
 
 DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 EXAMPLESDIR=	${DOCSDIR}/examples
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
@@ -71,7 +59,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/pnmtops:${PORTSDIR}/graphics/netpbm
 CONFIGURE_ARGS+=--with-x --with-appresdir=${PREFIX}/lib/X11/app-defaults
 PLIST_SUB+=	X11=""
 PLIST_SUB+=	HTMLDOCS=""
-MAN1+=		gxditview.1 xtotroff.1
 .endif
 
 # Run in src/libs/gnulib subdir, too
@@ -92,6 +79,6 @@ post-configure:
 	    fi)
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${PREFIX}/share/groff/site-tmac
+	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}/${PREFIX}/share/groff/site-tmac
 
 .include <bsd.port.post.mk>
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 7a7d0c87ddbd..d3899b674330 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (groff-1.21.tar.gz) = 344e6af5480e7ab4ec51e2a2ed10acd69ba3e062d285b6d5f6d49fb5ed2f9f7a
-SIZE (groff-1.21.tar.gz) = 3863837
+SHA256 (groff-1.22.2.tar.gz) = 380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076
+SIZE (groff-1.22.2.tar.gz) = 4019913
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
index 1c6b0ad08fae..22934456b7ac 100644
--- a/textproc/groff/files/mdoc.local
+++ b/textproc/groff/files/mdoc.local
@@ -22,60 +22,29 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/gnu/usr.bin/groff/tmac/mdoc.local 213835 2010-10-14 14:48:11Z jh $
+.\" $FreeBSD: head/gnu/usr.bin/groff/tmac/mdoc.local 261319 2014-01-31 12:26:30Z uqs $
 .\"
-.\"     %beginstrip%
-.
 .eo
-.
-.
 .ds volume-operating-system FreeBSD
-.
-.\" FreeBSD .Lb values
 .ds str-Lb-libarchive  Streaming Archive Library (libarchive, \-larchive)
 .ds str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth)
-.ds str-Lb-libbsm      Basic Security Module User Library (libbsm, \-lbsm)
-.ds str-Lb-libc_r      Reentrant C\~Library (libc_r, \-lc_r)
-.ds str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
-.ds str-Lb-libcam      Common Access Method User Library (libcam, \-lcam)
-.ds str-Lb-libcipher   FreeSec Crypt Library (libcipher, \-lcipher)
-.ds str-Lb-libdevinfo  Device and Resource Information Utility Library (libdevinfo, \-ldevinfo)
-.ds str-Lb-libdevstat  Device Statistics Library (libdevstat, \-ldevstat)
-.ds str-Lb-libdisk     Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
 .ds str-Lb-libedit     Line Editor and History Library (libedit, \-ledit)
+.ds str-Lb-libefi      EFI Runtime Services Library (libefi, \-lefi)
 .ds str-Lb-libelf      ELF Parsing Library (libelf, \-lelf)
+.ds str-Lb-libexecinfo Backtrace Access Library (libexecinfo, \-lexecinfo)
 .ds str-Lb-libfetch    File Transfer Library (libfetch, \-lfetch)
-.ds str-Lb-libgeom     Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
-.ds str-Lb-libgpib     General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib)
-.ds str-Lb-libipx      IPX Address Conversion Support Library (libipx, \-lipx)
-.ds str-Lb-libjail     Jail Library (libjail, \-ljail)
-.ds str-Lb-libkiconv   Kernel side iconv library (libkiconv, \-lkiconv)
-.ds str-Lb-libkse      N:M Threading Library (libkse, \-lkse)
-.ds str-Lb-libmd       Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
-.ds str-Lb-libmemstat  Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
-.ds str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
 .ds str-Lb-libpmc      Performance Monitoring Counters Interface Library (libpmc, \-lpmc)
-.ds str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss)
-.ds str-Lb-librpcsvc   RPC Service Library (librpcsvc, \-lrpcsvc)
-.ds str-Lb-libsdp      Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp)
-.ds str-Lb-libthr      1:1 Threading Library (libthr, \-lthr)
-.ds str-Lb-libufs      UFS File System Access Library (libufs, \-lufs)
-.ds str-Lb-libugidfw   File System Firewall Interface Library (libugidfw, \-lugidfw)
-.ds str-Lb-libvgl      Video Graphics Library (libvgl, \-lvgl)
-.
-.\" FreeBSD architectures not found in doc-common
-.ds volume-as-arm      arm
-.
-.\" Default .Os value
+.ds str-Lb-libproc     Processor Monitoring and Analysis Library (libproc, \-lproc)
+.ds str-Lb-libprocstat Process and Files Information Retrieval (libprocstat, \-lprocstat)
+.ds str-Lb-librtld_db  Run-time Linker Debugging Library (librtld_db, \-lrtld_db)
+.ds str-Lb-libsbuf     Safe String Composition Library (libsbuf, \-lsbuf)
+.ds str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .ds default-operating-system FreeBSD\~ports
-.
-.\" FreeBSD releases not found in doc-common
-.ds operating-system-FreeBSD-7.2    7.2
-.ds operating-system-FreeBSD-7.3    7.3
 .ds operating-system-FreeBSD-7.4    7.4
-.ds operating-system-FreeBSD-8.0    8.0
-.ds operating-system-FreeBSD-8.1    8.1
-.ds operating-system-FreeBSD-8.2    8.2
-.ds operating-system-FreeBSD-9.0    9.0
-.
+.ds operating-system-FreeBSD-8.3    8.3
+.ds operating-system-FreeBSD-8.4    8.4
+.ds operating-system-FreeBSD-9.1    9.1
+.ds operating-system-FreeBSD-9.2    9.2
+.ds operating-system-FreeBSD-10.0   10.0
+.ds operating-system-FreeBSD-11.0   11.0
 .ec
diff --git a/textproc/groff/files/patch-bash b/textproc/groff/files/patch-bash
deleted file mode 100644
index 2b5c19b59b7e..000000000000
--- a/textproc/groff/files/patch-bash
+++ /dev/null
@@ -1,45 +0,0 @@
---- contrib/hdtbl/examples/common.roff.orig	2011-01-14 13:33:12.190888414 +0100
-+++ contrib/hdtbl/examples/common.roff	2011-01-14 13:33:20.480831318 +0100
-@@ -65,7 +65,7 @@
- .\"	**	for example "Sun Dec  5 22:27:57     2004"		**
- .\"	******************************************************************
- .de date
--.  pso bash -c "echo -n .ds *date\ ;date"
-+.  pso sh -c "echo -n .ds *date\ ;date"
- .  tm \\*[*date] ***
- ..
- .
-@@ -83,9 +83,9 @@
- .  ds * \\$1\"
- .  substring * 0 0
- .  ie "\\*[*]"s" \
--.    pso bash -c "echo -n .nr *time 0+;date +%s"
-+.    pso sh -c "echo -n .nr *time 0+;date +%s"
- .  el \{\
--.   pso bash -c "echo -n .nr *time -;date +%s"
-+.   pso sh -c "echo -n .nr *time -;date +%s"
- .   nr *time 0-\\n[*time]
- .   tm elapsed time: \\n[*time] seconds
- .  \}
---- contrib/hdtbl/examples/fonts_n.in.orig	2011-01-14 13:33:25.820790311 +0100
-+++ contrib/hdtbl/examples/fonts_n.in	2011-01-14 13:33:35.440720348 +0100
-@@ -50,7 +50,7 @@
- .  el \
- .    ds *args \\n[.fn]
- .
--.  pso bash -c \
-+.  pso sh -c \
-        "echo -n .ds *f\ ; \
-         ls \\*[fontpath]/dev\*[.T] \
-         | tr '[:cntrl:]' ' '"
---- contrib/hdtbl/examples/fonts_x.in.orig	2011-01-14 13:33:39.430690407 +0100
-+++ contrib/hdtbl/examples/fonts_x.in	2011-01-14 13:33:59.840540242 +0100
-@@ -50,7 +50,7 @@
- .  el \
- .    ds *args \\n[.fn]
- .
--.  pso bash -c \
-+.  pso sh -c \
-        "echo -n .ds *f\ ; \
-         ls \\*[fontpath]/dev\*[.T] \
-         | tr '[:cntrl:]' ' '"
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index 7c7928d80749..78d75224fddd 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -12,6 +12,7 @@ bin/groffer
 bin/grog
 bin/grolbp
 bin/grolj4
+bin/gropdf
 bin/grops
 bin/grotty
 %%X11%%bin/gxditview
@@ -22,6 +23,7 @@ bin/lookbib
 bin/mmroff
 bin/neqn
 bin/nroff
+bin/pdfmom
 bin/pdfroff
 bin/pfbtops
 bin/pic
@@ -48,6 +50,69 @@ lib/groff/groffer/split_env.sh
 lib/groff/groffer/version.sh
 %%X11%%lib/X11/app-defaults/GXditview
 %%X11%%lib/X11/app-defaults/GXditview-color
+man/man1/addftinfo.1.gz
+man/man1/afmtodit.1.gz
+man/man1/chem.1.gz
+man/man1/eqn.1.gz
+man/man1/eqn2graph.1.gz
+man/man1/gdiffmk.1.gz
+man/man1/grap2graph.1.gz
+man/man1/grn.1.gz
+man/man1/grodvi.1.gz
+man/man1/groff.1.gz
+man/man1/groffer.1.gz
+man/man1/grog.1.gz
+man/man1/grohtml.1.gz
+man/man1/grolbp.1.gz
+man/man1/grolj4.1.gz
+man/man1/gropdf.1.gz
+man/man1/grops.1.gz
+man/man1/grotty.1.gz
+%%X11%%man/man1/gxditview.1.gz
+man/man1/hpftodit.1.gz
+man/man1/indxbib.1.gz
+man/man1/lkbib.1.gz
+man/man1/lookbib.1.gz
+man/man1/mmroff.1.gz
+man/man1/neqn.1.gz
+man/man1/nroff.1.gz
+man/man1/pdfmom.1.gz
+man/man1/pdfroff.1.gz
+man/man1/pfbtops.1.gz
+man/man1/pic.1.gz
+man/man1/pic2graph.1.gz
+man/man1/preconv.1.gz
+man/man1/refer.1.gz
+man/man1/roff2dvi.1.gz
+man/man1/roff2html.1.gz
+man/man1/roff2pdf.1.gz
+man/man1/roff2ps.1.gz
+man/man1/roff2text.1.gz
+man/man1/roff2x.1.gz
+man/man1/soelim.1.gz
+man/man1/tbl.1.gz
+man/man1/tfmtodit.1.gz
+man/man1/troff.1.gz
+%%X11%%man/man1/xtotroff.1.gz
+man/man5/groff_font.5.gz
+man/man5/groff_out.5.gz
+man/man5/groff_tmac.5.gz
+man/man5/lj4_font.5.gz
+man/man7/ditroff.7.gz
+man/man7/groff.7.gz
+man/man7/groff_char.7.gz
+man/man7/groff_diff.7.gz
+man/man7/groff_hdtbl.7.gz
+man/man7/groff_man.7.gz
+man/man7/groff_mdoc.7.gz
+man/man7/groff_me.7.gz
+man/man7/groff_mm.7.gz
+man/man7/groff_mmse.7.gz
+man/man7/groff_mom.7.gz
+man/man7/groff_ms.7.gz
+man/man7/groff_trace.7.gz
+man/man7/groff_www.7.gz
+man/man7/roff.7.gz
 %%EXAMPLESDIR%%/chem/122/README
 %%EXAMPLESDIR%%/chem/122/ch2a_ethyl.chem
 %%EXAMPLESDIR%%/chem/122/ch2b_benzene.chem
@@ -137,18 +202,24 @@ lib/groff/groffer/version.sh
 %%EXAMPLESDIR%%/mom/elvis_syntax
 %%EXAMPLESDIR%%/mom/elvis_syntax.new
 %%EXAMPLESDIR%%/mom/letter.mom
-%%EXAMPLESDIR%%/mom/letter.ps
+%%EXAMPLESDIR%%/mom/letter.pdf
+%%EXAMPLESDIR%%/mom/mom-pdf.mom
+%%EXAMPLESDIR%%/mom/mom-pdf.pdf
+%%EXAMPLESDIR%%/mom/mom.vim
+%%EXAMPLESDIR%%/mom/penguin.pdf
 %%EXAMPLESDIR%%/mom/penguin.ps
 %%EXAMPLESDIR%%/mom/sample_docs.mom
-%%EXAMPLESDIR%%/mom/sample_docs.ps
+%%EXAMPLESDIR%%/mom/sample_docs.pdf
 %%EXAMPLESDIR%%/mom/typesetting.mom
-%%EXAMPLESDIR%%/mom/typesetting.ps
+%%EXAMPLESDIR%%/mom/typesetting.pdf
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-1.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-10.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-11.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-12.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-13.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-14.html
+%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-15.html
+%%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-16.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-2.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-3.html
 %%HTMLDOCS%%%%EXAMPLESDIR%%/webpage-4.html
@@ -232,6 +303,7 @@ lib/groff/groffer/version.sh
 %%DOCSDIR%%/html/mom/toc.html
 %%DOCSDIR%%/html/mom/typesetting.html
 %%DOCSDIR%%/html/mom/using.html
+%%DOCSDIR%%/html/mom/version-2.html
 %%HTMLDOCS%%%%DOCSDIR%%/html/pic-1.html
 %%HTMLDOCS%%%%DOCSDIR%%/html/pic-10.html
 %%HTMLDOCS%%%%DOCSDIR%%/html/pic-11.html
@@ -260,6 +332,7 @@ lib/groff/groffer/version.sh
 %%DOCSDIR%%/meintro.ps
 %%DOCSDIR%%/meref.me
 %%DOCSDIR%%/meref.ps
+%%DOCSDIR%%/pdf/mom-pdf.pdf
 %%DOCSDIR%%/pdf/pdfmark.pdf
 %%DOCSDIR%%/pic.ms
 %%DOCSDIR%%/pic.ps
@@ -479,6 +552,85 @@ lib/groff/groffer/version.sh
 %%DATADIR%%/font/devlj4/generate/symbol.map
 %%DATADIR%%/font/devlj4/generate/text.map
 %%DATADIR%%/font/devlj4/generate/wingdings.map
+%%DATADIR%%/font/devpdf/AB
+%%DATADIR%%/font/devpdf/ABI
+%%DATADIR%%/font/devpdf/AI
+%%DATADIR%%/font/devpdf/AR
+%%DATADIR%%/font/devpdf/BMB
+%%DATADIR%%/font/devpdf/BMBI
+%%DATADIR%%/font/devpdf/BMI
+%%DATADIR%%/font/devpdf/BMR
+%%DATADIR%%/font/devpdf/CB
+%%DATADIR%%/font/devpdf/CBI
+%%DATADIR%%/font/devpdf/CI
+%%DATADIR%%/font/devpdf/CR
+%%DATADIR%%/font/devpdf/DESC
+%%DATADIR%%/font/devpdf/EURO
+%%DATADIR%%/font/devpdf/Foundry
+%%DATADIR%%/font/devpdf/HB
+%%DATADIR%%/font/devpdf/HBI
+%%DATADIR%%/font/devpdf/HI
+%%DATADIR%%/font/devpdf/HNB
+%%DATADIR%%/font/devpdf/HNBI
+%%DATADIR%%/font/devpdf/HNI
+%%DATADIR%%/font/devpdf/HNR
+%%DATADIR%%/font/devpdf/HR
+%%DATADIR%%/font/devpdf/NB
+%%DATADIR%%/font/devpdf/NBI
+%%DATADIR%%/font/devpdf/NI
+%%DATADIR%%/font/devpdf/NR
+%%DATADIR%%/font/devpdf/PB
+%%DATADIR%%/font/devpdf/PBI
+%%DATADIR%%/font/devpdf/PI
+%%DATADIR%%/font/devpdf/PR
+%%DATADIR%%/font/devpdf/S
+%%DATADIR%%/font/devpdf/TB
+%%DATADIR%%/font/devpdf/TBI
+%%DATADIR%%/font/devpdf/TI
+%%DATADIR%%/font/devpdf/TR
+%%DATADIR%%/font/devpdf/U-AB
+%%DATADIR%%/font/devpdf/U-ABI
+%%DATADIR%%/font/devpdf/U-AI
+%%DATADIR%%/font/devpdf/U-AR
+%%DATADIR%%/font/devpdf/U-BMB
+%%DATADIR%%/font/devpdf/U-BMBI
+%%DATADIR%%/font/devpdf/U-BMI
+%%DATADIR%%/font/devpdf/U-BMR
+%%DATADIR%%/font/devpdf/U-CB
+%%DATADIR%%/font/devpdf/U-CBI
+%%DATADIR%%/font/devpdf/U-CI
+%%DATADIR%%/font/devpdf/U-CR
+%%DATADIR%%/font/devpdf/U-HB
+%%DATADIR%%/font/devpdf/U-HBI
+%%DATADIR%%/font/devpdf/U-HI
+%%DATADIR%%/font/devpdf/U-HNB
+%%DATADIR%%/font/devpdf/U-HNBI
+%%DATADIR%%/font/devpdf/U-HNI
+%%DATADIR%%/font/devpdf/U-HNR
+%%DATADIR%%/font/devpdf/U-HR
+%%DATADIR%%/font/devpdf/U-NB
+%%DATADIR%%/font/devpdf/U-NBI
+%%DATADIR%%/font/devpdf/U-NI
+%%DATADIR%%/font/devpdf/U-NR
+%%DATADIR%%/font/devpdf/U-PB
+%%DATADIR%%/font/devpdf/U-PBI
+%%DATADIR%%/font/devpdf/U-PI
+%%DATADIR%%/font/devpdf/U-PR
+%%DATADIR%%/font/devpdf/U-S
+%%DATADIR%%/font/devpdf/U-TB
+%%DATADIR%%/font/devpdf/U-TBI
+%%DATADIR%%/font/devpdf/U-TI
+%%DATADIR%%/font/devpdf/U-TR
+%%DATADIR%%/font/devpdf/U-ZCMI
+%%DATADIR%%/font/devpdf/U-ZD
+%%DATADIR%%/font/devpdf/ZCMI
+%%DATADIR%%/font/devpdf/ZD
+%%DATADIR%%/font/devpdf/download
+%%DATADIR%%/font/devpdf/enc/text.enc
+%%DATADIR%%/font/devpdf/map/dingbats.map
+%%DATADIR%%/font/devpdf/map/symbolchars
+%%DATADIR%%/font/devpdf/map/symbolmap
+%%DATADIR%%/font/devpdf/map/textmap
 %%DATADIR%%/font/devps/AB
 %%DATADIR%%/font/devps/ABI
 %%DATADIR%%/font/devps/AI
@@ -591,6 +743,7 @@ lib/groff/groffer/version.sh
 %%DATADIR%%/tmac/ec.tmac
 %%DATADIR%%/tmac/eqnrc
 %%DATADIR%%/tmac/europs.tmac
+%%DATADIR%%/tmac/fallbacks.tmac
 %%DATADIR%%/tmac/fr.tmac
 %%DATADIR%%/tmac/hdmisc.tmac
 %%DATADIR%%/tmac/hdtbl.tmac
@@ -635,12 +788,17 @@ lib/groff/groffer/version.sh
 %%DATADIR%%/tmac/mse.tmac
 %%DATADIR%%/tmac/om.tmac
 %%DATADIR%%/tmac/papersize.tmac
+%%DATADIR%%/tmac/pdf.tmac
 %%DATADIR%%/tmac/pdfmark.tmac
 %%DATADIR%%/tmac/pic.tmac
 %%DATADIR%%/tmac/ps.tmac
 %%DATADIR%%/tmac/psatk.tmac
 %%DATADIR%%/tmac/psold.tmac
 %%DATADIR%%/tmac/pspic.tmac
+%%DATADIR%%/tmac/refer-me.tmac
+%%DATADIR%%/tmac/refer-mm.tmac
+%%DATADIR%%/tmac/refer-ms.tmac
+%%DATADIR%%/tmac/refer.tmac
 %%DATADIR%%/tmac/s.tmac
 %%DATADIR%%/tmac/safer.tmac
 %%DATADIR%%/tmac/spdf.tmac
@@ -656,43 +814,46 @@ lib/groff/groffer/version.sh
 share/groff/current
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
-@dirrm %%DATADIR%%/tmac/mm
-@dirrm %%DATADIR%%/tmac/mdoc
-@dirrm %%DATADIR%%/tmac
-@dirrm %%DATADIR%%/pic
-@dirrm %%DATADIR%%/oldfont/devps
-@dirrm %%DATADIR%%/oldfont
-@dirrm %%DATADIR%%/font/devutf8
-@dirrm %%DATADIR%%/font/devps/generate
-@dirrm %%DATADIR%%/font/devps
-@dirrm %%DATADIR%%/font/devlj4/generate
-@dirrm %%DATADIR%%/font/devlj4
-@dirrm %%DATADIR%%/font/devlbp
-@dirrm %%DATADIR%%/font/devlatin1
-@dirrm %%DATADIR%%/font/devhtml
-@dirrm %%DATADIR%%/font/devdvi/generate
-@dirrm %%DATADIR%%/font/devdvi
-@dirrm %%DATADIR%%/font/devascii
-@dirrmtry %%DATADIR%%/font/devX75-12
-@dirrmtry %%DATADIR%%/font/devX75
-@dirrmtry %%DATADIR%%/font/devX100-12
-@dirrmtry %%DATADIR%%/font/devX100
-@dirrm %%DATADIR%%/font
-@dirrm %%DATADIR%%
-@dirrm share/groff/site-font
-@dirrm share/groff/site-tmac
-@dirrm share/groff
-@dirrm %%DOCSDIR%%/pdf
-@dirrm %%DOCSDIR%%/html/mom
+@dirrmtry share/groff/site-tmac
+@dirrmtry share/groff/site-font
+@dirrmtry %%DATADIR%%/tmac/mm
+@dirrmtry %%DATADIR%%/tmac/mdoc
+@dirrmtry %%DATADIR%%/tmac
+@dirrmtry %%DATADIR%%/pic
+@dirrmtry %%DATADIR%%/oldfont/devps
+@dirrmtry %%DATADIR%%/oldfont
+@dirrmtry %%DATADIR%%/font/devutf8
+@dirrmtry %%DATADIR%%/font/devps/generate
+@dirrmtry %%DATADIR%%/font/devps
+@dirrmtry %%DATADIR%%/font/devpdf/map
+@dirrmtry %%DATADIR%%/font/devpdf/enc
+@dirrmtry %%DATADIR%%/font/devpdf
+@dirrmtry %%DATADIR%%/font/devlj4/generate
+@dirrmtry %%DATADIR%%/font/devlj4
+@dirrmtry %%DATADIR%%/font/devlbp
+@dirrmtry %%DATADIR%%/font/devlatin1
+@dirrmtry %%DATADIR%%/font/devhtml
+@dirrmtry %%DATADIR%%/font/devdvi/generate
+@dirrmtry %%DATADIR%%/font/devdvi
+@dirrmtry %%DATADIR%%/font/devascii
+%%X11%%@dirrmtry %%DATADIR%%/font/devX75-12
+%%X11%%@dirrmtry %%DATADIR%%/font/devX75
+%%X11%%@dirrmtry %%DATADIR%%/font/devX100-12
+%%X11%%@dirrmtry %%DATADIR%%/font/devX100
+@dirrmtry %%DATADIR%%/font
+@dirrmtry %%DATADIR%%
+@dirrmtry share/groff
+@dirrmtry %%DOCSDIR%%/pdf
+@dirrmtry %%DOCSDIR%%/html/mom
 @dirrmtry %%DOCSDIR%%/html/img
-@dirrm %%DOCSDIR%%/html
-@dirrm %%EXAMPLESDIR%%/mom
+@dirrmtry %%DOCSDIR%%/html
+@dirrmtry %%EXAMPLESDIR%%/mom
 @dirrmtry %%EXAMPLESDIR%%/img
-@dirrm %%EXAMPLESDIR%%/hdtbl
-@dirrm %%EXAMPLESDIR%%/chem/122
-@dirrm %%EXAMPLESDIR%%/chem
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
-@dirrm lib/groff/site-tmac
-@dirrm lib/groff/groffer
-@dirrm lib/groff
+@dirrmtry %%EXAMPLESDIR%%/hdtbl
+@dirrmtry %%EXAMPLESDIR%%/chem/122
+@dirrmtry %%EXAMPLESDIR%%/chem
+@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry %%DOCSDIR%%
+@dirrmtry lib/groff/site-tmac
+@dirrmtry lib/groff/groffer
+@dirrmtry lib/groff