diff --git a/data/Makefile b/data/Makefile
index 10bde5fcf5..0958151432 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,64 +1,60 @@
-# $Id: Makefile,v 1.19 1997-06-30 06:30:17 jkh Exp $
+# $Id: Makefile,v 1.20 1998-01-18 22:27:30 jfieber Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 ACCESS_LOG_DIR?=/home/www/server/logs
 ACCESS_LOG_FILE?=access_log
 ANALOG?=/home/www/bin/analog
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= cgallery.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 
 # Files or targets listed here are defined in this file.
 
-LOCAL=	stats.html stats-img.html
+#LOCAL=	stats.html stats-img.html
 
 stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl atoz.pl > ${.TARGET}
 
 # Subdirectories
 
 SUBDIR=		cgi commercial gifs ports releases tutorials ja_JP.EUC
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
-
-# Directories that need to be checked out from the 
-# CVS repository.
-
-CVSDIR=		FAQ handbook
+SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
 .include "web.mk"
 
diff --git a/data/Makefile.inc b/data/Makefile.inc
index bf9ec4e9f2..c44a0696a1 100644
--- a/data/Makefile.inc
+++ b/data/Makefile.inc
@@ -1,4 +1,3 @@
-# $Id: Makefile.inc,v 1.5 1997-07-01 03:51:59 max Exp $
+# $Id: Makefile.inc,v 1.6 1998-01-18 22:27:30 jfieber Exp $
 
 WEBBASE?=	/data
-SGMLOPTS+=	-links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/data/ja_JP.EUC/Makefile b/data/ja_JP.EUC/Makefile
index e8d82ff1b9..9d424f8a32 100644
--- a/data/ja_JP.EUC/Makefile
+++ b/data/ja_JP.EUC/Makefile
@@ -1,51 +1,48 @@
-# $Id: Makefile,v 1.6 1998-01-01 19:38:26 max Exp $
+# $Id: Makefile,v 1.7 1998-01-18 22:27:36 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.19
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 DOCS+= jabout.sgml
 #DOCS+= cgallery.sgml npgallery.sgml pgallery.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	index.html
 
 # Files or targets listed here are defined in this file.
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl ../atoz.pl > ${.TARGET}
 
 # Subdirectories
 
 #SUBDIR=		cgi commercial gifs ports releases tutorials
 SUBDIR=			ports releases
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 FORMATS?=	"html roff"
+SGMLOPTS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
-# Directories that need to be checked out from the 
-# CVS repository.
-
-#CVSDIR=		FAQ handbook
 
 WEBDIR=		ja_JP.EUC
 
 .include "../web.mk"
 
diff --git a/data/ja_JP.EUC/Makefile.inc b/data/ja_JP.EUC/Makefile.inc
index 9070a7b704..e0e9bd6b40 100644
--- a/data/ja_JP.EUC/Makefile.inc
+++ b/data/ja_JP.EUC/Makefile.inc
@@ -1,6 +1,5 @@
-# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $
+# $Id: Makefile.inc,v 1.4 1998-01-18 22:27:37 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.5
 
 WEBBASE?=	/data/ja_JP.EUC
-SGMLOPTS+=	-links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/data/ja_JP.EUC/ports/Makefile b/data/ja_JP.EUC/ports/Makefile
index ba0e4731fc..6858197d54 100644
--- a/data/ja_JP.EUC/ports/Makefile
+++ b/data/ja_JP.EUC/ports/Makefile
@@ -1,24 +1,26 @@
-#	$Id: Makefile,v 1.2 1997-12-07 15:44:05 max Exp $
+#	$Id: Makefile,v 1.3 1998-01-18 22:27:40 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.4
 
 PORTINDEX=	./portindex
-INDEX=		../../ports/ports/INDEX
-#CVSDIR=	ports/INDEX
+INDEX=		ports/INDEX
 
-COOKIE=		cvsdir Makefile.gen
+COOKIE=		index Makefile.gen
 
 .if exists(Makefile.gen)
 .include "Makefile.gen"
 CLEANFILES+=	${DOCS} Makefile.gen
 .endif
 
+index:
+	cvs co ${INDEX}
+
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 	${MAKE} ${MAKEFLAGS} ${.IMPSRC}
 
 index.sgml: ${INDEX} portindex ports.inc categories.ja_JP.EUC .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX}
 
 .include "../../web.mk"
