Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -3058,7 +3058,7 @@
       <para>For example,</para>
 
       <programlisting>RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
-xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
+		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
 
       <para>will check if the file or directory
 	<filename>/usr/local/news/bin/innd</filename> exists, and
@@ -3414,9 +3414,9 @@
 
 	<programlisting>.include &lt;bsd.port.pre.mk&gt;
 
-	  .if exists(${LOCALBASE}/bin/foo)
-	  LIB_DEPENDS=	libbar.so:${PORTSDIR}/foo/bar
-	  .endif</programlisting>
+.if exists(${LOCALBASE}/bin/foo)
+LIB_DEPENDS=	libbar.so:${PORTSDIR}/foo/bar
+.endif</programlisting>
       </example>
 
       <para>The problem with trying to automatically add dependencies
@@ -3513,10 +3513,11 @@
 # default
 RESOLUTION?=	300
 .if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
-${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
-@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
-@${FALSE}
+    ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
+pre-everything::
+	@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
+	@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
+	@${FALSE}
 .endif</programlisting>
 
     <para><package role="port">japanese/xdvi300</package> also has all
@@ -3884,9 +3885,11 @@
 	  <literal>Malformed conditional</literal>, an alternative
 	  syntax can be used.</para>
 
-	<programlisting>.if !empty(VARIABLE:MVALUE)
-# as an alternative to
-.if ${VARIABLE:MVALUE}</programlisting>
+	<programlisting>.if !empty(VARIABLE:MVALUE)</programlisting>
+	
+	<para>as an alternative to</para>
+
+	<programlisting>.if ${VARIABLE:MVALUE}</programlisting>
       </note>
     </sect2>
 
@@ -4687,14 +4690,14 @@
 	example:</para>
 
       <programlisting>post-install:
-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting>
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting>
 
       <para>When multiple files need to be stripped:</para>
 
       <programlisting>post-install:
-	  .for l in geometry media body track world
-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0
-	  .endfor</programlisting>
+.for l in geometry media body track world
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0
+.endfor</programlisting>
 
       <para>Use &man.file.1; on a file to determine if it has been
 	stripped.  Binaries are reported by &man.file.1; as
Index: en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
@@ -408,7 +408,7 @@
 	variable:</para>
 
       <programlisting>post-patch:
-      @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
+	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
 
       <para>Quite often, software being ported uses the CR/LF
 	convention in source files.  This may cause problems with
Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -1772,11 +1772,11 @@
 	<para>This snippet demonstrates the use of
 	  <application>qmake</application> for a Qt 4 port:</para>
 
-	<programlisting>USES=			qmake:outsource
+	<programlisting>USES=		qmake:outsource
 USE_QT4=	moc_build</programlisting>
 
 	<para>For a Qt 5 port:</para>
-	<programlisting>USES=	qmake:outsource
+	<programlisting>USES=		qmake:outsource
 USE_QT5=	buildtools_build</programlisting>
       </example>
 
@@ -1795,8 +1795,8 @@
 	    include and library search paths via the command
 	    line, use:</para>
 
-	  <programlisting>QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \
-	LIBS+=-L${LOCALBASE}/lib</programlisting>
+	  <programlisting>QMAKE_ARGS+=	INCLUDEPATH+=${LOCALBASE}/include \
+		LIBS+=-L${LOCALBASE}/lib</programlisting>
 	</listitem>
 
 	<listitem>