Reindented all <programlisting>s.

16 files changed, 649 insertions, 487 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index afe1daa3789..945c8936335 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.15 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.16 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -72,14 +72,16 @@
 	  As used in this example, <varname>_ACCEPTABLE=yes</varname>
 	  accepts <emphasis>all</emphasis> licenses.</para>
 
-        <programlisting>PACKAGES?=      ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
-WRKOBJDIR?=     /usr/tmp/pkgsrc   # build here instead of in pkgsrc
-BSDSRCDIR=      /usr/src
-BSDXSRCDIR=     /usr/xsrc         # for x11/xservers
-OBJHOSTNAME?=   yes               # use work.`hostname`
-FAILOVER_FETCH= yes               # insist on the correct checksum
-PKG_DEVELOPER?= yes
-_ACCEPTABLE=    yes</programlisting>
+<programlisting>
+    PACKAGES?=      ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
+    WRKOBJDIR?=     /usr/tmp/pkgsrc   # build here instead of in pkgsrc
+    BSDSRCDIR=      /usr/src
+    BSDXSRCDIR=     /usr/xsrc         # for x11/xservers
+    OBJHOSTNAME?=   yes               # use work.`hostname`
+    FAILOVER_FETCH= yes               # insist on the correct checksum
+    PKG_DEVELOPER?= yes
+    _ACCEPTABLE=    yes
+</programlisting>
       </sect3>
 
       <sect3 id="build.conf">
@@ -131,10 +133,12 @@ _ACCEPTABLE=    yes</programlisting>
 	version of ssh for some reason, be sure to install ssh before
 	starting it from <filename>rc.local</filename>:</para>
 
-      <programlisting>( cd /usr/pkgsrc/security/ssh ; make bulk-install )
-if [ -f /usr/pkg/etc/rc.d/sshd ]; then
-    /usr/pkg/etc/rc.d/sshd
-fi</programlisting>
+<programlisting>
+    ( cd /usr/pkgsrc/security/ssh ; make bulk-install )
+    if [ -f /usr/pkg/etc/rc.d/sshd ]; then
+        /usr/pkg/etc/rc.d/sshd
+    fi
+</programlisting>
 
       <para>Not doing so will result in you being not able to log in
 	via ssh after the bulk build is finished or if the machine
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 334dca88795..3186334583c 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.10 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.11 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -104,15 +104,19 @@
 	<para>The following lines are taken from
 	  <filename>pkgsrc/wm/scwm/Makefile</filename>:</para>
 
-        <programlisting>EVAL_PREFIX+=           GTKDIR=gtk+
-CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
-                        --with-gtk-prefix="${GTKDIR}"           \
-                        --enable-multibyte</programlisting>
+<programlisting>
+    EVAL_PREFIX+=           GTKDIR=gtk+
+    CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
+                            --with-gtk-prefix="${GTKDIR}"           \
+                            --enable-multibyte
+</programlisting>
 
 	<para>Specific defaults can be defined for the packages evaluated using
 	  <varname>EVAL_PREFIX</varname>, by using a definition of the form:</para>
 
-        <programlisting>GTKDIR_DEFAULT= ${LOCALBASE}</programlisting>
+<programlisting>
+    GTKDIR_DEFAULT= ${LOCALBASE}
+</programlisting>
 
 	<para>where <varname>GTKDIR</varname> corresponds
 	  to the first definition in
@@ -146,7 +150,9 @@ CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
 	    are not present, an attempt will be made to fetch them using commands
 	    of the form:</para>
 
-          <programlisting>${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}</programlisting>
+<programlisting>
+    ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
+</programlisting>
 
 	  <para>where ${site} varies through several possibilities in turn: first,
 	    <varname>MASTER_SITE_OVERRIDE</varname> is tried, then the sites
@@ -208,10 +214,12 @@ CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
 	    for a program that comes with a compressed shell archive
 	    whose name ends in <filename>.msg.gz</filename>:</para>
 
-          <programlisting>     EXTRACT_SUFX=   .msg.gz
-     EXTRACT_CMD=            zcat
-     EXTRACT_BEFORE_ARGS=
-     EXTRACT_AFTER_ARGS=     |sh</programlisting>
+<programlisting>
+    EXTRACT_SUFX=           .msg.gz
+    EXTRACT_CMD=            zcat
+    EXTRACT_BEFORE_ARGS=
+    EXTRACT_AFTER_ARGS=     |sh
+</programlisting>
 	</listitem>
       </varlistentry>
 
@@ -261,9 +269,11 @@ CONFIGURE_ARGS+=        --with-guile-prefix=${LOCALBASE}        \
 	    default <quote>configure</quote>. Here's an example from
 	    the <filename role="pkg">sysutils/top</filename> package:</para>
 
-          <programlisting>HAS_CONFIGURE=          yes
-CONFIGURE_SCRIPT=       Configure
-CONFIGURE_ARGS+=        netbsd13</programlisting>
+<programlisting>
+    HAS_CONFIGURE=          yes
+    CONFIGURE_SCRIPT=       Configure
+    CONFIGURE_ARGS+=        netbsd13
+</programlisting>
 
 	  <para>If the program uses an Imakefile for configuration, the appropriate
 	    steps can be invoked by setting <varname>USE_IMAKE</varname> to
@@ -310,13 +320,14 @@ CONFIGURE_ARGS+=        netbsd13</programlisting>
       If a subsequent stage is requested, all prior stages are made: e.g.
       <command>make build</command> will also perform the equivalent of:</para>
 
-    <programlisting>
-make fetch
-make checksum
-make extract
-make patch
-make configure
-make build</programlisting>
+<programlisting>
+    make fetch
+    make checksum
+    make extract
+    make patch
+    make configure
+    make build
+</programlisting>
   </sect1>
 
   <sect1 id="build.helpful-targets">
diff --git a/doc/guide/files/buildlink.xml b/doc/guide/files/buildlink.xml
index 77057efcc28..00c9bebd8f7 100644
--- a/doc/guide/files/buildlink.xml
+++ b/doc/guide/files/buildlink.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.10 2005/10/07 09:56:12 rillig Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.11 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
@@ -69,19 +69,25 @@
     <para> If a dependency on a particular package is required for its libraries and
       headers, then we replace: </para>
       
-    <programlisting>DEPENDS+=   foo>=1.1.0:../../category/foo</programlisting>
+<programlisting>
+    DEPENDS+=   foo>=1.1.0:../../category/foo
+</programlisting>
 
     <para>with</para>
 
-    <programlisting>.include "../../category/foo/buildlink3.mk"</programlisting>
+<programlisting>
+    .include "../../category/foo/buildlink3.mk"
+</programlisting>
 
     <para>The buildlink3.mk files usually define the required dependencies.
     If you need a newer version of the dependency when using buildlink3.mk
     files, then you can define it in your Makefile; for example:
     </para>
 
-    <programlisting>BUILDLINK_DEPENDS.foo+=   foo>=1.1.0
-.include "../../category/foo/buildlink3.mk"</programlisting>
+<programlisting>
+    BUILDLINK_DEPENDS.foo+=   foo>=1.1.0
+    .include "../../category/foo/buildlink3.mk"
+</programlisting>
 
     <para>There are several <filename>buildlink3.mk</filename>
       files in <filename>pkgsrc/mk</filename>
@@ -177,28 +183,29 @@
         <filename>buildlink3.mk</filename> is taken 
         from <filename>pkgsrc/graphics/tiff</filename>:</para>
 
-      <programlisting>
-# &#36;NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp &#36;
+<programlisting>
+    # &#36;NetBSD: buildlink3.mk,v 1.7 2004/03/18 09:12:12 jlam Exp &#36;
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
-TIFF_BUILDLINK3_MK:=    ${TIFF_BUILDLINK3_MK}+
+    BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
+    TIFF_BUILDLINK3_MK:=    ${TIFF_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=     tiff
-.endif
+    .if !empty(BUILDLINK_DEPTH:M+)
+    BUILDLINK_DEPENDS+=     tiff
+    .endif
 
-BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ntiff}
-BUILDLINK_PACKAGES+=    tiff
+    BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ntiff}
+    BUILDLINK_PACKAGES+=    tiff
 
-.if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tiff+=        tiff>=3.6.1
-BUILDLINK_PKGSRCDIR.tiff?=      ../../graphics/tiff
-.endif  # TIFF_BUILDLINK3_MK
+    .if !empty(TIFF_BUILDLINK3_MK:M+)
+    BUILDLINK_DEPENDS.tiff+=        tiff>=3.6.1
+    BUILDLINK_PKGSRCDIR.tiff?=      ../../graphics/tiff
+    .endif  # TIFF_BUILDLINK3_MK
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+    .include "../../devel/zlib/buildlink3.mk"
+    .include "../../graphics/jpeg/buildlink3.mk"
 
-BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//} </programlisting>
+    BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
+</programlisting>
 
       <para> The header and footer manipulate
         <varname>BUILDLINK_DEPTH</varname>, which is common across all
@@ -447,46 +454,46 @@ BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//} </programlisting>
       <para>The following is the recommended template for builtin.mk
         files: </para>
 