diff --git a/data/ports/Makefile b/data/ports/Makefile
index c26d866bfe..c8335275b2 100644
--- a/data/ports/Makefile
+++ b/data/ports/Makefile
@@ -1,22 +1,24 @@
-#	$Id: Makefile,v 1.4 1997-04-23 22:23:02 jfieber Exp $
+#	$Id: Makefile,v 1.5 1998-01-18 22:27:42 jfieber Exp $
 
 PORTINDEX=	./portindex
 INDEX=		ports/INDEX
-CVSDIR=		ports/INDEX
 
-COOKIE=		cvsdir Makefile.gen
+COOKIE=		index Makefile.gen
 
 .if exists(Makefile.gen)
 .include "Makefile.gen"
 CLEANFILES+=	${DOCS} Makefile.gen
 .endif
 
+index:
+	cvs co ${INDEX}
+
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 	${MAKE} ${MAKEFLAGS} ${.IMPSRC}
 
 index.sgml: ${INDEX} portindex ports.inc .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX}
 
 .include "../web.mk"
diff --git a/data/tutorials/Makefile b/data/tutorials/Makefile
index 0434928bee..d89b4c97ac 100644
--- a/data/tutorials/Makefile
+++ b/data/tutorials/Makefile
@@ -1,11 +1,13 @@
-# $Id: Makefile,v 1.11 1997-09-13 04:24:09 jfieber Exp $
+# $Id: Makefile,v 1.12 1998-01-18 22:27:43 jfieber Exp $
 
 DOCS?=		index.sgml
 SUBDIR=		devel diskformat disklessx fonts mh multios newuser upgrade
 DOCSUBDIR=	ddwg ppp
+SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+
 
 .if defined $(NEW_BUILD)
 SUBDIR=
 .endif
 
 .include "../web.mk"
diff --git a/data/web.mk b/data/web.mk
index 7b4e9bf795..7e5de9074d 100644
--- a/data/web.mk
+++ b/data/web.mk
@@ -1,262 +1,207 @@
 # bsd.web.mk
-# $Id: web.mk,v 1.12 1997-11-11 15:09:24 brian Exp $
+# $Id: web.mk,v 1.13 1998-01-18 22:27:31 jfieber 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
 #
-# Transformations:
-# 
-#  copy  -- no processing, simply copy the file to install
-#  spam  -- run the file through spam for processing and validation
-#  m4    -- run through the m4 macro processor
-#
 
 .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
 
 #
 # 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
+COPY=	-C
 
 ##################################################################
 # Transformation rules
 
 ###
 # 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:	.sgml .html
 SGMLNORM=	sgmlnorm
 CATALOG?=	/usr/local/share/sgml/html/catalog
 SGMLNORMFLAGS=	-d ${SGMLNORMOPTS} -c ${CATALOG}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
 
 .sgml.html:
 	${SGMLNORM} ${SGMLNORMFLAGS} ${.IMPSRC} > ${.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}
 
-###
-# file.java --> file.class
-#
-# Uses javac to compile java source.  Note: since we cannot tell
-# what classes will come out of a java file, we have install all
-# .class files.  The .if construction is there so that *.class
-# is only put in if there are actually java files in the DOCS.
-# Generally speaking, make and java were not made for each other.
-
-.SUFFIXES:	.java .class
-JAVAC?=		javac
-JAVAFLAGS=	${JAVAOPTS}
-_TMP:=		${DOCS:M*.java}
-.if !empty(_TMP)
-GENDOCS+=	${DOCS:M*.java:S/.java$/.class/g} *.class
-.endif
-ORPHANS:=	${ORPHANS:N*.java}
-
-.java.class:
-	${JAVAC} ${JAVAFLAGS} ${.IMPSRC}
-
-
-###
-# file.m4 --> file.html
-#
-# Runs file.m4 through the m4 preprocessor, generating file.sgml,
-# which is then taken care of by the .sgml to .html rule.
-
-.SUFFIXES:	.m4
-M4?=		m4
-M4FLAGS?=	${M4OPTS}
-GENDOCS+=	${DOCS:M*.m4:S/.m4$/.html/g}
-CLEANFILES+=	${DOCS:M*.m4:S/.m4$/.sgml/g}
-ORPHANS:=	${ORPHANS:N*.m4}
-
-.m4.sgml:
-	${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET}
-
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
-all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
+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
 
-#
-# Check these things out from cvs
-#
-cvsdir:
-.if defined(CVSDIR) && !empty(CVSDIR)
-	for i in ${CVSDIR}; do \
-		if [ ! -e $$i ]; then \
-			cvs co -P $$i; \
-		fi \
-	done
-.endif
-
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 	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
 
 realinstall2:
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	for entry in ${DOCSUBDIR}; do \
 		(cd ${DOCINSTALLDIR}/$$entry; \
 		tar czf $$entry-html.tar.gz *.html; \
 		ln -fs $${entry}.html index.html ) \
 	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}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}); \
 	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
 
 # THE END
