Updated the URLs for ftp.NetBSD.org, so that they will work after the

upcoming clean-up.

2 files changed, 15 insertions, 15 deletions

diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1
index 75eac35a79c..295d3fa0416 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.1
+++ b/pkgtools/pkg_install/files/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.27 2007/08/23 21:58:24 wiz Exp $
+.\" $NetBSD: pkg_add.1,v 1.28 2007/10/13 19:38:27 rillig Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -251,7 +251,7 @@ URL pointing at a file available on an ftp or web site.
 Thus you may extract files directly from their anonymous ftp or WWW
 locations (e.g.,
 .Nm
-ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/shells/bash-3.2.9.tgz
+ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/shells/bash-3.2.9.tgz
 or
 .Nm
 http://www.example.org/packages/screen-4.0.tbz).
@@ -502,9 +502,9 @@ a URL.
 The URL can be put into an environment variable,
 .Ev PKG_PATH .
 .Bd -literal
-# pkg_add -v ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/firefox-2.0.0.4.tgz
+# pkg_add -v ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All/firefox-2.0.0.4.tgz
 
-# export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/
+# export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All
 # pkg_add -v firefox
 .Ed
 .Pp
@@ -522,7 +522,7 @@ directory to your
 .Ev PKG_PATH
 like this:
 .Bd -literal
-# export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/;ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/vulnerable/"
+# export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All/;ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/vulnerable/"
 .Ed
 .Pp
 (The quotes are needed because semicolon
diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1
index 27efcaa009d..6ff5af89037 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1
@@ -144,13 +144,13 @@ OOPPTTIIOONNSS
      a URL pointing at a file available on an ftp or web site.  Thus you may
      extract files directly from their anonymous ftp or WWW locations (e.g.,
      ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/pkgsrc/pack-
-     ages/NetBSD-3.1/i386/shells/bash-3.2.9.tgz or ppkkgg__aadddd http://www.exam-
-     ple.org/packages/screen-4.0.tbz).  Note:  For ftp transfers, if you wish
-     to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_-
-     _S_I_V_E___M_O_D_E to some value in your environment.  Otherwise, the more stan-
-     dard ACTIVE mode may be used.  If ppkkgg__aadddd consistently fails to fetch a
-     package from a site known to work, it may be because you have a firewall
-     that demands the usage of _p_a_s_s_i_v_e _m_o_d_e ftp.
+     ages/NetBSD/i386/3.1_2007Q2/shells/bash-3.2.9.tgz or ppkkgg__aadddd
+     http://www.example.org/packages/screen-4.0.tbz).  Note:  For ftp trans-
+     fers, if you wish to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set the
+     variable _F_T_P___P_A_S_S_I_V_E___M_O_D_E to some value in your environment.  Otherwise,
+     the more standard ACTIVE mode may be used.  If ppkkgg__aadddd consistently fails
+     to fetch a package from a site known to work, it may be because you have
+     a firewall that demands the usage of _p_a_s_s_i_v_e _m_o_d_e ftp.
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
      ppkkgg__aadddd extracts each package's ``packing list'' into a special staging
@@ -300,9 +300,9 @@ EEXXAAMMPPLLEESS
      You can grab a compiled binary package from remote location by specifying
      a URL.  The URL can be put into an environment variable, PKG_PATH.
 
-     # pkg_add -v ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/firefox-2.0.0.4.tgz
+     # pkg_add -v ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All/firefox-2.0.0.4.tgz
 
-     # export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/
+     # export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All
      # pkg_add -v firefox
 
      Over time, as problems are found in packages, they will be moved from the
@@ -310,7 +310,7 @@ EEXXAAMMPPLLEESS
      vulnerable packages by default (and know what you are doing), you can add
      the _v_u_l_n_e_r_a_b_l_e directory to your PKG_PATH like this:
 
-     # export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/All/;ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD-3.1/i386/vulnerable/"
+     # export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All/;ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/vulnerable/"
 
      (The quotes are needed because semicolon (`;') is a shell meta-charac-
      ter.)  If you do this, consider installing and using the