Update to 1.22.4

6 files changed, 27 insertions, 38 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 27dc595eec29..e9eeca7fef3d 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	groff
-PORTVERSION=	1.22.3
-PORTREVISION=	1
+PORTVERSION=	1.22.4
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -71,23 +70,6 @@ PLIST_SUB+=	X11=""
 PLIST_SUB+=	HTMLDOCS=""
 .endif
 
-# Run in src/libs/gnulib subdir, too
-post-configure:
-	@(cd ${WRKSRC}/src/libs/gnulib && \
-	    ${SET_LATE_CONFIGURE_ARGS} \
-	    if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	    INSTALL="/usr/bin/install -c" \
-	    INSTALL_DATA="${INSTALL_DATA}" \
-	    INSTALL_LIB="${INSTALL_LIB}" \
-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	    ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \
-		 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-		 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-		 ${FALSE}; \
-	    fi)
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}/${PREFIX}/share/groff/site-tmac
 
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 2faae4943a1b..e28bcd9eaf8a 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495884266
-SHA256 (groff-1.22.3.tar.gz) = 3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5
-SIZE (groff-1.22.3.tar.gz) = 4188772
+TIMESTAMP = 1545820488
+SHA256 (groff-1.22.4.tar.gz) = e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293
+SIZE (groff-1.22.4.tar.gz) = 4137480
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
index 86f3a9f3e167..d3778ba10191 100644
--- a/textproc/groff/files/mdoc.local
+++ b/textproc/groff/files/mdoc.local
@@ -50,7 +50,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~12.0
+.ds doc-default-operating-system FreeBSD\~13.0
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-2.2.9  2.2.9
@@ -64,9 +64,12 @@
 .ds doc-operating-system-FreeBSD-10.1   10.1
 .ds doc-operating-system-FreeBSD-10.2   10.2
 .ds doc-operating-system-FreeBSD-10.3   10.3
+.ds doc-operating-system-FreeBSD-10.4   10.4
 .ds doc-operating-system-FreeBSD-11.0   11.0
 .ds doc-operating-system-FreeBSD-11.1   11.1
+.ds doc-operating-system-FreeBSD-11.2   11.2
 .ds doc-operating-system-FreeBSD-12.0   12.0
+.ds doc-operating-system-FreeBSD-13.0   13.0
 .
 .\" Definitions for other *BSDs not (yet) in doc-common
 .ds doc-operating-system-NetBSD-7.0     7.0
diff --git a/textproc/groff/files/patch-Makefile.in b/textproc/groff/files/patch-Makefile.in
new file mode 100644
index 000000000000..bdb64e38f06d
--- /dev/null
+++ b/textproc/groff/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2018-12-23 14:34:27 UTC
++++ Makefile.in
+@@ -12527,7 +12527,7 @@ ref-del.sed : $(libgroff_srcdir)/ref-del.sin
+ 	    -e 's/@''PACKAGE''@/$(LIBGROFF_PACKAGE)/g' $(libgroff_srcdir)/ref-del.sin > t-$@
+ 	mv t-$@ $@
+ 
+-install-data-local: install_charset_data
++install-data-local: 
+ install_charset_data:
+ 	-test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
diff --git a/textproc/groff/files/patch-src-libs-libgroff-Makefile.sub b/textproc/groff/files/patch-src-libs-libgroff-Makefile.sub
deleted file mode 100644
index aeddabd7367e..000000000000
--- a/textproc/groff/files/patch-src-libs-libgroff-Makefile.sub
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libs/libgroff/Makefile.sub.orig	2011-01-14 22:49:35.567009974 +0100
-+++ src/libs/libgroff/Makefile.sub	2011-01-14 22:49:39.566978160 +0100
-@@ -151,7 +151,7 @@
- 
- MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
--install_data: install_charset_data
-+install_data:
- install_charset_data:
- 	test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- 	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index 3851c63c5c98..6ab70ed2f4a4 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -81,7 +81,6 @@ man/man1/grolj4.1.gz
 man/man1/gropdf.1.gz
 man/man1/grops.1.gz
 man/man1/grotty.1.gz
-man/man7/groff_filenames.7.gz
 %%X11%%man/man1/gxditview.1.gz
 man/man1/hpftodit.1.gz
 man/man1/indxbib.1.gz
@@ -108,6 +107,7 @@ man/man1/tbl.1.gz
 man/man1/tfmtodit.1.gz
 man/man1/troff.1.gz
 %%X11%%man/man1/xtotroff.1.gz
+man/man5/groff_filenames.5.gz
 man/man5/groff_font.5.gz
 man/man5/groff_out.5.gz
 man/man5/groff_tmac.5.gz
@@ -431,6 +431,11 @@ man/man7/roff.7.gz
 %%DATADIR%%/font/devascii/DESC
 %%DATADIR%%/font/devascii/I
 %%DATADIR%%/font/devascii/R
+%%DATADIR%%/font/devcp1047/B
+%%DATADIR%%/font/devcp1047/BI
+%%DATADIR%%/font/devcp1047/DESC
+%%DATADIR%%/font/devcp1047/I
+%%DATADIR%%/font/devcp1047/R
 %%DATADIR%%/font/devdvi/CW
 %%DATADIR%%/font/devdvi/CWEC
 %%DATADIR%%/font/devdvi/CWI
@@ -648,7 +653,6 @@ man/man7/roff.7.gz
 %%DATADIR%%/font/devpdf/map/symbolchars
 %%DATADIR%%/font/devpdf/map/symbolmap
 %%DATADIR%%/font/devpdf/map/textmap
-%%DATADIR%%/font/devpdf/util/BuildFoundries
 %%DATADIR%%/font/devps/AB
 %%DATADIR%%/font/devps/ABI
 %%DATADIR%%/font/devps/AI
@@ -774,7 +778,6 @@ man/man7/roff.7.gz
 %%DATADIR%%/tmac/hyphen.sv
 %%DATADIR%%/tmac/hyphen.us
 %%DATADIR%%/tmac/hyphenex.cs
-%%DATADIR%%/tmac/hyphenex.det
 %%DATADIR%%/tmac/hyphenex.us
 %%DATADIR%%/tmac/ja.tmac
 %%DATADIR%%/tmac/latin1.tmac
@@ -808,6 +811,7 @@ man/man7/roff.7.gz
 %%DATADIR%%/tmac/papersize.tmac
 %%DATADIR%%/tmac/pdf.tmac
 %%DATADIR%%/tmac/pdfmark.tmac
+%%DATADIR%%/tmac/pdfpic.tmac
 %%DATADIR%%/tmac/pic.tmac
 %%DATADIR%%/tmac/ps.tmac
 %%DATADIR%%/tmac/psatk.tmac
@@ -829,9 +833,9 @@ man/man7/roff.7.gz
 %%DATADIR%%/tmac/tty.tmac
 %%DATADIR%%/tmac/unicode.tmac
 %%DATADIR%%/tmac/www.tmac
+%%DATADIR%%/tmac/zh.tmac
 share/groff/current
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
-@dir lib/groff/refer
 @dir lib/groff/site-tmac
 @dir share/groff/site-font