-      <programlisting>
-.if !defined(IS_BUILTIN.foo)
-#
-# IS_BUILTIN.foo is set to "yes" or "no" depending on whether "foo"
-# genuinely exists in the system or not.
-#
-IS_BUILTIN.foo?=        no
-
-# BUILTIN_PKG.foo should be set here if "foo" is built-in and its package
-# version can be determined.
-#
-.  if !empty(IS_BUILTIN.foo:M[yY][eE][sS])
-BUILTIN_PKG.foo?=       foo-1.0
-.  endif
-.endif  # IS_BUILTIN.foo
-
-.if !defined(USE_BUILTIN.foo)
-USE_BUILTIN.foo?=       ${IS_BUILTIN.foo}
-.  if defined(BUILTIN_PKG.foo)
-.    for _depend_ in ${BUILDLINK_DEPENDS.foo}
-.      if !empty(USE_BUILTIN.foo:M[yY][eE][sS])
-USE_BUILTIN.foo!=                                                       \
-      if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then     \
-              ${ECHO} "yes";                                            \
-      else                                                              \
-              ${ECHO} "no";                                             \
-      fi
-.      endif
-.    endfor
-.  endif
-.endif  # USE_BUILTIN.foo
-
-CHECK_BUILTIN.foo?=     no
-.if !empty(CHECK_BUILTIN.foo:M[nN][oO])
-#
-# Here we place code that depends on whether USE_BUILTIN.foo is set to
-# "yes" or "no".
-#
-.endif  # CHECK_BUILTIN.foo
-      </programlisting>
+<programlisting>
+    .if !defined(IS_BUILTIN.foo)
+    #
+    # IS_BUILTIN.foo is set to "yes" or "no" depending on whether "foo"
+    # genuinely exists in the system or not.
+    #
+    IS_BUILTIN.foo?=        no
+
+    # BUILTIN_PKG.foo should be set here if "foo" is built-in and its package
+    # version can be determined.
+    #
+    .  if !empty(IS_BUILTIN.foo:M[yY][eE][sS])
+    BUILTIN_PKG.foo?=       foo-1.0
+    .  endif
+    .endif  # IS_BUILTIN.foo
+
+    .if !defined(USE_BUILTIN.foo)
+    USE_BUILTIN.foo?=       ${IS_BUILTIN.foo}
+    .  if defined(BUILTIN_PKG.foo)
+    .    for _depend_ in ${BUILDLINK_DEPENDS.foo}
+    .      if !empty(USE_BUILTIN.foo:M[yY][eE][sS])
+    USE_BUILTIN.foo!=                                                       \
+          if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then     \
+                  ${ECHO} "yes";                                            \
+          else                                                              \
+                  ${ECHO} "no";                                             \
+          fi
+    .      endif
+    .    endfor
+    .  endif
+    .endif  # USE_BUILTIN.foo
+
+    CHECK_BUILTIN.foo?=     no
+    .if !empty(CHECK_BUILTIN.foo:M[nN][oO])
+    #
+    # Here we place code that depends on whether USE_BUILTIN.foo is set to
+    # "yes" or "no".
+    #
+    .endif  # CHECK_BUILTIN.foo
+</programlisting>
 
       <para> The first section sets
         <varname>IS_BUILTIN.<replaceable>pkg</replaceable></varname>
@@ -563,10 +570,10 @@ CHECK_BUILTIN.foo?=     no
         using pkgsrc versions of software for all but the most basic
         bits on a NetBSD system, you can set: </para>
 	
-      <programlisting>
-        PREFER_PKGSRC=  yes
-        PREFER_NATIVE=  getopt skey tcp_wrappers
-      </programlisting>
+<programlisting>
+    PREFER_PKGSRC=  yes
+    PREFER_NATIVE=  getopt skey tcp_wrappers
+</programlisting>
 
       <para> A package <emphasis>must</emphasis> have a
         <filename>builtin.mk</filename> 
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index d2318090e53..0eb374fc627 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.16 2005/10/07 18:30:17 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.17 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
   <title>Package components - files, directories and contents</title>
@@ -44,15 +44,16 @@
 	  <varname>CATEGORIES</varname>. If more than
 	  one is used, they need to be separated by spaces:</para>
 
-	<programlisting>
-archivers     cross         geography     meta-pkgs     security
-audio         databases     graphics      misc          shells
-benchmarks    devel         ham           multimedia    sysutils
-biology       editors       inputmethod   net           textproc
-cad           emulators     lang          news          time
-chat          finance       mail          parallel      wm
-comms         fonts         math          pkgtools      www
-converters    games         mbone         print         x11</programlisting>
+<programlisting>
+    archivers     cross         geography     meta-pkgs     security
+    audio         databases     graphics      misc          shells
+    benchmarks    devel         ham           multimedia    sysutils
+    biology       editors       inputmethod   net           textproc
+    cad           emulators     lang          news          time
+    chat          finance       mail          parallel      wm
+    comms         fonts         math          pkgtools      www
+    converters    games         mbone         print         x11
+</programlisting>
 	</listitem>
 
 	<listitem><para><varname>MASTER_SITES</varname> is a list of URLs where
@@ -62,28 +63,28 @@ converters    games         mbone         print         x11</programlisting>
 	    the following predefined sites:</para>
 
 <!-- sort bsd.sites.mk | sed -n 's/\(^MA[A-Z_]*\).*/        ${\1}/p' -->
-	  <programlisting>
-	    ${MASTER_SITE_APACHE}
-	    ${MASTER_SITE_BACKUP}
-	    ${MASTER_SITE_CYGWIN}
-	    ${MASTER_SITE_DEBIAN}
-	    ${MASTER_SITE_FREEBSD}
-	    ${MASTER_SITE_FREEBSD_LOCAL}
-	    ${MASTER_SITE_GNOME}
-	    ${MASTER_SITE_GNU}
-	    ${MASTER_SITE_GNUSTEP}
-	    ${MASTER_SITE_IFARCHIVE}
-	    ${MASTER_SITE_MOZILLA}
-	    ${MASTER_SITE_OPENOFFICE}
-	    ${MASTER_SITE_PERL_CPAN}
-	    ${MASTER_SITE_R_CRAN}
-	    ${MASTER_SITE_SOURCEFORGE}
-	    ${MASTER_SITE_SUNSITE}
-	    ${MASTER_SITE_SUSE}
-	    ${MASTER_SITE_TEX_CTAN}
-	    ${MASTER_SITE_XCONTRIB}
-	    ${MASTER_SITE_XEMACS}
-	  </programlisting>
+<programlisting>
+    ${MASTER_SITE_APACHE}
+    ${MASTER_SITE_BACKUP}
+    ${MASTER_SITE_CYGWIN}
+    ${MASTER_SITE_DEBIAN}
+    ${MASTER_SITE_FREEBSD}
+    ${MASTER_SITE_FREEBSD_LOCAL}
+    ${MASTER_SITE_GNOME}
+    ${MASTER_SITE_GNU}
+    ${MASTER_SITE_GNUSTEP}
+    ${MASTER_SITE_IFARCHIVE}
+    ${MASTER_SITE_MOZILLA}
+    ${MASTER_SITE_OPENOFFICE}
+    ${MASTER_SITE_PERL_CPAN}
+    ${MASTER_SITE_R_CRAN}
+    ${MASTER_SITE_SOURCEFORGE}
+    ${MASTER_SITE_SUNSITE}
+    ${MASTER_SITE_SUSE}
+    ${MASTER_SITE_TEX_CTAN}
+    ${MASTER_SITE_XCONTRIB}
+    ${MASTER_SITE_XEMACS}
+</programlisting>
 
 	  <para>If one of these predefined sites is chosen, you may
 	    want to specify a subdirectory of that
@@ -91,9 +92,10 @@ converters    games         mbone         print         x11</programlisting>
 	    actual site, you <emphasis>must</emphasis> use the
 	    following construct to specify a subdirectory:</para>
 
-	  <programlisting>
-	    ${MASTER_SITE_GNU:=subdirectory/name/}
-	    ${MASTER_SITE_SOURCEFORGE:=project_name/}</programlisting>
+<programlisting>
+    ${MASTER_SITE_GNU:=subdirectory/name/}
+    ${MASTER_SITE_SOURCEFORGE:=project_name/}
+</programlisting>
 
 	  <para>Note the trailing slash after the subdirectory name.</para>
 
@@ -103,10 +105,13 @@ converters    games         mbone         print         x11</programlisting>
 	    sites, set <varname>SITES_foo</varname> to a list of URIs
 	    where file <quote>foo</quote> may be
 	    found. <quote>foo</quote> includes the suffix, e.g.:</para>
-	  <programlisting>DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=     foo-file.tar.gz
-SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
-        http://www.somewhereelse.com/mirror/somehow/</programlisting>
+
+<programlisting>
+    DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
+    DISTFILES+=     foo-file.tar.gz
+    SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
+            http://www.somewhereelse.com/mirror/somehow/
+</programlisting>
 	</listitem>
 
 	<listitem><para><varname>DISTFILES</varname>: Name(s)
@@ -397,7 +402,9 @@ SITES_foo-file.tar.gz=http://www.somewhere.com/somehow/ \
             <varname>MESSAGE_SUBST</varname> in the package's
             <filename>Makefile</filename>:</para>
 
-          <programlisting>MESSAGE_SUBST+=  SOMEVAR="somevalue"</programlisting>
+<programlisting>
+    MESSAGE_SUBST+=  SOMEVAR="somevalue"
+</programlisting>
 
           <para>replaces "${SOMEVAR}" with <quote>somevalue</quote> in
             <filename>MESSAGE</filename>.</para>
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index 482bc309025..f1dff8656c7 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.6 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.7 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
@@ -150,19 +150,19 @@
       options are mutually exclusive, run <command>make show-options</command>,
       for example:</para>
 
