Subject: pkg/37071: obsolete URLs in documents
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <kano@na.rim.or.jp>
List: pkgsrc-bugs
Date: 10/07/2007 12:30:01
>Number:         37071
>Category:       pkg
>Synopsis:       obsolete URLs in documents
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          doc-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 07 12:30:00 +0000 2007
>Originator:     OKANO Takayoshi
>Release:        
>Organization:
personal
>Environment:
>Description:
our website http://www.NetBSD.org/ was restructured at Jun 2007
http://mail-index.NetBSD.org/netbsd-docs/2007/06/09/0000.html
 
but some documents don't synchronise yet.

>How-To-Repeat:
browse README.html
e.g. ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/emulators/compat12/README.html

>Fix:
apply following patch

Index: emulators/compat12/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat12/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- emulators/compat12/Makefile	30 Aug 2007 16:54:06 -0000	1.34
+++ emulators/compat12/Makefile	7 Oct 2007 12:05:41 -0000
@@ -4,7 +4,7 @@
 NETBSD_VERSION=		1.2
 PKGREVISION=		1
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.2/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.2/index.html
 COMMENT=		Shared libraries for NetBSD 1.2 compatibility
 
 EMUL_PLATFORMS=		netbsd-i386 netbsd-m68k netbsd-ns32k netbsd-sparc
Index: emulators/compat13/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat13/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- emulators/compat13/Makefile	30 Aug 2007 16:54:06 -0000	1.30
+++ emulators/compat13/Makefile	7 Oct 2007 12:05:41 -0000
@@ -4,7 +4,7 @@
 NETBSD_VERSION=		1.3
 PKGREVISION=		3
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.3/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.3/index.html
 COMMENT=		Shared libraries for NetBSD 1.3 compatibility
 
 EMUL_PLATFORMS=		netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k	\
Index: emulators/compat14/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat14/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- emulators/compat14/Makefile	30 Aug 2007 16:54:07 -0000	1.22
+++ emulators/compat14/Makefile	7 Oct 2007 12:05:41 -0000
@@ -6,7 +6,7 @@
 
 CONFLICTS=		compat14-crypto-[0-9]*
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.4/index.html
 COMMENT=		Shared libraries for NetBSD 1.4 compatibility
 
 EMUL_PLATFORMS=		netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k	\
Index: emulators/compat15-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat15-extras/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat15-extras/Makefile	30 Aug 2007 16:54:07 -0000	1.2
+++ emulators/compat15-extras/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat15	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.5
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.5/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.5/index.html
 COMMENT=		Additional shared libraries for NetBSD 1.5 compatibility
 
 EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc
Index: emulators/compat15/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat15/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat15/Makefile	30 Aug 2007 16:54:07 -0000	1.2
+++ emulators/compat15/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat15	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.5
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.5/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.5/index.html
 COMMENT=		Shared libraries for NetBSD 1.5 compatibility
 
 .if defined(NETBSD_COMPAT32)
Index: emulators/compat16-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat16-extras/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat16-extras/Makefile	30 Aug 2007 16:54:08 -0000	1.2
+++ emulators/compat16-extras/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat16	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.6
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.6/index.html
 COMMENT=		Additional shared libraries for NetBSD 1.6 compatibility
 
 EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc
Index: emulators/compat16/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat16/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- emulators/compat16/Makefile	30 Aug 2007 16:54:07 -0000	1.11
+++ emulators/compat16/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat16	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.6
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-1.6/index.html
 COMMENT=		Shared libraries for NetBSD 1.6 compatibility
 
 .if defined(NETBSD_COMPAT32)
Index: emulators/compat20-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat20-extras/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat20-extras/Makefile	30 Aug 2007 16:54:08 -0000	1.2
+++ emulators/compat20-extras/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat20	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		2.0
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-2.0/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-2.0/index.html
 COMMENT=		Additional shared libraries for NetBSD 2.0 compatibility
 
 EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc
Index: emulators/compat20/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat20/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat20/Makefile	30 Aug 2007 16:54:08 -0000	1.2
+++ emulators/compat20/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat20	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		2.0
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-2.0/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-2.0/index.html
 COMMENT=		Shared libraries for NetBSD 2.0 compatibility
 
 .if defined(NETBSD_COMPAT32)
Index: emulators/compat30-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat30-extras/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- emulators/compat30-extras/Makefile	30 Aug 2007 16:54:08 -0000	1.3
+++ emulators/compat30-extras/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat30	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		3.0
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-3.0/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-3.0/index.html
 COMMENT=		Additional shared libraries for NetBSD 3.0 compatibility
 
 EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc netbsd-vax
