Applied the "detab" tab->space conversion.

11 files changed, 124 insertions, 124 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index 44d21ce4cf0..16923fd3818 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.11 2005/05/08 13:52:17 wiz Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.12 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -71,7 +71,7 @@
 	  As used in this example, <varname>_ACCEPTABLE=yes</varname>
 	  accepts <emphasis>all</emphasis> licenses.</para>
 
-	<programlisting>PACKAGES?=      ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
+        <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
@@ -131,7 +131,7 @@ _ACCEPTABLE=    yes</programlisting>
 	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
+if [ -f /usr/pkg/etc/rc.d/sshd ]; then
     /usr/pkg/etc/rc.d/sshd
 fi</programlisting>
 
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 1e9e3fdce7e..8bb3a301abf 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.4 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: build.xml,v 1.5 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -103,15 +103,15 @@
 	<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
@@ -145,7 +145,7 @@ 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
@@ -207,7 +207,7 @@ 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
+          <programlisting>     EXTRACT_SUFX=   .msg.gz
      EXTRACT_CMD=            zcat
      EXTRACT_BEFORE_ARGS=
      EXTRACT_AFTER_ARGS=     |sh</programlisting>
@@ -260,7 +260,7 @@ CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}	\
 	    default <quote>configure</quote>. Here's an example from
 	    the <pkg>sysutils/top</pkg> package:</para>
 
-	  <programlisting>HAS_CONFIGURE=          yes
+          <programlisting>HAS_CONFIGURE=          yes
 CONFIGURE_SCRIPT=       Configure
 CONFIGURE_ARGS+=        netbsd13</programlisting>
 
diff --git a/doc/guide/files/buildlink.xml b/doc/guide/files/buildlink.xml
index a93074834b2..a08d344194c 100644
--- a/doc/guide/files/buildlink.xml
+++ b/doc/guide/files/buildlink.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.2 2005/04/12 16:13:27 tv Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
@@ -69,7 +69,7 @@
     <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>
 
@@ -168,25 +168,25 @@
       <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
+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
+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"
 
-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
@@ -441,33 +441,33 @@ BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//} </programlisting>
 # IS_BUILTIN.foo is set to "yes" or "no" depending on whether "foo"
 # genuinely exists in the system or not.
 #
-IS_BUILTIN.foo?=	no
+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
+BUILTIN_PKG.foo?=       foo-1.0
 .  endif
 .endif  # IS_BUILTIN.foo
 
 .if !defined(USE_BUILTIN.foo)
