- Remove entries for USE_AUTOCONF, USE_AUTOMAKE, USE_LIBTOOL,

USE_AUTOHEADER, which are declared as deprecated.
- Add USE_AUTOHEADER_VER entry.

Approved by:	josef (mentor)

en_US.ISO8859-1/books/porters-handbook/book.sgml

@@ -645,7 +645,7 @@ lib/X11/oneko/mouse.xpm
 	  <command>autoconf</command> to regenerate
 	  <command>configure</command>, do not take the diffs of
 	  <command>configure</command> (it often grows to a few thousand
-	  lines!); define <literal>USE_AUTOCONF=yes</literal> and take the
+	  lines!); define <literal>USE_AUTOCONF_VER=213</literal> and take the
 	  diffs of <filename>configure.in</filename>.</para>
 
 	<para>Also, if you had to delete a file, then you can do it in the
@@ -3085,7 +3085,7 @@ PATCHFILES=     patch1:test</programlisting>
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_AUTOMAKE</makevar></entry>
+		<entry><makevar>USE_AUTOMAKE_VER</makevar></entry>
 
 		<entry>The port uses GNU <command>automake</command> as part
 		  of its build process.  See <xref linkend="using-automake">
@@ -3094,7 +3094,7 @@ PATCHFILES=     patch1:test</programlisting>
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_AUTOCONF</makevar></entry>
+		<entry><makevar>USE_AUTOCONF_VER</makevar></entry>
 
 		<entry>The port uses GNU <command>autoconf</command> as part
 		  of its build process.  See <xref linkend="using-automake">
@@ -3103,7 +3103,7 @@ PATCHFILES=     patch1:test</programlisting>
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_LIBTOOL</makevar></entry>
+		<entry><makevar>USE_LIBTOOL_VER</makevar></entry>
 
 		<entry>The port uses GNU <command>libtool</command> as part of
 		  its build process.  See <xref linkend="using-automake"> for
@@ -3148,7 +3148,7 @@ PATCHFILES=     patch1:test</programlisting>
 	    <makevar>USE_IMAKE</makevar>).  Define
 	    <literal>USE_GMAKE=yes</literal> if your port requires GNU
 	    <command>make</command> instead of BSD <command>make</command>.
-	    Define <literal>USE_AUTOCONF=yes</literal> if your port requires
+	    Define <literal>USE_AUTOCONF_VER=213</literal> if your port requires
 	    GNU autoconf to be run.  Define <literal>USE_QT=yes</literal> if
 	    your port uses the latest qt toolkit.  Use
 	    <literal>USE_PERL5=yes</literal> if your port requires version 5
@@ -3329,7 +3329,7 @@ PORTVERSION=   1.0</programlisting>
 	  <command>configure</command>), set those extra arguments in
 	  <makevar>CONFIGURE_ARGS</makevar>.  If your package uses GNU
 	  <command>autoconf</command>, set
-	  <literal>USE_AUTOCONF=yes</literal>.  This implies
+	  <literal>USE_AUTOCONF_VER=213</literal>.  This implies
 	  <makevar>GNU_CONFIGURE</makevar>, and will cause
 	  <command>autoconf</command> to be run before
 	  <command>configure</command>.</para>
@@ -3689,14 +3689,6 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 	  </thead>
 
 	  <tbody>
-	    <row>
-	      <entry><makevar>USE_AUTOMAKE</makevar></entry>
-
-	      <entry>The port uses <command>automake</command>.  Implies
-		<makevar>USE_AUTOCONF</makevar> and
-		<literal><makevar>USE_AUTOMAKE_VER</makevar>?=14</literal>.</entry>
-	      </row>
-
 	    <row>
 	      <entry><makevar>AUTOMAKE</makevar></entry>
 
@@ -3759,17 +3751,10 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 	      <entry><makevar>USE_AUTOCONF_VER</makevar></entry>
 
 	      <entry>Specifies that the port uses <command>autoconf</command>.
+		Implies <literal>GNU_CONFIGURE</literal>.
 		The default value is 213.</entry>
 	    </row>
 
-	    <row>
-	      <entry><makevar>USE_AUTOCONF</makevar></entry>
-
-	      <entry>Specifies that the port uses <command>autoconf</command>.
-		Implies <literal>GNU_CONFIGURE</literal> and
-		<literal>USE_AUTOCONF_VER?=213</literal>.</entry>
-	    </row>
-
 	    <row>
 	      <entry><makevar>AUTOCONF</makevar></entry>
 
@@ -3795,6 +3780,13 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 		<command>autoconf</command>.</entry>
 	    </row>
 
+	    <row>
+	      <entry><makevar>USE_AUTOHEADER_VER</makevar></entry>
+
+	      <entry>Specifies that the port uses <command>autoheader</command>.
+	        Implies <literal>USE_AUTOCONF_VER</literal>.
+		The default value is 213.</entry>
+
 	    <row>
 	      <entry><makevar>AUTOHEADER</makevar></entry>
 
@@ -3828,10 +3820,11 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_LIBTOOL</makevar></entry>
+	      <entry><makevar>USE_LIBTOOL_VER</makevar></entry>
 
 	      <entry>The port uses <command>libtool</command>.  Implies
-		<makevar>GNU_CONFIGURE</makevar>.</entry>
+		<makevar>GNU_CONFIGURE</makevar>.
+		The default value is 13.</entry>
 	      </row>
 
 	    <row>