 @@ -1,14 +1,14 @@
-$NetBSD: TODO,v 1.10457 2011/07/30 12:38:30 ryoon Exp $
+$NetBSD: TODO,v 1.10458 2011/07/31 08:48:22 spz Exp $
 Suggested new packages
 ======================
 	any unresolved PRs (if you have commit access)
 	http://www.netbsd.org/Gnats/category/pkg.html
 	any complete, polished packages in pkgsrc-wip (ditto)
 	http://pkgsrc-wip.sourceforge.net/
 	bacula-rescue
 	Scripts used to help create rescue boot cd's for bare metal
 	restores with bacula.  Scripts exist for linux, solaris, and
 @@ -1530,28 +1530,28 @@ Suggested pkgsrc enhancements
 	o Make "pkg_install -u" clear the unsafe_depends* and rebuild
 	  tags, and set unsafe_depends* on depending packages,
 	  following the behavior of make replace.
 	o Figure out a way to have "pkg_install -u", probably with a
 	  flag, preserve the value of the automatic tag.  We do not
 	  have consensus on the right behavior.
 Suggested other platform enhancements
 =====================================
 	o platform independent bulk build infrastructure
-	o update the binary bootstrap kits on
+	o update the binary bootstrap kits in
-	  ftp://ftp.netbsd.org/pub/NetBSD/packages/bootstrap-pkgsrc/
+	  ftp.NetBSD.org:/pub/pkgsrc/packages/OS/arch/version-branch/
 Suggested cleanups in pkgsrc
 ============================
 	o Make packages install their configuration files under the
 	  examples hierarchy, using bsd.pkg.install.mk to copy them
 	  to the PKG_SYSCONFDIR directory when necessary.
 	o Make packages install honour PKGLOCALEDIR by setting
 	  USE_PKGLOCALEDIR=YES where appropriate (for eg. Solaris).
 	  Affects: cross/h8300-hms-binutils, cross/h8300-hms-gcc,
 	  cross/i386-netbsdpe, sysutils/apcupsd, sysutils/gnometoaster,
 	  sysutils/mtoolsfm, sysutils/xnc

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: build.xml,v 1.61 2009/08/02 02:41:53 joerg Exp $ -->
+<!-- $NetBSD: build.xml,v 1.62 2011/07/31 08:48:22 spz Exp $ -->
 <chapter id="build">
   <title>The build process</title>
   <sect1 id="build.intro">
     <title>Introduction</title>
     <para>This chapter gives a detailed description on how a package is
     built. Building a package is separated into different
     <emphasis>phases</emphasis> (for example <varname>fetch</varname>,
     <varname>build</varname>, <varname>install</varname>), all of which are
     described in the following sections. Each phase is split into
     so-called <emphasis>stages</emphasis>, which take the name of the
 @@ -329,30 +329,30 @@ ${MASTER_SITE_PGSQL}
 ${MASTER_SITE_R_CRAN}
 ${MASTER_SITE_SOURCEFORGE}
 ${MASTER_SITE_SOURCEFORGE_JP}
 ${MASTER_SITE_SUNSITE}
 ${MASTER_SITE_SUSE}
 ${MASTER_SITE_TEX_CTAN}
 ${MASTER_SITE_XCONTRIB}
 ${MASTER_SITE_XEMACS}
 </programlisting>
       <para>Some explanations for the less self-explaining ones:
       <varname>MASTER_SITE_BACKUP</varname> contains backup sites
       for packages that are maintained in <ulink
-      url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}"
+      url="ftp://ftp.NetBSD.org/pkgsrc/distfiles/${DIST_SUBDIR}"
       />.  <varname>MASTER_SITE_LOCAL</varname> contains local
       package source distributions that are maintained in <ulink
