diff --git a/en/copyright/Makefile b/en/copyright/Makefile
index 0e2fb28c2c..be36c9bada 100644
--- a/en/copyright/Makefile
+++ b/en/copyright/Makefile
@@ -1,22 +1,27 @@
-# $Id: Makefile,v 1.6 1998-10-15 19:29:45 wosch Exp $
+# $Id: Makefile,v 1.7 1999-04-08 21:50:03 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 
 DOCS=	license.sgml
 DOCS+=	freebsd-license.sgml
 DOCS+=	daemon.sgml
 DOCS+=	copyright.sgml
 
 INDEXLINK= copyright.html
 
 DATA+= COPYING COPYING.LIB ${LEGAL}
 
 # FreeBSD Ports redistribution restrictions
 LEGAL= LEGAL
 CLEANFILES+= ${LEGAL}
+.if defined(NOPORTSCVS)
+${LEGAL}: $${PORTSBASE}/ports/LEGAL
+	cp ${PORTSBASE}/ports/LEGAL LEGAL
+.else
 ${LEGAL}: $${CVSROOT}/ports/LEGAL,v
 	co -q -p ${.ALLSRC} > ${.TARGET}
+.endif
 
 .include "../web.mk"
diff --git a/en/ports/Makefile b/en/ports/Makefile
index e32a8e8895..3769d23e32 100644
--- a/en/ports/Makefile
+++ b/en/ports/Makefile
@@ -1,55 +1,70 @@
-#	$Id: Makefile,v 1.20 1999-03-12 10:13:06 wosch Exp $
+#	$Id: Makefile,v 1.21 1999-04-08 21:50:03 nik Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 
 PORTINDEX=	perl5 ${.CURDIR}/portindex
 INDEX=		INDEX
 PINDEX=		ports/${INDEX}
 Y2K=		YEAR2000
 PY2K=		ports/${Y2K}
 WWW=		WWW_SITE
 PWWW=		ports/${WWW}
 
 COOKIE=		${INDEX} Makefile.gen
 
 .if exists(Makefile.gen)
 .include "Makefile.gen"
 .endif
 CLEANFILES+=	${DOCS} Makefile.gen ${INDEX} ${Y2K} ${WWW} packages.exists
 
 cvsindex= $${CVSROOT}/${PINDEX},v
 cvsy2k= $${CVSROOT}/${PY2K},v
 cvswww= $${CVSROOT}/${PWWW},v
 _ALLINSTALL= packages.exists ${INDEX} ${Y2K} ${WWW}
 
+.if defined(NOPORTSCVS)
+${INDEX}: $${PORTSBASE}/${PINDEX}
+	cp ${PORTSBASE}/${PINDEX} ${INDEX}
+
+${Y2K}: $${PORTSBASE}/${PY2K}
+	cp ${PORTSBASE}/${PY2K} ${Y2K}
+
+${WWW}: $${PORTSBASE}/${PWWW}
+	cp ${PORTSBASE}/${PWWW} ${WWW}
+.else
 ${INDEX}: ${cvsindex}
 	cvs -QR co -p ${PINDEX} > ${INDEX}
 
 ${Y2K}: ${cvsy2k}
 	cvs -QR co -p ${PY2K} > ${Y2K}
 
 ${WWW}: ${cvswww}
 	cvs -QR co -p ${PWWW} > ${WWW}
+.endif
 
 # build the list of available packages only on the 
 # main FreeBSD machines
 hostname!= hostname
 
+.if defined(NOPORTSCVS)
+packages.exists:
+.else
 packages.exists: ${cvsindex} ${cvsy2k} ${cvswww}
+.endif
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org"
 	sh ${.CURDIR}/packages > ${.TARGET}
 .else
 	touch ${.TARGET}
 .endif
 
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
 	${MAKE} ${MAKEFLAGS} ${.IMPSRC}
 
 index.sgml: ${INDEX} ${Y2K} ${WWW} packages.exists portindex ports.inc .NOTMAIN
 	rm -f *.sgml
 	${PORTINDEX} ${INDEX} ${Y2K} ${WWW}
 
 .include "../web.mk"
diff --git a/en/web.mk b/en/web.mk
index 80c9093808..f8fb0e3d4c 100644
--- a/en/web.mk
+++ b/en/web.mk
@@ -1,213 +1,218 @@
 # bsd.web.mk
-# $Id: web.mk,v 1.17 1999-04-02 22:06:58 wosch Exp $
+# $Id: web.mk,v 1.18 1999-04-08 21:50:02 nik 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
 
 #
 # 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.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}
 
 
 ##################################################################
 # 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
 	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 \
 		if [ $$entry != "handbook" ]; then \
 			(cd ${DOCINSTALLDIR}/$$entry; \
 			if test -f $$entry.html; then tar czf $$entry-html.tar.gz *.html; fi; \
 			if test -f $$entry.html; then ln -fs $${entry}.html index.html;fi ) \
 		fi; \
 	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 [ $$entry = "handbook" -a ${WEBDIR} = "data" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt 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
 
 # THE END
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index bd02311813..32a6d0c36a 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -1,213 +1,218 @@
 # bsd.web.mk
-# $Id: web.site.mk,v 1.17 1999-04-02 22:06:58 wosch Exp $
+# $Id: web.site.mk,v 1.18 1999-04-08 21:50:02 nik 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
 
 #
 # 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.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}
 
 
 ##################################################################
 # 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
 	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 \
 		if [ $$entry != "handbook" ]; then \
 			(cd ${DOCINSTALLDIR}/$$entry; \
 			if test -f $$entry.html; then tar czf $$entry-html.tar.gz *.html; fi; \
 			if test -f $$entry.html; then ln -fs $${entry}.html index.html;fi ) \
 		fi; \
 	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 [ $$entry = "handbook" -a ${WEBDIR} = "data" ]; then \
 			${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/ ${PARAMS} FORMATS="txt 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
 
 # THE END