Index: head/da_DK.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/da_DK.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/da_DK.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,43 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/da_DK.ISO8859-1; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/da_DK.ISO8859-1; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/da_DK.ISO8859-1; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf da*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/da_DK.ISO8859-1; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/de_DE.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/de_DE.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/de_DE.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,48 +1,47 @@
 #
 # $FreeBSD$
-# $FreeBSDde$
-# basiert auf: r44174
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf de* handbook faq
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/el_GR.ISO8859-7/htdocs/doc/Makefile
===================================================================
--- head/el_GR.ISO8859-7/htdocs/doc/Makefile	(revision 51077)
+++ head/el_GR.ISO8859-7/htdocs/doc/Makefile	(revision 51078)
@@ -1,55 +1,47 @@
 #
 # $FreeBSD$
 #
-#
-# The FreeBSD Greek Documentation Project
-#
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
-# This file should be placed in the www/el/doc directory
-# (which should be created)
-#
-# %SOURCE%	en/doc/Makefile
-# %SRCID%	1.1
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf el*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/es_ES.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/es_ES.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/es_ES.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,49 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
 
-.if make(clean)
-	${RM} -rf es*
-.endif
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/es_ES.ISO8859-1; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/fr_FR.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/fr_FR.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/fr_FR.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,64 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
 
-# The FreeBSD French Documentation Project
-# Original revision: 1.8
-
-.if exists(Makefile.conf)
-.include "Makefile.conf"
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-# all: all-all all-install all-pgpkeyring
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
+
 all-pgpkeyring:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/share/pgpkeys; \
-		${MAKE} \
-			pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-# .if make(install)
-# 	@unset DESTDIR || true; \
-# 	 cd ${.CURDIR}/../../../doc/fr_FR.ISO8859-1/books/handbook; \
-# 		${MAKE} \
-# 			pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
-# .endif
-.if make(clean)
-#	${RM} -rf fr* handbook faq pgpkeyring.txt
-	${RM} -rf fr*
-.endif
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
 
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
-	 cd ${.CURDIR}/../../../doc/fr_FR.ISO8859-1; \
+	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/hu_HU.ISO8859-2/htdocs/doc/Makefile
===================================================================
--- head/hu_HU.ISO8859-2/htdocs/doc/Makefile	(revision 51077)
+++ head/hu_HU.ISO8859-2/htdocs/doc/Makefile	(revision 51078)
@@ -1,46 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf hu*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/it_IT.ISO8859-15/htdocs/doc/Makefile
===================================================================
--- head/it_IT.ISO8859-15/htdocs/doc/Makefile	(revision 51077)
+++ head/it_IT.ISO8859-15/htdocs/doc/Makefile	(revision 51078)
@@ -1,46 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
-.if exists(Makefile.conf)
-.include "Makefile.conf"
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf it*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/ja_JP.eucJP/htdocs/doc/Makefile
===================================================================
--- head/ja_JP.eucJP/htdocs/doc/Makefile	(revision 51077)
+++ head/ja_JP.eucJP/htdocs/doc/Makefile	(revision 51078)
@@ -1,45 +1,47 @@
 #
 # $FreeBSD$
-# Original revision: r40713
 #
 # Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= NO_JPMAN= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= NO_JPMAN= install
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= NO_JPMAN= ${.TARGET}
-.if make(clean)
-	${RM} -rf ja*
-.endif
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/mn_MN.UTF-8/htdocs/doc/Makefile
===================================================================
--- head/mn_MN.UTF-8/htdocs/doc/Makefile	(revision 51077)
+++ head/mn_MN.UTF-8/htdocs/doc/Makefile	(revision 51078)
@@ -1,46 +1,47 @@
 #
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf mn*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/nl_NL.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/nl_NL.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/nl_NL.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,47 +1,47 @@
 #
 # $FreeBSD$
