From d6dd7354afeec70945bd0faf9194dde12b1e8a4a Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Thu, 25 Mar 2021 14:11:31 +0100
Subject: group-base: Fix category for mandoc patch

mandoc's category changed when we migrated to the version of mandoc
present in Gentoo's main portage tree. This meant that the patch would
no longer apply.
---
 .../mandoc-1.14.5/fix-empty-tbl-nullptr.patch      | 22 ++++++++++++++++++++++
 .../mandoc-1.14.5/fix-empty-tbl-nullptr.patch      | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 group-base/patches/app-text/mandoc-1.14.5/fix-empty-tbl-nullptr.patch
 delete mode 100644 group-base/patches/sys-apps/mandoc-1.14.5/fix-empty-tbl-nullptr.patch

diff --git a/group-base/patches/app-text/mandoc-1.14.5/fix-empty-tbl-nullptr.patch b/group-base/patches/app-text/mandoc-1.14.5/fix-empty-tbl-nullptr.patch
new file mode 100644
index 0000000..8e2d249
--- /dev/null
+++ b/group-base/patches/app-text/mandoc-1.14.5/fix-empty-tbl-nullptr.patch
@@ -0,0 +1,22 @@
+--- a/tbl_term.c	2019-11-08 16:58:41.628382060 +0100
++++ b/tbl_term.c	2019-11-08 16:59:56.127323602 +0100
+@@ -626,7 +626,8 @@
+ 
+ 		lw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->string == NULL ||
++		      strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 		tbl_direct_border(tp, BHORIZ * lw,
+ 		    col->width + col->spacing / 2);
+@@ -670,7 +671,8 @@
+ 
+ 		rw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->string == NULL ||
++		      strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 
+ 		/* The line crossing at the end of this column. */
diff --git a/group-base/patches/sys-apps/mandoc-1.14.5/fix-empty-tbl-nullptr.patch b/group-base/patches/sys-apps/mandoc-1.14.5/fix-empty-tbl-nullptr.patch
deleted file mode 100644
index 8e2d249..0000000
--- a/group-base/patches/sys-apps/mandoc-1.14.5/fix-empty-tbl-nullptr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tbl_term.c	2019-11-08 16:58:41.628382060 +0100
-+++ b/tbl_term.c	2019-11-08 16:59:56.127323602 +0100
-@@ -626,7 +626,8 @@
- 
- 		lw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->string == NULL ||
-+		      strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 		tbl_direct_border(tp, BHORIZ * lw,
- 		    col->width + col->spacing / 2);
-@@ -670,7 +671,8 @@
- 
- 		rw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->string == NULL ||
-+		      strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 
- 		/* The line crossing at the end of this column. */
-- 
cgit v1.2.3-2-gb3c3