diff --git a/en/Makefile b/en/Makefile
index 10bde5fcf5..0958151432 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,64 +1,60 @@
-# $Id: Makefile,v 1.19 1997-06-30 06:30:17 jkh Exp $
+# $Id: Makefile,v 1.20 1998-01-18 22:27:30 jfieber Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 ACCESS_LOG_DIR?=/home/www/server/logs
 ACCESS_LOG_FILE?=access_log
 ANALOG?=/home/www/bin/analog
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= cgallery.sgml commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= npgallery.sgml pgallery.sgml publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 
 # Files or targets listed here are defined in this file.
 
-LOCAL=	stats.html stats-img.html
+#LOCAL=	stats.html stats-img.html
 
 stats.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	egrep -iv '\.(gif|jpg|jpeg|au) ' | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 stats-img.html: ${ACCESS_LOG_DIR}/${ACCESS_LOG_FILE}
 	renice +10 $$$$; \
 	(cd ${ACCESS_LOG_DIR};zcat ${ACCESS_LOG_FILE}.*.gz; \
 	    cat ${ACCESS_LOG_FILE}) | \
 	${ANALOG} +i0 +R500 -o > ${.TARGET}
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl atoz.pl > ${.TARGET}
 
 # Subdirectories
 
 SUBDIR=		cgi commercial gifs ports releases tutorials ja_JP.EUC
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
-
-# Directories that need to be checked out from the 
-# CVS repository.
-
-CVSDIR=		FAQ handbook
+SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
 .include "web.mk"
 
diff --git a/en/Makefile.inc b/en/Makefile.inc
index bf9ec4e9f2..c44a0696a1 100644
--- a/en/Makefile.inc
+++ b/en/Makefile.inc
@@ -1,4 +1,3 @@
-# $Id: Makefile.inc,v 1.5 1997-07-01 03:51:59 max Exp $
+# $Id: Makefile.inc,v 1.6 1998-01-18 22:27:30 jfieber Exp $
 
 WEBBASE?=	/data
-SGMLOPTS+=	-links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/en/ports/Makefile b/en/ports/Makefile
index c26d866bfe..c8335275b2 100644
--- a/en/ports/Makefile
+++ b/en/ports/Makefile
@@ -1,22 +1,24 @@
-#	$Id: Makefile,v 1.4 1997-04-23 22:23:02 jfieber Exp $
+#	$Id: Makefile,v 1.5 1998-01-18 22:27:42 jfieber Exp $
 
 PORTINDEX=	./portindex
 INDEX=		ports/INDEX
-CVSDIR=		ports/INDEX
 
-COOKIE=		cvsdir Makefile.gen
+COOKIE=		index Makefile.gen
 
 .if exists(Makefile.gen)
 .include "Makefile.gen"
 CLEANFILES+=	${DOCS} Makefile.gen
 .endif
 
+index:
+	cvs co ${INDEX}
+
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 	${MAKE} ${MAKEFLAGS} ${.IMPSRC}
 
 index.sgml: ${INDEX} portindex ports.inc .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX}
 
 .include "../web.mk"
diff --git a/en/web.mk b/en/web.mk
index 7b4e9bf795..7e5de9074d 100644
--- a/en/web.mk
+++ b/en/web.mk
@@ -1,262 +1,207 @@
 # bsd.web.mk
-# $Id: web.mk,v 1.12 1997-11-11 15:09:24 brian Exp $
+# $Id: web.mk,v 1.13 1998-01-18 22:27:31 jfieber 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
 #
-# Transformations:
-# 
-#  copy  -- no processing, simply copy the file to install
-#  spam  -- run the file through spam for processing and validation
-#  m4    -- run through the m4 macro processor
-#
 
 .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
 
 #
 # 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
+COPY=	-C
 
 ##################################################################
 # Transformation rules
 
 ###
 # 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:	.sgml .html
 SGMLNORM=	sgmlnorm
 CATALOG?=	/usr/local/share/sgml/html/catalog
 SGMLNORMFLAGS=	-d ${SGMLNORMOPTS} -c ${CATALOG}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
 
 .sgml.html:
 	${SGMLNORM} ${SGMLNORMFLAGS} ${.IMPSRC} > ${.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}
 
