aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2014-03-07 12:23:51 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2014-03-07 12:23:51 +0000
commitbc0ea04e7d0de1f9ea78cb10168f0b9ce5a750ec (patch)
treeaadc4e4dd4296914f03a6c3dd6da4bb13c2ba3b9
parent42293fc0966d243f9ee8fd728425245a4f3dcf80 (diff)
downloaddoc-bc0ea04e7d0de1f9ea78cb10168f0b9ce5a750ec.tar.gz
doc-bc0ea04e7d0de1f9ea78cb10168f0b9ce5a750ec.zip
- Move the PGP keyring generation to the language-independent share directory
Discussed with: hrs, wblock
Notes
Notes: svn path=/head/; revision=44166
-rw-r--r--Makefile2
-rw-r--r--de_DE.ISO8859-1/books/handbook/Makefile3
-rw-r--r--el_GR.ISO8859-7/books/handbook/Makefile29
-rw-r--r--en_US.ISO8859-1/books/handbook/Makefile34
-rw-r--r--en_US.ISO8859-1/htdocs/doc/Makefile2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/Makefile30
-rw-r--r--fr_FR.ISO8859-1/books/handbook/Makefile30
-rw-r--r--fr_FR.ISO8859-1/htdocs/doc/Makefile2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/Makefile28
-rw-r--r--it_IT.ISO8859-15/books/handbook/Makefile33
-rw-r--r--ja_JP.eucJP/books/handbook/Makefile29
-rw-r--r--nl_NL.ISO8859-1/books/handbook/Makefile29
-rw-r--r--pl_PL.ISO8859-2/books/handbook/Makefile30
-rw-r--r--pt_BR.ISO8859-1/books/handbook/Makefile30
-rw-r--r--release/Makefile2
-rw-r--r--ru_RU.KOI8-R/books/handbook/Makefile30
-rw-r--r--ru_RU.KOI8-R/htdocs/doc/Makefile2
-rw-r--r--share/Makefile5
-rw-r--r--share/mk/doc.docbook.mk1
-rw-r--r--share/pgpkeys/Makefile24
-rw-r--r--share/pgpkeys/decke.key5
-rw-r--r--share/pgpkeys/scop.key7
-rw-r--r--share/pgpkeys/thomas.key3
-rw-r--r--zh_CN.UTF-8/books/handbook/Makefile28
-rw-r--r--zh_TW.Big5/books/handbook/Makefile30
25 files changed, 41 insertions, 407 deletions
diff --git a/Makefile b/Makefile
index 0664d86ef4..a1379b792b 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@ SUBDIR+= zh_CN.UTF-8
SUBDIR+= zh_TW.Big5
.endif
+SUBDIR+= share
+
DOC_PREFIX?= ${.CURDIR}
.if exists(/usr/bin/svnlite)
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 1f46588470..6d55623559 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -275,9 +275,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index ac3b982eea..6948995e22 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -9,25 +9,6 @@
# ------------------------------------------------------------------------
#
-# Μεταβλητές σχετικές με το Εγχειρίδιο
-#
-# WITH_PGPKEYS Η εκτυπώσιμη μορφή του εγχειριδίου περιέχει κανονικά
-# μόνο τα fingerprints από τα PGP κλειδιά. Αν θέλετε
-# να εκτυπώνονται ολόκληρα τα κλειδιά, τότε αυτή η
-# μεταβλητή πρέπει να είναι 'defined'. Αυτή η επιλογή
-# δεν επηρεάζει σε τίποτα τις μορφές HTML.
-#
-# Make targets μόνο για το Εγχειρίδιο
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-#
# Για να προσθέσετε ένα νέο κεφάλαιο στο Εγχειρίδιο:
#
# - Ενημερώστε αυτό το Makefile, το chapters.ent και το book.xml
@@ -293,16 +274,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 07a87bd934..56b026ff52 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -5,25 +5,6 @@
#
# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-#
# To add a new chapter to the Handbook:
#
# - Update this Makefile, chapters.ent and book.xml
@@ -287,16 +268,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml ${DOC}.parsed.xml
- @${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} ${DOC}.parsed.xml
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
@@ -343,8 +314,3 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-# XXX
-.if defined(FINGERPRINTS_ONLY)
-XSLTPROCOPTS+=--param generate.fingerprint.only '1'
-.endif
diff --git a/en_US.ISO8859-1/htdocs/doc/Makefile b/en_US.ISO8859-1/htdocs/doc/Makefile
index 7021e631e5..d8b98e4bbc 100644
--- a/en_US.ISO8859-1/htdocs/doc/Makefile
+++ b/en_US.ISO8859-1/htdocs/doc/Makefile
@@ -26,7 +26,7 @@ all-install:
INSTALL_COMPRESSED= install
all-pgpkeyring:
@unset DESTDIR || true; \
- cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \
+ cd ${DOC_PREFIX}/share/pgpkeys; \
${MAKE} \
pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 4dc9e523a2..19f348bda5 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -10,26 +10,6 @@
# %SRCID% 0.0
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
MAINTAINER= jesusr@FreeBSD.org
DOC?= book
@@ -200,16 +180,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
DOC_PREFIX?= ${.CURDIR}/../../..
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index 643e16dd3a..763d3d328d 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -7,26 +7,6 @@
# Build the FreeBSD Handbook.
#
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
MAINTAINER=blackend@FreeBSD.org
DOC?= book
@@ -228,16 +208,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/fr_FR.ISO8859-1/htdocs/doc/Makefile b/fr_FR.ISO8859-1/htdocs/doc/Makefile
index ba3324794d..870db36a52 100644
--- a/fr_FR.ISO8859-1/htdocs/doc/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/doc/Makefile
@@ -34,7 +34,7 @@ all-install:
INSTALL_COMPRESSED= install
all-pgpkeyring:
@unset DESTDIR || true; \
- cd ${DOC_PREFIX}/${LANGCODE}; \
+ cd ${DOC_PREFIX}/share/pgpkeys; \
${MAKE} \
pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index ecb9d9d2ca..449466a1dc 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -11,24 +11,6 @@
# ------------------------------------------------------------------------
#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-#
# To add a new chapter to the Handbook:
#
# - Update this Makefile, chapters.ent and book.xml
@@ -255,16 +237,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 4ea1fc4e5c..d35dbf7c42 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -5,29 +5,6 @@
# Crea il Manuale di FreeBSD.
#
-# ------------------------------------------------------------------------
-#
-# Variabili specifiche del Manuale
-#
-# WITH_PGPKEYS La versione stampata del manuale riporta solo i
-# fingerprints PGP di base. Se vuoi visualizzare
-# le chiavi intere, allora setta questa variabile.
-# Questa opzione non ha effetto sui formati HTML.
-#
-# Targets specifici del Manuale
-#
-# pgpkeyring Questo target leggerΰ il contenuto del file
-# pgpkeys/chapter.xml ad estrarrΰ tutte le chiavi
-# pgp sullo standard output. Questo output puς
-# quindi essere rediretto su un file e distribuito
-# come un keyring pubblico degli sviluppatori di
-# FreeBSD che puς essere facilmente importato in
-# PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
-.PATH: ${.CURDIR}/../../share/xml/glossary
-
MAINTAINER= ale@FreeBSD.org
DOC?= book
@@ -229,16 +206,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Variabili specifiche del Manuale
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 4ec5ac667c..f280d389e2 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -7,25 +7,6 @@
#
# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-#
# To add a new chapter to the Handbook:
#
# - Update this Makefile, chapters.ent and book.xml
@@ -294,16 +275,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml ${DOC}.parsed.xml
- @${XSLTPROC} ${XSLPGP} ${DOC}.parsed.xml
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 235967baec..e0ff40e390 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -8,25 +8,6 @@
#
# ------------------------------------------------------------------------
-#
-# Handboekspecifieke variabelen
-#
-# WITH_PGPKEYS De gedrukte verie van het handboek geeft standaard
-# alleen PGP vingerafdrukken weer. Als het gewenst
-# is dat de complete sleutel wordt weergegeven dan
-# dient deze variabele insteld te worden. De optie
-# heeft geen invloed op de HTML formaten.
-#
-# Handboekspecifieke doelen
-#
-# pgpkeyring Dit doel leest de inhoud van pgpkeys/chapter.xml
-# en schrijft dan alle PGP sleutels naar stdout.
-# De uitvoer kan omgeleid worden naar een bestand
-# en verspreid worden als een publieke sleutelring
-# van FreeBSD ontwikkelaars die eenvoudig in
-# PGP/GPG ingelezen kan worden.
-#
-# ------------------------------------------------------------------------
# Om een nieuw hoofdstuk aan het Handboek toe te voegen:
#
# - Werk deze Makefile, chapters.ent en book.xml bij
@@ -291,16 +272,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${XSLTPROC} ${XSLPGP} ${DOC}.parsed.xml
-
-#
-# Handboekspecifieke variablen
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 06f8da187d..e8f781bee5 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -6,26 +6,6 @@
# Build the FreeBSD Handbook.
#
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
.PATH: ${.CURDIR}/../../share/xml/glossary
MAINTAINER= doc@FreeBSD.org
@@ -197,16 +177,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index 9d74af4614..49531ae1b6 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -9,26 +9,6 @@
# Original revision: 1.53
#
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
MAINTAINER=lioux@FreeBSD.org
DOC?= book
@@ -151,16 +131,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
DOC_PREFIX?= ${.CURDIR}/../../..
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/Makefile b/release/Makefile
index 4ed7ac46ab..7b6e50988b 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -131,7 +131,7 @@ release.1:
.endif
# Build PGP key ring
${RM} -f ${DOCKEYFILE}
- cd ${DOC_PREFIX}/en_US.ISO8859-1/books/handbook && ${MAKE} pgpkeyring > ${DOCKEYFILE}
+ cd ${DOC_PREFIX}/share/pgpkeys && ${MAKE} pgpkeyring > ${DOCKEYFILE}
# Construct the build.txt file with the documentation build info.
${RM} -f ${DOCBUILDFILE}
${TOUCH} ${DOCBUILDFILE}
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 8c5ccecd07..3d15be6be7 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -9,26 +9,6 @@
# Build the FreeBSD Handbook.
#
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
.PATH: ${.CURDIR}/../../share/xml/glossary
MAINTAINER=phantom@FreeBSD.org
@@ -241,16 +221,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
url_relprEFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/htdocs/doc/Makefile b/ru_RU.KOI8-R/htdocs/doc/Makefile
index f36aa177b3..344138eefa 100644
--- a/ru_RU.KOI8-R/htdocs/doc/Makefile
+++ b/ru_RU.KOI8-R/htdocs/doc/Makefile
@@ -36,7 +36,7 @@ all-install:
INSTALL_COMPRESSED= install
all-pgpkeyring:
@unset DESTDIR || true; \
- cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \
+ cd ${DOC_PREFIX}/share/pgpkeys; \
${MAKE} \
pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
diff --git a/share/Makefile b/share/Makefile
new file mode 100644
index 0000000000..f6f6fe4488
--- /dev/null
+++ b/share/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR+= pgpkeys
+
+.include <bsd.subdir.mk>
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index bc030c9f78..45786f33d1 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -58,7 +58,6 @@ XSLXHTML?= http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml.xsl
XSLXHTMLCHUNK?= http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-chunk.xsl
XSLEPUB?= http://www.FreeBSD.org/XML/share/xml/freebsd-epub.xsl
XSLFO?= http://www.FreeBSD.org/XML/share/xml/freebsd-fo.xsl
-XSLPGP?= http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl
XSLSCH?= /usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
diff --git a/share/pgpkeys/Makefile b/share/pgpkeys/Makefile
new file mode 100644
index 0000000000..9f31286f47
--- /dev/null
+++ b/share/pgpkeys/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+XSLPGP= http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl
+
+FILES= pgpkeyring.txt
+CLEANFILES= pgpkeyring.txt keyring.xml
+
+keyring.xml:
+ @${ECHO_CMD} "<?xml version='1.0' encoding='UTF-8'?>" > ${.TARGET}
+ @${ECHO_CMD} "<keyring>" >> ${.TARGET}
+ @${CAT} *.key >> ${.TARGET}
+ @${ECHO_CMD} "</keyring>" >> ${.TARGET}
+
+pgpkeyring: keyring.xml
+ @${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml
+
+pgpkeyring.txt:
+ @${MAKE} pgpkeyring >${.TARGET}
+
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
+
+.if defined(FINGERPRINTS_ONLY)
+XSLTPROCOPTS+=--param generate.fingerprint.only '1'
+.endif
diff --git a/share/pgpkeys/decke.key b/share/pgpkeys/decke.key
index 60592f9bed..cb7d2a31e5 100644
--- a/share/pgpkeys/decke.key
+++ b/share/pgpkeys/decke.key
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh decke 59C48D501F718F36 ;
@@ -6,8 +5,8 @@ sh addkey.sh decke 59C48D501F718F36 ;
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
pub 4096R/59C48D501F718F36 2013-11-22 [expires: 2016-11-21]
Key fingerprint = 2824 75D6 97AB C053 1B71 C127 59C4 8D50 1F71 8F36
-uid Bernhard Frφhlich <decke@FreeBSD.org>
-uid Bernhard Frφhlich <decke@bluelife.at>
+uid Bernhard Fröhlich <decke@FreeBSD.org>
+uid Bernhard Fröhlich <decke@bluelife.at>
sub 4096R/18EA4819E808DF16 2013-11-22 [expires: 2016-11-21]
]]></programlisting>
diff --git a/share/pgpkeys/scop.key b/share/pgpkeys/scop.key
index e187314279..3ac3de182d 100644
--- a/share/pgpkeys/scop.key
+++ b/share/pgpkeys/scop.key
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh scop BCD241CB;
-->
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub 1024D/BCD241CB 2002-04-07 Ville Skyttδ <ville.skytta@iki.fi>
+pub 1024D/BCD241CB 2002-04-07 Ville Skyttä <ville.skytta@iki.fi>
Key fingerprint = 4E0D EBAB 3106 F1FA 3FA9 B875 D98C D635 BCD2 41CB
-uid Ville Skyttδ <ville.skytta@xemacs.org>
-uid Ville Skyttδ <scop@FreeBSD.org>
+uid Ville Skyttä <ville.skytta@xemacs.org>
+uid Ville Skyttä <scop@FreeBSD.org>
sub 2048g/9426F4D1 2002-04-07
]]></programlisting>
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
diff --git a/share/pgpkeys/thomas.key b/share/pgpkeys/thomas.key
index 1890bf922e..d0475f8ece 100644
--- a/share/pgpkeys/thomas.key
+++ b/share/pgpkeys/thomas.key
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh thomas 393D2469;
-->
<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
pub 1024D/393D2469 1999-09-23 Thomas Quinot <thomas@cuivre.fr.eu.org>
- Empreinte de la clι = 4737 A0AD E596 6D30 4356 29B8 004D 54B8 393D 2469
+ Empreinte de la clΓ© = 4737 A0AD E596 6D30 4356 29B8 004D 54B8 393D 2469
uid Thomas Quinot <thomas@debian.org>
uid Thomas Quinot <thomas@FreeBSD.org>
sub 1024g/8DE13BB2 1999-09-23
diff --git a/zh_CN.UTF-8/books/handbook/Makefile b/zh_CN.UTF-8/books/handbook/Makefile
index 4fb68e4079..dbb07d4a2e 100644
--- a/zh_CN.UTF-8/books/handbook/Makefile
+++ b/zh_CN.UTF-8/books/handbook/Makefile
@@ -7,24 +7,6 @@
# ------------------------------------------------------------------------
#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-#
# To add a new chapter to the Handbook:
#
# - Update this Makefile, chapters.ent and book.xml
@@ -296,18 +278,8 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
DOC_PREFIX?= ${.CURDIR}/../../..
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 37593e0104..6dee2d0433 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -5,26 +5,6 @@
# Build the FreeBSD Handbook.
#
-# ------------------------------------------------------------------------
-#
-# Handbook-specific variables
-#
-# WITH_PGPKEYS The print version of the handbook only prints PGP
-# fingerprints by default. If you would like for the
-# entire key to be displayed, then set this variable.
-# This option has no affect on the HTML formats.
-#
-# Handbook-specific targets
-#
-# pgpkeyring This target will read the contents of
-# pgpkeys/chapter.xml and will extract all of
-# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
-# public keyring of FreeBSD developers that can
-# easily be imported into PGP/GPG.
-#
-# ------------------------------------------------------------------------
-
.PATH: ${.CURDIR}/../../share/xml/glossary
MAINTAINER= doc@FreeBSD.org
@@ -241,16 +221,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml}
XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
XMLFLAGS+= -i chap.freebsd-glossary
-pgpkeyring: pgpkeys/chapter.xml
- @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
-
-#
-# Handbook-specific variables
-#
-.if defined(WITH_PGPKEYS)
-JADEFLAGS+= -V withpgpkeys
-.endif
-
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..