diff --git a/en/web.mk b/en/web.mk
index da0d62523c..8daeed5bb2 100644
--- a/en/web.mk
+++ b/en/web.mk
@@ -1,237 +1,247 @@
 # bsd.web.mk
-# $FreeBSD: www/en/web.mk,v 1.31 2000/09/30 00:21:38 nbm Exp $
+# $FreeBSD: www/en/web.mk,v 1.32 2000/10/02 07:52:48 kuriyama Exp $
 
 #
 # Build and install a web site.
 #
 # Basic targets:
 #
 # all (default) -- performs batch mode processing necessary
 # install -- Installs everything
 # clean -- remove anything generated by processing
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
 WEBDIR?=	${.CURDIR:T}
 CGIDIR?=	${.CURDIR:T}
 DESTDIR?=	${HOME}/public_html
 
 WEBOWN?=	${USER}
 WEBGRP?=	www
 WEBMODE?=	664
 
 CGIOWN?=	${USER}
 CGIGRP?=	www
 CGIMODE?=	775
 
 PERL?=		perl5
 
 #
 # Install dirs derived from the above.
 #
 DOCINSTALLDIR=	${DESTDIR}${WEBBASE}/${WEBDIR}
 CGIINSTALLDIR=	${DESTDIR}${WEBBASE}/${CGIDIR}
 
 #
 # The orphan list contains sources specified in DOCS that there
 # is no transform rule for.  We start out with all of them, and
 # each rule below removes the ones it knows about.  If any are
 # left over at the end, the user is warned about them.
 #
 ORPHANS:=	${DOCS}
 
 COPY=	-C
 
 #
 # Where the ports live, if CVS isn't used (ie. NOPORTSCVS is defined)
 #
 PORTSBASE?=	/usr
 
 ##################################################################
 # Transformation rules
 
 ###
 # file.sgml --> file.revinc
 #
 # Generate temporary file for translation revision checking
 .SUFFIXES:	.sgml .revinc
 GENDOCS+=	${REVFILES}
 .sgml.revinc:
 	if [ -f ${BUILDTOP}/en/${DIR_IN_LOCAL}/${.IMPSRC} ]; then \
 	  ${BUILDTOP}/ja/revcheck ${BUILDTOP} ${DIR_IN_LOCAL} ${.IMPSRC} > ${.TARGET}; \
 	else \
 	  touch ${.TARGET}; \
 	fi
 
 ###
 # file.sgml --> file.html
 #
 # Runs file.sgml through spam to validate and expand some entity
 # references are expanded.  file.html is added to the list of
 # things to install.
 
 .SUFFIXES:	.html