-      url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/"
+      url="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/"
       />.</para>
       <para>If you choose one of these predefined sites, you may
       want to specify a subdirectory of that site. Since these
       macros may expand to more than one actual site, you
       <emphasis>must</emphasis> use the following construct to
       specify a subdirectory:</para>
 <programlisting>
 MASTER_SITES=   ${MASTER_SITE_GNU:=subdirectory/name/}
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=project_name/}
 </programlisting>

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: bulk.xml,v 1.8 2010/03/18 10:56:18 wiz Exp $ -->
+<!-- $NetBSD: bulk.xml,v 1.9 2011/07/31 08:48:22 spz Exp $ -->
 <chapter id="bulk">
 <title>Creating binary packages for everything in pkgsrc (bulk
 builds)</title>
 <para>When you have multiple machines that should run the same packages,
 it is wasted time if they all build their packages themselves from
 source. There are two ways of getting a set of binary packages: The old
 bulk build system, or the new (as of 2007) parallel bulk build (pbulk)
 system. This chapter describes how to set them up so that the packages
 are most likely to be usable later.</para>
 <sect1 id="bulk.pre">
 @@ -518,62 +518,57 @@ fi
       <varname>MKSUMS=yes</varname> in your
       <filename>mk/bulk/build.conf</filename>.</para>
       <para>If you would like to PGP sign the checksum files (highly
       recommended!), remember to set
       <varname>SIGN_AS=username@NetBSD.org</varname> in your
       <filename>mk/bulk/build.conf</filename>.  This will prompt you for
       your GPG password to sign the files before uploading everything.</para>
       <para>Then, make sure that you have <varname>RSYNC_DST</varname>
       set properly in your <filename>mk/bulk/build.conf</filename>
       file, i.e. adjust it to something like one of the following:</para>
-      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload </screen>
+      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</screen>
-      <para>Please use appropriate values for "packages-20xxQy",
+      <para>Please use appropriate values for "20xxQy" (the branch),
-      "NetBSD-a.b.c" and "arch" here. If your login on ftp.NetBSD.org
+      "a.b.c" (the OS version) and "arch" here. If your login on ftp.NetBSD.org
       is different from your local login, write your login directly
       into the variable, e.g. my local account is "feyrer", but for my
       login "hubertf", I use:</para>
-      <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</screen>
+      <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</screen>
       <para>A separate <filename>upload</filename> directory is used
       here to allow "closing" the directory during upload. To do
       so, run the following command on ftp.NetBSD.org next:</para>
-      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</userinput></screen>
+      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</userinput></screen>
       <para>Please note that <filename>/pub/NetBSD/packages</filename> is
       only appropriate for packages for the NetBSD operating
       system. Binary packages for other operating systems should go
       into <filename>/pub/pkgsrc</filename>.</para>
       <para>Before uploading the binary pkgs, ssh authentication needs
       to be set up. This example shows how to set up temporary keys
       for the root account <emphasis>inside the sandbox</emphasis>
       (assuming that no keys should be present there usually):</para>
       <screen>
 &rprompt; <userinput>chroot /usr/sandbox</userinput>
 chroot-&rprompt; <userinput>rm $HOME/.ssh/id-dsa*</userinput>
-chroot-&rprompt; <userinput>ssh-keygen -t dsa</userinput>
+chroot-&rprompt; <userinput>ssh-keygen -t rsa</userinput>
-chroot-&rprompt; <userinput>cat $HOME/.ssh/id-dsa.pub</userinput>
+chroot-&rprompt; <userinput>cat $HOME/.ssh/id-rsa.pub</userinput>
       </screen>
-      <para>Now take the output of <filename>id-dsa.pub</filename> and
+      <para>Now take the output of <filename>id-rsa.pub</filename> and
       append it to your <filename>~/.ssh/authorized_keys</filename>
-      file on ftp.NetBSD.org. You can remove the key after the
+      file on ftp.NetBSD.org. You should remove the key after the
       upload is done!</para>
       <para>Next, test if your ssh connection really works:</para>
       <screen>chroot-&rprompt; <userinput>ssh ftp.NetBSD.org date</userinput> </screen>
       <para>Use "-l yourNetBSDlogin" here as appropriate!</para>
       <para>Now after all this works, you can exit the sandbox and start
       the upload:</para>
       <screen>
 chroot-&rprompt; <userinput>exit</userinput>
 @@ -587,30 +582,31 @@ chroot-&rprompt; exit
       restricted packages.</para>
       <para>After the upload has ended, first thing is to revoke ssh access:</para>
       <screen>nbftp% <userinput>vi ~/.ssh/authorized_keys</userinput>
       Gdd:x! </screen>
       <para>Use whatever is needed to remove the key you've entered
       before! Last, move the uploaded packages out of the
       <filename>upload</filename> directory to have them accessible
       to everyone:</para>
       <screen>