-###
-# file.java --> file.class
-#
-# Uses javac to compile java source.  Note: since we cannot tell
-# what classes will come out of a java file, we have install all
-# .class files.  The .if construction is there so that *.class
-# is only put in if there are actually java files in the DOCS.
-# Generally speaking, make and java were not made for each other.
-
-.SUFFIXES:	.java .class
-JAVAC?=		javac
-JAVAFLAGS=	${JAVAOPTS}
-_TMP:=		${DOCS:M*.java}
-.if !empty(_TMP)
-GENDOCS+=	${DOCS:M*.java:S/.java$/.class/g} *.class
-.endif
-ORPHANS:=	${ORPHANS:N*.java}
-
-.java.class:
-	${JAVAC} ${JAVAFLAGS} ${.IMPSRC}
-
-
-###
-# file.m4 --> file.html
-#
-# Runs file.m4 through the m4 preprocessor, generating file.sgml,
-# which is then taken care of by the .sgml to .html rule.
-
-.SUFFIXES:	.m4
-M4?=		m4
-M4FLAGS?=	${M4OPTS}
-GENDOCS+=	${DOCS:M*.m4:S/.m4$/.html/g}
-CLEANFILES+=	${DOCS:M*.m4:S/.m4$/.sgml/g}
-ORPHANS:=	${ORPHANS:N*.m4}
-
-.m4.sgml:
-	${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET}
-
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
-all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
+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
 
-#
-# Check these things out from cvs
-#
-cvsdir:
-.if defined(CVSDIR) && !empty(CVSDIR)
-	for i in ${CVSDIR}; do \
-		if [ ! -e $$i ]; then \
-			cvs co -P $$i; \
-		fi \
-	done
-.endif
-
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 	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
 
 realinstall2:
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	for entry in ${DOCSUBDIR}; do \
 		(cd ${DOCINSTALLDIR}/$$entry; \
 		tar czf $$entry-html.tar.gz *.html; \
 		ln -fs $${entry}.html index.html ) \
 	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}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}); \
 	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
 
 # THE END
diff --git a/ja/Makefile b/ja/Makefile
index e8d82ff1b9..9d424f8a32 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,51 +1,48 @@
-# $Id: Makefile,v 1.6 1998-01-01 19:38:26 max Exp $
+# $Id: Makefile,v 1.7 1998-01-18 22:27:36 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.19
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  about.sgml applications.sgml auditors.sgml availability.sgml branch.sgml
 DOCS+= commercial.sgml daemon.sgml docproj.sgml docs.sgml 
 DOCS+= features.sgml gallery.sgml index-site.sgml register.sgml 
 DOCS+= internet.sgml license.sgml mailto.sgml mirror.sgml newsflash.sgml
 DOCS+= publish.sgml search.sgml searchhints.sgml
 DOCS+= send-pr.sgml security.sgml support.sgml where.sgml resignation.sgml
 DOCS+= jabout.sgml
 #DOCS+= cgallery.sgml npgallery.sgml pgallery.sgml
 
 CLEANFILES+=atoz.sgml
 
 # These will be directly installed.
 
 DATA=	index.html
 
 # Files or targets listed here are defined in this file.
 
 index-site.sgml: atoz.sgml
 atoz.sgml: web.atoz 
 	sort -fu web.atoz | perl ../atoz.pl > ${.TARGET}
 
 # Subdirectories
 
 #SUBDIR=		cgi commercial gifs ports releases tutorials
 SUBDIR=			ports releases
 
 # Subdirectories that have linuxdoc docs and makefiles that use
 # <bsd.sgml.mk>.
 
 DOCSUBDIR=	FAQ handbook
 FORMATS?=	"html roff"
+SGMLOPTS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
-# Directories that need to be checked out from the 
-# CVS repository.
-
-#CVSDIR=		FAQ handbook
 
 WEBDIR=		ja_JP.EUC
 
 .include "../web.mk"
 
diff --git a/ja/Makefile.inc b/ja/Makefile.inc
index 9070a7b704..e0e9bd6b40 100644
--- a/ja/Makefile.inc
+++ b/ja/Makefile.inc
@@ -1,6 +1,5 @@
-# $Id: Makefile.inc,v 1.3 1997-11-23 22:55:07 max Exp $
+# $Id: Makefile.inc,v 1.4 1998-01-18 22:27:37 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.5
 
 WEBBASE?=	/data/ja_JP.EUC