-USE_BUILTIN.foo?=	${IS_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";						\
+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
+.endif  # USE_BUILTIN.foo
 
-CHECK_BUILTIN.foo?=	no
+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
@@ -552,8 +552,8 @@ CHECK_BUILTIN.foo?=	no
         bits on a NetBSD system, you can set: </para>
 	
       <programlisting>
-	PREFER_PKGSRC=	yes
-	PREFER_NATIVE=	getopt skey tcp_wrappers
+        PREFER_PKGSRC=  yes
+        PREFER_NATIVE=  getopt skey tcp_wrappers
       </programlisting>
 
       <para> A package <emphasis>must</emphasis> have a
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index b36da5c0da0..d4bcb1dda73 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.4 2005/05/07 15:28:40 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.5 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
   <title>Package components - files, directories and contents</title>
@@ -354,7 +354,7 @@ converters    games         mbone         print         x11</programlisting>
       accordingly, e.g.   <pkg>editors/sam</pkg> again, but the quick
       answer is: </para>
 
-    <programlisting>WRKSRC=		${WRKDIR}</programlisting>
+    <programlisting>WRKSRC=             ${WRKDIR}</programlisting>
 
     <para> Please note that the old <varname>NO_WRKSUBDIR</varname>
       has been deprecated and should not be used. Also, if your
diff --git a/doc/guide/files/examples.xml b/doc/guide/files/examples.xml
index 9b9de13c74b..962375bb038 100644
--- a/doc/guide/files/examples.xml
+++ b/doc/guide/files/examples.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: examples.xml,v 1.3 2005/05/10 00:05:03 rillig Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.4 2005/05/14 22:34:59 rillig Exp $ -->
 
 <appendix id="examples">
   <title>A simple example package: bison</title>
@@ -18,16 +18,16 @@
       <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>
     </sect2>
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index c7538793236..44ad5686e4a 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.7 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.8 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
   <title>Frequently Asked Questions</title>
@@ -258,12 +258,12 @@
 	resume downloads, you'll have to use something like:</para>
 
     <programlisting>
-	FETCH_CMD=wget
-	.if defined(FETCH_CMD) &amp;&amp; ${FETCH_CMD} == "wget"
-	FETCH_BEFORE_ARGS=--passive-ftp
-	FETCH_RESUME_ARGS=-c
-	FETCH_OUTPUT_ARGS=-O
-	.endif
+        FETCH_CMD=wget
+        .if defined(FETCH_CMD) &amp;&amp; ${FETCH_CMD} == "wget"
+        FETCH_BEFORE_ARGS=--passive-ftp
+        FETCH_RESUME_ARGS=-c
+        FETCH_OUTPUT_ARGS=-O
+        .endif
     </programlisting>
 
 </sect1>
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 395748bd777..bcb79f3dd61 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.13 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.14 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Notes on fixes for packages</title>
@@ -901,7 +901,7 @@ pre-configure:
           <filename>/etc/mk.conf</filename> to indicate acceptance of
           the particular license:</para>
 
-	<programlisting>ACCEPTABLE_LICENSES+=graphviz-license</programlisting>
+        <programlisting>ACCEPTABLE_LICENSES+=graphviz-license</programlisting>
 
 	<para>When adding a package with a new license, the license
           text should be added to <filename>pkgsrc/licenses</filename>
diff --git a/doc/guide/files/ftp-layout.xml b/doc/guide/files/ftp-layout.xml
index 2ce86a5e862..34e9a61fb84 100644
--- a/doc/guide/files/ftp-layout.xml
+++ b/doc/guide/files/ftp-layout.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.2 2005/01/10 21:00:38 hubertf Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
 
 <appendix id="ftp-layout">
   <title>Layout of the FTP server's package archive</title>
@@ -64,7 +64,7 @@
                 SunOS-5.9/
                         sparc -> ../pkgsrc-2004Q1/SunOS-5.9/sparc
                         x86 -> ../pkgsrc-2004Q1/SunOS-5.9/x86
-			</programlisting>
+                        </programlisting>
 
   <para>
     To create:</para>
@@ -78,9 +78,9 @@
       <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
+        pkgsrc-2004Q4/\                         # pkgsrc-branch
+        `uname -s`-`uname -r`/                  # OS & version
+        `uname -p`                              # architecture
        </programlisting>
 
     </listitem>
diff --git a/doc/guide/files/makefile.xml b/doc/guide/files/makefile.xml
index 62142e00c04..b55ca920d09 100644
--- a/doc/guide/files/makefile.xml
+++ b/doc/guide/files/makefile.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: makefile.xml,v 1.11 2005/05/14 03:30:56 rillig Exp $ -->
+<!-- $NetBSD: makefile.xml,v 1.12 2005/05/14 22:34:59 rillig Exp $ -->
 
 <!-- based on:
 pkgsrc/bootstrap/bmake/for.c 1.1.1.1
@@ -129,16 +129,16 @@ pkgsrc/bootstrap/bmake/var.c 1.2
       <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
-
-INT_LIST+=		${STRING}		# 1
-INT_LIST+=		${ANOTHER_INT_LIST}	# 2
-EXT_LIST+=		${STRING:Q}		# 3
-EXT_LIST+=		${ANOTHER_EXT_LIST}	# 4
+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>
 
       <para>When you add a string to an external list (example 3), it
@@ -153,9 +153,9 @@ EXT_LIST+=		${ANOTHER_EXT_LIST}	# 4
       <title>Converting an internal list into an external list</title>
 
       <programlisting>
-EXT_LIST=	# empty
+EXT_LIST=       # empty
 .for i in ${INT_LIST}
-EXT_LIST+=	${i:Q}""
+EXT_LIST+=      ${i:Q}""
 .endfor
       </programlisting>
 
@@ -171,16 +171,16 @@ EXT_LIST+=	${i:Q}""
       <title>Passing variables to a shell command</title>
 
       <programlisting>
-STRING=		foo bar <    > * `date` $$HOME ' "
-EXT_LIST=	string=${STRING:Q} x=second\ item
+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"'
+        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
@@ -240,17 +240,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>
+        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
@@ -269,19 +269,19 @@ all:
 	are two completely different cases which can be solved with the
 	same trick.</para>
 
-	<programlisting>
-EMPTY=			# empty
+        <programlisting>
+EMPTY=                  # empty
 empty_test:
-	for i in a ${EMPTY:Q} c; do \
-		echo "$$i"; \
-	done
+        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"
+        echo ${i:Q}
+        echo "foo"
 .endfor
-	</programlisting>
+        </programlisting>
 
 	<para>The first example will only print two of the three lines
 	we might have expected. This is because
diff --git a/doc/guide/files/options.xml b/doc/guide/files/options.xml
index 193afe347b3..72b12484aac 100644
--- a/doc/guide/files/options.xml
+++ b/doc/guide/files/options.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: options.xml,v 1.2 2005/05/06 23:28:50 wiz Exp $ -->
+<!-- $NetBSD: options.xml,v 1.3 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="options">
   <title>Options handling</title>
@@ -34,19 +34,19 @@
       <programlisting>
 # Global and legacy options
 .if defined(WIBBLE_USE_OPENLDAP) && !empty(WIBBLE_USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap
+PKG_DEFAULT_OPTIONS+=   ldap
 .endif
 .if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sasl
+PKG_DEFAULT_OPTIONS+=   sasl
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.wibble
-PKG_SUPPORTED_OPTIONS=	ldap sasl
+PKG_OPTIONS_VAR=        PKG_OPTIONS.wibble
+PKG_SUPPORTED_OPTIONS=  ldap sasl
 #
 # Default options for "wibble" package.
 #
 .if !defined(PKG_OPTIONS.wibble)
-PKG_DEFAULT_OPTIONS+=	sasl
+PKG_DEFAULT_OPTIONS+=   sasl
 endif
 .include "../../mk/bsd.options.mk"
 
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=      --enable-ldap=${BUILDLINK_PREFIX.openldap}
 ###
 .if !empty(PKG_OPTIONS:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-sasl=${BUILDLINK_PREFIX.sasl}
+CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
 .endif
       </programlisting>
 
@@ -108,20 +108,20 @@ CONFIGURE_ARGS+=	--enable-sasl=${BUILDLINK_PREFIX.sasl}
             always removed from the selected build options, e.g.
 	    </para>
 
-	  <programlisting>
-	PKG_DEFAULT_OPTIONS=	kerberos ldap sasl
-	PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
-	WIBBLE_OPTIONS=		${PKG_DEFAULT_OPTIONS} -sasl
-	# implies PKG_OPTIONS == "kerberos ldap"
-	  </programlisting>
+          <programlisting>
+        PKG_DEFAULT_OPTIONS=    kerberos ldap sasl
+        PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
+        WIBBLE_OPTIONS=         ${PKG_DEFAULT_OPTIONS} -sasl
+        # implies PKG_OPTIONS == "kerberos ldap"
+          </programlisting>
 
           <para>or</para>
 
-	  <programlisting>
-	PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
-	WIBBLE_OPTIONS=		kerberos -ldap ldap
-	# implies PKG_OPTIONS == "kerberos"
-	  </programlisting>
+          <programlisting>
+        PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
+        WIBBLE_OPTIONS=         kerberos -ldap ldap
+        # implies PKG_OPTIONS == "kerberos"
+          </programlisting>
 
 	  <para> This variable should be set in
             <filename>/etc/mk.conf</filename>. </para>
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index b39510f3351..7470cdda938 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.8 2005/05/08 13:53:06 wiz Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.9 2005/05/14 22:34:59 rillig Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -290,7 +290,7 @@
 	  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>
+          <programlisting>interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:</programlisting></para>
 
       </sect3>
     </sect2>
@@ -359,7 +359,7 @@
       <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>
+                ac_cv___attribute__=yes ./bootstrap</programlisting></para>
 
       <note>
         <para>icc 8.1 needs the `-i-static' argument instead of -static-libcxa.</para>
@@ -374,7 +374,7 @@
 
      <para>After bootstrapping, you should set <varname>PKGSRC_COMPILER</varname>
         in <filename>/etc/mk.conf</filename>:
-	<programlisting>PKGSRC_COMPILER=icc</programlisting></para>
+        <programlisting>PKGSRC_COMPILER=icc</programlisting></para>
 
      <para>The default installation directory for icc is
         <filename>/opt/intel_cc_80</filename>, which
@@ -432,7 +432,7 @@
 	    as well. You can work around this by enclosing all the pkgsrc specific parts 
 	    of the file with:</para>
 
-	  <programlisting>.ifdef BSD_PKG_MK
+          <programlisting>.ifdef BSD_PKG_MK
 # pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
 .else
 # OpenBSD stuff
@@ -517,13 +517,13 @@
 	  optionally, <varname>CPP</varname> in <filename>/etc/mk.conf</filename>,
 	  eg.</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, eg.</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