Update the pkgsrc guide to match the recent www.NetBSD.org htdocs directory

structure rototill.
(Someone, please regen! My documentation toolchain coredumps.)

3 files changed, 17 insertions, 17 deletions

diff --git a/doc/guide/Makefile b/doc/guide/Makefile
index 1b4b2412fae..6a95173acde 100644
--- a/doc/guide/Makefile
+++ b/doc/guide/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.28 2007/03/08 16:02:32 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2007/07/02 19:00:01 tnn Exp $
 #
 
 DISTNAME=		pkgsrc-guide-${PKGVERSION}
 CATEGORIES=		# empty
 MASTER_SITES=		${MASTER_SITE_LOCAL}
-DISTFILES=		htdocs-share-20070119.tar.gz
+DISTFILES=		htdocs-share-20070702.tar.gz
 
 MAINTAINER=		packages@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Documentation/pkgsrc/
+HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=		The pkgsrc guide
 
 # To regenerate pkgsrc/doc/pkgsrc.{html,txt} and
-# htdocs/Documentation/pkgsrc, just run "make regen".
+# htdocs/docs/pkgsrc, just run "make regen".
 
 PKGVERSION!=		date '+%Y%m%d'
 DIST_SUBDIR=		${PKGBASE}
@@ -58,7 +58,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 .if !empty(OUTPUTS:Mhtml) || !empty(OUTPUTS:Mhtml-split)
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/htdocs/NetBSD.css ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/htdocs/global.css ${DOCDIR}
 .endif
 .if !empty(OUTPUTS:Mascii)
 	${INSTALL_DATA} ${WRKSRC}/pkgsrc.txt ${DOCDIR}
@@ -89,7 +89,7 @@ install-doc: build
 
 install-htdocs: build
 	cd ${WRKSRC} && ${CP} pkgsrc.txt pkgsrc.pdf pkgsrc.ps *.html	\
-		${HTDOCSDIR}/Documentation/pkgsrc
+		${HTDOCSDIR}/docs/pkgsrc
 
 .PHONY: regen regen-doc regen-htdocs
 regen: regen-doc regen-htdocs
@@ -103,10 +103,10 @@ regen-doc: build
 
 regen-htdocs: build
 	@${STEP_MSG} "Updating the files in htdocs"
-	cd ${HTDOCSDIR}/Documentation/pkgsrc && cvs update
+	cd ${HTDOCSDIR}/docs/pkgsrc && cvs update
 	${MAKE} ${MAKEFLAGS} install-htdocs
 	@${STEP_MSG} "Committing the files in htdocs"
-	cd ${HTDOCSDIR}/Documentation/pkgsrc && cvs commit -m "regen"
+	cd ${HTDOCSDIR}/docs/pkgsrc && cvs commit -m "regen"
 
 do-lint:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} lint
@@ -135,6 +135,6 @@ htdocs-share:
 	cd ${HTDOCSDIR}							\
 	&& pax -wz -f ${.CURDIR}/htdocs-share-${PKGVERSION}.tar.gz	\
 		-s ',^,htdocs/,'					\
-		NetBSD.css share
+		global.css share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/doc/guide/distinfo b/doc/guide/distinfo
index 6ae6759ab01..f79084f3ed1 100644
--- a/doc/guide/distinfo
+++ b/doc/guide/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/01/19 19:39:38 tv Exp $
+$NetBSD: distinfo,v 1.10 2007/07/02 19:00:01 tnn Exp $
 
-SHA1 (pkgsrc-guide/htdocs-share-20070119.tar.gz) = 7a3d97b63cd49bd996ca2dfb7b3a2c5901a75e6a
-RMD160 (pkgsrc-guide/htdocs-share-20070119.tar.gz) = 692615fa4b673b60ccddfbddaa81fd17c7a13af8
-Size (pkgsrc-guide/htdocs-share-20070119.tar.gz) = 94077 bytes
+SHA1 (pkgsrc-guide/htdocs-share-20070702.tar.gz) = 3b5be79ec3eec0ac7d5bcc40217024d9d9c992e3
+RMD160 (pkgsrc-guide/htdocs-share-20070702.tar.gz) = e4c52d0af0ba1d34f6f2ba890cb20c781e41493a
+Size (pkgsrc-guide/htdocs-share-20070702.tar.gz) = 96023 bytes
diff --git a/doc/guide/files/editing.xml b/doc/guide/files/editing.xml
index b926df44fab..840e1dd2451 100644
--- a/doc/guide/files/editing.xml
+++ b/doc/guide/files/editing.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: editing.xml,v 1.13 2006/10/07 01:24:00 rillig Exp $ -->
+<!-- $NetBSD: editing.xml,v 1.14 2007/07/02 19:00:01 tnn Exp $ -->
 
 <appendix id="editing">
 <title>Editing guidelines for the pkgsrc guide</title>
@@ -20,14 +20,14 @@
 	<listitem><para><filename>pkgsrc/doc/pkgsrc.html</filename></para></listitem>
 
 	<listitem><para><ulink
-	url="http://www.NetBSD.org/Documentation/pkgsrc/"/></para></listitem>
+	url="http://www.NetBSD.org/docs/pkgsrc/"/></para></listitem>
 
 	<listitem><para><ulink
-	url="http://www.NetBSD.org/Documentation/pkgsrc/pkgsrc.pdf"/>:
+	url="http://www.NetBSD.org/docs/pkgsrc/pkgsrc.pdf"/>:
 	The PDF version of the pkgsrc guide.</para></listitem>
 
 	<listitem><para><ulink
-	url="http://www.NetBSD.org/Documentation/pkgsrc/pkgsrc.ps"/>:
+	url="http://www.NetBSD.org/docs/pkgsrc/pkgsrc.ps"/>:
 	PostScript version of the pkgsrc guide.</para></listitem>
 
 	</itemizedlist>