sys-apps/man : import from arbor, adjust to -Wp,-D_FORTIFY_SOURCE=2

3 files changed, 106 insertions, 0 deletions

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
+
diff --git a/packages/sys-apps/man/man-1.6g-r3.exheres-0 b/packages/sys-apps/man/man-1.6g-r3.exheres-0
new file mode 100644
index 0000000..cf75bb8
--- /dev/null
+++ b/packages/sys-apps/man/man-1.6g-r3.exheres-0
@@ -0,0 +1,55 @@
+# Copyright 2007 Bryan Østergaard <kloeri@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require alternatives
+
+SUMMARY="Man page reader"
+HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
+DOWNLOADS="http://primates.ximian.com/~flucifredi/${PN}/${PNV}.tar.gz"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    run:
+        sys-apps/groff[>=1.19.2]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PN}-1.6f-unicode.patch
+    "${FILES}"/${PN}-1.6g-fix-install-location-of-man2html.patch
+)
+
+src_configure() {
+    local build=$(exhost --build)
+    local build_cflags_var=${build//-/_}_CFLAGS
+
+    edo env                                       \
+        BUILD_CC="$(exhost --build)-cc ${!build_cflags_var}" \
+        DEFS="-I/usr/$(exhost --target)/include"  \
+    "${WORK}/configure"                           \
+            -default                              \
+            -prefix=/usr/$(exhost --target)       \
+            -sbindir=/usr/$(exhost --target)/bin  \
+            -mandir=/usr/share/man                \
+            -confdir=/etc                         \
+            -compatibility_mode_for_colored_groff
+    # Redcore Linux : adjust conf_script to -Wp,-D_FORTIFY_SOURCE=2
+    edo sed -e "s/\,/\?/g" -e "s/"Wp?"/"Wp,"/g" conf_script
+}
+
+src_install() {
+    default
+    alternatives_for man ${PN} 1000 \
+        /usr/$(exhost --target)/bin/apropos     ${PN}.apropos       \
+        /usr/$(exhost --target)/bin/man         ${PN}.man           \
+        /usr/$(exhost --target)/bin/makewhatis  ${PN}.makewhatis    \
+        /usr/$(exhost --target)/bin/whatis      ${PN}.whatis        \
+        /usr/share/man/man1/apropos.1           ${PN}.apropos.1     \
+        /usr/share/man/man1/man.1               ${PN}.man.1         \
+        /usr/share/man/man1/whatis.1            ${PN}.whatis.1      \
+        /usr/share/man/man8/makewhatis.8        ${PN}.makewhatis.8
+
+}