-# Original revision: 1.8
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf nl*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/pt_BR.ISO8859-1/htdocs/doc/Makefile
===================================================================
--- head/pt_BR.ISO8859-1/htdocs/doc/Makefile	(revision 51077)
+++ head/pt_BR.ISO8859-1/htdocs/doc/Makefile	(revision 51078)
@@ -1,50 +1,47 @@
-# The FreeBSD Documentation Project
-# The FreeBSD Brazilian Portuguese Documentation Project
 #
-# Original version: 1.8
-#
 # $FreeBSD$
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf pt* faq
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/ru_RU.KOI8-R/htdocs/doc/Makefile
===================================================================
--- head/ru_RU.KOI8-R/htdocs/doc/Makefile	(revision 51077)
+++ head/ru_RU.KOI8-R/htdocs/doc/Makefile	(revision 51078)
@@ -1,65 +1,47 @@
 #
-# The FreeBSD Russian Documentation Project
-#
 # $FreeBSD$
-# $FreeBSDru: frdp/www/ru/doc/Makefile,v 1.2 2004/01/03 04:36:26 andy Exp $
 #
-# Original revision: 1.8
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
+# in to the right place as necessary.
 #
-.if exists(Makefile.conf)
-.include "Makefile.conf"
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
-#
-# Build the FreeBSD documentation *outside* of the www tree, and install it
-# in to the right place as necessary.
-#
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
 
-#all: all-all all-install all-pgpkeyring
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
+
 all-pgpkeyring:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/share/pgpkeys; \
-		${MAKE} \
-			pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
 
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-#.if make(install)
-#	@unset DESTDIR || true; \
-#	 cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \
-#		${MAKE} \
-#			pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt
-#.endif
-.if make(clean)
-	${RM} -rf ru* handbook faq
-.endif
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
 
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/tr_TR.ISO8859-9/htdocs/doc/Makefile
===================================================================
--- head/tr_TR.ISO8859-9/htdocs/doc/Makefile	(revision 51077)
+++ head/tr_TR.ISO8859-9/htdocs/doc/Makefile	(revision 51078)
@@ -1,49 +1,47 @@
 #
-# The FreeBSD Documentation Project
-# The FreeBSD Turkish Documentation Project#
 # $FreeBSD$
-# Based on: 1.8
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf tr*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/zh_CN.UTF-8/htdocs/doc/Makefile
===================================================================
--- head/zh_CN.UTF-8/htdocs/doc/Makefile	(revision 51077)
+++ head/zh_CN.UTF-8/htdocs/doc/Makefile	(revision 51078)
@@ -1,47 +1,47 @@
 #
 # $FreeBSD$
-# Original revision: 1.8
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf zh_CN*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
Index: head/zh_TW.UTF-8/htdocs/doc/Makefile
===================================================================
--- head/zh_TW.UTF-8/htdocs/doc/Makefile	(revision 51077)
+++ head/zh_TW.UTF-8/htdocs/doc/Makefile	(revision 51078)
@@ -1,47 +1,47 @@
 #
 # $FreeBSD$
-# Original revision: 1.8
 #
-# Build the FreeBSD documentation *outside* of the www tree, and install it
+# Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
-# This assumes that you have the www/ and doc/ trees checked out beside
-# one another -- this was always the case anyway, so there are no extra
-# requirements here.
-#
+
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
-all: all-all all-install
+_DOC_FORMATS?=	html-split html
 
+all: all-all 
+
+
 all-all:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" \
-			INSTALL_COMPRESSED= all
-all-install:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \
-			INSTALL_COMPRESSED= install
-install clean:
-	@unset DESTDIR || true; \
-	 cd ${DOC_PREFIX}/${LANGCODE}; \
-		${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \
-			INSTALL_COMPRESSED= ${.TARGET}
-.if make(clean)
-	${RM} -rf zh_TW*
-.endif
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
+all-pgpkeyring:
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+
+clean:
+	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
+
+# here are dragons
+install:
+	unset DESTDIR || true; \
+	  ${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
+
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
+.if ${LANGCODE} == en_US.ISO8859-1
+all: all-pgpkeyring
+.endif
 
+
+# XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}