From owner-svn-doc-all@FreeBSD.ORG  Thu May 23 06:12:41 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E5293ACC;
 Thu, 23 May 2013 06:12:41 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BE41F65F;
 Thu, 23 May 2013 06:12:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4N6Cfjh061773;
 Thu, 23 May 2013 06:12:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4N6CfRe061770;
 Thu, 23 May 2013 06:12:41 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305230612.r4N6CfRe061770@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 23 May 2013 06:12:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r41710 - in head: en_US.ISO8859-1/books/handbook share/mk
 share/xml share/xsl
X-SVN-Group: doc-head
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 May 2013 06:12:42 -0000

Author: gabor
Date: Thu May 23 06:12:40 2013
New Revision: 41710
URL: http://svnweb.freebsd.org/changeset/doc/41710

Log:
  - Port PGP keyring generation to XSLT

Added:
  head/share/xsl/freebsd-pgpkeyring.xsl   (contents, props changed)
Deleted:
  head/share/xml/pgp.dsl
Modified:
  head/en_US.ISO8859-1/books/handbook/Makefile
  head/share/mk/doc.docbook.mk

Modified: head/en_US.ISO8859-1/books/handbook/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/Makefile	Wed May 22 20:41:12 2013	(r41709)
+++ head/en_US.ISO8859-1/books/handbook/Makefile	Thu May 23 06:12:40 2013	(r41710)
@@ -299,7 +299,7 @@ XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:
 XMLFLAGS+= -i chap.freebsd-glossary
 
 pgpkeyring: pgpkeys/chapter.xml ${DOC}.parsed.xml
-	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t xml ${XMLDECL} ${DOC}.parsed.print.xml
+	@${XSLTPROC} ${XSLPGP} ${DOC}.parsed.xml
 
 #
 # Handbook-specific variables

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Wed May 22 20:41:12 2013	(r41709)
+++ head/share/mk/doc.docbook.mk	Thu May 23 06:12:40 2013	(r41710)
@@ -78,13 +78,13 @@ XMLDECL?=	/usr/local/share/sgml/docbook/
 
 DSLHTML?=	${DOC_PREFIX}/share/xml/spellcheck.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
-DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
 
 XSLPROF?=	/usr/local/share/xsl/docbook/profiling/profile.xsl
 XSLXHTML?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
 XSLXHTMLCHUNK?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
 XSLEPUB?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
 XSLFO?=		${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
+XSLPGP?=	${DOC_PREFIX}/share/xsl/freebsd-pgpkeyring.xsl
 
 XSLSCH?=	/usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
 

Added: head/share/xsl/freebsd-pgpkeyring.xsl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/xsl/freebsd-pgpkeyring.xsl	Thu May 23 06:12:40 2013	(r41710)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+  <xsl:output method="text"/>
+
+  <xsl:template match="/">
+    <xsl:for-each select="//programlisting[@role='pgpkey']">
+      <xsl:value-of select="."/>
+      <xsl:text>&#xA;</xsl:text>
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>