From 02100bc07f92823d94298cf62eb7b82b40832ef9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 11 Sep 2018 02:06:06 +0100
Subject: sys-apps/man : import from arbor, adjust to -Wp,-D_FORTIFY_SOURCE=2

---
 packages/sys-apps/man/files/man-1.6f-unicode.patch | 27 ++++++++++++++++++++++
 ...man-1.6g-fix-install-location-of-man2html.patch | 24 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 packages/sys-apps/man/files/man-1.6f-unicode.patch
 create mode 100644 packages/sys-apps/man/files/man-1.6g-fix-install-location-of-man2html.patch

(limited to 'packages/sys-apps/man/files')

diff --git a/packages/sys-apps/man/files/man-1.6f-unicode.patch b/packages/sys-apps/man/files/man-1.6f-unicode.patch
new file mode 100644
index 0000000..c26aefa
--- /dev/null
+++ b/packages/sys-apps/man/files/man-1.6f-unicode.patch
@@ -0,0 +1,27 @@
+Upstream: unknown
+Source: http://bugs.gentoo.org/146315
+
+--- man-1.6f/configure
++++ man-1.6f/configure
+@@ -473,9 +473,9 @@
+   then
+     if test $Fnroff = "missing"
+     then
+-      nroff="nroff -Tlatin1 -mandoc"
++      nroff="nroff -Tascii -c -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="troff -mandoc"
+     echo "Warning: could not find groff"
+@@ -484,7 +484,7 @@
+     then
+       nroff="$Fgroff -Tlatin1 -mandoc"
+     else
+-      nroff="$Fnroff -Tlatin1 -mandoc"
++      nroff="$Fnroff -mandoc"
+     fi
+     troff="$Fgroff -Tps -mandoc"
+     jnroff="$Fgroff -Tnippon -mandocj"
+
diff --git a/packages/sys-apps/man/files/man-1.6g-fix-install-location-of-man2html.patch b/packages/sys-apps/man/files/man-1.6g-fix-install-location-of-man2html.patch
new file mode 100644
index 0000000..0f0b6c5
--- /dev/null
+++ b/packages/sys-apps/man/files/man-1.6g-fix-install-location-of-man2html.patch
@@ -0,0 +1,24 @@
+Source: Michael Forney
+Reason: Fix installation directory of man2html for multiarch
+Upstream: Emailed patch to maintainer, will be included in 1.6h
+
+---
+ man2html/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man2html/Makefile.in b/man2html/Makefile.in
+index b41eaba..7096dee 100644
+--- a/man2html/Makefile.in
++++ b/man2html/Makefile.in
+@@ -2,7 +2,7 @@ CC = @CC@
+ CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
+ EXEEXT = @EXEEXT@
+-bindir = $(DESTDIR)$(PREFIX)/usr/bin
++bindir = $(DESTDIR)$(PREFIX)@bindir@
+ mandir = $(DESTDIR)$(PREFIX)@mandir@
+ vardir = $(DESTDIR)$(PREFIX)/var
+ httpdir = $(DESTDIR)$(PREFIX)/home/httpd
+-- 
+1.8.4
+
-- 
cgit v1.2.3