From f42eb9f25c82572fe8751c4c8db40057729a70c2 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 12 Dec 2017 16:27:43 +0000
Subject: [PATCH] Fix building pgpkeyring.txt with parallel builds by setting
 .ORDER targets. [1]

While here, change the all-pgpkeyring target, forgotten in r51260.

Reported by:	wosch [1]
Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/doc/Makefile | 2 +-
 share/pgpkeys/Makefile              | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/doc/Makefile b/en_US.ISO8859-1/htdocs/doc/Makefile
index 858e435655..33844f74da 100644
--- a/en_US.ISO8859-1/htdocs/doc/Makefile
+++ b/en_US.ISO8859-1/htdocs/doc/Makefile
@@ -21,7 +21,7 @@ all-all:
 	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
 all-pgpkeyring:
-	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys all
 
 clean:
 	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
diff --git a/share/pgpkeys/Makefile b/share/pgpkeys/Makefile
index f72c876d3b..fbd9f82d74 100644
--- a/share/pgpkeys/Makefile
+++ b/share/pgpkeys/Makefile
@@ -7,6 +7,9 @@ XSLPGP=		http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl
 FILES=		pgpkeyring.txt
 CLEANFILES=	pgpkeyring.txt keyring.xml
 
+.ORDER:	pgpkeyring pgpkeyring.txt
+.ORDER:	keyring.xml pgpkeyring.txt
+
 all:	keyring.xml pgpkeyring pgpkeyring.txt
 
 keyring.xml:	.PHONY
@@ -19,7 +22,8 @@ pgpkeyring: keyring.xml
 	@${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml
 
 pgpkeyring.txt:
-	@${MAKE} pgpkeyring > ${.TARGET}.tmp
+	@${RM} -f ${.TARGET}.tmp || true
+	@${MAKE} -C ${.CURDIR} pgpkeyring > ${.TARGET}.tmp
 	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"