-    <programlisting>
-      The following options are supported by this package:
-      ssl      Enable SSL support.
-      Exactly one of the following gecko options is required:
-      firefox  Use firefox as gecko rendering engine.
-      mozilla  Use mozilla as gecko rendering engine.
-      At most one of the following database options may be selected:
-      mysql    Enable support for MySQL database.
-      pgsql    Enable support for PostgreSQL database.
-
-      These options are enabled by default: firefox
-      These options are currently enabled: mozilla ssl
-    </programlisting>
+<programlisting>
+    The following options are supported by this package:
+    ssl      Enable SSL support.
+    Exactly one of the following gecko options is required:
+    firefox  Use firefox as gecko rendering engine.
+    mozilla  Use mozilla as gecko rendering engine.
+    At most one of the following database options may be selected:
+    mysql    Enable support for MySQL database.
+    pgsql    Enable support for PostgreSQL database.
+
+    These options are enabled by default: firefox
+    These options are currently enabled: mozilla ssl
+</programlisting>
 
     <para>The following variables can be defined in
       <filename>/etc/mk.conf</filename> to select which options to enable
diff --git a/doc/guide/files/examples.xml b/doc/guide/files/examples.xml
index 24a07747252..25acffae8a2 100644
--- a/doc/guide/files/examples.xml
+++ b/doc/guide/files/examples.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: examples.xml,v 1.7 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.8 2005/10/23 11:25:58 rillig Exp $ -->
 
 <appendix id="examples">
   <title>A simple example package: bison</title>
@@ -15,39 +15,45 @@
     <sect2 id="example-Makefile">
       <title>Makefile</title>
 
-      <programlisting># &#36;NetBSD&#36;
-#
+<programlisting>
+    # &#36;NetBSD&#36;
+    #
 
-DISTNAME=       bison-1.25
-CATEGORIES=     devel
-MASTER_SITES=   ${MASTER_SITE_GNU}
+    DISTNAME=       bison-1.25
+    CATEGORIES=     devel
+    MASTER_SITES=   ${MASTER_SITE_GNU}
 
-MAINTAINER=     thorpej@NetBSD.org
-HOMEPAGE=       http://www.gnu.org/software/bison/bison.html
-COMMENT=        GNU yacc clone
+    MAINTAINER=     thorpej@NetBSD.org
+    HOMEPAGE=       http://www.gnu.org/software/bison/bison.html
+    COMMENT=        GNU yacc clone
 
-GNU_CONFIGURE=  yes
-INFO_FILES=     bison.info
+    GNU_CONFIGURE=  yes
+    INFO_FILES=     bison.info
 
-.include "../../mk/bsd.pkg.mk"</programlisting>
+    .include "../../mk/bsd.pkg.mk"
+</programlisting>
     </sect2>
 
     <sect2 id="example-descr">
       <title>DESCR</title>
 
-      <programlisting>GNU version of yacc.  Can make re-entrant parsers, and numerous other
-improvements.  Why you would want this when Berkeley &man.yacc.1; is part
-of the &os; source tree is beyond me.</programlisting>
+<programlisting>
+    GNU version of yacc.  Can make re-entrant parsers, and numerous other
+    improvements.  Why you would want this when Berkeley &man.yacc.1; is part
+    of the &os; source tree is beyond me.
+</programlisting>
     </sect2>
 
     <sect2 id="example-plist">
       <title>PLIST</title>
 
-      <programlisting>@comment &#36;NetBSD&#36;
-bin/bison
-man/man1/bison.1.gz
-share/bison.simple
-share/bison.hairy</programlisting>
+<programlisting>
+    @comment &#36;NetBSD&#36;
+    bin/bison
+    man/man1/bison.1.gz
+    share/bison.simple
+    share/bison.hairy
+</programlisting>
     </sect2>
 
     <sect2 id="checking-package-with-pkglint">
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index 81bb741dd2d..d40aff4092a 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.15 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.16 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -47,7 +47,9 @@ users:</para>
 
 <para>To subscribe, do:</para>
 
-<programlisting>&cprompt; echo subscribe <replaceable>listname</replaceable> | mail majordomo@NetBSD.org</programlisting>
+<programlisting>
+    &cprompt; echo subscribe <replaceable>listname</replaceable> | mail majordomo@NetBSD.org
+</programlisting>
 
 <para>Archives for all these mailing lists are available from
 <ulink url="http://mail-index.NetBSD.org/"/>.</para>
@@ -270,10 +272,12 @@ values.</para> <para>For example, if you want to use
 <filename>wget</filename> to resume downloads, you'll have to use something
 like:</para>
 
-<programlisting>FETCH_CMD=wget
-FETCH_BEFORE_ARGS=--passive-ftp
-FETCH_RESUME_ARGS=-c
-FETCH_OUTPUT_ARGS=-O</programlisting>
+<programlisting>
+    FETCH_CMD=             wget
+    FETCH_BEFORE_ARGS=     --passive-ftp
+    FETCH_RESUME_ARGS=     -c
+    FETCH_OUTPUT_ARGS=     -O
+</programlisting>
 
 </sect1>
 
@@ -287,7 +291,9 @@ X11 (<filename>/usr/X11R6</filename>, <filename>/usr/openwin</filename>,
 ...), you will have to add the following line into
 <filename>/etc/mk.conf</filename>:</para>
 
-<programlisting>X11_TYPE=XFree86</programlisting>
+<programlisting>
+    X11_TYPE=XFree86
+</programlisting>
 
 </sect1>
 
