- Move the PGP keyring generation to the language-independent share d…

…irectory Discussed with: hrs, wblock
freebsd · Mar 7, 2014 · b6ff19a · b6ff19a
1 parent 8231383
commit b6ff19a
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 407 deletions.
diff --git 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
@@ -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
@@ -7,25 +7,6 @@
 # %SRCID%	43126
 #
 
-# ------------------------------------------------------------------------
-#
-# ÌåôáâëçôÝò ó÷åôéêÝò ìå ôï Åã÷åéñßäéï
-#
-#       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.
-#
 # ------------------------------------------------------------------------
 #
 # Ãéá íá ðñïóèÝóåôå Ýíá íÝï êåöÜëáéï óôï Åã÷åéñßäéï:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,24 +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.
-#
 # ------------------------------------------------------------------------
 #
 # To add a new chapter to the Handbook:
@@ -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
@@ -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
@@ -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
@@ -7,25 +7,6 @@
 # Bouw het Nederlandse FreeBSD Handboek.
 #
 
-# ------------------------------------------------------------------------
-#
-# 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:
 #
@@ -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}/../../..