From owner-svn-doc-head@FreeBSD.ORG Fri Mar 7 12:23:56 2014 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B50CEC5A; Fri, 7 Mar 2014 12:23:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E4C6977; Fri, 7 Mar 2014 12:23:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27CNu1h028688; Fri, 7 Mar 2014 12:23:56 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27CNp9g028648; Fri, 7 Mar 2014 12:23:51 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201403071223.s27CNp9g028648@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 7 Mar 2014 12:23:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44166 - in head: . de_DE.ISO8859-1/books/handbook el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook en_US.ISO8859-1/htdocs/doc es_ES.ISO8859-1/books/handbook fr_FR.ISO8859-... X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 12:23:56 -0000 Author: gabor Date: Fri Mar 7 12:23:51 2014 New Revision: 44166 URL: http://svnweb.freebsd.org/changeset/doc/44166 Log: - Move the PGP keyring generation to the language-independent share directory Discussed with: hrs, wblock Added: head/share/Makefile (contents, props changed) head/share/pgpkeys/Makefile (contents, props changed) Modified: head/Makefile head/de_DE.ISO8859-1/books/handbook/Makefile head/el_GR.ISO8859-7/books/handbook/Makefile head/en_US.ISO8859-1/books/handbook/Makefile head/en_US.ISO8859-1/htdocs/doc/Makefile head/es_ES.ISO8859-1/books/handbook/Makefile head/fr_FR.ISO8859-1/books/handbook/Makefile head/fr_FR.ISO8859-1/htdocs/doc/Makefile head/hu_HU.ISO8859-2/books/handbook/Makefile head/it_IT.ISO8859-15/books/handbook/Makefile head/ja_JP.eucJP/books/handbook/Makefile head/nl_NL.ISO8859-1/books/handbook/Makefile head/pl_PL.ISO8859-2/books/handbook/Makefile head/pt_BR.ISO8859-1/books/handbook/Makefile head/release/Makefile head/ru_RU.KOI8-R/books/handbook/Makefile head/ru_RU.KOI8-R/htdocs/doc/Makefile head/share/mk/doc.docbook.mk head/share/pgpkeys/decke.key head/share/pgpkeys/scop.key head/share/pgpkeys/thomas.key head/zh_CN.UTF-8/books/handbook/Makefile head/zh_TW.Big5/books/handbook/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -31,6 +31,8 @@ SUBDIR+= zh_CN.UTF-8 SUBDIR+= zh_TW.Big5 .endif +SUBDIR+= share + DOC_PREFIX?= ${.CURDIR} .if exists(/usr/bin/svnlite) Modified: head/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/de_DE.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/de_DE.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/el_GR.ISO8859-7/books/handbook/Makefile ============================================================================== --- head/el_GR.ISO8859-7/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/el_GR.ISO8859-7/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/en_US.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/en_US.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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 Modified: head/en_US.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/doc/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/en_US.ISO8859-1/htdocs/doc/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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 Modified: head/es_ES.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/es_ES.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/es_ES.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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" Modified: head/fr_FR.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/fr_FR.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/fr_FR.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/fr_FR.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/fr_FR.ISO8859-1/htdocs/doc/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/fr_FR.ISO8859-1/htdocs/doc/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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 Modified: head/hu_HU.ISO8859-2/books/handbook/Makefile ============================================================================== --- head/hu_HU.ISO8859-2/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/hu_HU.ISO8859-2/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/it_IT.ISO8859-15/books/handbook/Makefile ============================================================================== --- head/it_IT.ISO8859-15/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/it_IT.ISO8859-15/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/ja_JP.eucJP/books/handbook/Makefile ============================================================================== --- head/ja_JP.eucJP/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/ja_JP.eucJP/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/nl_NL.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/nl_NL.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/pl_PL.ISO8859-2/books/handbook/Makefile ============================================================================== --- head/pl_PL.ISO8859-2/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/pl_PL.ISO8859-2/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/pt_BR.ISO8859-1/books/handbook/Makefile ============================================================================== --- head/pt_BR.ISO8859-1/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/pt_BR.ISO8859-1/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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" Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/release/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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} Modified: head/ru_RU.KOI8-R/books/handbook/Makefile ============================================================================== --- head/ru_RU.KOI8-R/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/ru_RU.KOI8-R/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/ru_RU.KOI8-R/htdocs/doc/Makefile ============================================================================== --- head/ru_RU.KOI8-R/htdocs/doc/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/ru_RU.KOI8-R/htdocs/doc/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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 Added: head/share/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR+= pgpkeys + +.include Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Fri Mar 7 11:37:21 2014 (r44165) +++ head/share/mk/doc.docbook.mk Fri Mar 7 12:23:51 2014 (r44166) @@ -58,7 +58,6 @@ XSLXHTML?= http://www.FreeBSD.org/XML/sh 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 Added: head/share/pgpkeys/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/pgpkeys/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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} "" > ${.TARGET} + @${ECHO_CMD} "" >> ${.TARGET} + @${CAT} *.key >> ${.TARGET} + @${ECHO_CMD} "" >> ${.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 Modified: head/share/pgpkeys/decke.key ============================================================================== --- head/share/pgpkeys/decke.key Fri Mar 7 11:37:21 2014 (r44165) +++ head/share/pgpkeys/decke.key Fri Mar 7 12:23:51 2014 (r44166) @@ -1,4 +1,3 @@ - +pub 1024D/BCD241CB 2002-04-07 Ville SkyttΓ¤ Key fingerprint = 4E0D EBAB 3106 F1FA 3FA9 B875 D98C D635 BCD2 41CB -uid Ville Skyttδ -uid Ville Skyttδ +uid Ville SkyttΓ¤ +uid Ville SkyttΓ¤ sub 2048g/9426F4D1 2002-04-07 ]]> - 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 uid Thomas Quinot sub 1024g/8DE13BB2 1999-09-23 Modified: head/zh_CN.UTF-8/books/handbook/Makefile ============================================================================== --- head/zh_CN.UTF-8/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/zh_CN.UTF-8/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../.. Modified: head/zh_TW.Big5/books/handbook/Makefile ============================================================================== --- head/zh_TW.Big5/books/handbook/Makefile Fri Mar 7 11:37:21 2014 (r44165) +++ head/zh_TW.Big5/books/handbook/Makefile Fri Mar 7 12:23:51 2014 (r44166) @@ -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}/../../..