+.if defined(REVCHECK)
+PREHTML=	${.CURDIR}/${BUILDTOP}/ja/prehtml
+PREHTMLFLAGS=	${PREHTMLOPTS}
+BUILDTOP=	${LOCALTOP}/..
+LOCALPREFIX!=	cd ${LOCALTOP}; echo $${PWD};
+DIR_IN_LOCAL=   ${PWD:S/^${LOCALPREFIX}//:S/^\///}
+PREHTMLFLAGS+=	-revcheck "${LOCALTOP}" "${DIR_IN_LOCAL}"
+.else
+DATESUBST=	's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date	"Last modified: \1">/'
+PREHTML=	sed -e ${DATESUBST}
+.endif
 .if !defined(OPENJADE)
 SGMLNORM=	sgmlnorm
 .else
 SGMLNORM=	osgmlnorm
 .endif
 PREFIX?=	/usr/local
 CATALOG?=	${PREFIX}/share/sgml/html/catalog
 SGMLNORMFLAGS=	-d ${SGMLNORMOPTS} -c ${CATALOG} -D ${.CURDIR}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
-DATESUBST=	's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date	"Last modified: \1">/'
 
 .sgml.html:
-	sed -e ${DATESUBST} ${.IMPSRC} |\
+	${PREHTML} ${PREHTMLFLAGS} ${.IMPSRC} |\
 	SGML_CATALOG_FILES='' ${SGMLNORM} ${SGMLNORMFLAGS} > ${.TARGET}
 
 ###
 # file.docb --> file.html
 #
 # Generate HTML from docbook
 
 .SUFFIXES:	.docb
 GENDOCS+=	${DOCS:M*.docb:S/.docb$/.html/g}
 ORPHANS:=	${ORPHANS:N*.docb}
 
 .docb.html:
 	sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC}
 
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
 all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
 
 #
 # Warn about anything in DOCS that has no translation
 #
 .if !empty(ORPHANS)
 orphans:
 	@echo Warning!  I don\'t know what to do with: ${ORPHANS}
 .else
 orphans:
 .endif
 
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 .if defined(DIRS_TO_CLEAN) && !empty(DIRS_TO_CLEAN)
 .for dir in ${DIRS_TO_CLEAN}
 	(cd ${dir} && ${MAKE} clean)
 .endfor
 .endif
 	rm -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES}
 .endif
 
 #
 # Really clean things up
 #
 .if !target(cleandir)
 cleandir: clean _PROGSUBDIR
 	rm -f ${.CURDIR}/tags .depend
 	cd ${.CURDIR}; rm -rf obj;
 .endif
 
 #
 # Install targets: before, real, and after.
 #
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
 .endif
 .if !target(afterinstall)
 afterinstall:
 .endif
 
 _ALLINSTALL+=	${GENDOCS} ${DATA} ${LOCAL}
 
 realinstall: ${COOKIE} ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
 .if !empty(_ALLINSTALL)
 	@mkdir -p ${DOCINSTALLDIR}
 	for entry in ${_ALLINSTALL}; do \
 		${INSTALL} ${COPY} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE} \
 			${INSTALLFLAGS} $${entry} ${DOCINSTALLDIR}; \
 	done
 .if defined(INDEXLINK) && !empty(INDEXLINK)
 	(cd ${DOCINSTALLDIR}; ln -s -f ${INDEXLINK} index.html)
 .endif
 .endif
 .if defined(CGI) && !empty(CGI)
 	@mkdir -p ${CGIINSTALLDIR}
 	for entry in ${CGI}; do \
 		${INSTALL} ${COPY} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE} \
 			${INSTALLFLAGS} $${entry} ${CGIINSTALLDIR}; \
 	done
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	for entry in ${DOCSUBDIR}; do \
 		mkdir -p ${DOCINSTALLDIR}/$$entry; \
 	done
 .endif
 
 # Set up install dependencies so they happen in the correct order.
 install: afterinstall
 afterinstall: realinstall2
 realinstall: beforeinstall
 realinstall2: realinstall
 .endif 
 
 #
 # This recursively calls make in subdirectories.
 #
 #SUBDIR+=${DOCSUBDIR}
 _PROGSUBDIR: .USE
 .if defined(SUBDIR) && !empty(SUBDIR)
 	@for entry in ${SUBDIR}; do \
 		(${ECHODIR} "===> ${DIRPRFX}$$entry"; \
 		cd ${.CURDIR}/$${entry} && \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/); \
 	done
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	@for entry in ${DOCSUBDIR}; do \
 		(${ECHODIR} "===> ${DIRPRFX}$$entry"; \
 		cd ${.CURDIR}/$${entry} && \
 		if [ ${WEBDIR} = "data" -a $$entry = "handbook" -o $$entry = "docproj-primer" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt html html-split"; \
 		elif [ $$entry = "handbook" -a ${WEBDIR} = "data/ja" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="html html-split"; \
 		else \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}; \
 		fi); \
 	done
 .endif
 
 
 #
 # cruft for generating linuxdoc stuff
 #
 
 .if defined (DOCSUBDIR) && !empty(DOCSUBDIR)
 
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
 PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 PARAMS+=	SGMLOPTS="${SGMLOPTS}"
 
 .endif
 
 .include <bsd.obj.mk>
 # THE END
diff --git a/ja/Makefile b/ja/Makefile
index 20b8b297ce..11f197bc1a 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,74 +1,73 @@
-# $FreeBSD: www/ja/Makefile,v 1.40 2000/06/18 23:08:11 kuriyama Exp $
+# $FreeBSD: www/ja/Makefile,v 1.41 2000/10/02 07:54:39 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.53
 
-.if exists(Makefile.conf)
-.include "Makefile.conf"
+LOCALTOP= .
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= index.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 # Japanese-only file
 DOCS+= jabout.sgml
 
 CLEANFILES+=atoz.sgml site.sgml
 
 # These will be directly installed.
 
 DATA=	index.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= alpha
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= releases 
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 .endif
 
 # Non-SGML
 #SUBDIR+= gifs
 #SUBDIR+= cgi
 
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 # Extern
 SUBDIR+= tutorials
 
 DOCSUBDIR=	FAQ handbook
 .endif
 SGMLOPTS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -e EUC-JP
 
 WEBDIR=		data/ja
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	..
-DIR_IN_LOCAL=	.
-
-.include "../web.mk"
+REVCHECK=	yes
 
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/alpha/Makefile b/ja/alpha/Makefile
index d6b01a9902..3594772c09 100644
--- a/ja/alpha/Makefile
+++ b/ja/alpha/Makefile
@@ -1,18 +1,18 @@
-# $FreeBSD: www/ja/alpha/Makefile,v 1.9 1999/09/07 15:15:46 kuriyama Exp $
+# $FreeBSD: www/ja/alpha/Makefile,v 1.10 1999/12/23 01:15:46 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.6
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
- 
+
 DOCS=   alpha.sgml
 
 INDEXLINK=alpha.html
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	alpha
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/commercial/Makefile b/ja/commercial/Makefile
index b563a1b5e1..2f693121fa 100644
--- a/ja/commercial/Makefile
+++ b/ja/commercial/Makefile
@@ -1,26 +1,26 @@
-# $FreeBSD: www/ja/commercial/Makefile,v 1.9 1999/12/23 01:15:46 kuriyama Exp $
+# $FreeBSD: www/ja/commercial/Makefile,v 1.10 2000/05/07 01:55:55 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.12
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 PERL=	perl5
 
 DOCS = 	commercial.sgml
 # DOCS+=  consulting.sgml
 # DOCS+=  consulting_bycat.sgml
 # DOCS+=  hardware.sgml
 # DOCS+=  misc.sgml
 # DOCS+=  software.sgml
 # DOCS+=  software_bycat.sgml
 
 INDEXLINK=commercial.html
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	commercial
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/conspectus/Makefile b/ja/conspectus/Makefile
index 4d7ebd9a72..2fc00bd3a2 100644
--- a/ja/conspectus/Makefile
+++ b/ja/conspectus/Makefile
@@ -1,19 +1,19 @@
-# $FreeBSD$
+# $FreeBSD: www/ja/conspectus/Makefile,v 1.1 2000/06/18 23:06:42 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=   index.sgml 
 
 # not translated yet
 #SUBDIR=	stable
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	conspectus
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/copyright/Makefile b/ja/copyright/Makefile
index 0d470241ed..906348a7b2 100644
--- a/ja/copyright/Makefile
+++ b/ja/copyright/Makefile
@@ -1,42 +1,42 @@
-# $FreeBSD: www/ja/copyright/Makefile,v 1.11 1999/12/18 05:13:28 kuriyama Exp $
+# $FreeBSD: www/ja/copyright/Makefile,v 1.12 1999/12/23 01:15:47 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.9
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=	license.sgml
 DOCS+=	freebsd-license.sgml
 DOCS+=	daemon.sgml
 DOCS+=	copyright.sgml
 
 INDEXLINK= copyright.html
 
 CVS_READONLY?=	YES
 CVS_OPT+=	-Q
 .if !empty(CVS_READONLY)
 CVS_OPT+=	-R
 .endif
 
 
 # DATA+= COPYING COPYING.LIB ${LEGAL}
 
 # FreeBSD Ports redistribution restrictions
 #LEGAL= LEGAL
 #LEGAL_FILE=	ports/LEGAL
 #CLEANFILES+= ${LEGAL}
 #.if defined(NOPORTSCVS)
 #${LEGAL}: $${PORTSBASE}/${LEGAL_FILE}
 #	cp ${PORTSBASE}/${LEGAL_FILE} LEGAL
 #.else
 #${LEGAL}: $${CVSROOT}/${LEGAL_FILE},v
 #       cvs ${CVS_OPT} co -p ${LEGAL_FILE} > ${.TARGET}
 #.endif
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	copyright
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/docproj/Makefile b/ja/docproj/Makefile
index c373b46da3..20ac0c8148 100644
--- a/ja/docproj/Makefile
+++ b/ja/docproj/Makefile
@@ -1,24 +1,24 @@
-# $FreeBSD: www/ja/docproj/Makefile,v 1.10 1999/09/07 15:15:47 kuriyama Exp $
+# $FreeBSD: www/ja/docproj/Makefile,v 1.11 1999/12/23 01:15:48 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.7
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=  current.sgml 
 DOCS+= doc-set.sgml
 DOCS+= sgml.sgml
 DOCS+= submitting.sgml
 DOCS+= who.sgml 
 DOCS+= translations.sgml
 DOCS+= docproj.sgml
 
 INDEXLINK= docproj.html
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	docproj
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/gallery/Makefile b/ja/gallery/Makefile
index aef453e444..b5734c8ba6 100644
--- a/ja/gallery/Makefile
+++ b/ja/gallery/Makefile
@@ -1,26 +1,26 @@
-# $FreeBSD: www/ja/gallery/Makefile,v 1.10 2000/04/27 02:07:19 kuriyama Exp $
+# $FreeBSD: www/ja/gallery/Makefile,v 1.11 2000/10/02 07:54:40 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.10
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS = gallery.sgml
 
 INDEXLINK= gallery.html
 
 CLEANFILES+= gallery.inc
 
 gallery.html: gallery.sgml gallery.inc
 gallery.inc: ../../en/gallery/gallery.db gallery.sgml
 	${PERL} ${.CURDIR}/../../en/gallery/prune.pl ${.CURDIR}/../../en/gallery/gallery.db /dev/null | \
 	${PERL} -ne 'chomp; m/([-\w]+):\s+(\d+)/ and print qq/<!ENTITY num./.lc($$1).qq/ CDATA "$$2">\n/'\
 	> gallery.inc
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	gallery
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/includes.sgml b/ja/includes.sgml
index 070fffaae1..f0f4f9cce0 100644
--- a/ja/includes.sgml
+++ b/ja/includes.sgml
@@ -1,98 +1,98 @@
-<!-- $FreeBSD: www/ja/includes.sgml,v 1.22 2000/02/16 04:27:56 motoyuki Exp $ -->
+<!-- $FreeBSD: www/ja/includes.sgml,v 1.23 2000/04/01 23:38:41 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.35 -->
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
   relative to the server root.  It should be defined in the prolog
   <em>before</em> including this file if the page does not live at the
   default location below. 
 
   When making a  link, use <a href="&base/mypage.html">foo</a> and
   &base will be expanded appropriately.  Base is also used in the
   definition of standard boilerplate entities in this file, so be sure
   base is correct!
 -->
 
 <!ENTITY base CDATA ".">
 <!ENTITY FAQbase CDATA "./FAQ">
 
 <!-- Images -->
 <!ENTITY i.daemon '<img src="&base/../gifs/daemon.gif" alt="" align="left"  width="80" height="76">'>
 <!ENTITY i.new '<img src="&base/../gifs/new.gif" alt="[New!]" width="28" height="11">'>
 
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
 <!ENTITY copyright 'Copyright (c) 1995-2000 The FreeBSD Inc.  
   All rights reserved.'>
 <!ENTITY email 'freebsd-questions'>
 <!ENTITY author '<a href="&base/mailto.html">&email@FreeBSD.ORG</a><br>
   &copyright;'>
 <!ENTITY date ''>
 <!ENTITY home '<a href="&base/"><img src="&base/../gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
 
 <!-- Revision checking -->
 <!ENTITY % rev.diff "IGNORE">
 <![ %rev.diff; [
 <!ENTITY cvsweb 'http://www.jp.FreeBSD.org/cgi/cvsweb.cgi/'>
 <!ENTITY rev.msg '
 <p>
-(訳注: 最新の <a href="&buildtop;/&reldir;/&basename;.html">原文</a> とは
-<a href="&cvsweb;www/en/&reldir;/&basename;.sgml.diff?r1=&rev.base;&amp;r2=&rev.latest;">
+(訳注: 最新の <a href="&file.orgbase;.html">原文</a> とは
+<a href="&cvsweb;&file.cvsweb;.diff?r1=&rev.target;&amp;r2=&rev.latest;">
 ずれ</a> があります.)
 </p>'>
 ]]>
 <!ENTITY rev.msg ''>
 
 <!-- Standard headers and footers -->
 
 <!ENTITY header '<head><META HTTP-EQUIV="Content-Type"
 CONTENT="text/html; charset=EUC-JP"><title>&title;</title></head><body
 text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
 src="&base/../gifs/bar.gif" alt="メニュー" width="565" height="33" border="0" usemap="#bar">
 &rev.msg;
 <h1 align="left"><font color="#660000">&title;</font></h1><br clear="all">
 
 <map name="bar">
 <area shape="rect" coords="1,1,111,31" href="&base/index.html" alt="トッ
 プページ">
 <area shape="rect" coords="112,11,196,31" href="&base/ports/index.html" alt="アプリケーション">
 <area shape="rect" coords="196,12,257,33" href="&base/support.html" alt="サポート">
 <area shape="rect" coords="256,12,365,33" href="&base/docs.html" alt="ドキュメント"> 
 <area shape="rect" coords="366,13,424,32" href="&base/commercial/commercial.html" alt="ベンダ">
 <area shape="rect" coords="425,16,475,32" href="&base/search/search.html" alt="検索">
 <area shape="rect" coords="477,16,516,33" href="&base/search/index-site.html" alt="索引">
 <area shape="rect" coords="516,15,562,33" href="&base/index.html" alt="トップページ">
 <area shape="rect" href="&base/index.html" coords="0,0,564,32" alt="トップページ">
 </map>'>
 
 <!ENTITY footer '<HR NOSHADE>
 <address>&author;<br>&date;</address>'>
 
 <!-- Short names for various anchor points -->
 <!ENTITY a.latest.not '<a href="&base/releases/3.4R/notes.html">'>
 <!ENTITY a.latest.ann '<a href="&base/releases/3.4R/announce.html">'>
 
 
 <!-- macro for webbuild paper --> 
 <!ENTITY webbuild ' 
 <p>この文書は, FreeBSD Web ページを手動で CVS リポジトリから構築して
 更新する方法を解説しています.</p>'>
 
 <!-- avoid replacing &nbsp; etc. with hardcoded Latin1 values -->
 <!ENTITY nbsp SDATA "[nbsp ]">
 <!ENTITY copy SDATA "[copy ]">
 <!ENTITY reg SDATA "[reg ]">
 <!ENTITY deg SDATA "[deg ]">
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
 
diff --git a/ja/internal/Makefile b/ja/internal/Makefile
index 9f82d2e955..a2302267e9 100644
--- a/ja/internal/Makefile
+++ b/ja/internal/Makefile
@@ -1,26 +1,26 @@
-# $FreeBSD: www/ja/internal/Makefile,v 1.13 2000/01/22 01:20:37 kuriyama Exp $
+# $FreeBSD: www/ja/internal/Makefile,v 1.14 2000/05/07 01:54:44 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.22
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 # DOCS=   photos.sgml     
 DOCS+=  internal.sgml   
 DOCS+=  about.sgml
 DOCS+=  machines.sgml
 DOCS+=  mirror.sgml
 DOCS+=	statistic.sgml
 DOCS+=	developer.sgml
 
 INDEXLINK=	internal.html
 
 # DATA+=  README.mirror
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	internal
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/java/Makefile b/ja/java/Makefile
index ef3785467e..e2b8b47d8d 100644
--- a/ja/java/Makefile
+++ b/ja/java/Makefile
@@ -1,26 +1,30 @@
-# $FreeBSD: www/ja/java/Makefile,v 1.5 2000/04/27 22:47:17 kuriyama Exp $
+# $FreeBSD: www/ja/java/Makefile,v 1.6 2000/09/28 11:58:22 hrs Exp $
 
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 SUBDIR =	dists
 #SUBDIR+=	docs
 #SUBDIR+=	links
 
 #DOCS =  advocacy.sgml
 #DOCS+=  howhelp.sgml
 DOCS+=  index.sgml
 DOCS+=  install.sgml
 DOCS+=  newsflash.sgml
 #DOCS+=  press.sgml
 
-### Revision checking
+REVCHECK= YES
+
+.include "${LOCALTOP}/web.mk"
 REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
 BUILDTOP=	../..
 DIR_IN_LOCAL=	java
 
 .include "../web.mk"
diff --git a/ja/java/dists/Makefile b/ja/java/dists/Makefile
index 1b82fad884..dc2d6c3ebe 100644
--- a/ja/java/dists/Makefile
+++ b/ja/java/dists/Makefile
@@ -1,17 +1,21 @@
-# $FreeBSD: www/ja/java/dists/Makefile,v 1.1 2000/04/27 02:05:10 kuriyama Exp $
+# $FreeBSD: www/ja/java/dists/Makefile,v 1.2 2000/09/28 11:58:23 hrs Exp $
 
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.3
 
+LOCALTOP= ../..
+
 DOCS=	10.sgml
 DOCS+=	11.sgml
 DOCS+=	12.sgml
 DOCS+=	13.sgml
 DOCS+=	index.sgml
 
 ### Revision checking
 REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
 BUILDTOP=	../../..
 DIR_IN_LOCAL=	java/dists
 
-.include "../../web.mk"
+REVCHECK= YES
+
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/news/1996/Makefile b/ja/news/1996/Makefile
index 8d12561a30..3f7ff8fb13 100644
--- a/ja/news/1996/Makefile
+++ b/ja/news/1996/Makefile
@@ -1,16 +1,22 @@
-# $FreeBSD: www/ja/news/1996/Makefile,v 1.1 2000/05/12 15:34:40 kuriyama Exp $
+# $FreeBSD: www/ja/news/1996/Makefile,v 1.2 2000/09/28 11:58:24 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ../..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=	index.sgml
 
 ### Revision checking
+#REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
+REVCHECK=	YES
+
+.include "${LOCALTOP}/web.mk"
 REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
 BUILDTOP=	../../..
 DIR_IN_LOCAL=	news/1996
 
 .include "../../web.mk"
diff --git a/ja/news/1997/Makefile b/ja/news/1997/Makefile
index 9be31fb61e..b31b591c75 100644
--- a/ja/news/1997/Makefile
+++ b/ja/news/1997/Makefile
@@ -1,16 +1,20 @@
-# $FreeBSD: www/ja/news/1997/Makefile,v 1.1 2000/05/12 15:34:41 kuriyama Exp $
+# $FreeBSD: www/ja/news/1997/Makefile,v 1.2 2000/09/28 11:58:24 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ../..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=	index.sgml
 
-### Revision checking
+REVCHECK=	yes
+
+.include "${LOCALTOP}/web.mk"
 REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
 BUILDTOP=	../../..
 DIR_IN_LOCAL=	news/1997
 
 .include "../../web.mk"
diff --git a/ja/news/Makefile b/ja/news/Makefile
index a2024bb71e..ada6b103e5 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,46 +1,46 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.19 2000/06/15 01:40:22 kuriyama Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.20 2000/08/02 08:04:44 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.20
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 # quick news letter
 DOCS=	qnewsletter.sgml
 DOCS+=	qnewsletter-1-1.sgml
 DOCS+=	qnewsletter-1-2.sgml
 DOCS+=	qnewsletter-1-3.sgml
 DOCS+=	qnewsletter-1-4.sgml
 DOCS+=	qnewsletter-1-5.sgml
 DOCS+=	qnewsletter-1-6.sgml
 DOCS+=	qnewsletter-1-7.sgml
 DOCS+=	qnewsletter-2-1.sgml
 DOCS+=	qnewsletter-2-2.sgml
 
 DOCS+= press.sgml
 DOCS+= newsflash.sgml
 DOCS+= news.sgml
 #DOCS+= webchanges.sgml
 
 # press releases
 DOCS+= pressreleases.sgml
 DOCS+= press-rel-1.sgml
 DOCS+= press-rel-2.sgml
 DOCS+= press-rel-3.sgml
 DOCS+= press-rel-4.sgml
 
 # The yearly State of the Union address
 #DOCS+=	sou1999.sgml
 
 INDEXLINK= news.html
 
 SUBDIR= 	1996
 SUBDIR+= 	1997
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	news
+REVCHECK=	YES
 
-.include "../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/prehtml b/ja/prehtml
new file mode 100755
index 0000000000..52ac3435f4
--- /dev/null
+++ b/ja/prehtml
@@ -0,0 +1,127 @@
+#!/usr/bin/perl -w
+#
+# The FreeBSD Japanese Documentation Project
+#
+# This is a preprocessor for HTML docs.
+#
+# usage: prehtml [-revcheck <localtop> <relative to localtop>] <SGML filename>
+#   (ex. % prehtml -revcheck ../.. news/1996 index.sgml)
+#
+# $FreeBSD$
+
+my $revcheck;
+my $topdir;
+my $reldir;
+
+my %file;
+my %rev;
+
+### parse options ....................................................
+###
+sub sOPT {1};
+sub sARG {2};
+
+my $opt_state = sOPT;
+my $argv;
+
+while(defined($_ = $ARGV[0])) {
+
+    if ($opt_state eq sOPT) {
+        # option expected        
+        if(/^-(.+)/) {
+            shift @ARGV; # discard option itself;
+            local $_ = $1;
+            /revcheck/ and do {
+                $topdir = shift @ARGV;
+                $reldir = shift @ARGV;
+                if($reldir ne '' and $reldir !~ /\/$/) {
+                    $reldir .= "/";
+                }
+                $revcheck = 1;
+                next;
+            };
+        } else {
+            # this is not a option but an argument
+            $opt_state = sARG;
+            next;
+        }
+    } elsif ($opt_state eq sARG) {
+        $file{target} = $_;
+        if($revcheck) {
+            s/.sgml$//;
+            my $basename = $_;
+            $file{cvsweb}  = "www/en/${reldir}${basename}.sgml";
+            $file{orgbase} = "${topdir}/../en/${reldir}${basename}";
+            $rev{org} = get_rev_org($file{orgbase}.".sgml");
+        }
+        last;
+    }
+    die "internal error: option parsing abnormally terminated.\n";
+}
+
+### add and replace entities .........................................
+###
+open TARGET,"<$file{target}" or die "cannot open a target file: $!\n";
+my $pos_date;
+### first, get date string and rev_target
+while(defined($_ = <TARGET>)) {
+    if(/<!ENTITY\s+date\s+\"\$Free[B]SD: [^\s]+ [.0-9]+ ([\/0-9]+)[^\$]*\$\">/) {
+        $pos_date = tell(TARGET);
+        $date = "<!ENTITY date \"Last modified: $1\">";
+    }
+
+    if($revcheck) {
+        if(/[Oo]riginal [Rr]evision:[ \t]*([0-9.]+)/) {
+            $rev{target} = $1;
+        }
+        last if($revcheck and $rev{target} and $date);
+    } else {
+        last if($date);
+    }
+}
+
+$rev{target} ||= "TARGET revision not found";
+$rev{org}    ||= "ORG revision not found";
+
+### next, put lines and replace the line with
+### $date + entity difinitions for revcheck 
+seek TARGET,0,0;
+while(defined($_ = <TARGET>)) {
+    if(tell(TARGET) == $pos_date) {
+        print $date,"\n";
+        if($revcheck) {
+            #print STDERR "$rev{org} -> $rev{target}\n";
+            print "<!ENTITY base CDATA '$topdir'>\n";
+            print "<!ENTITY file.cvsweb  CDATA '$file{cvsweb}'>\n";
+            print "<!ENTITY file.orgbase CDATA '$file{orgbase}'>\n";
+            print "<!ENTITY rev.latest CDATA '$rev{org}'>\n";
+            print "<!ENTITY rev.target CDATA '$rev{target}'>\n";
+            printf "<!ENTITY %% rev.diff '%s'>\n", ($rev{org} eq $rev{target}) ? "IGNORE" : "INCLUDE";
+        }
+    } else {
+        # for backward compatibility
+        s/<!ENTITY \% rev.incl SYSTEM "[-a-zA-Z0-9]+.revinc"> \%rev.incl;//;
+        print;
+    }
+}
+close TARGET;
+
+exit 0;
+
+sub get_rev_org 
+{
+    my $infile = shift @_;
+    my $rev_org;
+
+    open ORG,"<$infile" or return undef;
+    while(defined($_ = <ORG>)) {
+        if(/\$Free[B]SD: [^\s]+ ([.0-9]+) [\/0-9]+[^\$]*\$/) {
+            $rev_org = $1;
+            last;
+        }
+    }
+    close ORG;
+    return $rev_org;
+}
+
+__END__
diff --git a/ja/projects/Makefile b/ja/projects/Makefile
index e81b46cfc3..04afa7602e 100644
--- a/ja/projects/Makefile
+++ b/ja/projects/Makefile
@@ -1,20 +1,20 @@
-# $FreeBSD: www/ja/projects/Makefile,v 1.8 1999/09/07 15:15:51 kuriyama Exp $
+# $FreeBSD: www/ja/projects/Makefile,v 1.9 1999/12/23 01:15:56 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.6
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=	projects.sgml
 DOCS+=	mozilla.sgml
 DOCS+=	newbies.sgml
 
 INDEXLINK= projects.html
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	projects
+REVCHECK=	yes
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.1.5R/Makefile b/ja/releases/2.1.5R/Makefile
index ae9cfd5c7a..3d6a54cf31 100644
--- a/ja/releases/2.1.5R/Makefile
+++ b/ja/releases/2.1.5R/Makefile
@@ -1,13 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.5R/Makefile,v 1.2 1999/09/06 07:03:24 peter Exp $
+# $FreeBSD: www/ja/releases/2.1.5R/Makefile,v 1.3 1999/12/23 01:15:58 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 #DOCS=	announce.sgml notes.sgml
 DOCS=	notes.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.1.5R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.1.6R/Makefile b/ja/releases/2.1.6R/Makefile
index f757fdcaf7..128187e8b8 100644
--- a/ja/releases/2.1.6R/Makefile
+++ b/ja/releases/2.1.6R/Makefile
@@ -1,13 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.6R/Makefile,v 1.2 1999/09/06 07:03:24 peter Exp $
+# $FreeBSD: www/ja/releases/2.1.6R/Makefile,v 1.3 1999/12/23 01:15:59 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
+LOCALTOP= ../..
+
 #DOCS=	announce.sgml notes.sgml security.sgml
 DOCS=	notes.sgml security.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.1.6R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.1.7R/Makefile b/ja/releases/2.1.7R/Makefile
index 24b77b3480..ce2aa34e68 100644
--- a/ja/releases/2.1.7R/Makefile
+++ b/ja/releases/2.1.7R/Makefile
@@ -1,13 +1,13 @@
-# $FreeBSD: www/ja/releases/2.1.7R/Makefile,v 1.2 1999/09/06 07:03:24 peter Exp $
+# $FreeBSD: www/ja/releases/2.1.7R/Makefile,v 1.3 1999/12/23 01:16:00 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 #DOCS=	announce.sgml notes.sgml
 DOCS=	notes.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.1.7R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.1R/Makefile b/ja/releases/2.2.1R/Makefile
index 2b72b36b60..4c2b355a2e 100644
--- a/ja/releases/2.2.1R/Makefile
+++ b/ja/releases/2.2.1R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.1R/Makefile,v 1.2 1999/09/06 07:03:25 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.1R/Makefile,v 1.3 1999/12/23 01:16:01 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	notes.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.1R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.2R/Makefile b/ja/releases/2.2.2R/Makefile
index e17e1d618f..52f35b44eb 100644
--- a/ja/releases/2.2.2R/Makefile
+++ b/ja/releases/2.2.2R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.2R/Makefile,v 1.2 1999/09/06 07:03:25 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.2R/Makefile,v 1.3 1999/12/23 01:16:01 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
+LOCALTOP= ../..
+
 DOCS=	notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.2R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.5R/Makefile b/ja/releases/2.2.5R/Makefile
index d840d55813..a5fe5ae814 100644
--- a/ja/releases/2.2.5R/Makefile
+++ b/ja/releases/2.2.5R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.5R/Makefile,v 1.3 1999/09/06 07:03:25 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.5R/Makefile,v 1.4 1999/12/23 01:16:02 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.5R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.6R/Makefile b/ja/releases/2.2.6R/Makefile
index c29062f9f0..6ade6cde45 100644
--- a/ja/releases/2.2.6R/Makefile
+++ b/ja/releases/2.2.6R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.6R/Makefile,v 1.4 1999/09/06 07:03:26 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.6R/Makefile,v 1.5 1999/12/23 01:16:03 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.6R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.7R/Makefile b/ja/releases/2.2.7R/Makefile
index 920e806375..eb49cfc4a6 100644
--- a/ja/releases/2.2.7R/Makefile
+++ b/ja/releases/2.2.7R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.7R/Makefile,v 1.4 1999/09/06 07:03:26 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.7R/Makefile,v 1.5 1999/12/23 01:16:04 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.7R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2.8R/Makefile b/ja/releases/2.2.8R/Makefile
index a7a0f680b8..a627f50c56 100644
--- a/ja/releases/2.2.8R/Makefile
+++ b/ja/releases/2.2.8R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2.8R/Makefile,v 1.2 1999/09/06 07:03:27 peter Exp $
+# $FreeBSD: www/ja/releases/2.2.8R/Makefile,v 1.3 1999/12/23 01:16:05 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2.8R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/2.2R/Makefile b/ja/releases/2.2R/Makefile
index 42207d61cd..fd9b7784bd 100644
--- a/ja/releases/2.2R/Makefile
+++ b/ja/releases/2.2R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/2.2R/Makefile,v 1.2 1999/09/06 07:03:27 peter Exp $
+# $FreeBSD: www/ja/releases/2.2R/Makefile,v 1.3 1999/12/23 01:16:06 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.2
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml install-media.sgml notes.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/2.2R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.0R/Makefile b/ja/releases/3.0R/Makefile
index 0d8e04f669..ee75030fdd 100644
--- a/ja/releases/3.0R/Makefile
+++ b/ja/releases/3.0R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.0R/Makefile,v 1.4 1999/09/06 07:03:28 peter Exp $
+# $FreeBSD: www/ja/releases/3.0R/Makefile,v 1.5 1999/12/23 01:16:07 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.0R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.1R/Makefile b/ja/releases/3.1R/Makefile
index 69a2167485..c5ea3d1f7d 100644
--- a/ja/releases/3.1R/Makefile
+++ b/ja/releases/3.1R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.1R/Makefile,v 1.3 1999/09/06 07:03:28 peter Exp $
+# $FreeBSD: www/ja/releases/3.1R/Makefile,v 1.4 1999/12/23 01:16:08 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.1R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.2R/Makefile b/ja/releases/3.2R/Makefile
index 2840b0539f..17be134c18 100644
--- a/ja/releases/3.2R/Makefile
+++ b/ja/releases/3.2R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.2R/Makefile,v 1.2 1999/09/06 07:03:29 peter Exp $
+# $FreeBSD: www/ja/releases/3.2R/Makefile,v 1.3 1999/12/23 01:16:09 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.2R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.3R/Makefile b/ja/releases/3.3R/Makefile
index a6ab218239..63eca95d05 100644
--- a/ja/releases/3.3R/Makefile
+++ b/ja/releases/3.3R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.3R/Makefile,v 1.2 1999/10/29 13:03:14 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.3R/Makefile,v 1.3 1999/12/23 01:16:10 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.3R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.4R/Makefile b/ja/releases/3.4R/Makefile
index 278e82b818..126aebc059 100644
--- a/ja/releases/3.4R/Makefile
+++ b/ja/releases/3.4R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.4R/Makefile,v 1.2 2000/01/06 02:39:46 kuriyama Exp $
+# $FreeBSD: www/ja/releases/3.4R/Makefile,v 1.3 2000/01/06 03:42:53 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.4R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/3.5R/Makefile b/ja/releases/3.5R/Makefile
index f9ffbec749..9db9c044fe 100644
--- a/ja/releases/3.5R/Makefile
+++ b/ja/releases/3.5R/Makefile
@@ -1,12 +1,12 @@
-# $FreeBSD: www/ja/releases/3.5R/Makefile,v 1.1 2000/06/29 00:06:23 motoyuki Exp $
+# $FreeBSD: www/ja/releases/3.5R/Makefile,v 1.2 2000/07/09 15:55:59 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml notes.sgml errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/3.5R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/4.0R/Makefile b/ja/releases/4.0R/Makefile
index c21b729d39..2fca0f3f4c 100644
--- a/ja/releases/4.0R/Makefile
+++ b/ja/releases/4.0R/Makefile
@@ -1,14 +1,14 @@
-# $FreeBSD: www/ja/releases/4.0R/Makefile,v 1.1 2000/04/01 15:04:20 kuriyama Exp $
+# $FreeBSD: www/ja/releases/4.0R/Makefile,v 1.2 2000/06/29 00:06:24 motoyuki Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml
 DOCS+=	notes.sgml
 DOCS+=	errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/4.0R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/4.1R/Makefile b/ja/releases/4.1R/Makefile
index ff70ba781d..9daa7ec9c2 100644
--- a/ja/releases/4.1R/Makefile
+++ b/ja/releases/4.1R/Makefile
@@ -1,14 +1,14 @@
-# $FreeBSD: www/ja/releases/4.1R/Makefile,v 1.1 2000/08/28 21:40:16 hrs Exp $
+# $FreeBSD: www/ja/releases/4.1R/Makefile,v 1.2 2000/09/15 07:45:38 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.1
 
+LOCALTOP= ../..
+
 DOCS=	announce.sgml
 DOCS+=	notes.sgml
 DOCS+=	errata.sgml
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../../..
-DIR_IN_LOCAL=	releases/4.1R
+REVCHECK=	YES
 
-.include "../../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/releases/Makefile b/ja/releases/Makefile
index 72a55a1e33..1b2040c3ae 100644
--- a/ja/releases/Makefile
+++ b/ja/releases/Makefile
@@ -1,26 +1,26 @@
-# $FreeBSD: www/ja/releases/Makefile,v 1.17 2000/06/29 00:06:23 motoyuki Exp $
+# $FreeBSD: www/ja/releases/Makefile,v 1.18 2000/08/28 21:40:15 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.24
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS?=	index.sgml snapshots.sgml
 
 #SUBDIR=	1.1 1.1.5 2.0 2.0.5R 2.1R
 SUBDIR=	2.1.5R 2.1.6R 2.1.7R 2.2R
 SUBDIR+=	2.2.1R 2.2.2R 2.2.5R 2.2.6R 2.2.7R 2.2.8R 3.0R 3.1R 3.2R
 SUBDIR+=	3.3R 3.4R 3.5R
 SUBDIR+=	4.0R 4.1R
 
 .if defined $(NEW_BUILD)
 SUBDIR=
 .endif
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	releases
+REVCHECK=	YES
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/search/Makefile b/ja/search/Makefile
index 63e0d71897..2cc7ca00f4 100644
--- a/ja/search/Makefile
+++ b/ja/search/Makefile
@@ -1,30 +1,31 @@
-# $FreeBSD: www/ja/search/Makefile,v 1.8 2000/04/24 02:16:33 kuriyama Exp $
+# $FreeBSD: www/ja/search/Makefile,v 1.9 2000/09/30 12:30:40 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.7
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS+= index-site.sgml
 DOCS+= search.sgml 
 DOCS+= searchhints.sgml
 DOCS+= search-mid.sgml
 
 INDEXLINK=      search.html
 CLEANFILES+=atoz.sgml site.sgml
 
 index-site.html: atoz.sgml site.sgml
 atoz.sgml: web.atoz 
 	sort -fu ${.ALLSRC} | ${PERL} ${.CURDIR}/../../en/search/atoz.pl > ${.TARGET}
+
 site.sgml: ${.CURDIR}/../../en/search/site.map
 	${PERL} ${.CURDIR}/../../en/search/site.pl < ${.ALLSRC} > ${.TARGET}
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	search
+REVCHECK=	YES
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/security/Makefile b/ja/security/Makefile
index 0209ee0dbe..606e2e1bf2 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,19 +1,19 @@
-# $FreeBSD: www/ja/security/Makefile,v 1.10 1999/11/23 04:56:41 kuriyama Exp $
+# $FreeBSD: www/ja/security/Makefile,v 1.11 1999/12/23 01:16:13 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.6
 
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
+LOCALTOP= ..
+
+.if exists(${LOCALTOP}/Makefile.conf)
+.include "${LOCALTOP}/Makefile.conf"
 .endif
 
 DOCS=  
 DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	security
+REVCHECK=	YES
 
-.include "../../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/ja/tutorials/Makefile b/ja/tutorials/Makefile
index f78473cf0f..06f3543c87 100644
--- a/ja/tutorials/Makefile
+++ b/ja/tutorials/Makefile
@@ -1,27 +1,27 @@
 #
-# $FreeBSD: www/ja/tutorials/Makefile,v 1.5 2000/07/20 12:42:51 hrs Exp $
+# $FreeBSD: www/ja/tutorials/Makefile,v 1.6 2000/10/02 07:54:41 kuriyama Exp $
 #
 # Original revision: 1.9
 #
 # Build the FreeBSD tutorials/articles outside of the www tree, and then
 # install them in to the right place.
 
+LOCALTOP= ..
+
 DOCS = index.sgml
 
 DIRS_TO_CLEAN =	../../../doc/ja_JP.eucJP/articles \
 		../../../doc/ja_JP.eucJP/books/porters-handbook \
 		../../../doc/ja_JP.eucJP/books/ppp-primer
 #		../../../doc/ja_JP.eucJP/books/fdp-primer \
 
 all afterinstall:
 	(cd ${.CURDIR}/../../../doc/ja_JP.eucJP/articles && ${MAKE} 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/ja/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/})
 #	(cd ${.CURDIR}/../../../doc/ja_JP.eucJP/books/fdp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/ja/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/})
 	(cd ${.CURDIR}/../../../doc/ja_JP.eucJP/books/porters-handbook && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/ja/porters-handbook ${.TARGET:S/afterinstall/install/})
 	(cd ${.CURDIR}/../../../doc/ja_JP.eucJP/books/ppp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/ja/tutorials/ppp ${.TARGET:S/afterinstall/install/})
 
 ### Revision checking
-REVFILES=	${DOCS:M*.sgml:S/.sgml$/.revinc/g}
-BUILDTOP=	../..
-DIR_IN_LOCAL=	tutorials
+REVCHECK=	YES
 
-.include "../web.mk"
+.include "${LOCALTOP}/web.mk"
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index da0d62523c..8daeed5bb2 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,237 +1,247 @@
 # bsd.web.mk
-# $FreeBSD: www/en/web.mk,v 1.31 2000/09/30 00:21:38 nbm Exp $
+# $FreeBSD: www/en/web.mk,v 1.32 2000/10/02 07:52:48 kuriyama Exp $
 
 #
 # Build and install a web site.
 #
 # Basic targets:
 #
 # all (default) -- performs batch mode processing necessary
 # install -- Installs everything
 # clean -- remove anything generated by processing
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
 WEBDIR?=	${.CURDIR:T}
 CGIDIR?=	${.CURDIR:T}
 DESTDIR?=	${HOME}/public_html
 
 WEBOWN?=	${USER}
 WEBGRP?=	www
 WEBMODE?=	664
 
 CGIOWN?=	${USER}
 CGIGRP?=	www
 CGIMODE?=	775
 
 PERL?=		perl5
 
 #
 # Install dirs derived from the above.
 #
 DOCINSTALLDIR=	${DESTDIR}${WEBBASE}/${WEBDIR}
 CGIINSTALLDIR=	${DESTDIR}${WEBBASE}/${CGIDIR}
 
 #
 # The orphan list contains sources specified in DOCS that there
 # is no transform rule for.  We start out with all of them, and
 # each rule below removes the ones it knows about.  If any are
 # left over at the end, the user is warned about them.
 #
 ORPHANS:=	${DOCS}
 
 COPY=	-C
 
 #
 # Where the ports live, if CVS isn't used (ie. NOPORTSCVS is defined)
 #
 PORTSBASE?=	/usr
 
 ##################################################################
 # Transformation rules
 
 ###
 # file.sgml --> file.revinc
 #
 # Generate temporary file for translation revision checking
 .SUFFIXES:	.sgml .revinc
 GENDOCS+=	${REVFILES}
 .sgml.revinc:
 	if [ -f ${BUILDTOP}/en/${DIR_IN_LOCAL}/${.IMPSRC} ]; then \
 	  ${BUILDTOP}/ja/revcheck ${BUILDTOP} ${DIR_IN_LOCAL} ${.IMPSRC} > ${.TARGET}; \
 	else \
 	  touch ${.TARGET}; \
 	fi
 
 ###
 # file.sgml --> file.html
 #
 # Runs file.sgml through spam to validate and expand some entity
 # references are expanded.  file.html is added to the list of
 # things to install.
 
 .SUFFIXES:	.html
+.if defined(REVCHECK)
+PREHTML=	${.CURDIR}/${BUILDTOP}/ja/prehtml
+PREHTMLFLAGS=	${PREHTMLOPTS}
+BUILDTOP=	${LOCALTOP}/..
+LOCALPREFIX!=	cd ${LOCALTOP}; echo $${PWD};
+DIR_IN_LOCAL=   ${PWD:S/^${LOCALPREFIX}//:S/^\///}
+PREHTMLFLAGS+=	-revcheck "${LOCALTOP}" "${DIR_IN_LOCAL}"
+.else
+DATESUBST=	's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date	"Last modified: \1">/'
+PREHTML=	sed -e ${DATESUBST}
+.endif
 .if !defined(OPENJADE)
 SGMLNORM=	sgmlnorm
 .else
 SGMLNORM=	osgmlnorm
 .endif
 PREFIX?=	/usr/local
 CATALOG?=	${PREFIX}/share/sgml/html/catalog
 SGMLNORMFLAGS=	-d ${SGMLNORMOPTS} -c ${CATALOG} -D ${.CURDIR}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
-DATESUBST=	's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date	"Last modified: \1">/'
 
 .sgml.html:
-	sed -e ${DATESUBST} ${.IMPSRC} |\
+	${PREHTML} ${PREHTMLFLAGS} ${.IMPSRC} |\
 	SGML_CATALOG_FILES='' ${SGMLNORM} ${SGMLNORMFLAGS} > ${.TARGET}
 
 ###
 # file.docb --> file.html
 #
 # Generate HTML from docbook
 
 .SUFFIXES:	.docb
 GENDOCS+=	${DOCS:M*.docb:S/.docb$/.html/g}
 ORPHANS:=	${ORPHANS:N*.docb}
 
 .docb.html:
 	sgmlfmt -d docbook -f html ${SGMLOPTS} ${.IMPSRC}
 
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
 all: ${COOKIE} orphans ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
 
 #
 # Warn about anything in DOCS that has no translation
 #
 .if !empty(ORPHANS)
 orphans:
 	@echo Warning!  I don\'t know what to do with: ${ORPHANS}
 .else
 orphans:
 .endif
 
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 .if defined(DIRS_TO_CLEAN) && !empty(DIRS_TO_CLEAN)
 .for dir in ${DIRS_TO_CLEAN}
 	(cd ${dir} && ${MAKE} clean)
 .endfor
 .endif
 	rm -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES}
 .endif
 
 #
 # Really clean things up
 #
 .if !target(cleandir)
 cleandir: clean _PROGSUBDIR
 	rm -f ${.CURDIR}/tags .depend
 	cd ${.CURDIR}; rm -rf obj;
 .endif
 
 #
 # Install targets: before, real, and after.
 #
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
 .endif
 .if !target(afterinstall)
 afterinstall:
 .endif
 
 _ALLINSTALL+=	${GENDOCS} ${DATA} ${LOCAL}
 
 realinstall: ${COOKIE} ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
 .if !empty(_ALLINSTALL)
 	@mkdir -p ${DOCINSTALLDIR}
 	for entry in ${_ALLINSTALL}; do \
 		${INSTALL} ${COPY} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE} \
 			${INSTALLFLAGS} $${entry} ${DOCINSTALLDIR}; \
 	done
 .if defined(INDEXLINK) && !empty(INDEXLINK)
 	(cd ${DOCINSTALLDIR}; ln -s -f ${INDEXLINK} index.html)
 .endif
 .endif
 .if defined(CGI) && !empty(CGI)
 	@mkdir -p ${CGIINSTALLDIR}
 	for entry in ${CGI}; do \
 		${INSTALL} ${COPY} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE} \
 			${INSTALLFLAGS} $${entry} ${CGIINSTALLDIR}; \
 	done
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	for entry in ${DOCSUBDIR}; do \
 		mkdir -p ${DOCINSTALLDIR}/$$entry; \
 	done
 .endif
 
 # Set up install dependencies so they happen in the correct order.
 install: afterinstall
 afterinstall: realinstall2
 realinstall: beforeinstall
 realinstall2: realinstall
 .endif 
 
 #
 # This recursively calls make in subdirectories.
 #
 #SUBDIR+=${DOCSUBDIR}
 _PROGSUBDIR: .USE
 .if defined(SUBDIR) && !empty(SUBDIR)
 	@for entry in ${SUBDIR}; do \
 		(${ECHODIR} "===> ${DIRPRFX}$$entry"; \
 		cd ${.CURDIR}/$${entry} && \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/); \
 	done
 .endif
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	@for entry in ${DOCSUBDIR}; do \
 		(${ECHODIR} "===> ${DIRPRFX}$$entry"; \
 		cd ${.CURDIR}/$${entry} && \
 		if [ ${WEBDIR} = "data" -a $$entry = "handbook" -o $$entry = "docproj-primer" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt html html-split"; \
 		elif [ $$entry = "handbook" -a ${WEBDIR} = "data/ja" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="html html-split"; \
 		else \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}; \
 		fi); \
 	done
 .endif
 
 
 #
 # cruft for generating linuxdoc stuff
 #
 
 .if defined (DOCSUBDIR) && !empty(DOCSUBDIR)
 
 FORMATS?=	"html ps latin1 ascii"
 PARAMS=		DESTDIR=${DESTDIR} DOCDIR=${WEBBASE}/${WEBDIR}
 PARAMS+=	DOCOWN=${WEBOWN} DOCGRP=${WEBGRP}
 PARAMS+=	FORMATS=${FORMATS} COPY="${COPY}"
 PARAMS+=	SGMLOPTS="${SGMLOPTS}"
 
 .endif
 
 .include <bsd.obj.mk>
 # THE END