Index: emulators/compat30/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/compat30/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- emulators/compat30/Makefile	30 Aug 2007 16:54:08 -0000	1.2
+++ emulators/compat30/Makefile	7 Oct 2007 12:05:41 -0000
@@ -3,7 +3,7 @@
 COMPAT_PKG=		compat30	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		3.0
 
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-3.0/index.html
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-3.0/index.html
 COMMENT=		Shared libraries for NetBSD 3.0 compatibility
 
 .if defined(NETBSD_COMPAT32)
Index: emulators/simh/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/DESCR,v
retrieving revision 1.4
diff -u -r1.4 DESCR
--- emulators/simh/DESCR	28 Nov 2002 21:43:23 -0000	1.4
+++ emulators/simh/DESCR	7 Oct 2007 12:05:41 -0000
@@ -3,5 +3,5 @@
 	altair altairz80 eclipse gri h316 hp2100 i1401 i1620 ibm1130 id16 id32
 	nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 s3 sds vax
 
-See http://www.netbsd.org/Ports/vax/emulator-howto.html on how to install
+See http://www.netbsd.org/ports/vax/emulator-howto.html on how to install
 NetBSD/vax on simh!
Index: emulators/ski/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ski/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- emulators/ski/DESCR	22 Feb 2007 19:01:18 -0000	1.3
+++ emulators/ski/DESCR	7 Oct 2007 12:05:41 -0000
@@ -3,9 +3,9 @@
 To get the ski to run on NetBSD/i386, you need the following:
 
 compat_linux support in the kernel:
-	http://www.netbsd.org/guide/en/chap-linux.html
+	http://www.netbsd.org/docs/guide/en/chap-linux.html
 procfs support in the kernel:
-	http://www.netbsd.org/guide/en/chap-linux.html#chap-linux-emulating-procfs
+	http://www.netbsd.org/docs/guide/en/chap-linux.html#chap-linux-emulating-procfs
 mount /dev/pts:
 	http://mail-index.netbsd.org/tech-kern/2004/11/08/0016.html
 
Index: fonts/mglfonts/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/mglfonts/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- fonts/mglfonts/Makefile	22 Feb 2007 19:26:29 -0000	1.5
+++ fonts/mglfonts/Makefile	7 Oct 2007 12:05:41 -0000
@@ -6,7 +6,7 @@
 MASTER_SITES=	http://www.at.sakura.ne.jp/~suz/arc/
 
 MAINTAINER=	fk200329@fsinet.or.jp
-HOMEPAGE=	http://www.NetBSD.org/Ports/hpcmips/mgl2.html
+HOMEPAGE=	http://www.NetBSD.org/ports/hpcmips/mgl2.html
 COMMENT=	MGL2 fonts and font tools
 
 #HF#DEPENDS= 	mgl>=0.1.9a:../../graphics/mgl
Index: graphics/mgl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mgl/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- graphics/mgl/Makefile	15 Feb 2007 14:58:21 -0000	1.26
+++ graphics/mgl/Makefile	7 Oct 2007 12:05:42 -0000
@@ -8,7 +8,7 @@
 MASTER_SITES=	http://at.sakura.ne.jp/~suz/arc/
 
 MAINTAINER=	fk200329@fsinet.or.jp
-HOMEPAGE=	http://www.NetBSD.org/Ports/hpcmips/mgl2.html
+HOMEPAGE=	http://www.NetBSD.org/ports/hpcmips/mgl2.html
 COMMENT=	Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
 
 DEPENDS+=	mglfonts>=0.1:../../fonts/mglfonts
Index: mk/buildlink3/PKGVIEWS_UG
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/PKGVIEWS_UG,v
retrieving revision 1.3
diff -u -r1.3 PKGVIEWS_UG
--- mk/buildlink3/PKGVIEWS_UG	15 Dec 2006 12:46:24 -0000	1.3
+++ mk/buildlink3/PKGVIEWS_UG	7 Oct 2007 12:05:42 -0000
@@ -219,4 +219,4 @@
 behind pkgviews, the following paper by Alistair Crooks is highly
 recommended:
 
-	http://www.NetBSD.org/Documentation/software/pkgviews.pdf
+	http://www.NetBSD.org/docs/software/pkgviews.pdf
Index: mk/buildlink3/README
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/README,v
retrieving revision 1.6
diff -u -r1.6 README
--- mk/buildlink3/README	24 Mar 2005 17:46:01 -0000	1.6
+++ mk/buildlink3/README	7 Oct 2007 12:05:42 -0000
@@ -36,7 +36,7 @@
 is highly-recommended reading for a more complete understanding of
 package views principles and is available at:
 