@@ -301,7 +307,9 @@ X11 (<filename>/usr/X11R6</filename>, <filename>/usr/openwin</filename>,
 you will have to add the following line into
 <filename>/etc/mk.conf</filename>:</para>
 
-<programlisting>X11_TYPE=xorg</programlisting>
+<programlisting>
+    X11_TYPE=xorg
+</programlisting>
 
 </sect1>
 
@@ -318,8 +326,10 @@ form of a URL, e.g. in Amdahl, the machine
 port 80 as the proxy port number.  So the proxy environment variables
 are:</para>
 
-<programlisting>ftp_proxy=ftp://orpheus.amdahl.com:80/
-http_proxy=http://orpheus.amdahl.com:80/</programlisting>
+<programlisting>
+    ftp_proxy=ftp://orpheus.amdahl.com:80/
+    http_proxy=http://orpheus.amdahl.com:80/
+</programlisting>
 
 </sect1>
 
@@ -452,9 +462,11 @@ use it, install sudo (either as binary package or from
 <filename role="pkg">security/sudo</filename>) and then put the following 
 into your <filename>/etc/mk.conf</filename>:</para>
 
-<programlisting>.if exists(${LOCALBASE}/bin/sudo)
-SU_CMD=${LOCALBASE}/bin/sudo /bin/sh -c
-.endif</programlisting>
+<programlisting>
+    .if exists(${LOCALBASE}/bin/sudo)
+    SU_CMD=        ${LOCALBASE}/bin/sudo /bin/sh -c
+    .endif
+</programlisting>
 
 </sect1>
 
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index ad5e1a28663..3fc7716fef6 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.31 2005/10/23 00:41:54 hubertf Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.32 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Notes on fixes for packages</title>
@@ -26,16 +26,20 @@
         Makefile before any preprocessor-like .if, .ifdef, or .ifndef
         statements:</para>
     
-      <programlisting>.include "../../mk/bsd.prefs.mk"
-    
+<programlisting>
+    .include "../../mk/bsd.prefs.mk"
+
     .if defined(USE_MENUS)
-      ...
-    .endif</programlisting>
+    # ...
+    .endif
+</programlisting>
     
       <para>If you wish to set the <varname>CFLAGS</varname> variable
         in <filename>/etc/mk.conf</filename>, please make sure to use: 
     
-        <programlisting>CFLAGS+=  -your -flags</programlisting>
+<programlisting>
+    CFLAGS+=  -your -flags
+</programlisting>
     
         Using <varname>CFLAGS=</varname> (i.e. without the
         <quote>+</quote>) may lead to problems with packages that need
@@ -142,7 +146,9 @@
       <para>The format for a <varname>BUILD_DEPENDS</varname> and a
         <varname>DEPENDS</varname> definition is:</para>
     
-      <programlisting>&lt;pre-req-package-name&gt;:../../&lt;category&gt;/&lt;pre-req-package&gt;</programlisting>
+<programlisting>
+    &lt;pre-req-package-name&gt;:../../&lt;category&gt;/&lt;pre-req-package&gt;
+</programlisting>
     
       <para>Please note that the <quote>pre-req-package-name</quote>
         may include any of the wildcard version numbers recognized by
@@ -155,9 +161,9 @@
             <filename>buildlink3.mk</filename> file available, use it:
 </para>
 
-            <programlisting>
+<programlisting>
     .include "../../graphics/jpeg/buildlink3.mk"
-    </programlisting>
+</programlisting>
         </listitem>
     
         <listitem>
@@ -166,7 +172,9 @@
             file available, use the <varname>BUILD_DEPENDS</varname>
             definition:</para>
     
-          <programlisting>BUILD_DEPENDS+=  autoconf-2.13:../../devel/autoconf</programlisting>
+<programlisting>
+    BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
+</programlisting>
         </listitem>
     
         <listitem>
@@ -177,12 +185,15 @@
             is the <filename role="pkg">print/lyx</filename> package, 
 	    which uses the xpm library, version 3.4j to build:</para>
     
-          <programlisting>DEPENDS+=       xpm-3.4j:../../graphics/xpm</programlisting>
+<programlisting>
+    DEPENDS+=       xpm-3.4j:../../graphics/xpm
+</programlisting>
     
-          <para>You can also use wildcards in package dependences:
-</para>
+          <para>You can also use wildcards in package dependences:</para>
     
-          <programlisting>DEPENDS+=       xpm-[0-9]*:../../graphics/xpm</programlisting>
+<programlisting>
+    DEPENDS+=       xpm-[0-9]*:../../graphics/xpm
+</programlisting>
     
           <para>Note that such wildcard dependencies are retained when
             creating binary packages.  The dependency is checked when
@@ -199,7 +210,9 @@
             will only  build against a certain minimum version of a
             pre-requisite:</para>
               
-          <programlisting>DEPENDS+=       tiff>=3.5.4:../../graphics/tiff</programlisting>
+<programlisting>
+    DEPENDS+=       tiff>=3.5.4:../../graphics/tiff
+</programlisting>
     
           <para>This means that the package will build against version
             3.5.4 of the tiff library or newer.  Such a dependency may
@@ -214,7 +227,9 @@
             correctly.  Such recommendations can be expressed using
             <varname>RECOMMENDED</varname>:</para>
     
-          <programlisting>RECOMMENDED+=   tiff>=3.6.1:../../graphics/tiff</programlisting>
+<programlisting>
+    RECOMMENDED+=   tiff>=3.6.1:../../graphics/tiff
+</programlisting>
 
           <para>In addition to the above <varname>DEPENDS</varname>
             line, this denotes that while a package will build against
@@ -255,7 +270,9 @@
 	    be able to execute the latex binary from the teTeX package
 	    when it runs, and that is specified:</para>
     
-          <programlisting>DEPENDS+=        teTeX-[0-9]*:../../print/teTeX</programlisting>
+<programlisting>
+    DEPENDS+=        teTeX-[0-9]*:../../print/teTeX
+</programlisting>
     
           <para>The comment about wildcard dependencies from previous
             paragraph  applies here, too.</para> 
@@ -268,17 +285,21 @@
 	(it relies on the jpeg sources being present in source form 
 	during the build):</para>
     
-      <programlisting>if [ ! -e ${_PKGSRCDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \
-          cd ${_PKGSRCDIR}/../../graphics/jpeg &amp;&amp; ${MAKE} extract;              \
-    fi</programlisting>
+<programlisting>
+    if [ ! -e ${_PKGSRCDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then    \
+        cd ${_PKGSRCDIR}/../../graphics/jpeg &amp;&amp; ${MAKE} extract; \
+    fi
+</programlisting>
     
       <para>If you build any other packages that way, please make sure
         the working files are deleted too when this package's working
         files are cleaned up.  The easiest way to do so is by adding a
         pre-clean target:</para>
     
-      <programlisting>pre-clean:
-          cd ${_PKGSRCDIR}/../../graphics/jpeg &amp;&amp; ${MAKE} clean</programlisting>
+<programlisting>
+    pre-clean:
+            cd ${_PKGSRCDIR}/../../graphics/jpeg &amp;&amp; ${MAKE} clean
+</programlisting>
     
       <para>Please also note the <varname>BUILD_USES_MSGFMT</varname>
         and <varname>BUILD_USES_GETTEXT_M4</varname> definitions, which
@@ -308,12 +329,16 @@
         install the same shared library, thus you set in
         <filename>pkgsrc/x11/Xaw3d/Makefile</filename>:</para>
     
-      <programlisting>CONFLICTS=      Xaw-Xpm-[0-9]*</programlisting>
+<programlisting>
+    CONFLICTS=      Xaw-Xpm-[0-9]*
+</programlisting>
     
       <para>and in <filename>pkgsrc/x11/Xaw-Xpm/Makefile</filename>:
 </para>
     
-      <programlisting>CONFLICTS=      Xaw3d-[0-9]*</programlisting>
+<programlisting>
+    CONFLICTS=      Xaw3d-[0-9]*
+</programlisting>
     
       <para>Packages will automatically conflict with other packages
         with the name prefix  and a different version
@@ -412,18 +437,21 @@
         (2, ...). The <quote>nb</quote> is treated like a
         <quote>.</quote> by the pkg tools. e.g.</para>
     
-      <programlisting>  DISTNAME= foo-17.42
-    PKGREVISION=  9</programlisting>
+<programlisting>
+    DISTNAME=       foo-17.42
+    PKGREVISION=    9
+</programlisting>
     
       <para>will result in a <varname>PKGNAME</varname> of
         <quote>foo-17.42nb9</quote>.</para>
     
       <para>When a new release of the package is released, the
         <varname>PKGREVISION</varname> should be removed, e.g. on a new
-        minor release of the above package, things should be like:
-</para>
+        minor release of the above package, things should be like:</para>
     
-      <programlisting>DISTNAME=   foo-17.43</programlisting>
+<programlisting>
+    DISTNAME=       foo-17.43
+</programlisting>
     </sect2>
     
     
@@ -442,8 +470,10 @@
           operating systems will not perform more than one operation at a time.
           As such, you should call <quote>${INSTALL}</quote>, etc. like this:</para>
 
-          <programlisting>${INSTALL_DATA_DIR} ${PREFIX}/dir1
-${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
+<programlisting>
+    ${INSTALL_DATA_DIR} ${PREFIX}/dir1
+    ${INSTALL_DATA_DIR} ${PREFIX}/dir2
+</programlisting>
       </sect3>
 
     </sect2>
@@ -554,7 +584,10 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
             <quote>ar</quote>, <quote>ranlib</quote>, and <quote>ld
             -Bshareable</quote> commands, and instead use:</para> 
 
-          <programlisting>${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info major:minor</programlisting>
+<programlisting>
+    ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} \
+        -rpath ${PREFIX}/lib -version-info major:minor
+</programlisting>
 
           <para>Note that the library is changed to have a
             <filename>.la</filename> extension, and the objects are
@@ -570,23 +603,24 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
 
           <para>From the libtool manual:</para>
 
-          <programlisting>
-     So, libtool library versions are described by three integers:
+<programlisting>
+    So, libtool library versions are described by three integers:
 
-CURRENT
-       The most recent interface number that this library implements.
+    CURRENT
+        The most recent interface number that this library implements.
 
-REVISION
-       The implementation number of the CURRENT interface.
+    REVISION
+        The implementation number of the CURRENT interface.
 
-AGE
-       The difference between the newest and oldest interfaces that this
-       library implements.  In other words, the library implements all the
-       interface numbers in the range from number `CURRENT - AGE' to
-       `CURRENT'.
+    AGE
+        The difference between the newest and oldest interfaces that
+	this library implements.  In other words, the library implements
+	all the interface numbers in the range from number `CURRENT -
+	AGE' to `CURRENT'.
        
-     If two libraries have identical CURRENT and AGE numbers, then the
-dynamic linker chooses the library with the greater REVISION number. </programlisting>
+    If two libraries have identical CURRENT and AGE numbers, then the
+    dynamic linker chooses the library with the greater REVISION number.
+</programlisting>
 
           <para>The <quote>-release</quote> option will produce
             different results for a.out and ELF (excluding symlinks)
@@ -627,11 +661,15 @@ dynamic linker chooses the library with the greater REVISION number. </programli
             expects you to change that argument to be the
             <filename>.la</filename> file. e.g.</para>
 
-          <programlisting>${LIBTOOL} --mode=link ${CC} -o someprog -L../somelib -lsomelib</programlisting>
+<programlisting>
+    ${LIBTOOL} --mode=link ${CC} -o someprog -L../somelib -lsomelib
+</programlisting>
 
           <para>should be changed to:</para>
 
-          <programlisting>${LIBTOOL} --mode=link ${CC} -o <replaceable>someprog</replaceable> <replaceable>../somelib/somelib.la</replaceable></programlisting>
+<programlisting>
+    ${LIBTOOL} --mode=link ${CC} -o <replaceable>someprog</replaceable> <replaceable>../somelib/somelib.la</replaceable>
+</programlisting>
 
           <para>and it will do the right thing with the libraries.</para>
         </listitem>
@@ -642,7 +680,9 @@ dynamic linker chooses the library with the greater REVISION number. </programli
             --mode=install</quote>, and change the library name to
             <filename>.la</filename>. e.g.</para>
 
-          <programlisting>${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${SOMELIB:.a=.la} ${PREFIX}/lib</programlisting>
+<programlisting>
+    ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${SOMELIB:.a=.la} ${PREFIX}/lib
+</programlisting>
 
           <para>This will install the static <filename>.a</filename>,
             shared library, any needed symlinks, and run
@@ -724,27 +764,31 @@ dynamic linker chooses the library with the greater REVISION number. </programli
 
         <para>For packages that need only autoconf:</para>
 
-        <programlisting>AUTOCONF_REQD=    2.50     # if default version is not good enough
-USE_TOOLS+=	autoconf   # use "autoconf213" for autoconf-2.13
-...
+<programlisting>
+    AUTOCONF_REQD=  2.50            # if default version is not good enough
+    USE_TOOLS+=     autoconf        # use "autoconf213" for autoconf-2.13
+    ...
 
-pre-configure:
-          cd ${WRKSRC}; autoconf
+    pre-configure:
+            cd ${WRKSRC}; autoconf
 
-...</programlisting>
+    ...
+</programlisting>
 
         <para>and for packages that need automake and autoconf:</para> 
 
-<programlisting>AUTOMAKE_REQD=  1.7.1      # if default version is not good enough
-USE_TOOLS+=	automake   # use "automake14" for automake-1.4
-...
+<programlisting>
+    AUTOMAKE_REQD=  1.7.1           # if default version is not good enough
+    USE_TOOLS+=     automake        # use "automake14" for automake-1.4
+    ...
 
-pre-configure:
-          cd ${WRKSRC};                                           \
-          aclocal; autoheader;                                    \
-          automake -a --foreign -i; autoconf
+    pre-configure:
+            cd ${WRKSRC};                          \
+            aclocal; autoheader;                   \
+            automake -a --foreign -i; autoconf
 
-...</programlisting>
+    ...
+</programlisting>
 
         <para>Packages which use GNU Automake will almost certainly
           require GNU Make.</para> 
@@ -778,14 +822,18 @@ pre-configure:
         <filename>&lt;sys/param.h&gt;</filename> on said systems.
 </para>
 
-      <programlisting><![CDATA[#include <sys/param.h>]]></programlisting>
+<programlisting>
+    <![CDATA[#include <sys/param.h>]]>
+</programlisting>
 
       <para>and then you can surround the BSD-specific parts of your
         package's C/C++ code using this conditional:</para>
 
-      <programlisting><![CDATA[#if (defined(BSD) && BSD >= 199306)
+<programlisting>
+    <![CDATA[#if (defined(BSD) && BSD >= 199306)
     ...
-#endif]]></programlisting>
+    #endif]]>
+</programlisting>
 
       <para>Please use the <quote>__NetBSD__</quote> definition sparingly - it
         should only apply to features of &os; that are not present in other
@@ -801,7 +849,9 @@ pre-configure:
 	the platform, with the following command:
       </para>
 
-      <programlisting> gcc -E -dM - < /dev/null </programlisting>
+<programlisting>
+    <![CDATA[gcc -E -dM - < /dev/null ]]>
+</programlisting>
     </sect2>
   </sect1>
   
@@ -837,11 +887,15 @@ pre-configure:
         the pkgsrc mechanism of an interactive stage which will be needed, and
         this should be set in the package's <filename>Makefile</filename>, e.g.:</para>
 
-      <programlisting>INTERACTIVE_STAGE= build</programlisting>
+<programlisting>
+    INTERACTIVE_STAGE=      build
+</programlisting>
 
       <para>Multiple interactive stages can be specified:</para>
 
-      <programlisting>INTERACTIVE_STAGE= configure install</programlisting>
+<programlisting>
+    INTERACTIVE_STAGE=      configure install
+</programlisting>
     </sect2>
 
 
@@ -880,20 +934,23 @@ pre-configure:
         the license, e.g. in 
 	<filename role="pkg">graphics/xv</filename>: </para>
 
-      <programlisting>LICENSE=        xv-license</programlisting>
+<programlisting>
+    LICENSE=        xv-license
+</programlisting>
 
       <para>
 	When trying to build, the user will get a notice that the
         package is covered by a license which has not been
         accepted:</para>
 	
-      <programlisting>
-&cprompt; <userinput>make</userinput>
-===> xv-3.10anb9 has an unacceptable license: xv-license.
-===>     To view the license, enter "/usr/bin/make show-license".
-===>     To indicate acceptance, add this line to your /etc/mk.conf:
-===>     ACCEPTABLE_LICENSES+=xv-license
-*** Error code 1</programlisting>
+<programlisting>
+    &cprompt; <userinput>make</userinput>
+    ===> xv-3.10anb9 has an unacceptable license: xv-license.
+    ===>     To view the license, enter "/usr/bin/make show-license".
+    ===>     To indicate acceptance, add this line to your /etc/mk.conf:
+    ===>     ACCEPTABLE_LICENSES+=xv-license
+    *** Error code 1
+</programlisting>
 
         <para>The license can be viewed with <command>make
           show-license</command>, and if it is considered appropriate,
@@ -901,7 +958,9 @@ pre-configure:
           <filename>/etc/mk.conf</filename> to indicate acceptance of
           the particular license:</para>
 
-        <programlisting>ACCEPTABLE_LICENSES+=xv-license</programlisting>
+<programlisting>
+    ACCEPTABLE_LICENSES+=xv-license
+</programlisting>
 
 	<para>When adding a package with a new license, the license
           text should be added to <filename>pkgsrc/licenses</filename>
@@ -969,11 +1028,13 @@ pre-configure:
         following definitions in your <filename>Makefile</filename> (we
         shall use <command>tclsh</command> in this example):</para>
     
-      <programlisting>  REPLACE_INTERPRETER+=     tcl
-    _REPLACE.tcl.old=     .*/bin/tclsh
-    _REPLACE.tcl.new=     ${PREFIX}/bin/tclsh
-    _REPLACE_FILES.tcl=   ...list of tcl scripts which need to be fixed,
-                          relative to ${WRKSRC}, just as in REPLACE_PERL</programlisting>
+<programlisting>
+    REPLACE_INTERPRETER+=   tcl
+    _REPLACE.tcl.old=       .*/bin/tclsh
+    _REPLACE.tcl.new=       ${PREFIX}/bin/tclsh
+    _REPLACE_FILES.tcl=     # list of tcl scripts which need to be fixed,
+                            # relative to ${WRKSRC}, just as in REPLACE_PERL
+</programlisting>
     </sect2>
 
     
@@ -997,7 +1058,9 @@ pre-configure:
         <varname>PERL5_PACKLIST</varname> to a space-separated list of
         paths to packlist files, e.g.:</para>
   
-      <programlisting>PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist</programlisting>
+<programlisting>
+    PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist
+</programlisting>
   
       <para>The variables <varname>PERL5_SITELIB</varname>,
         <varname>PERL5_SITEARCH</varname>, and
diff --git a/doc/guide/files/ftp-layout.xml b/doc/guide/files/ftp-layout.xml
index 34e9a61fb84..0be827ce685 100644
--- a/doc/guide/files/ftp-layout.xml
+++ b/doc/guide/files/ftp-layout.xml
@@ -1,70 +1,70 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.4 2005/10/23 11:25:58 rillig Exp $ -->
 
 <appendix id="ftp-layout">
   <title>Layout of the FTP server's package archive</title>
 
   <para>Layout for precompiled binary packages on ftp.NetBSD.org:</para>
 
-  <!-- BEWARE! Use no tabs here, only spaces! -->
-  <programlisting>
-/pub/NetBSD/packages/
-                distfiles/
+<!-- BEWARE! Use no tabs here, only spaces! -->
+<programlisting>
+    /pub/NetBSD/packages/
+        distfiles/
 
-                # Unpacked pkgsrc trees
-                pkgsrc-current -> /pub/NetBSD/NetBSD-current/pkgsrc
-                pkgsrc-2003Q4 -> N/A
-                pkgsrc-2004Q1/pkgsrc
+        # Unpacked pkgsrc trees
+        pkgsrc-current -> /pub/NetBSD/NetBSD-current/pkgsrc
+        pkgsrc-2003Q4 -> N/A
+        pkgsrc-2004Q1/pkgsrc
 
-                # pkgsrc archives
-                pkgsrc-current.tar.gz -> ../NetBSD-current/tar_files/pkgsrc.tar.gz
-                pkgsrc-2003Q4.tar.gz -> N/A
-                pkgsrc-2004Q1.tar.gz -> N/A
+        # pkgsrc archives
+        pkgsrc-current.tar.gz -> ../NetBSD-current/tar_files/pkgsrc.tar.gz
+        pkgsrc-2003Q4.tar.gz -> N/A
+        pkgsrc-2004Q1.tar.gz -> N/A
 
-                # Per pkgsrc-release/OS-release/arch package archives
-                pkgsrc-2003Q4/
-                        NetBSD-1.6.2/
-                                i386/
-                                        All/
-                                        archivers/
-                                                foo -> ../All/foo
-                                        ...
-                pkgsrc-2004Q1/
-                        NetBSD-1.6.2/
-                                i386/
-                                        All/
-                                        ...
-                        NetBSD-2.0/
-                                i386/
-                                        All/
-                                        ...
-                        SunOS-5.9/
-                                sparc/
-                                        All/
-                                        ...
-                                x86/
-                                        All/
-                                        ...
+        # Per pkgsrc-release/OS-release/arch package archives
+        pkgsrc-2003Q4/
+            NetBSD-1.6.2/
+                i386/
+                    All/
+                    archivers/
+                        foo -> ../All/foo
+                    ...
+        pkgsrc-2004Q1/
+            NetBSD-1.6.2/
+                i386/
+                    All/
+                    ...
+            NetBSD-2.0/
+                i386/
+                    All/
+                    ...
+            SunOS-5.9/
+                sparc/
+                    All/
+                    ...
+                x86/
+                    All/
+                    ...
 
-                # Per os-release package archive convenience links
-                NetBSD-1.6.2 -> 1.6.2
-                1.6.2/
-                        i386 -> ../pkgsrc-2004Q1/NetBSD-1.6.2/i386
-                        m68k/
-                                All/
-                                archivers/
-                                        foo -> ../All/foo
-                                ...
-                        amiga -> m68k
-                        atari -> m68k
-                        ...
+        # Per os-release package archive convenience links
+        NetBSD-1.6.2 -> 1.6.2
+        1.6.2/
+            i386 -> ../pkgsrc-2004Q1/NetBSD-1.6.2/i386
+            m68k/
+                All/
+                archivers/
+                    foo -> ../All/foo
+                ...
+            amiga -> m68k
+            atari -> m68k
+            ...
 
-                2.0 -> NetBSD-2.0       # backward compat, historic
-                NetBSD-2.0/
-                        i386 -> ../pkgsrc-2004Q1/NetBSD-2.0/i386
-                SunOS-5.9/
-                        sparc -> ../pkgsrc-2004Q1/SunOS-5.9/sparc
-                        x86 -> ../pkgsrc-2004Q1/SunOS-5.9/x86
-                        </programlisting>
+        2.0 -> NetBSD-2.0       # backward compat, historic
+        NetBSD-2.0/
+            i386 -> ../pkgsrc-2004Q1/NetBSD-2.0/i386
+        SunOS-5.9/
+            sparc -> ../pkgsrc-2004Q1/SunOS-5.9/sparc
+            x86 -> ../pkgsrc-2004Q1/SunOS-5.9/x86
+</programlisting>
 
   <para>
     To create:</para>
@@ -77,11 +77,12 @@
     <listitem>
       <para> Upload /usr/pkgsrc/packages to </para>
 
-      <programlisting>    ftp://ftp.NetBSD.org/pub/NetBSD/packages/\
-        pkgsrc-2004Q4/\                         # pkgsrc-branch
-        `uname -s`-`uname -r`/                  # OS & version
-        `uname -p`                              # architecture
-       </programlisting>
+<programlisting>
+    ftp://ftp.NetBSD.org/pub/NetBSD/packages/\
+        pkgsrc-2004Q4/\             # pkgsrc-branch
+        `uname -s`-`uname -r`/\     # OS & version
+        `uname -p`                  # architecture
+</programlisting>
 
     </listitem>
 
diff --git a/doc/guide/files/getting.xml b/doc/guide/files/getting.xml
index d1172afaff1..70a4035b2e3 100644
--- a/doc/guide/files/getting.xml
+++ b/doc/guide/files/getting.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: getting.xml,v 1.4 2005/05/24 12:14:42 wiz Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.5 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="getting">
   <title>Where to get pkgsrc</title>
@@ -23,7 +23,9 @@
       the Software Update Protocol, SUP. To do so, make sure your
       supfile has a line</para>
   
-    <programlisting>release=pkgsrc</programlisting>
+<programlisting>
+    release=pkgsrc
+</programlisting>
   
     <para>in it, see the examples in
       <filename>/usr/share/examples/supfiles</filename>, and that the
diff --git a/doc/guide/files/makefile.xml b/doc/guide/files/makefile.xml
index 00183417808..5d9b06ae046 100644
--- a/doc/guide/files/makefile.xml
+++ b/doc/guide/files/makefile.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: makefile.xml,v 1.18 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: makefile.xml,v 1.19 2005/10/23 11:25:58 rillig Exp $ -->
 
 <!-- based on:
 pkgsrc/bootstrap/bmake/for.c 1.1.1.1
@@ -131,18 +131,18 @@ pkgsrc/bootstrap/bmake/var.c 1.2
     <sect2 id="adding-to-list">
       <title>Adding things to a list</title>
 
-      <programlisting>
-STRING=                 foo * bar `date`
-INT_LIST=               # empty
-ANOTHER_INT_LIST=       apache-[0-9]*:../../www/apache
-EXT_LIST=               # empty
-ANOTHER_EXT_LIST=       a=b c=d
+<programlisting>
+    STRING=                 foo * bar `date`
+    INT_LIST=               # empty
+    ANOTHER_INT_LIST=       apache-[0-9]*:../../www/apache
+    EXT_LIST=               # empty
+    ANOTHER_EXT_LIST=       a=b c=d
 
-INT_LIST+=              ${STRING}               # 1
-INT_LIST+=              ${ANOTHER_INT_LIST}     # 2
-EXT_LIST+=              ${STRING:Q}             # 3
-EXT_LIST+=              ${ANOTHER_EXT_LIST}     # 4
-      </programlisting>
+    INT_LIST+=              ${STRING}               # 1
+    INT_LIST+=              ${ANOTHER_INT_LIST}     # 2
+    EXT_LIST+=              ${STRING:Q}             # 3
+    EXT_LIST+=              ${ANOTHER_EXT_LIST}     # 4
+</programlisting>
 
       <para>When you add a string to an external list (example 3), it
       must be quoted. In all other cases, you must not add a quoting
@@ -155,12 +155,12 @@ EXT_LIST+=              ${ANOTHER_EXT_LIST}     # 4
     <sect2 id="converting-internal-to-external">
       <title>Converting an internal list into an external list</title>
 
-      <programlisting>
-EXT_LIST=       # empty
-.for i in ${INT_LIST}
-EXT_LIST+=      ${i:Q}""
-.endfor
-      </programlisting>
+<programlisting>
+    EXT_LIST=       # empty
+    .for i in ${INT_LIST}
+    EXT_LIST+=      ${i:Q}""
+    .endfor
+</programlisting>
 
       <para>This code converts the internal list
       <varname>INT_LIST</varname> into the external list
@@ -173,18 +173,18 @@ EXT_LIST+=      ${i:Q}""
     <sect2 id="passing-variable-to-shell">
       <title>Passing variables to a shell command</title>
 
-      <programlisting>
-STRING=         foo bar <    > * `date` $$HOME ' "
-EXT_LIST=       string=${STRING:Q} x=second\ item
+<programlisting>
+    STRING=         foo bar <    > * `date` $$HOME ' "
+    EXT_LIST=       string=${STRING:Q} x=second\ item
 
-all:
-        echo ${STRING}                  # 1
-        echo "${STRING}"                # 2
-        echo "${STRING:Q}"              # 3
-        echo ${STRING:Q}                # 4
-        echo x${STRING:Q} | sed 1s,.,,  # 5
-        env ${EXT_LIST} /bin/sh -c 'echo "$$string"; echo "$$x"'
-      </programlisting>
+    all:
+            echo ${STRING}                  # 1
+            echo "${STRING}"                # 2
+            echo "${STRING:Q}"              # 3
+            echo ${STRING:Q}                # 4
+            echo x${STRING:Q} | sed 1s,.,,  # 5
+            env ${EXT_LIST} /bin/sh -c 'echo "$$string"; echo "$$x"'
+</programlisting>
 
       <para>Example 1 leads to a syntax error in the shell, as the
       characters are just copied.</para>
@@ -243,17 +243,17 @@ all:
 	pass the <varname>CPPFLAGS</varname> value properly trimmed. And
 	here is how we do it:</para>
 
-        <programlisting>
-CPPFLAGS=               # empty
-CPPFLAGS+=              -Wundef -DPREFIX=\"${PREFIX:Q}\"
-CPPFLAGS+=              ${MY_CPPFLAGS}
+<programlisting>
+    CPPFLAGS=               # empty
+    CPPFLAGS+=              -Wundef -DPREFIX=\"${PREFIX:Q}\"
+    CPPFLAGS+=              ${MY_CPPFLAGS}
 
-CONFIGURE_ARGS+=        CPPFLAGS=${CPPFLAGS:M*:Q}
+    CONFIGURE_ARGS+=        CPPFLAGS=${CPPFLAGS:M*:Q}
 
-all:
-        echo x${CPPFLAGS:Q}x            # leading and trailing whitespace
-        echo x${CONFIGURE_ARGS}x        # properly trimmed
-        </programlisting></listitem>
+    all:
+            echo x${CPPFLAGS:Q}x            # leading and trailing whitespace
+            echo x${CONFIGURE_ARGS}x        # properly trimmed
+</programlisting></listitem>
 
 	<listitem><para>The example above contains one bug: The
 	<varname>${PREFIX}</varname> is a properly quoted shell
@@ -272,19 +272,19 @@ all:
 	are two completely different cases which can be solved with the
 	same trick.</para>
 
-        <programlisting>
-EMPTY=                  # empty
-empty_test:
-        for i in a ${EMPTY:Q} c; do \
-                echo "$$i"; \
-        done
+<programlisting>
+    EMPTY=                  # empty
+    empty_test:
+            for i in a ${EMPTY:Q} c; do \
+                    echo "$$i"; \
+            done
 
-for_test:
-.for i in a:\ a:\test.txt
-        echo ${i:Q}
-        echo "foo"
-.endfor
-        </programlisting>
+    for_test:
+    .for i in a:\ a:\test.txt
+            echo ${i:Q}
+            echo "foo"
+    .endfor
+</programlisting>
 
 	<para>The first example will only print two of the three lines
 	we might have expected. This is because
@@ -313,9 +313,9 @@ for_test:
       contains a ``-'' character, one of the closing braces is included
       in <varname>${VAR}</varname> after this code executes.</para>
 
-      <programlisting>
-        VAR:= ${VAR:N${_othervar_:C/-//}}
-      </programlisting>
+<programlisting>
+    VAR:=   ${VAR:N${_othervar_:C/-//}}
+</programlisting>
 
       <para>For a more complex code snippet and a workaround, see the
       package <filename role="pkg">regress/make-quoting</filename>, testcase
diff --git a/doc/guide/files/options.xml b/doc/guide/files/options.xml
index 2eab6a1a056..0beb98878b9 100644
--- a/doc/guide/files/options.xml
+++ b/doc/guide/files/options.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: options.xml,v 1.13 2005/10/05 13:59:56 dillo Exp $ -->
+<!-- $NetBSD: options.xml,v 1.14 2005/10/23 11:25:58 rillig Exp $ -->
 
 <!-- based on: pkgsrc/mk/bsd.options.mk 1.42 -->
 
@@ -36,50 +36,51 @@ e.g. <filename>options.mk</filename>, that is included by the
 main package <filename>Makefile</filename>.</para>
 
 <programlisting>
-PKG_OPTIONS_VAR=		PKG_OPTIONS.wibble
-PKG_SUPPORTED_OPTIONS=		wibble-foo ldap
-PKG_OPTIONS_OPTIONAL_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	mysql pgsql
-PKG_SUGGESTED_OPTIONS=		wibble-foo
-PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_OPENLDAP:ldap
-PKG_OPTIONS_LEGACY_OPTS+=	foo:wibble-foo
-
-.include "../../mk/bsd.prefs.mk"
-
-# this package was previously named wibble2
-.if defined(PKG_OPTIONS.wibble2)
-PKG_LEGACY_OPTIONS+=  ${PKG_OPTIONS.wibble2}
-PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.wibble2 used, use "${PKG_OPTIONS_VAR:Q}" instead."
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-# Package-specific option-handling
-
-###
-### FOO support
-###
-.if !empty(PKG_OPTIONS:Mwibble-foo)
-CONFIGURE_ARGS+=	--enable-foo
-.endif
-
-###
-### LDAP support
-###
-.if !empty(PKG_OPTIONS:Mldap)
-.  include "../../databases/openldap/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ldap=${BUILDLINK_PREFIX.openldap}
-.endif
-
-###
-### database support
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-.  include "../../mk/mysql.buildlink3.mk"
-.endif
-.if !empty(PKG_OPTIONS:Mpgsql)
-.  include "../../mk/pgsql.buildlink3.mk"
-.endif
+    PKG_OPTIONS_VAR=		PKG_OPTIONS.wibble
+    PKG_SUPPORTED_OPTIONS=		wibble-foo ldap
+    PKG_OPTIONS_OPTIONAL_GROUPS=	database
+    PKG_OPTIONS_GROUP.database=	mysql pgsql
+    PKG_SUGGESTED_OPTIONS=		wibble-foo
+    PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_OPENLDAP:ldap
+    PKG_OPTIONS_LEGACY_OPTS+=	foo:wibble-foo
+
+    .include "../../mk/bsd.prefs.mk"
+
+    # this package was previously named wibble2
+    .if defined(PKG_OPTIONS.wibble2)
+    PKG_LEGACY_OPTIONS+=  ${PKG_OPTIONS.wibble2}
+    PKG_OPTIONS_DEPRECATED_WARNINGS+= \
+            "Deprecated variable PKG_OPTIONS.wibble2 used, use "${PKG_OPTIONS_VAR:Q}" instead."
+    .endif
+
+    .include "../../mk/bsd.options.mk"
+
+    # Package-specific option-handling
+
+    ###
+    ### FOO support
+    ###
+    .if !empty(PKG_OPTIONS:Mwibble-foo)
+    CONFIGURE_ARGS+=	--enable-foo
+    .endif
+
+    ###
+    ### LDAP support
+    ###
+    .if !empty(PKG_OPTIONS:Mldap)
+    .  include "../../databases/openldap/buildlink3.mk"
+    CONFIGURE_ARGS+=	--enable-ldap=${BUILDLINK_PREFIX.openldap}
+    .endif
+
+    ###
+    ### database support
+    ###
+    .if !empty(PKG_OPTIONS:Mmysql)
+    .  include "../../mk/mysql.buildlink3.mk"
+    .endif
+    .if !empty(PKG_OPTIONS:Mpgsql)
+    .  include "../../mk/pgsql.buildlink3.mk"
+    .endif
 </programlisting>
 
 <para>The first section contains the information about which build
@@ -175,7 +176,9 @@ options.</para>
 each option.  The correct way to check for an option is to check
 whether it is listed in <varname>PKG_OPTIONS</varname>:</para>
 
-<programlisting>.if !empty(PKG_OPTIONS:M<replaceable>option</replaceable>)</programlisting>
+<programlisting>
+    .if !empty(PKG_OPTIONS:M<replaceable>option</replaceable>)
+</programlisting>
 
 </sect1>
 
diff --git a/doc/guide/files/pkginstall.xml b/doc/guide/files/pkginstall.xml
index 266af15584c..869f5f1c3d9 100644
--- a/doc/guide/files/pkginstall.xml
+++ b/doc/guide/files/pkginstall.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: pkginstall.xml,v 1.6 2005/09/02 19:12:37 rillig Exp $ -->
+<!-- $NetBSD: pkginstall.xml,v 1.7 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="pkginstall"> <?dbhtml filename="pkginstall.html"?>
 <title>The pkginstall framework</title>
@@ -36,7 +36,9 @@
 Note that in order to use any of the described functionalities, you must
 add the following to your package's <filename>Makefile</filename>:</para>
 
-<programlisting>USE_PKGINSTALL=YES</programlisting>
+<programlisting>
+    USE_PKGINSTALL= YES
+</programlisting>
 
 <para>You may be thinking that many of the things described here could be
 easily done with simple code in the package's post-installation target
@@ -97,7 +99,9 @@ directories anywhere in the file system:</para>
     separated by spaces: the directory name, its owner, its group and its
     numerical mode.  For example:</para>
 
-    <programlisting>MAKE_DIRS_PERMS+= ${VARBASE}/foo/private ${ROOT_USER} ${ROOT_GROUP} 0700</programlisting>
+<programlisting>
+    MAKE_DIRS_PERMS+=         ${VARBASE}/foo/private ${ROOT_USER} ${ROOT_GROUP} 0700
+</programlisting>
 
     <para>The difference between the two is exactly the same as their
     non-<varname>PERMS</varname> counterparts.</para>
@@ -145,7 +149,9 @@ installation prefix:</para>
     specifies their owner, their group and their numeric permissions, in
     this order.  For example:</para>
 
-    <programlisting>SUPPORT_FILES_PERMS+= ${PREFIX}/share/somefile ${VARBASE}/somefile ${ROOT_USER} ${ROOT_GROUP} 0700</programlisting>
+<programlisting>
+    SUPPORT_FILES_PERMS+= ${PREFIX}/share/somefile ${VARBASE}/somefile ${ROOT_USER} ${ROOT_GROUP} 0700
+</programlisting>
 
     <para>The difference between the two is exactly the same as their
     non-<varname>PERMS</varname> counterparts.</para>
@@ -267,7 +273,9 @@ achieve it.  If you are lucky, though, it may be as easy as passing an
 extra flag to the configuration script; this is the case of GNU Autoconf-
 generated files:</para>
 
-<programlisting>CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}</programlisting>
+<programlisting>
+    CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+</programlisting>
 
 <para>Note that this specifies where the package has to <emphasis>look
 for</emphasis> its configuration files, not where they will be originally
@@ -303,8 +311,10 @@ used.  Check out <xref linkend="files-outside-prefix" /> for information
 about their syntax and their purpose.  Here is an example, taken from the
 <filename role="pkg">mail/mutt</filename> package:</para>
 
-<programlisting>EGDIR=        ${PREFIX}/share/doc/mutt/samples
-CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc</programlisting>
+<programlisting>
+    EGDIR=        ${PREFIX}/share/doc/mutt/samples
+    CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+</programlisting>
 
 <para>Note that the <varname>EGDIR</varname> variable is specific to that
 package and has no meaning outside it.</para>
@@ -355,7 +365,9 @@ to:</para>
     without its extension, to the <varname>RCD_SCRIPTS</varname> variable.
     Continuing the previous example:</para>
 
-    <programlisting>RCD_SCRIPTS+= cupsd</programlisting>
+<programlisting>
+    RCD_SCRIPTS+=   cupsd
+</programlisting>
   </listitem>
 
 </orderedlist>
@@ -418,7 +430,9 @@ installation, it can do so by using the pkginstall framework.</para>
 <varname>PKG_USERS</varname> variable.  Each entry has the following
 syntax, which mimics <filename>/etc/passwd</filename>:</para>
 
-<programlisting>user:group[:[userid][:[descr][:[home][:shell]]]]</programlisting>
+<programlisting>
+    user:group[:[userid][:[descr][:[home][:shell]]]]
+</programlisting>
 
 <para>Only the user and group are required; everything else is optional,
 but the colons must be in the right places when specifying optional bits.
@@ -426,14 +440,18 @@ By default, a new user will have home directory
 <filename>/nonexistent</filename>, and login shell
 <filename>/sbin/nologin</filename> unless they are specified as part of the
 user element.  Note that if the description contains spaces, then spaces
-should be double backslash-escaped, as in:</para>
+should be backslash-escaped, as in:</para>
 
-<programlisting>foo:foogrp::The\\ Foomister</programlisting>
+<programlisting>
+    foo:foogrp::The\ Foomister
+</programlisting>
 
 <para>Similarly, groups can be created using the
 <varname>PKG_GROUPS</varname> variable, whose syntax is:</para>
 
-<programlisting>group[:groupid]</programlisting>
+<programlisting>
+    group[:groupid]
+</programlisting>
 
 <para>As before, only the group name is required; the numeric identifier is
 optional.</para>
@@ -456,8 +474,10 @@ accomplish this task.</para>
 add some hooks to the installation scripts to handle it.  Consider the
 following example, taken from <filename role="pkg">shells/zsh</filename>:</para>
 
-<programlisting>USE_PKGINSTALL= YES
-PKG_SHELL=      ${PREFIX}/bin/zsh</programlisting>
+<programlisting>
+    USE_PKGINSTALL= YES
+    PKG_SHELL=      ${PREFIX}/bin/zsh
+</programlisting>
 
 <!-- ================================================================== -->
 
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index af5ce87c781..6af4b45fb46 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.14 2005/09/14 17:04:17 reed Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.15 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -297,8 +297,11 @@
 	<para>The TERM setting used for DOS-type console windows (including those
 	  invoked by the csh and ksh startup shortcuts) is "interix".  Most systems
 	  don't have a termcap/terminfo entry for it, but the following .termcap
-	  entry provides adequate emulation in most cases:
-          <programlisting>interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:</programlisting></para>
+	  entry provides adequate emulation in most cases:</para>
+
+<programlisting>
+    interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
+</programlisting>
 
       </sect3>
     </sect2>
@@ -338,7 +341,11 @@
 	course, your compiler's man pages for details.</para>
 
       <para>If you are using SGI's MIPSPro compiler, please set
-         <programlisting>PKGSRC_COMPILER=mipspro</programlisting>
+
+<programlisting>
+    PKGSRC_COMPILER=        mipspro
+</programlisting>
+
         in <filename>/etc/mk.conf</filename>.  Otherwise, pkgsrc will assume you
         are using gcc and may end up passing invalid flags to the compiler.  Note that
         bootstrap should create an appropriate <filename>mk.conf.example</filename> by
@@ -365,9 +372,12 @@
       </para>
 
       <para>To bootstrap using icc, assuming the default icc installation
-        directory:
-        <programlisting>env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
-                ac_cv___attribute__=yes ./bootstrap</programlisting></para>
+        directory:</para>
+
+<programlisting>
+    env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
+            ac_cv___attribute__=yes ./bootstrap
+</programlisting>
 
       <note>
         <para>icc 8.1 needs the `-i-static' argument instead of -static-libcxa.</para>
@@ -381,15 +391,21 @@
         compiler.</para>
 
      <para>After bootstrapping, you should set <varname>PKGSRC_COMPILER</varname>
-        in <filename>/etc/mk.conf</filename>:
-        <programlisting>PKGSRC_COMPILER=icc</programlisting></para>
+        in <filename>/etc/mk.conf</filename>:</para>
+
+<programlisting>
+    PKGSRC_COMPILER=        icc
+</programlisting>
 
      <para>The default installation directory for icc is
         <filename>/opt/intel_cc_80</filename>, which
         is also the pkgsrc default. If you have installed it into a different
         directory, set <varname>ICCBASE</varname> in
-        <filename>/etc/mk.conf</filename>:
-        <programlisting>ICCBASE=/opt/icc</programlisting></para>
+        <filename>/etc/mk.conf</filename>:</para>
+
+<programlisting>
+    ICCBASE=                /opt/icc
+</programlisting>
 
      <para>pkgsrc uses the static linking method of the runtime libraries
         provided by icc, so binaries can be run on other systems which do not
@@ -440,11 +456,13 @@
 	    as well. You can work around this by enclosing all the pkgsrc-specific parts 
 	    of the file with:</para>
 
-          <programlisting>.ifdef BSD_PKG_MK
-# pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
-.else
-# OpenBSD stuff
-.endif</programlisting>
+<programlisting>
+    .ifdef BSD_PKG_MK
+    # pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
+    .else
+    # OpenBSD stuff
+    .endif
+</programlisting>
 	</listitem>
       </orderedlist>
     </sect2>
@@ -526,13 +544,17 @@
 	  optionally, <varname>CPP</varname> in <filename>/etc/mk.conf</filename>,
 	  e.g.:</para>
 
-        <programlisting>CC=     cc
-CXX=    CC
-CPP=    /usr/ccs/lib/cpp</programlisting>
+<programlisting>
+    CC=     cc
+    CXX=    CC
+    CPP=    /usr/ccs/lib/cpp
+</programlisting>
 
 	<para>You may also want to build 64-bit binaries, e.g.:</para>
 
-        <programlisting>CFLAGS= -xtarget=ultra -xarch=v9</programlisting>
+<programlisting>
+    CFLAGS= -xtarget=ultra -xarch=v9
+</programlisting>
 
 	<para>Whichever compiler you use, please ensure the compiler tools and
 	  your $prefix are in your <varname>PATH</varname>. This includes
diff --git a/doc/guide/files/plist.xml b/doc/guide/files/plist.xml
index d776222e767..dd13d26d84f 100644
--- a/doc/guide/files/plist.xml
+++ b/doc/guide/files/plist.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: plist.xml,v 1.9 2005/09/28 13:02:44 rillig Exp $ -->
+<!-- $NetBSD: plist.xml,v 1.10 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="plist">
   <title>PLIST issues</title>
@@ -21,7 +21,9 @@
       <filename>PLIST</filename> file you write:
     </para>
 
-    <programlisting>@comment &#36;NetBSD&#36;</programlisting>
+<programlisting>
+    @comment &#36;NetBSD&#36;
+</programlisting>
   </sect1>
     
   <sect1 id="automatic-plist-generation">
@@ -55,17 +57,17 @@
       <filename>libdata/foo</filename> directory removed from the
       resulting PLIST:</para> 
   
-    <programlisting>
-      PRINT_PLIST_AWK+= /^libdata\/foo/ { next; }
-    </programlisting>
+<programlisting>
+    PRINT_PLIST_AWK+=       /^libdata\/foo/ { next; }
+</programlisting>
   
     <para> And to get all the <varname>@dirrm</varname> lines referring
       to a specific (shared) directory converted to
       <varname>@comment</varname>s: </para> 
   
-    <programlisting>
-      PRINT_PLIST_AWK+= /^@dirrm share\/specific/ { print "@comment " $$0; next; }
-    </programlisting>
+<programlisting>
+    PRINT_PLIST_AWK+=       /^@dirrm share\/specific/ { print "@comment " $$0; next; }
+</programlisting>
   </sect1>
     
   
@@ -156,7 +158,9 @@
       following way, similar to <varname>MESSAGE_SUBST</varname> (see <xref
       linkend="components.optional"/>): </para>
 
-    <programlisting>PLIST_SUBST+=    SOMEVAR="somevalue"</programlisting>
+<programlisting>
+    PLIST_SUBST+=   SOMEVAR="somevalue"
+</programlisting>
 
     <para>This replaces all occurrences of <quote>${SOMEVAR}</quote>
       in the PLIST with <quote>somevalue</quote>.  </para>
@@ -233,9 +237,9 @@
       an extra package to remove it.  Therefore, one simply does:
       </para>
   
-    <programlisting>
-      @unexec ${RMDIR} %D/path/to/shared/directory 2>/dev/null || ${TRUE}
-    </programlisting>
+<programlisting>
+    @unexec ${RMDIR} %D/path/to/shared/directory 2>/dev/null || ${TRUE}
+</programlisting>
   
     <para> in the PLISTs of all affected packages, instead of the
       regular "@dirrm" line. </para>
@@ -262,10 +266,10 @@
     <para> From now on, we'll discuss the second solution.  To get an
       idea of the *-dirs packages available, issue: </para>
       
-    <programlisting>
-      &cprompt; cd .../pkgsrc
-      &cprompt; ls -d */*-dirs
-    </programlisting>
+<programlisting>
+    &cprompt; cd .../pkgsrc
+    &cprompt; ls -d */*-dirs
+</programlisting>
   
     <para> Their use from other packages is very simple.  The
       <varname>USE_DIRS</varname> variable takes a list of package names
@@ -278,9 +282,9 @@
       following line in it: 
       </para>
   
-    <programlisting>
-      USE_DIRS+= xdg-1.1
-    </programlisting>
+<programlisting>
+    USE_DIRS+=      xdg-1.1
+</programlisting>
   
     <para> After regenerating the PLIST using <command>make
       print-PLIST</command>, you should get the right (commented out)
diff --git a/doc/guide/files/submit.xml b/doc/guide/files/submit.xml
index 397c363f7f4..d13152f3320 100644
--- a/doc/guide/files/submit.xml
+++ b/doc/guide/files/submit.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: submit.xml,v 1.7 2005/06/08 23:03:49 wiz Exp $ -->
+<!-- $NetBSD: submit.xml,v 1.8 2005/10/23 11:25:58 rillig Exp $ -->
 
 <chapter id="submit"> <?dbhtml filename="submit.html"?>
 <title>Submitting and Committing</title>
@@ -93,8 +93,8 @@ packages here:
 </para>
 
 <programlisting>
-  % cd .../pkgsrc/category/pkgname
-  % cvs import pkgsrc/category/pkgname TNF pkgsrc-base
+    &uprompt; cd .../pkgsrc/category/pkgname
+    &uprompt; cvs import pkgsrc/category/pkgname TNF pkgsrc-base
 </programlisting>
 
 <para>