From owner-svn-doc-all@freebsd.org  Wed Dec  6 18:50:34 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D43CE891AD;
 Wed,  6 Dec 2017 18:50:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 385347E56A;
 Wed,  6 Dec 2017 18:50:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB6IoXlZ056343;
 Wed, 6 Dec 2017 18:50:33 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB6IoXbm056341;
 Wed, 6 Dec 2017 18:50:33 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201712061850.vB6IoXbm056341@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 6 Dec 2017 18:50:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r51260 - in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys
X-SVN-Group: doc-head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys
X-SVN-Commit-Revision: 51260
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Dec 2017 18:50:34 -0000

Author: gjb
Date: Wed Dec  6 18:50:32 2017
New Revision: 51260
URL: https://svnweb.freebsd.org/changeset/doc/51260

Log:
  Fix generating pgpkeyring.txt when it does not exist, which seems
  to have been broken following r51076 or r51077.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/doc/Makefile
  head/share/pgpkeys/Makefile

Modified: head/en_US.ISO8859-1/htdocs/doc/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/doc/Makefile	Wed Dec  6 09:15:25 2017	(r51259)
+++ head/en_US.ISO8859-1/htdocs/doc/Makefile	Wed Dec  6 18:50:32 2017	(r51260)
@@ -32,9 +32,10 @@ install:
 	  ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install
 	${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt
 
+beforeinstall:
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 .if ${LANGCODE} == en_US.ISO8859-1
-all: all-pgpkeyring
+	${MAKE} -C ${.CURDIR} all-pgpkeyring
 .endif
 
 

Modified: head/share/pgpkeys/Makefile
==============================================================================
--- head/share/pgpkeys/Makefile	Wed Dec  6 09:15:25 2017	(r51259)
+++ head/share/pgpkeys/Makefile	Wed Dec  6 18:50:32 2017	(r51260)
@@ -7,6 +7,8 @@ XSLPGP=		http://www.FreeBSD.org/XML/share/xml/freebsd-
 FILES=		pgpkeyring.txt
 CLEANFILES=	pgpkeyring.txt keyring.xml
 
+all:	keyring.xml pgpkeyring pgpkeyring.txt
+
 keyring.xml:	.PHONY
 	@${ECHO_CMD} "<?xml version='1.0' encoding='UTF-8'?>" > ${.TARGET}
 	@${ECHO_CMD} "<keyring>" >> ${.TARGET}