-SGMLOPTS+=	-links -hdr ${.CURDIR}/../doc.hdr -ftr ${.CURDIR}/../doc.ftr
diff --git a/ja/ports/Makefile b/ja/ports/Makefile
index ba0e4731fc..6858197d54 100644
--- a/ja/ports/Makefile
+++ b/ja/ports/Makefile
@@ -1,24 +1,26 @@
-#	$Id: Makefile,v 1.2 1997-12-07 15:44:05 max Exp $
+#	$Id: Makefile,v 1.3 1998-01-18 22:27:40 jfieber Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.4
 
 PORTINDEX=	./portindex
-INDEX=		../../ports/ports/INDEX
-#CVSDIR=	ports/INDEX
+INDEX=		ports/INDEX
 
-COOKIE=		cvsdir Makefile.gen
+COOKIE=		index Makefile.gen
 
 .if exists(Makefile.gen)
 .include "Makefile.gen"
 CLEANFILES+=	${DOCS} Makefile.gen
 .endif
 
+index:
+	cvs co ${INDEX}
+
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 	${MAKE} ${MAKEFLAGS} ${.IMPSRC}
 
 index.sgml: ${INDEX} portindex ports.inc categories.ja_JP.EUC .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX}
 
 .include "../../web.mk"
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index d4e9f52c63..89ea7b6362 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,262 +1,207 @@
 # bsd.web.mk
-# $Id: web.site.mk,v 1.12 1997-11-11 15:09:24 brian Exp $
+# $Id: web.site.mk,v 1.13 1998-01-18 22:27:31 jfieber 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
 #
-# Transformations:
-# 
-#  copy  -- no processing, simply copy the file to install
-#  spam  -- run the file through spam for processing and validation
-#  m4    -- run through the m4 macro processor
-#
 
 .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
 
 #
 # 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
+COPY=	-C
 
 ##################################################################
 # Transformation rules
 
 ###
 # 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:	.sgml .html
 SGMLNORM=	sgmlnorm
 CATALOG?=	/usr/local/share/sgml/html/catalog
 SGMLNORMFLAGS=	-d ${SGMLNORMOPTS} -c ${CATALOG}
 GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
 ORPHANS:=	${ORPHANS:N*.sgml}
 
 .sgml.html:
 	${SGMLNORM} ${SGMLNORMFLAGS} ${.IMPSRC} > ${.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}
 
-###
-# file.java --> file.class
-#
-# Uses javac to compile java source.  Note: since we cannot tell
-# what classes will come out of a java file, we have install all
-# .class files.  The .if construction is there so that *.class
-# is only put in if there are actually java files in the DOCS.
-# Generally speaking, make and java were not made for each other.
-
-.SUFFIXES:	.java .class
-JAVAC?=		javac
-JAVAFLAGS=	${JAVAOPTS}
-_TMP:=		${DOCS:M*.java}
-.if !empty(_TMP)
-GENDOCS+=	${DOCS:M*.java:S/.java$/.class/g} *.class
-.endif
-ORPHANS:=	${ORPHANS:N*.java}
-
-.java.class:
-	${JAVAC} ${JAVAFLAGS} ${.IMPSRC}
-
-
-###
-# file.m4 --> file.html
-#
-# Runs file.m4 through the m4 preprocessor, generating file.sgml,
-# which is then taken care of by the .sgml to .html rule.
-
-.SUFFIXES:	.m4
-M4?=		m4
-M4FLAGS?=	${M4OPTS}
-GENDOCS+=	${DOCS:M*.m4:S/.m4$/.html/g}
-CLEANFILES+=	${DOCS:M*.m4:S/.m4$/.sgml/g}
-ORPHANS:=	${ORPHANS:N*.m4}
-
-.m4.sgml:
-	${M4} ${M4OPTS} < ${.IMPSRC} > ${.TARGET}
-
 
 ##################################################################
 # Targets
 
 #
 # If no target is specified, .MAIN is made
 #
 .MAIN: all
 
 #
 # Build most everything
 #
-all: ${COOKIE} orphans cvsdir ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
+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
 
-#
-# Check these things out from cvs
-#
-cvsdir:
-.if defined(CVSDIR) && !empty(CVSDIR)
-	for i in ${CVSDIR}; do \
-		if [ ! -e $$i ]; then \
-			cvs co -P $$i; \
-		fi \
-	done
-.endif
-
 #
 # Clean things up
 #
 .if !target(clean)
 clean: _PROGSUBDIR
 	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
 
 realinstall2:
 .if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
 	for entry in ${DOCSUBDIR}; do \
 		(cd ${DOCINSTALLDIR}/$$entry; \
 		tar czf $$entry-html.tar.gz *.html; \
 		ln -fs $${entry}.html index.html ) \
 	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}; \
 		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS}); \
 	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
 
 # THE END