-	http://www.NetBSD.org/Documentation/software/pkgviews.pdf
+	http://www.NetBSD.org/docs/software/pkgviews.pdf
 
 Unfortunately, Alistair ran out of time to devote to integrating his
 work into the main pkgsrc branch.  The code he developed languished on
Index: mk/bulk/post-build
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bulk/post-build,v
retrieving revision 1.68
diff -u -r1.68 post-build
--- mk/bulk/post-build	21 Jan 2007 23:42:29 -0000	1.68
+++ mk/bulk/post-build	7 Oct 2007 12:05:42 -0000
@@ -655,7 +655,7 @@
 <!-- <li>See the list of <a href="../index.html">all log files</a>. -->
 <li>Visit the <a href="http://www.NetBSD.org">NetBSD web site</a>.
 <li>Learn more about
-    <a href="http://www.NetBSD.org/Documentation/software/packages.html">
+    <a href="http://www.NetBSD.org/docs/software/packages.html">
     The NetBSD Packages Collection</a>.
 </ul>
 </p>
Index: net/hf6to4/files/hf6to4.8
===================================================================
RCS file: /cvsroot/pkgsrc/net/hf6to4/files/hf6to4.8,v
retrieving revision 1.4
diff -u -r1.4 hf6to4.8
--- net/hf6to4/files/hf6to4.8	30 May 2005 22:49:43 -0000	1.4
+++ net/hf6to4/files/hf6to4.8	7 Oct 2007 12:05:42 -0000
@@ -236,7 +236,7 @@
 .Pa http://www.feyrer.de/NetBSD/6to4.html ,
 .Nx
 IPv6 Documentation at
-.Pa http://www.netbsd.org/Documentation/network/ipv6/ ,
+.Pa http://www.netbsd.org/docs/network/ipv6/ ,
 RFC 3068.
 .Sh HISTORY
 The
Index: net/hf6to4/files/hf6to4.html
===================================================================
RCS file: /cvsroot/pkgsrc/net/hf6to4/files/hf6to4.html,v
retrieving revision 1.3
diff -u -r1.3 hf6to4.html
--- net/hf6to4/files/hf6to4.html	30 May 2005 22:49:43 -0000	1.3
+++ net/hf6to4/files/hf6to4.html	7 Oct 2007 12:05:42 -0000
@@ -254,7 +254,7 @@
 <code></code><code>http://www.feyrer.de/NetBSD/6to4.html</code>,
 NetBSD
 IPv6 Documentation at
-<code></code><code>http://www.netbsd.org/Documentation/network/ipv6/</code>,
+<code></code><code>http://www.netbsd.org/docs/network/ipv6/</code>,
 RFC 3068.
         <h3>
         HISTORY
Index: pkgtools/digest/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/digest/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- pkgtools/digest/Makefile	3 Jul 2007 14:04:17 -0000	1.53
+++ pkgtools/digest/Makefile	7 Oct 2007 12:05:42 -0000
@@ -9,7 +9,7 @@
 DISTFILES=	# empty
 
 MAINTAINER?=	agc@NetBSD.org
-HOMEPAGE?=	http://www.NetBSD.org/Documentation/software/packages.html
+HOMEPAGE?=	http://www.NetBSD.org/docs/software/packages.html
 COMMENT?=	Message digest wrapper utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
Index: pkgtools/p5-pkgsrc-Dewey/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- pkgtools/p5-pkgsrc-Dewey/Makefile	8 Mar 2007 08:02:25 -0000	1.8
+++ pkgtools/p5-pkgsrc-Dewey/Makefile	7 Oct 2007 12:05:42 -0000
@@ -7,7 +7,7 @@
 DISTFILES=	# empty
 
 MAINTAINER=	wiz@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/
+HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Perl module to compare pkgsrc Dewey numbers
 
 CPPFLAGS+=	-DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H
Index: pkgtools/p5-pkgsrc-Dewey/files/Dewey.pm
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/p5-pkgsrc-Dewey/files/Dewey.pm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Dewey.pm
--- pkgtools/p5-pkgsrc-Dewey/files/Dewey.pm	13 Nov 2005 19:53:19 -0000	1.1.1.1
+++ pkgtools/p5-pkgsrc-Dewey/files/Dewey.pm	7 Oct 2007 12:05:43 -0000
@@ -65,7 +65,7 @@
 L<http://www.pkgsrc.org/>
 
 The pkgsrc guide:
-L<http://www.netbsd.org/Documentation/pkgsrc/>
+L<http://www.netbsd.org/docs/pkgsrc/>
 
 =head1 AUTHORS
 
Index: pkgtools/pkg_filecheck/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_filecheck/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- pkgtools/pkg_filecheck/Makefile	8 Sep 2007 21:57:59 -0000	1.27
+++ pkgtools/pkg_filecheck/Makefile	7 Oct 2007 12:05:43 -0000
@@ -7,7 +7,7 @@
 DISTFILES=		# empty
 
 MAINTAINER=		dillo@NetBSD.org
-#HOMEPAGE=		http://www.NetBSD.org/Documentation/netbsd/doc/pkgsrc.html
+#HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=		Check for files not owned by any package
 
 WRKSRC=		${WRKDIR}
Index: pkgtools/pkg_install/files/lib/pkgsrc.7
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/pkgsrc.7,v
retrieving revision 1.1
diff -u -r1.1 pkgsrc.7
--- pkgtools/pkg_install/files/lib/pkgsrc.7	16 Jul 2007 09:57:59 -0000	1.1
+++ pkgtools/pkg_install/files/lib/pkgsrc.7	7 Oct 2007 12:05:43 -0000
@@ -51,4 +51,4 @@
 .Xr pkg_add 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
-.Pa http://www.netbsd.org/Documentation/pkgsrc/
+.Pa http://www.netbsd.org/docs/pkgsrc/
Index: pkgtools/pkgdiff/files/feedback-patches
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkgdiff/files/feedback-patches,v
retrieving revision 1.1
diff -u -r1.1 feedback-patches
--- pkgtools/pkgdiff/files/feedback-patches	23 Nov 2004 22:00:48 -0000	1.1
+++ pkgtools/pkgdiff/files/feedback-patches	7 Oct 2007 12:05:43 -0000
@@ -47,7 +47,7 @@
 
 	http://www.NetBSD.org/packages/$pkg/README.html
 
-See http://www.NetBSD.org/Documentation/software/packages.html
+See http://www.NetBSD.org/docs/software/packages.html
 to learn more about the NetBSD Packages Collection, to find out
 more about the NetBSD operating system, see http://www.NetBSD.org/.
 
Index: pkgtools/pkglint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/Makefile,v
retrieving revision 1.364
diff -u -r1.364 Makefile
--- pkgtools/pkglint/Makefile	29 Sep 2007 13:39:22 -0000	1.364
+++ pkgtools/pkglint/Makefile	7 Oct 2007 12:05:43 -0000
@@ -7,7 +7,7 @@
 DISTFILES=	# empty
 
 MAINTAINER=	rillig@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/
+HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Verifier for NetBSD packages and complete pkgsrc tree
 
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
Index: pkgtools/pkglint/files/doc/pkglint.xml
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/doc/pkglint.xml,v
retrieving revision 1.4
diff -u -r1.4 pkglint.xml
--- pkgtools/pkglint/files/doc/pkglint.xml	25 Nov 2006 20:27:42 -0000	1.4
+++ pkgtools/pkglint/files/doc/pkglint.xml	7 Oct 2007 12:05:43 -0000
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
 	<!ENTITY pkglint "<literal>pkglint</literal>">
-	<!ENTITY pkgsrc-guide "http://www.NetBSD.org/Documentation/pkgsrc">
+	<!ENTITY pkgsrc-guide "http://www.NetBSD.org/docs/pkgsrc">
 
 	<!ENTITY chap.intro SYSTEM "chap.intro.xml">
 	<!ENTITY chap.defs SYSTEM "chap.defs.xml">
Index: pkgtools/rpm2pkg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/rpm2pkg/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- pkgtools/rpm2pkg/Makefile	6 Jul 2006 21:14:19 -0000	1.34
+++ pkgtools/rpm2pkg/Makefile	7 Oct 2007 12:05:43 -0000
@@ -7,7 +7,7 @@
 DISTFILES=	# empty
 
 MAINTAINER=	tron@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/
+HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Convert RPM archives to NetBSD packages
 
 CONFLICTS+=	suse-base<=6.4
Index: pkgtools/url2pkg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/url2pkg/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- pkgtools/url2pkg/Makefile	25 Sep 2007 13:59:42 -0000	1.51
+++ pkgtools/url2pkg/Makefile	7 Oct 2007 12:05:43 -0000
@@ -7,7 +7,7 @@
 DISTFILES=	# none
 
 MAINTAINER=	rillig@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/creating.html
+HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/creating.html
 COMMENT=	Tool to automate initial steps in building a package
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
Index: sysutils/xen12/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xen12/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- sysutils/xen12/Makefile	27 Jul 2006 18:48:04 -0000	1.12
+++ sysutils/xen12/Makefile	7 Oct 2007 12:05:43 -0000
@@ -11,7 +11,7 @@
 DISTFILES+=		xen12-addtl-ide-dma-040522.tar.gz
 
 MAINTAINER=		cl@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Ports/xen/
+HOMEPAGE=		http://www.NetBSD.org/ports/xen/
 COMMENT=		Xen Virtual Machine Monitor
 
 ONLY_FOR_PLATFORM=	*-*-i386
Index: sysutils/xenkernel20/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xenkernel20/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/xenkernel20/Makefile	1 Jul 2007 20:20:24 -0000	1.4
+++ sysutils/xenkernel20/Makefile	7 Oct 2007 12:05:43 -0000
@@ -8,7 +8,7 @@
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/Ports/xen/
+HOMEPAGE=	http://www.NetBSD.org/ports/xen/
 COMMENT=	Xen Kernel
 
 ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386
Index: sysutils/xentools12/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools12/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sysutils/xentools12/Makefile	6 Jul 2006 21:14:19 -0000	1.9
+++ sysutils/xentools12/Makefile	7 Oct 2007 12:05:43 -0000
@@ -11,7 +11,7 @@
 DISTFILES+=		netbsd-xen-kernel-headers-040508.tar.gz
 
 MAINTAINER=		cl@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Ports/xen/
+HOMEPAGE=		http://www.NetBSD.org/ports/xen/
 COMMENT=		Userland Tools for Xen
 
 ONLY_FOR_PLATFORM=	*-*-i386
Index: sysutils/xentools20/MESSAGE.NetBSD
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools20/MESSAGE.NetBSD,v
retrieving revision 1.2
diff -u -r1.2 MESSAGE.NetBSD
--- sysutils/xentools20/MESSAGE.NetBSD	10 Mar 2006 20:26:03 -0000	1.2
+++ sysutils/xentools20/MESSAGE.NetBSD	7 Oct 2007 12:05:43 -0000
@@ -12,6 +12,6 @@
 Please also refer to the the "NetBSD/xen How-To" for more information on
 creating a Xen setup:
 
-	http://www.NetBSD.org/Ports/xen/howto.html
+	http://www.NetBSD.org/ports/xen/howto.html
 
 ===========================================================================
Index: sysutils/xentools3/MESSAGE.NetBSD
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools3/MESSAGE.NetBSD,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE.NetBSD
--- sysutils/xentools3/MESSAGE.NetBSD	14 Jun 2007 19:39:45 -0000	1.1.1.1
+++ sysutils/xentools3/MESSAGE.NetBSD	7 Oct 2007 12:05:43 -0000
@@ -12,6 +12,6 @@
 Please also refer to the the "NetBSD/xen How-To" for more information on
 creating a Xen setup:
 
-	http://www.NetBSD.org/Ports/xen/howto.html
+	http://www.NetBSD.org/ports/xen/howto.html
 
 ===========================================================================
Index: templates/README.pkg
===================================================================
RCS file: /cvsroot/pkgsrc/templates/README.pkg,v
retrieving revision 1.22
diff -u -r1.22 README.pkg
--- templates/README.pkg	6 Jul 2006 21:14:20 -0000	1.22
+++ templates/README.pkg	7 Oct 2007 12:05:43 -0000
@@ -38,7 +38,7 @@
 
 <p>Problem reports, updates or suggestions for this package should be
 reported with
-<a href="http://www.NetBSD.org/Misc/send-pr.html">send-pr.</a></p>
+<a href="http://www.NetBSD.org/support/send-pr.html">send-pr.</a></p>
 
 <P>
 The following security vulnerabilities are known for %%PORT%%
Index: www/snownews/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/www/snownews/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE
--- www/snownews/MESSAGE	27 Dec 2003 23:04:23 -0000	1.1.1.1
+++ www/snownews/MESSAGE	7 Oct 2007 12:05:43 -0000
@@ -4,5 +4,5 @@
 The NetBSD project provides several RSS feeds of interest to NetBSD users
 and developers. Information on these feeds can be found at:
 
-   http://www.netbsd.org/Changes/rss.html
+   http://www.netbsd.org/changes/rss.html
 ===========================================================================