-nbftp% <userinput>cd /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch</userinput>
+nbftp% <userinput>cd /pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy</userinput>
 nbftp% <userinput>mv upload/* .</userinput>
 nbftp% <userinput>rmdir upload</userinput>
-nbftp% <userinput>chmod 755 .</userinput>
+nbftp% <userinput>chgrp -R netbsd .</userinput>
 nbftp% <userinput>find . -type d | xargs chmod 775</userinput>
       </screen>
 <!-- end old -->
 </sect2>
 </sect1>
 <sect1 id="bulk.pbulk">
 <title>Running a pbulk-style bulk build</title>
 <para>Running a pbulk-style bulk build works roughly as follows:</para>
 <itemizedlist>

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: configuring.xml,v 1.38 2011/04/09 08:03:49 wiz Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.39 2011/07/31 08:48:22 spz Exp $ -->
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
 <anchor id="mk.conf" />
 <para>The whole pkgsrc system is configured in a single file, usually
 called <filename>mk.conf</filename>. In which directory pkgsrc looks for
 that file depends on the installation. On NetBSD, when you use
 &man.make.1; from the base system, it is in the directory
 <filename>/etc/</filename>. In all other cases the default location is
 <literal>${PREFIX}/etc/</literal>, depending on where you told the
 bootstrap program to install the binary packages.</para>
 @@ -58,27 +58,27 @@ works.
 	    database about installed packages is stored.  The default is
 	    <filename>/var/db/pkg</filename>.</para>
 	</listitem>
 	<listitem><para><varname>MASTER_SITE_OVERRIDE</varname>:
 	    If set, override the packages'
 	    <varname>MASTER_SITES</varname> with this value.</para>
 	</listitem>
 	<listitem><para><varname>MASTER_SITE_BACKUP</varname>:
 	    Backup location(s) for distribution files and patch files
 	    if not found locally or in
 	    <filename>${MASTER_SITES}</filename> or
 	    <filename>${PATCH_SITES}</filename> respectively.
 	    The defaults are
-	    <filename>ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/</filename>
+	    <filename>ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/${DIST_SUBDIR}/</filename>
 	    and
 	    <filename>ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/</filename>.</para>
 	</listitem>
 	<listitem><para><varname>BINPKG_SITES</varname>:
 	    List of sites carrying binary pkgs. <replaceable>rel</replaceable> and
 	    <replaceable>arch</replaceable> are replaced with OS
 	    release (<quote>2.0</quote>, etc.) and architecture
 	    (<quote>mipsel</quote>, etc.).</para>
 	</listitem>
 	<listitem><para><varname>ACCEPTABLE_LICENSES</varname>:
 	    List of acceptable licenses. License names are case-sensitive.
 	    Whenever you try to build a package whose license is not in this
 	    list, you will get an error message. If the license condition is

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: faq.xml,v 1.47 2010/12/23 23:54:17 abs Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.48 2011/07/31 08:48:22 spz Exp $ -->
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
 <para>This section contains hints, tips &amp; tricks on special things in
 pkgsrc that we didn't find a better place for in the previous chapters, and
 it contains items for both pkgsrc users and developers.</para>
 <!-- ================================================================== -->
   <sect1 id="mailing-list-pointers">
     <title>Are there any mailing lists for pkg-related discussion?</title>
 @@ -359,27 +359,27 @@ refuses to do passive.  For the other to
 <filename>/usr/bin/ftp</filename> from falling back to active
 transfers.</para>
 </sect1>
 <!-- ================================================================== -->
 <sect1 id="fetching-all-distfiles">
 <title>How to fetch all distfiles at once</title>
 <para>You would like to download all the distfiles in a single batch
 from work or university, where you can't run a <command>make
 fetch</command>.  There is an archive of distfiles on <ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/">ftp.NetBSD.org</ulink>,
+url="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/">ftp.NetBSD.org</ulink>,
 but downloading the entire directory may not be appropriate.</para>
 <para>The answer here is to do a <command>make fetch-list</command> in
 <filename>/usr/pkgsrc</filename> or one of its subdirectories, carry the
 resulting list to your machine at work/school and use it there.  If you
 don't have a NetBSD-compatible &man.ftp.1; (like tnftp) at work, don't
 forget to set <varname>FETCH_CMD</varname> to something that fetches a
 URL:</para>
 <para>At home:</para>
 <screen>&cprompt; <userinput>cd /usr/pkgsrc</userinput>
 &cprompt; <userinput>make fetch-list FETCH_CMD=wget DISTDIR=/tmp/distfiles >/tmp/fetch.sh</userinput>
 @@ -507,31 +507,31 @@ reinstall any affected packages.
 and some of these bugs can leave a machine vulnerable to exploitation by
 attackers.  In an effort to lessen the exposure, the NetBSD packages team
 maintains a database of known-exploits to packages which have at one time
 been included in pkgsrc.  The database can be downloaded automatically, and
 a security audit of all packages installed on a system can take place.  To
 do this, refer to the following two tools (installed as part of the
 <filename role="pkg">pkgtools/pkg_install</filename> package):</para>
 <orderedlist>
   <listitem>
     <para><command>pkg_admin fetch-pkg-vulnerabilities</command>, an easy way to
     download a list of the security vulnerabilities information.  This list
-    is kept up to date by the NetBSD security officer and the NetBSD
+    is kept up to date by the pkgsrc security team, and is distributed
-    packages team, and is distributed from the NetBSD ftp server:</para>
+    from the NetBSD ftp server:</para>
     <para><ulink
-    url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/pkg-vulnerabilities"/></para>
+    url="ftp://ftp.NetBSD.org/pkgsrc/distfiles/pkg-vulnerabilities"/></para>
   </listitem>
   <listitem>
     <para><command>pkg_admin audit</command>, an easy way to audit the
     current machine, checking each known vulnerability.  If a
     vulnerable package is installed, it will be shown by output to stdout,
     including a description of the type of vulnerability, and a URL
     containing more information.</para>
   </listitem>
 </orderedlist>
 <para>Use of these tools is strongly recommended!  After

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: introduction.xml,v 1.24 2011/04/09 19:09:45 wiz Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.25 2011/07/31 08:48:22 spz Exp $ -->
 <chapter id="introduction">
   <title>What is pkgsrc?</title>
   <sect1 id="introduction-section">
     <title>Introduction</title>
 <para>There is a lot of software freely available for Unix-based
 systems, which is usually available in form of the source code. Before
 such software can be used, it needs to be configured to the local
 system, compiled and installed, and this is exactly what The NetBSD
 Packages Collection (pkgsrc) does. pkgsrc also has some basic commands
 to handle binary packages, so that not every user has to build the
 @@ -281,27 +281,27 @@ minutes!
       </varlistentry>
       <varlistentry>
 	<term>Precompiled/binary package</term>
 	<listitem>
 	  <para>A set of binaries built with pkgsrc from a distfile
 	    and stuffed together in a single <filename>.tgz</filename>
 	    file so it can be installed on machines of the same
 	    machine architecture without the need to
 	    recompile. Packages are usually generated in
 	    <filename>/usr/pkgsrc/packages</filename>; there is also
 	    an archive on <ulink
-	    url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/">ftp.NetBSD.org</ulink>.</para>
+	    url="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/">ftp.NetBSD.org</ulink>.</para>
 	  <para>Sometimes, this is referred to by the term <quote>package</quote> too,
 	    especially in the context of precompiled packages.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>Program</term>
 	<listitem>
 	  <para>The piece of software to be installed which will be
 	  constructed from all the files in the distfile by the
 	  actions defined in the corresponding package.</para>