Adding upstream version 6.8.upstream/6.8upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index 1492821..f56783b 100644
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -7,16 +7,18 @@ MAKEFILE_BUILD_PS_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure/build-depends/grep.mk
-include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
+include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 _XFAIL_PSMAN_MAN_set := \
 	$(_MANDIR)/man1/iconv.1.ps.set \
 	$(_MANDIR)/man2/fanotify_init.2.ps.set \
+	$(_MANDIR)/man2/membarrier.2.ps.set \
+	$(_MANDIR)/man2/statx.2.ps.set \
 	$(_MANDIR)/man2/syscall.2.ps.set \
 	$(_MANDIR)/man3/newlocale.3.ps.set \
 	$(_MANDIR)/man7/address_families.7.ps.set \
@@ -42,8 +44,8 @@ _XFAIL_PSMAN_MAN_set := \
 	$(_MANDIR)/man7/vdso.7.ps.set
 
 
-_PSMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MAN))
-_PSMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MDOC))
+_PSMAN_MAN_set  := $(patsubst %, %.ps.set, $(_NONSO_MAN))
+_PSMAN_MDOC_set := $(patsubst %, %.ps.set, $(_NONSO_MDOC))
 
 
 ifeq ($(SKIP_XFAIL),yes)