diff --git a/zh_TW.Big5/books/porters-handbook/book.sgml b/zh_TW.Big5/books/porters-handbook/book.sgml
index 90cf5ca7b7..dccdb77d1f 100644
--- a/zh_TW.Big5/books/porters-handbook/book.sgml
+++ b/zh_TW.Big5/books/porters-handbook/book.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     Original Revision: 1.876
+     Original Revision: 1.954
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -29,6 +29,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder role="mailto:doc@FreeBSD.org">FreeBSD ���p��</holder>
     </copyright>
 
@@ -54,7 +55,7 @@
     <chapter id="own-port">
       <title>�ۦ楴�y port</title>
 
-      <para>����A�}�l��ۦ�s�@ port �Χ�s�{�� port	���@�ǿ���F�ܡH�Ӧn�o�I</para>
+      <para>����A�}�l��ۦ�s�@ port �Χ�s���@�ǿ���F�ܡH�Ӧn�o�I</para>
 
       <para>�U���N���Ф@�ǫإ� port �ɸӪ`�N���ƶ��C�p�G�O�Q�ɯŲ{���� port
         �A����]�аѾ\ <xref linkend="port-upgrading"> �����C</para>
@@ -72,9 +73,8 @@
         �u���@�ǥi�H����(overridden)�C�j�����������ܼ�(�D����)�q�`���|�g�b
         <filename>/usr/ports/Mk/bsd.port.mk</filename> ���A��L���]�O�t���h�C
         �Ъ`�N�G���ɨëD�ϥΤ@�몺 tab �]�w�ȡA�ӬO�ĥ� 1 �� tab ���� 4 ��
-	space�C
-        �G<application>Emacs</application> �P <application>Vim</application>
-	���ӳ��|�b���J���ɮɶ��KŪ�������]�w�ȡC
+	space�C  <application>Emacs</application> �P
+	<application>Vim</application> ���ӳ��|�b���J���ɮɶ��KŪ�������]�w�ȡC
         &man.vi.1; �� &man.ex.1; �o��ӵ{���]���i�H��
 	<command>:set tabstop=4</command> �H�ק�]�w�ȡC</para>
       </note>
@@ -226,7 +226,8 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	  <para>���M�A�Y�� port �õL�w�˦��ݪ��ؿ����ܡA�N�����]
 	    <makevar>PLIST_DIRS</makevar> �o�C</para>
 
-	  <para>�M�ӡA�ϥ� <makevar>PLIST_FILES</makevar> �B<makevar>PLIST_DIRS</makevar> �O�����I�X�N���G
+	  <para>�M�ӡA�ϥ� <makevar>PLIST_FILES</makevar>�B
+	    <makevar>PLIST_DIRS</makevar> �O�����I�X�N���G
 	    ����ϥ� &man.pkg.create.1; ���һ��� command sequences�C
 	    �]���A�o�۶ȾA�Ω��²�檺 port �A�H��²�Ƹ� port ���@�k�C
 	    ���~�A�o���٦��@�Ӧn�B�G�i�H��� ports collection �������ɮ��`�ơC
@@ -272,7 +273,8 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	  </listitem>
 
 	  <listitem>
-	    <para>�� port �i�H�� <command>reinstall</command> �ӭ��s�w�ˡC</para>
+	    <para>�� port �i�H�� <command>reinstall</command> �ӭ��s�w��
+	      �C</para>
 	  </listitem>
 
 	  <listitem>
@@ -429,7 +431,8 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	    <para>�䦸�A�i�� <maketarget>extract</maketarget> ���q�A���|�q
 	      <makevar>DISTDIR</makevar> ����X�� port �һݪ��ɮ�(�q�`�O gzip
 	      �榡�� tarball)�A�M������Y�� <makevar>WRKDIR</makevar>
-	      �ҳ]�w���{�ɥؿ��W��(�w�]�O <filename>work</filename> �ؿ�)���C</para>
+	      �ҳ]�w���{�ɥؿ��W��(�w�]�O <filename>work</filename> �ؿ�)��
+	      �C</para>
 	  </step>
 
 	  <step>
@@ -593,74 +596,78 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
       <sect1 id="slow-patch">
 	<title>Patching</title>
 
-	<para>In the preparation of the port, files that have been added or
-	  changed can be picked up with a &man.diff.1;
-	  for later feeding to &man.patch.1;.  Each patch you
-	  wish to apply should be saved into a file named
-	  <filename>patch-<replaceable>*</replaceable></filename> where
-	  <replaceable>*</replaceable> indicates
-	  the pathname of the file that is patched,
-	  such as <filename>patch-Imakefile</filename> or
-	  <filename>patch-src-config.h</filename>.  These files should
-	  be stored in <makevar>PATCHDIR</makevar>
-	  (usually <filename>files/</filename>, from where they will be
-	  automatically applied.  All patches must be relative to
-	  <makevar>WRKSRC</makevar> (generally the directory your port's
-	  tarball unpacks itself into, that being where the build is done).
-	  To make fixes and upgrades easier, you should avoid having more than
-	  one patch fix the same file (e.g., <filename>patch-file</filename> and
-	  <filename>patch-file2</filename> both changing
-	  <filename><makevar>WRKSRC</makevar>/foobar.c</filename>).</para>
+	<para>�b port ���dzƹL�{���A�s�W���ܧ�L���ɮסA
+	  �i�H�Q�� &man.diff.1; �N�o���ܰʦC�X�A
+	  �H�K������ &man.patch.1; �ϥΡC
+	  �Ҧ��A�Q�M�Ϊ� patch �����өR�W��
+	  <filename>patch-<replaceable>*</replaceable></filename>�A�䤤
+	  <replaceable>*</replaceable> ���ܭn patch �ɮת����|���ɦW�W�١A
+	  �Ҧp <filename>patch-Imakefile</filename> ��
+	  <filename>patch-src-config.h</filename>�C
+	  �o���ɮ׳������x�s�b <makevar>PATCHDIR</makevar>
+	  (�q�`�O <filename>files/</filename>�A��b�䤺���ɮ׳��|�۰ʳQ�M�ΡC
+	  �Ҧ� patch �ɸ��|���O�۹��
+	  <makevar>WRKSRC</makevar> (�q�`�|�N port �� tarball ������̭��A
+	  port ���ظm�]�|�b�o�̧���)�C
+	  ���F�����ץ��M��s�󶶧Q�A�A�����קK�h�� patch �ץ��P�@���ɮ�
+	  (�|�Ҩӻ��A<filename>patch-file</filename> �M
+	  <filename>patch-file2</filename> �P�ɧ��
+	  <filename><makevar>WRKSRC</makevar>/foobar.c</filename>)�C</para>
 
-	<para>Please only use characters <literal>[-+._a-zA-Z0-9]</literal> for
-	  naming your patches.  Do not use any other characters besides them.
-	  Do not name your patches like <filename>patch-aa</filename> or
-	  <filename>patch-ab</filename> etc, always mention path and file name
-	  in patch names.</para>
+	<para>�Хu�ϥ� <literal>[-+._a-zA-Z0-9]</literal> �o�Ǧr���өR�W
+	  patch �ɡA���n�ϥγo�Ǧr���H�~���r���C
+	  �d�U���n�N�A�� patch �ɩR�W�� <filename>patch-aa</filename> �άO
+	  <filename>patch-ab</filename> ���W�١A
+	  �Шϥθ��|�M�W�٬������R�W�C</para>
 
-	<para>Do not put RCS strings in patches.  CVS will mangle them when we
-	  put the files into the ports tree, and when we check them out again,
-	  they will come out different and the patch will fail.  RCS strings
-	  are surrounded by dollar (<literal>&dollar;</literal>) signs, and
-	  typically start with <literal>&dollar;Id</literal> or
-	  <literal>&dollar;RCS</literal>.</para>
+	<para>���n�N RCS �r���i�A�� patch �ɡCCVS �|�b�o���ɮװe�J
+	  ports tree ���ɭԧ˶��ɮפ��e�A�ӥB�b�N���̭��s check out
+	  �X�ӫ�A�|�]�ɮפ��e���t���y�� patch ���ѡC
+	  RCS �r��O�H���r�� (<literal>&dollar;</literal>) �A�_�Ӫ��A
+	  �q�`�H <literal>&dollar;Id</literal> ��
+	  <literal>&dollar;RCS</literal> ���}�Y�C</para>
 
-	<para>Using the recurse (<option>-r</option>) option to
-	  &man.diff.1; to generate patches is fine, but please take
-	  a look at the resulting patches to make sure you do not have any
-	  unnecessary junk in there.  In particular, diffs between two backup
-	  files, <filename>Makefile</filename>s when the port uses
-	  <command>Imake</command> or GNU <command>configure</command>, etc.,
-	  are unnecessary and should be deleted.  If you had to edit
-	  <filename>configure.in</filename> and run
-	  <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_AUTOTOOLS=autoconf:261</literal> and take the
-	  diffs of <filename>configure.in</filename>.</para>
+	<para>�A�i�H�ϥ� &man.diff.1; �f�t recurse (<option>-r</option>) �ﶵ
+	  �Ӳ��� patch �ɡA���ЦA���˵����ͥX�� patch �ɡA�T�O�A�S������
+	  ���󤣥��n���U����T�b�̭��C�S�O�O�墨�Ǹg��
+	  <command>Imake</command> �� GNU <command>configure</command>
+	  �Ҳ��ͪ� <filename>Makefile</filename> �ɲ��� patch�A
+	  ���O�����n���A�o���� patch �ɳ����ӳQ�R���C���p�A�����z�L�ק�
+	  <command>configure.in</command> �A����
+	  <command>autoconf</command> �ӭ��s����
+	  <command>configure</command>�A���n��
+	  <command>configure</command> ���� patch �� (�o�����|�����Ƥd��I)�F
+	  �Щw�q <literal>USE_AUTOTOOLS=autoconf:261</literal> �ù�
+	  <filename>configure.in</filename> ���� patch �ɡC</para>
 
-	<para>If you had to delete a file, then you can do it in the
-	  <maketarget>post-extract</maketarget> target rather than as part of
-	  the patch.</para>
+	<para>�о��q���n��L�Ϊ� whitespace �@�ק�A�]���b Open Source �ɦU��
+	  project ���|�ϥΫܦh�ۦP�� code base�A�o�ǥi��o�O�ĥΤ��P���s�Ƥ覡
+	  �Bcoding style�C  �Y�n�չϧ��ܳo�ǽs�ƭ��檺�ܡA�Фp�ߡG
+	  �o�ǥu�|�O�{�ҵL�\�����C  ���~���ȷ|�y�� CVS repository �Ŷ����O�A
+	  �]�|���H���H��X�u�����D�p���Ҧb�A�H�Τ��뤣�X�o�q patch �쩳�b�@����
+	  �C</para>
 
-	<para>Simple replacements can be performed directly from the port
-	  <filename>Makefile</filename> using the in-place mode of
-	  &man.sed.1;.  This is very useful when you need to patch in
-	  a variable value. Example:</para>
+	<para>���p�A�����R���@���ɮסA����A�i�H�b
+	  <maketarget>post-extract</maketarget> ���q���o��ơA
+	  �Ӥ��O�b patch ���q�C</para>
+
+	<para>�A�i�H�����b port ��
+	  <filename>Makefile</filename> ������²�檺�m���u�@�A�u�ݨϥ�
+	  &man.sed.1; �� in-place mode �Y�i�C�o�b�u�� patch �@���ܼƪ��Ȯɬ۷����ΡC
+	  �Ҧp�G</para>
 
 	<programlisting>post-patch:
 	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure</programlisting>
 
-	<para>Quite often, there is a situation when the software being
-	  ported, especially if it is primarily developed on &windows;, uses
-	  the CR/LF convention for most of its source files.  This may cause
-	  problems with further patching, compiler warnings, scripts
-	  execution (<command>/bin/sh^M</command> not found), etc.  To
-	  quickly convert all files from CR/LF to just LF, add
-	  <literal>USE_DOS2UNIX=yes</literal> to the port
-	  <filename>Makefile</filename>.  A list of files to convert can
-	  be specified:</para>
+	<para>�b���ӳn��ɡA�S�O�O���Ǧb &windows; ���x�}�o���n��A
+	  �ɱ`�|�J��@�ر��p�A�N�O�b�j������ source file ���A
+	  �ϥ� CR/LF �����_��C�o�|�v�T���᪺ patching�Bcompiler warnings�B�H��
+	  scripts execution (�䤣�� <command>/bin/sh^M</command> �����p) ���C
+	  ���F�ֳt�ഫ CR/LF �� LF�A�i�H��
+	  <literal>USE_DOS2UNIX=yes</literal> �[�� port ��
+	  <filename>Makefile</filename> �ɤ��C
+	  �A�]�i�H�]�w���u�w����w���ɮװ��ഫ�G</para>
 
 	<programlisting>USE_DOS2UNIX=    util.c util.h</programlisting>
 
@@ -677,39 +684,39 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programlisting>
       <sect1 id="slow-configure">
 	<title>�]�w</title>
 
-	<para>Include any additional customization commands in your
-	  <filename>configure</filename> script and save it in the
-	  <filename>scripts</filename> subdirectory.  As mentioned above, you
-	  can also do this with <filename>Makefile</filename> targets and/or
-	  scripts with the name <filename>pre-configure</filename> or
-	  <filename>post-configure</filename>.</para>
+        <para>�N�����B�~���ۭq���O�]�t�i�A��
+          <filename>configure</filename> script ���A�B�N���x�s�b
+          <filename>scripts</filename> ���l��Ƨ��̡C �p�P�W�����쪺�A
+          �A�]�i�H�b <filename>Makefile</filename> �Ϊ̬O�b
+          �W�٬� <filename>pre-configure</filename> ��
+          <filename>post-configure</filename> �� script �ɤ����P�˪��ơC</para>
       </sect1>
 
       <sect1 id="slow-user-input">
-	<title>Handling user input</title>
+	<title>�B�z�ϥΪ̿�J</title>
 
-	<para>If your port requires user input to build, configure, or install,
-	  you must set <makevar>IS_INTERACTIVE</makevar> in your <filename>Makefile</filename>.  This
-	  will allow <quote>overnight builds</quote> to skip your port if the
-	  user sets the variable <envar>BATCH</envar> in his environment (and
-	  if the user sets the variable <envar>INTERACTIVE</envar>, then
-	  <emphasis>only</emphasis> those ports requiring interaction are
-	  built).  This will save a lot of wasted time on the set of
-	  machines that continually build ports (see below).</para>
+	<para>�p�G�� port �ݭn�ϥΪ̧@�X��ܤ~��w�˪��ܡA
+	  �h�����b <filename>Makefile</filename> �[�W
+	  <makevar>IS_INTERACTIVE</makevar> �ܼơC  �p���@�ӭY�ϥΪ̦��]�w
+	  <envar>BATCH</envar> �����ܼƪ��ܡA�N�|���L�� port ���~��
+	  <quote>overnight builds</quote>(�Y�ϥΪ̧�������ܼƭȳ]��
+	  <envar>BATCH</envar> ���ܡA���� <emphasis>�u��</emphasis>
+	  ���ǻݭn�P�ϥΪ̤��ʪ� port �~�|�sĶ�C)�C
+	  �o�ϱo���ǻݭn�����sĶ port �������|�٤U�\�h�ɶ�(�᭱�|�����o�I)
+	  �C</para>
 
-	<para>It is also recommended that if there are reasonable default
-	  answers to the questions, you check the
-	  <makevar>PACKAGE_BUILDING</makevar> variable and turn off the
-	  interactive script when it is set.  This will allow us to build the
-	  packages for CDROMs and FTP.</para>
+	<para>���~��ij�A�Y�O�o�Ǥ��ʰ��D���X�A���w�]�ﶵ���ܡA
+	  �����T�{�@�U <makevar>PACKAGE_BUILDING</makevar> �ܼƸӦp��]�A
+	  �~��t�X���ܼƦӨM�w�O�_����ʡC  �p���@�Ӥ~�i�H�۰ʽsĶ�X
+	  CDROM �P FTP �W���M��C</para>
       </sect1>
     </chapter>
 
     <chapter id="makefile">
-      <title>Configuring the Makefile</title>
+      <title>�]�w Makefile</title>
 
-      <para>Configuring the <filename>Makefile</filename> is pretty simple, and again we suggest
-	that you look at existing examples before starting. Also, there is a
+      <para>�]�w <filename>Makefile</filename> �O��D�`²�檺�ơA
+	��ij�z�b�}�l�e�A���ݬݽd�ҡCAlso, there is a
 	<link linkend="porting-samplem">sample Makefile</link> in this
 	handbook, so take a look and please follow the ordering of variables
 	and sections in that template to make your port easier for others to
@@ -1499,14 +1506,14 @@ PORTEPOCH=      1</programlisting>
 	      </row>
 
 	      <row>
-		<entry><filename>graphics</filename></entry>
-		<entry>�ϧγB�z���u��n��C</entry>
+		<entry><filename>gnustep*</filename></entry>
+		<entry>GNUstep �ୱ���Ҭ������n��C</entry>
 		<entry></entry>
 	      </row>
 
 	      <row>
-		<entry><filename>gnustep*</filename></entry>
-		<entry>GNUstep �ୱ���Ҭ������n��C</entry>
+		<entry><filename>graphics</filename></entry>
+		<entry>�ϧγB�z���u��n��C</entry>
 		<entry></entry>
 	      </row>
 
@@ -1788,30 +1795,6 @@ PORTEPOCH=      1</programlisting>
 		<entry></entry>
 	      </row>
 
-	      <row>
-		<entry><filename>tcl80*</filename></entry>
-		<entry>Ports that use Tcl version 8.0 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tcl82*</filename></entry>
-		<entry>Ports that use Tcl version 8.2 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tcl83*</filename></entry>
-		<entry>Ports that use Tcl version 8.3 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tcl84*</filename></entry>
-		<entry>Ports that use Tcl version 8.4 to run.</entry>
-		<entry></entry>
-	      </row>
-
 	      <row>
 		<entry><filename>textproc</filename></entry>
 		<entry>Text processing utilities.</entry>
@@ -1825,36 +1808,6 @@ PORTEPOCH=      1</programlisting>
 		<entry></entry>
 	      </row>
 
-	      <row>
-		<entry><filename>tk80*</filename></entry>
-		<entry>Ports that use Tk version 8.0 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tk82*</filename></entry>
-		<entry>Ports that use Tk version 8.2 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tk83*</filename></entry>
-		<entry>Ports that use Tk version 8.3 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tk84*</filename></entry>
-		<entry>Ports that use Tk version 8.4 to run.</entry>
-		<entry></entry>
-	      </row>
-
-	      <row>
-		<entry><filename>tkstep80*</filename></entry>
-		<entry>Ports that use TkSTEP version 8.0 to run.</entry>
-		<entry></entry>
-	      </row>
-
 	      <row>
 		<entry><filename>ukrainian</filename></entry>
 		<entry>Ukrainian language support.</entry>
@@ -2205,14 +2158,17 @@ PORTEPOCH=      1</programlisting>
 		<entry>0.7.1d</entry>
 		<entry>0.7.1.d</entry>
 	      </row>
+
 	      <row>
 		<entry>10Alpha3</entry>
 		<entry>10.a3</entry>
 	      </row>
+
 	      <row>
 		<entry>3Beta7-pre2</entry>
 		<entry>3.b7.p2</entry>
 	      </row>
+
 	      <row>
 		<entry>8:f_17</entry>
 		<entry>8f.17</entry>
@@ -3225,14 +3181,14 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>For example,</para>
 
 	    <programlisting>RUN_DEPENDS=   ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
-	       wish8.0:${PORTSDIR}/x11-toolkits/tk80</programlisting>
+	       xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
 
 	  <para>will check if the file or directory
 	    <filename>/usr/local/etc/innd</filename> exists, and build and
 	    install it from the <filename>news/inn</filename> subdirectory of
 	    the ports tree if it is not found.  It will also see if an
-	    executable called <command>wish8.0</command> is in the search
-	    path, and descend into the <filename>x11-toolkits/tk80</filename>
+	    executable called <command>xmlcatmgr</command> is in the search
+	    path, and descend into the <filename>textproc/xmlcatmgr</filename>
 	    subdirectory of your ports tree to build and install it if it is
 	    not found.</para>
 
@@ -3721,10 +3677,13 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
 
 	  <para>These variables are designed to be set by the system
 	    administrator.  There are many that are standardized in
-	    <filename>ports/Mk/bsd.*.mk</filename>; others are not,
-	    which can be confusing.  If you need to add such a
-	    configuration variable, please consider using one of the
-	    ones from the following list.</para>
+	    <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup"><filename>ports/KNOBS</filename></ulink>
+	    file.</para>
+
+	  <para>When creating a port, do not make knob names specific to a
+	    given application.  For example in Avahi port, use
+	    <makevar>WITHOUT_MDNS</makevar> instead of
+	    <makevar>WITHOUT_AVAHI_MDNS</makevar>.</para>
 
 	  <note>
 	    <para>You should not assume that a
@@ -3743,7 +3702,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
 	  </note>
 
 	  <table frame="none">
-	    <title>The <makevar>WITH_<replaceable>*</replaceable></makevar>
+	    <title>Common <makevar>WITH_<replaceable>*</replaceable></makevar>
 	      and <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
 	      variables</title>
 
@@ -3757,37 +3716,6 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
 	      </thead>
 
 	      <tbody>
-	        <row>
-		  <entry><makevar>WITH_APACHE2</makevar></entry>
-
-		  <entry>If set, use
-		    <filename role="package">www/apache20</filename>
-		    instead of the default of
-		    <filename role="package">www/apache13</filename>.</entry>
-	        </row>
-
-	        <row>
-		  <entry><makevar>WITH_BERKELEY_DB</makevar></entry>
-
-		  <entry>Define this variable to specify the ability to
-		    use a variant of the Berkeley database package such as
-		    <filename role="package">databases/db41</filename>.
-		    An associated variable,
-		    <makevar>WITH_BDB_VER</makevar>, may be
-		    set to values such as 2, 3, 4, 41 or 42.</entry>
-	        </row>
-
-	        <row>
-		  <entry><makevar>WITH_MYSQL</makevar></entry>
-
-		  <entry>Define this variable to specify the ability to
-		    use a variant of the MySQL database package such as
-		    <filename role="package">databases/mysql40-server</filename>.
-		    An associated variable,
-		    <makevar>WANT_MYSQL_VER</makevar>, may be
-		    set to values such as 323, 40, 41, or 50.</entry>
-	        </row>
-
 	        <row id="knobs-without-nls">
 		  <entry><makevar>WITHOUT_NLS</makevar></entry>
 
@@ -3805,19 +3733,9 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
 	        <row>
 		  <entry><makevar>WITH_OPENSSL_PORT</makevar></entry>
 
-		  <entry>Use the version of OpenSSL from
+		  <entry>Installs the version of OpenSSL from
 		    <filename role="package">security/openssl</filename>,
-		    overwriting the version that was originally installed
-		    in the base system.</entry>
-	        </row>
-
-	        <row>
-		  <entry><makevar>WITH_POSTGRESQL</makevar></entry>
-
-		  <entry>Define this variable to specify the ability to
-		    use a variant of the PostGreSQL database package such as
-		    <filename role="package">databases/postgresql72</filename>.
-		    </entry>
+		    even if the base is up to date.</entry>
 	        </row>
 
 	        <row>
@@ -4555,26 +4473,11 @@ PORTVERSION=   1.0</programlisting>
 	  argument is <literal>--prefix=&dollar;{PREFIX}
 	  --infodir=&dollar;{PREFIX}/&dollar;{INFO_PATH}
 	  --mandir=&dollar;{MANPREFIX}/man
-	  &dollar;{CONFIGURE_TARGET}</literal>), set those
+	  --build=&dollar;{CONFIGURE_TARGET}</literal>), set those
 	  extra arguments in <makevar>CONFIGURE_ARGS</makevar>.  Extra
 	  environment variables can be passed using
 	  <makevar>CONFIGURE_ENV</makevar> variable.</para>
 
-	<para>If your package uses GNU <command>configure</command>, and
-	  the resulting executable file has a <quote>strange</quote> name
-	  like
-	  <filename>i386-portbld-freebsd4.7-</filename><replaceable>appname</replaceable>,
-	  you will need to additionally override the
-	  <makevar>CONFIGURE_TARGET</makevar> variable to specify the
-	  target in the way required by scripts generated by recent
-	  versions of <command>autoconf</command>.  Add the following line
-	  immediately after the <literal>GNU_CONFIGURE=yes</literal> line
-	  in your <filename>Makefile</filename>:</para>
-
-	<para>
-	  <literal>CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}</literal>
-	  </para>
-
 	  <table frame="none">
 	    <title>Variables for ports that use configure</title>
 
@@ -5297,13 +5200,13 @@ USE_GL=     glu</programlisting>
       </table>
 
       <example id="using-x11-vars">
-	<title>Using X11 related variables in port</title>
+	<title>Using some X11 related variables in port</title>
 	<programlisting># Use X11 libraries and depend on
 # font server as well as cyrillic fonts.
-RUN_DEPENDS=   ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT} \
-               ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
+RUN_DEPENDS=   ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
+               ${LOCALBASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
 
-USE_XLIB=      yes</programlisting>
+USE_XORG=      yes</programlisting>
       </example>
 
       </sect2>
@@ -5356,7 +5259,7 @@ USE_XLIB=      yes</programlisting>
 	<title>X11 fonts</title>
 
 	<para>If your port installs fonts for the X Window System, put them in
-	  <filename><makevar>X11BASE</makevar>/lib/X11/fonts/local</filename>.<para>
+	  <filename><makevar>LOCALBASE</makevar>/lib/X11/fonts/local</filename>.<para>
 
       </sect2>
 
@@ -5364,9 +5267,9 @@ USE_XLIB=      yes</programlisting>
 	<title>Getting fake <envar>DISPLAY</envar> using Xvfb</title>
 
 	<para>Some applications require a working X11 display for compilation to
-	  succeed.  This pose a problem for the FreeBSD package building
-	  cluster, which operates headless.  When the following canonical hack
-	  is used, the package cluster will start the virtual framebuffer
+	  succeed.  This pose a problem for machines which operates headless.
+	  When the following variable is used, the build infrastructure will
+	  start the virtual framebuffer
 	  X server.  The working <envar>DISPLAY</envar> is then passed
 	  to the build.</para>
 
@@ -5779,8 +5682,8 @@ do-configure:
 	      add directories to the include and library searchpaths
 	      via the commandline, for example:</para>
 
-	    <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${X11BASE}/include \
-       LIBS+=-L${X11BASE}/lib sillyapp.pro</programlisting>
+	    <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
+       LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
 
 	  </listitem>
 
@@ -5831,6 +5734,7 @@ do-configure:
 	      <entry>Should be defined for the remaining variables to have any
 		effect.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_VERSION</makevar></entry>
 	      <entry>List of space-separated suitable Java versions for
@@ -5838,33 +5742,39 @@ do-configure:
 		specify a range of versions (allowed values:
 		<literal>1.1[+] 1.2[+] 1.3[+] 1.4[+]</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_OS</makevar></entry>
 	      <entry>List of space-separated suitable JDK port operating
 		systems for the port (allowed values: <literal>native
 		linux</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_VENDOR</makevar></entry>
 	      <entry>List of space-separated suitable JDK port vendors for
 		the port (allowed values: <literal>freebsd bsdjava sun ibm
 		blackdown</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_BUILD</makevar></entry>
 	      <entry>When set, it means that the selected JDK port should
 		be added to the build dependencies of the port.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_RUN</makevar></entry>
 	      <entry>When set, it means that the selected JDK port should
 		be added to the run dependencies of the port.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_EXTRACT</makevar></entry>
 	      <entry>When set, it means that the selected JDK port should
 		be added to the extract dependencies of the port.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>USE_JIKES</makevar></entry>
 	      <entry>Whether the port should or should not use the
@@ -5903,6 +5813,7 @@ do-configure:
 	      <entry>The name of the JDK port (e.g.
 		<literal>'java/jdk14'</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VERSION</makevar></entry>
 	      <entry>The full version of the JDK port (e.g.
@@ -5910,104 +5821,124 @@ do-configure:
 		two digits of this version number, use
 		<makevar>${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}</makevar>.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_OS</makevar></entry>
 	      <entry>The operating system used by the JDK port (e.g.
 		<literal>'linux'</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VENDOR</makevar></entry>
 	      <entry>The vendor of the JDK port (e.g.
 		<literal>'sun'</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_OS_DESCRIPTION</makevar></entry>
 	      <entry>Description of the operating system used by the JDK port
 		(e.g. <literal>'Linux'</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_PORT_VENDOR_DESCRIPTION</makevar></entry>
 	      <entry>Description of the vendor of the JDK port (e.g.
 		<literal>'FreeBSD Foundation'</literal>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_HOME</makevar></entry>
 	      <entry>Path to the installation directory of the JDK (e.g.
 		<filename>'/usr/local/jdk1.3.1'</filename>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAC</makevar></entry>
 	      <entry>Path to the Java compiler to use (e.g.
 		<filename>'/usr/local/jdk1.1.8/bin/javac'</filename> or
 		<filename>'/usr/local/bin/jikes'</filename>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAR</makevar></entry>
 	      <entry>Path to the <command>jar</command> tool to use (e.g.
 		<filename>'/usr/local/jdk1.2.2/bin/jar'</filename> or
 		<filename>'/usr/local/bin/fastjar'</filename>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>APPLETVIEWER</makevar></entry>
 	      <entry>Path to the <command>appletviewer</command> utility (e.g.
 		<filename>'/usr/local/linux-jdk1.2.2/bin/appletviewer'</filename>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA</makevar></entry>
 	      <entry>Path to the <command>java</command> executable. Use
 		this for executing Java programs (e.g.
 		<filename>'/usr/local/jdk1.3.1/bin/java'</filename>).</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVADOC</makevar></entry>
 	      <entry>Path to the <command>javadoc</command> utility
 		program.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAH</makevar></entry>
 	      <entry>Path to the <command>javah</command> program.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAP</makevar></entry>
 	      <entry>Path to the <command>javap</command> program.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_KEYTOOL</makevar></entry>
 	      <entry>Path to the <command>keytool</command> utility program.
 		This variable is available only if the JDK is Java 1.2 or
 		higher.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_N2A</makevar></entry>
 	      <entry>Path to the <command>native2ascii</command> tool.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_POLICYTOOL</makevar></entry>
 	      <entry>Path to the <command>policytool</command> program.
 		This variable is available only if the JDK is Java 1.2 or
 		higher.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_SERIALVER</makevar></entry>
 	      <entry>Path to the <command>serialver</command> utility
 		program.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMIC</makevar></entry>
 	      <entry>Path to the RMI stub/skeleton generator,
 		<command>rmic</command>.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMIREGISTRY</makevar></entry>
 	      <entry>Path to the RMI registry program,
 		<command>rmiregistry</command>.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>RMID</makevar></entry>
 	      <entry>Path to the RMI daemon program <command>rmid</command>.
 		This variable is only available if the JDK is Java 1.2
 		or higher.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVA_CLASSES</makevar></entry>
 	      <entry>Path to the archive that contains the JDK class
@@ -6016,6 +5947,7 @@ do-configure:
 		JDKs used
 		<filename>${JAVA_HOME}/lib/classes.zip</filename>.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>HAVE_JIKES</makevar></entry>
 	      <entry>Defined whenever <command>jikes</command> is used by
@@ -6049,12 +5981,14 @@ do-configure:
 		Default: <filename>${PREFIX}/share/java</filename>.
 	      </entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVAJARDIR</makevar></entry>
 	      <entry>The directory where JAR files should be installed.
 		Default:
 		<filename>${JAVASHAREDIR}/classes</filename>.</entry>
 	    </row>
+
 	    <row>
 	      <entry><makevar>JAVALIBDIR</makevar></entry>
 	      <entry>The directory where JAR files installed by other
@@ -7443,7 +7377,7 @@ PLIST_SUB+=     VERSION="${VER_STR}"
 	      <row>
 		<entry><literal>relative</literal></entry>
 
-		<entry><literal>--with-wx=${X11BASE}
+		<entry><literal>--with-wx=${LOCALBASE}
 		    --with-wx-config=${WX_CONFIG:T}</literal></entry>
 	      </row>
 	    </tbody>
@@ -8088,6 +8022,60 @@ CFLAGS+=        -DLUA_VERSION_STRING="${VER_STR}"
       <programlisting>USE_XFCE=        mcsmanager configenv</programlisting>
     </sect1>
 
+    <sect1 id="using-databases">
+      <title>Using databases</title>
+
+	<table frame="none">
+	  <title>Variables for ports using databases</title>
+
+	  <tgroup cols="2">
+	    <thead>
+	      <row>
+		<entry>Variable</entry>
+
+		<entry>Means</entry>
+	      </row>
+	    </thead>
+
+	    <tbody>
+	      <row>
+		<entry><makevar>USE_BDB</makevar></entry>
+
+		<entry>If variable is set to <literal>yes</literal>,
+		  add dependency on <filename role="package">databases/db41</filename>
+		  port.  The variable may also be set to values: 2, 3, 40, 41,
+		  42, 43, 44, 45 46, or 47.  You can declare a range of
+		  acceptable values, <makevar>USE_BDB</makevar>=42+ will find
+		  the highest installed version, and fall back to 42 if nothing
+		  else is installed.</entry>
+	      </row>
+
+	      <row>
+		<entry><makevar>USE_MYSQL</makevar></entry>
+
+		<entry>If variable is set to <literal>yes</literal>, add
+		  dependency on <filename role="package">databases/mysql50-server</filename>
+		  port.  An associated variable,
+		  <makevar>WANT_MYSQL_VER</makevar>, may be
+		  set to values such as 323, 40, 41, 50, 51 or 60.</entry>
+	      </row>
+
+	      <row>
+		<entry><makevar>USE_PGSQL</makevar></entry>
+
+		<entry>If set to <literal>yes</literal>, add dependency on
+		  <filename role="package">databases/postgresql82</filename>
+		  port.  An associated variable,
+		  <makevar>WANT_PGSQL_VER</makevar>, may be set to values such
+		  as 73, 74, 80, 81, 82, or 83.</entry>
+	      </row>
+
+	    </tbody>
+	  </tgroup>
+	</table>
+
+    </sect1>
+
     <sect1 id="rc-scripts">
       <title>Starting and stopping services (rc scripts)</title>
 
@@ -8114,9 +8102,8 @@ CFLAGS+=        -DLUA_VERSION_STRING="${VER_STR}"
 	<literal>.&nbsp;%%RC_SUBR%%</literal>, because older versions of &os;
 	do not have an <filename>/etc/rc.subr</filename> file.  Standard
 	<makevar>SUB_LIST</makevar> expansions are used too.
-	Use of the <literal>%%PREFIX%%</literal>,
-	<literal>%%LOCALBASE%%</literal>, and
-	<literal>%%X11BASE%%</literal> expansions is strongly encouraged as well.
+	Use of the <literal>%%PREFIX%%</literal> and
+	<literal>%%LOCALBASE%%</literal> expansions is strongly encouraged as well.
 	More on
 	<makevar>SUB_LIST</makevar> in <link
 	linkend="using-sub-files">the relevant section</link>.</para>
@@ -8677,7 +8664,7 @@ etc/orbit.conf.sample
 	  with <literal>VALUE</literal> in each file listed in
 	  <makevar>SUB_FILES</makevar>.  Several common pairs are
 	  automatically defined: <makevar>PREFIX</makevar>,
-	  <makevar>LOCALBASE</makevar>, <makevar>X11BASE</makevar>,
+	  <makevar>LOCALBASE</makevar>,
 	  <makevar>DATADIR</makevar>, <makevar>DOCSDIR</makevar>,
 	  <makevar>EXAMPLESDIR</makevar>.  Any line beginning with
 	  <literal>@comment</literal> will be deleted from resulting files
@@ -8796,10 +8783,7 @@ as .putsy.conf and edit it.</programlisting>
 	<para><makevar>PREFIX</makevar> �ܼƭY�L�S�O�]�w�A�|�P
 	  <makevar>LOCALBASE</makevar> �ۦP (�w�]��
 	  <filename>/usr/local</filename>)�C  �Y���]�w
-	  <makevar>USE_X_PREFIX</makevar> �� <makevar>USE_IMAKE</makevar>�A
-	  ���� <makevar>PREFIX</makevar> �h�� <makevar>X11BASE</makevar> (
-	  ���F�ۮe���z�ѡA�w�]���� <filename>/usr/X11R6</filename>�A
-	  �����[��|��������)�C  �Y���]�w <makevar>USE_LINUX_PREFIX</makevar>�A
+	  <makevar>USE_LINUX_PREFIX</makevar>�A
 	  ���� <makevar>PREFIX</makevar> �h�� <makevar>LINUXBASE</makevar> (
 	  �w�]�� <filename>/compat/linux</filename>)�C</para>
 
@@ -8831,10 +8815,6 @@ as .putsy.conf and edit it.</programlisting>
 	<filename>/var/tmp/<replaceable>port-name</replaceable></filename>
 	to do that while you have it installed would do that.</para>
 
-	<para>Do not set <makevar>USE_X_PREFIX</makevar> unless your port
-	  truly requires it (i.e., it needs to
-	  reference files in <makevar>X11BASE</makevar>).</para>
-
 	<para>The variable <makevar>PREFIX</makevar> can be reassigned in your
 	  <filename>Makefile</filename> or in the user's environment.
 	  However, it is strongly discouraged for individual ports to set this
@@ -10531,106 +10511,128 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    <entry>5.0-CURRENT after branching for RELENG_5_0</entry>
 		    <entry>500100</entry>
 		  </row>
+
 		  <row>
 		    <entry>&lt;sys/dkstat.h&gt; is empty and should
 		    not be included.</entry>
 		    <entry>500101</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after the d_mmap_t interface
 		      change.</entry>
 		    <entry>500102</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after taskqueue_swi changed to run
 		      without Giant, and taskqueue_swi_giant added to run
 		      with Giant.</entry>
 		    <entry>500103</entry>
 		  </row>
+
 		  <row>
 		    <entry>cdevsw_add() and cdevsw_remove() no
 		      longer exists.
 		      Appearance of MAJOR_AUTO allocation facility.</entry>
 		    <entry>500104</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after new cdevsw initialization method.</entry>
 		    <entry>500105</entry>
 		  </row>
+
 		  <row>
 		    <entry>devstat_add_entry() has been replaced by
 		      devstat_new_entry()</entry>
 		    <entry>500106</entry>
 		  </row>
+
 		  <row>
 		    <entry>Devstat interface change; see sys/sys/param.h 1.149</entry>
 		    <entry>500107</entry>
 		  </row>
+
 		  <row>
 		    <entry>Token-Ring interface changes.</entry>
 		    <entry>500108</entry>
 		  </row>
+
 		  <row>
 		    <entry>Addition of vm_paddr_t.</entry>
 		    <entry>500109</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after &man.realpath.3; has been made
 		      thread-safe</entry>
 		    <entry>500110</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after &man.usbhid.3; has been synced with
 		      NetBSD</entry>
 		    <entry>500111</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after new NSS implementation
 		      and addition of POSIX.1 getpw*_r, getgr*_r
 		      functions</entry>
 		    <entry>500112</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.0-CURRENT after removal of the old rc system.</entry>
 		    <entry>500113</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-RELEASE.</entry>
 		    <entry>501000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after branching for RELENG_5_1.</entry>
 		    <entry>501100</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after correcting the semantics of
 		      sigtimedwait(2) and sigwaitinfo(2).</entry>
 		    <entry>501101</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after adding the lockfunc and lockfuncarg
 		      fields to &man.bus.dma.tag.create.9;.</entry>
 		    <entry>501102</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after GCC 3.3.1-pre 20030711 snapshot
 		      integration.</entry>
 		    <entry>501103</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT 3ware API changes to twe.</entry>
 		    <entry>501104</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT dynamically-linked /bin and /sbin
 		      support and movement of libraries to /lib.</entry>
 		    <entry>501105</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after adding kernel support for
 		      Coda 6.x.</entry>
 		    <entry>501106</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after 16550 UART constants moved from
 		      <filename>&lt;dev/sio/sioreg.h&gt;</filename> to
@@ -10639,125 +10641,150 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		      supported by rtld.</entry>
 		    <entry>501107</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after PFIL_HOOKS API update</entry>
 		    <entry>501108</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after adding kiconv(3)</entry>
 		    <entry>501109</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after changing default operations
 			for open and close in cdevsw</entry>
 		    <entry>501110</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.1-CURRENT after changed layout of cdevsw</entry>
 		    <entry>501111</entry>
 		  </row>
+
 		  <row>
 		    <entry> 5.1-CURRENT after adding kobj multiple inheritance
 		    </entry>
 		    <entry>501112</entry>
 		  </row>
+
 		  <row>
 		    <entry> 5.1-CURRENT after the if_xname change in
 			struct ifnet</entry>
 		    <entry>501113</entry>
 		  </row>
+
 		  <row>
 		    <entry> 5.1-CURRENT after changing /bin and /sbin to
 			be dynamically linked</entry>
 		    <entry>501114</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-RELEASE</entry>
 		    <entry>502000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2.1-RELEASE</entry>
 		    <entry>502010</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after branching for RELENG_5_2</entry>
 		    <entry>502100</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after __cxa_atexit/__cxa_finalize
 			functions were added to libc.</entry>
 		    <entry>502101</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after change of default thread library
 			from libc_r to libpthread.</entry>
 		    <entry>502102</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after device driver API megapatch.
 		    </entry>
 		    <entry>502103</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after getopt_long_only() addition.
 		    </entry>
 		    <entry>502104</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after NULL is made into ((void *)0)
 			for C, creating more warnings.
 		    </entry>
 		    <entry>502105</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after pf is linked to the build and
 			install.
 		    </entry>
 		    <entry>502106</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after time_t is changed to a
 			64-bit value on sparc64.
 		    </entry>
 		    <entry>502107</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after Intel C/C++ compiler support in some headers and execve(2) changes to be more strictly conforming to POSIX.
 		    </entry>
 		    <entry>502108</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the introduction of the
 		      bus_alloc_resource_any API
 		    </entry>
 		    <entry>502109</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the addition of UTF-8 locales
 		    </entry>
 		    <entry>502110</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the removal of the getvfsent(3)
 		      API
 		    </entry>
 		    <entry>502111</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the addition of the .warning
 		      directive for make.</entry>
 		    <entry>502112</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after ttyioctl() was made mandatory
 		      for serial drivers.</entry>
 		    <entry>502113</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after import of the ALTQ framework.
 		    </entry>
 		    <entry>502114</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after changing sema_timedwait(9) to
 		      return 0 on success and a non-zero error code on
@@ -10765,41 +10792,48 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    </entry>
 		    <entry>502115</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after changing kernel dev_t to
 		      be pointer to struct cdev *.
 		    </entry>
 		    <entry>502116</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after changing kernel udev_t to dev_t.
 		    </entry>
 		    <entry>502117</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after adding support for CLOCK_VIRTUAL
 		      and CLOCK_PROF to clock_gettime(2) and clock_getres(2).
 		    </entry>
 		    <entry>502118</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after changing network interface
 		      cloning overhaul.
 		    </entry>
 		    <entry>502119</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the update of the package tools
 		      to revision 20040629.
 		    </entry>
 		    <entry>502120</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after marking Bluetooth code as
 		      non-i386 specific.
 		    </entry>
 		    <entry>502121</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the introduction of the KDB
 		      debugger framework, the conversion of DDB into a
@@ -10807,6 +10841,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    </entry>
 		    <entry>502122</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after change to make
 		      VFS_ROOT take a struct
@@ -10817,30 +10852,35 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    </entry>
 		    <entry>502123</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the change to separate the way
 		      ports rc.d and legacy scripts are started.
 		    </entry>
 		    <entry>502124</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the backout of the
 		      previous change.
 		    </entry>
 		    <entry>502125</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the removal of
 		      kmem_alloc_pageable() and the import of gcc 3.4.2.
 		    </entry>
 		    <entry>502126</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after changing the UMA kernel
 		      API to allow ctors/inits to fail.
 		    </entry>
 		    <entry>502127</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.2-CURRENT after the change of the
 		      vfs_mount signature as well as global replacement of
@@ -10849,27 +10889,33 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    </entry>
 		    <entry>502128</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.3-BETA/RC before the pfil API change</entry>
 		    <entry>503000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.3-RELEASE</entry>
 		    <entry>503001</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.3-STABLE after branching for RELENG_5_3</entry>
 		    <entry>503100</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.3-STABLE after addition of glibc style
 		      &man.strftime.3; padding options.</entry>
 		    <entry>503101</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.3-STABLE after OpenBSD's nc(1) import MFC.</entry>
 		    <entry>503102</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-PRERELEASE after the MFC of the fixes in
 			<filename>&lt;src/include/stdbool.h&gt;</filename> and
@@ -10877,63 +10923,77 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 			for using the GCC-compatibility of the Intel C/C++ compiler.</entry>
 		    <entry>503103</entry>
  		  </row>
+
 		  <row>
 		    <entry>5.4-PRERELEASE after the MFC of the change of
 		       ifi_epoch from wall clock time to uptime.</entry>
 		    <entry>503104</entry>
  		  </row>
+
 		  <row>
 		    <entry>5.4-PRERELEASE after the MFC of the fix of EOVERFLOW check in vswprintf(3).</entry>
 		    <entry>503105</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-RELEASE.</entry>
 		    <entry>504000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after branching for RELENG_5_4</entry>
 		    <entry>504100</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after increasing the default
 		      thread stacksizes</entry>
 		    <entry>504101</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after the addition of sha256</entry>
 		    <entry>504102</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after the MFC of if_bridge</entry>
 		    <entry>504103</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after the MFC of bsdiff and portsnap</entry>
 		    <entry>504104</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.4-STABLE after MFC of ldconfig_local_dirs
 		      change.</entry>
 		    <entry>504105</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.5-RELEASE.</entry>
 		    <entry>505000</entry>
 		  </row>
+
 		  <row>
 		    <entry>5.5-STABLE after branching for RELENG_5_5</entry>
 		    <entry>505100</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT</entry>
 		    <entry>600000</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after permanently enabling PFIL_HOOKS
 		      in the kernel.
 		    </entry>
 		    <entry>600001</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after initial addition of
 		      ifi_epoch to struct if_data.  Backed out after a
@@ -10941,62 +11001,73 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    </entry>
 		    <entry>600002</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after the re-addition of the
 		      ifi_epoch member of struct if_data.
 		    </entry>
 		    <entry>600003</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after addition of the struct inpcb
 		      argument to the pfil API.
 		    </entry>
 		    <entry>600004</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after addition of the "-d
 		      DESTDIR" argument to newsyslog.
 		    </entry>
 		    <entry>600005</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after addition of glibc style
 		      &man.strftime.3; padding options.
 		    </entry>
 		    <entry>600006</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after addition of 802.11 framework
 		      updates.
 		    </entry>
 		    <entry>600007</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after changes to VOP_*VOBJECT() functions
 		      and introduction of MNTK_MPSAFE flag for Giantfree filesystems.
 		    </entry>
 		    <entry>600008</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after addition of the cpufreq framework
 		      and drivers.
 		    </entry>
 		    <entry>600009</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after importing OpenBSD's nc(1).</entry>
 		    <entry>600010</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after removing semblance of SVID2
 			<literal>matherr()</literal> support.</entry>
 		    <entry>600011</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after increase of default thread stacks'
 			size.</entry>
 		    <entry>600012</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after fixes in
 			<filename>&lt;src/include/stdbool.h&gt;</filename> and
@@ -11004,289 +11075,412 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 			for using the GCC-compatibility of the Intel C/C++ compiler.</entry>
 		    <entry>600013</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after EOVERFLOW checks in vswprintf(3) fixed.</entry>
 		    <entry>600014</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after changing the struct if_data
 		       member, ifi_epoch, from wall clock time to uptime.</entry>
 		    <entry>600015</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after LC_CTYPE disk format changed.</entry>
 		    <entry>600016</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after NLS catalogs disk format changed.</entry>
 		    <entry>600017</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after LC_COLLATE disk format changed.</entry>
 		    <entry>600018</entry>
 		  </row>
+
 		  <row>
 		    <entry>Installation of acpica includes into /usr/include.</entry>
 		    <entry>600019</entry>
 		  </row>
+
 		  <row>
 		    <entry>Addition of MSG_NOSIGNAL flag to send(2) API.</entry>
 		    <entry>600020</entry>
 		  </row>
+
 		  <row>
 		    <entry>Addition of fields to cdevsw</entry>
 		    <entry>600021</entry>
 		  </row>
+
 		  <row>
 		    <entry>Removed gtar from base system.</entry>
 		    <entry>600022</entry>
 		  </row>
+
 		  <row>
 		    <entry>LOCAL_CREDS, LOCAL_CONNWAIT socket options added to unix(4).</entry>
 		    <entry>600023</entry>
 		  </row>
+
 		  <row>
 		    <entry>&man.hwpmc.4; and related tools added to 6.0-CURRENT.</entry>
 		    <entry>600024</entry>
 		  </row>
+
 		  <row>
 		    <entry>struct icmphdr added to 6.0-CURRENT.</entry>
 		    <entry>600025</entry>
 		  </row>
+
 		  <row>
 		    <entry>pf updated to 3.7.</entry>
 		    <entry>600026</entry>
 		  </row>
+
 		  <row>
 		    <entry>Kernel libalias and ng_nat introduced.</entry>
 		    <entry>600027</entry>
 		  </row>
+
 		  <row>
 		    <entry>POSIX ttyname_r(3) made available through unistd.h and libc.</entry>
 		    <entry>600028</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after libpcap updated to v0.9.1 alpha 096.</entry>
 		    <entry>600029</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after importing NetBSD's if_bridge(4).</entry>
 		    <entry>600030</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after struct ifnet was broken out
 		      of the driver softcs.</entry>
 		    <entry>600031</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-CURRENT after the import of libpcap v0.9.1.</entry>
 		    <entry>600032</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after bump of all shared library
 		      versions that had not been changed since
 		      RELENG_5.</entry>
 		    <entry>600033</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after credential argument is added to
 		      dev_clone event handler.  6.0-RELEASE.</entry>
 		    <entry>600034</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after 6.0-RELEASE</entry>
 		    <entry>600100</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after incorporating scripts from the
 		      local_startup directories into the base &man.rcorder.8;.</entry>
 		    <entry>600101</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after updating the ELF types and
 		      constants.</entry>
 		    <entry>600102</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after MFC of pidfile(3) API.</entry>
 		    <entry>600103</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after MFC of ldconfig_local_dirs
 		      change.</entry>
 		    <entry>600104</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.0-STABLE after NLS catalog support of
 		      csh(1).</entry>
 		    <entry>600105</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-RELEASE</entry>
 		    <entry>601000</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after 6.1-RELEASE.</entry>
 		    <entry>601100</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after the import of csup.</entry>
 		    <entry>601101</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after the iwi(4) update.</entry>
 		    <entry>601102</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after the resolver update to
 		      BIND9, and exposure of reentrant version of
 		      netdb functions.</entry>
 		    <entry>601103</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after DSO (dynamic shared
 		      objects) support has been enabled in
 		      OpenSSL.</entry>
 		    <entry>601104</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.1-STABLE after 802.11 fixups changed the
 		      api for the IEEE80211_IOC_STA_INFO ioctl.</entry>
-		    <entry>601104</entry>
+		    <entry>601105</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-RELEASE</entry>
 		    <entry>602000</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after 6.2-RELEASE.</entry>
 		    <entry>602100</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after the addition of Wi-Spy
 		      quirk.</entry>
 		    <entry>602101</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after pci_find_extcap() addition.</entry>
 		    <entry>602102</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of dlsym change to look
 		      for a requested symbol both
 		      in specified dso and its implicit dependencies.</entry>
 		    <entry>602103</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of ng_deflate(4) and
 		      ng_pred1(4) netgraph nodes and new compression and
 		      encryption modes for ng_ppp(4) node.</entry>
 		    <entry>602104</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of BSD licensed version of &man.gzip.1;
 		      ported from NetBSD.</entry>
 		    <entry>602105</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of PCI MSI and MSI-X
 		      support.</entry>
 		    <entry>602106</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of ncurses 5.6 and wide
 		      character support.</entry>
 		    <entry>602107</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of CAM 'SG' peripheral device,
 			which implements a subset of Linux SCSI SG passthrough device API.</entry>
 		    <entry>602108</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of readline 5.2 patchset 002.</entry>
 		    <entry>602109</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of pmap_invalidate_cache(),
 		      pmap_change_attr(), pmap_mapbios(), pmap_mapdev_attr(),
 		      and pmap_unmapbios() for amd64 and i386.</entry>
 		    <entry>602110</entry>
 		  </row>
+
 		  <row>
 		    <entry>6.2-STABLE after MFC of BOP_BDFLUSH and caused
 		      breakage of the filesystem modules KBI.</entry>
 		    <entry>602111</entry>
-		  </row>
 		  <row>
 		    <entry>6.2-STABLE after libutil(3) MFC's.</entry>
 		    <entry>602112</entry>
 		  </row>
+
+		  <row>
+		    <entry>6.2-STABLE after MFC of wide and single byte
+		      ctype separation.  Newly compiled binary that references
+		      to ctype.h may require a new symbol, __mb_sb_limit,
+		      which is not available on older systems.</entry>
+		    <entry>602113</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.2-STABLE after ctype ABI forward compatibility
+		      restored.</entry>
+		    <entry>602114</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.2-STABLE after back out of wide and single byte
+		      ctype separation.</entry>
+		    <entry>602115</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-RELEASE</entry>
+		    <entry>603000</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-STABLE after 6.3-RELEASE.</entry>
+		    <entry>603100</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-STABLE after fixing
+		      multibyte type support in bit macro.</entry>
+		    <entry>603101</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-STABLE after adding l_sysid to struct flock.</entry>
+		    <entry>603102</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-STABLE after MFC of the
+		      <function>memrchr</function> function.</entry>
+		    <entry>603103</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.3-STABLE after MFC of support for
+		      <literal>:u</literal> variable modifier in make(1).</entry>
+		    <entry>603104</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.4-RELEASE</entry>
+		    <entry>604000</entry>
+		  </row>
+
+		  <row>
+		    <entry>6.4-STABLE after 6.4-RELEASE.</entry>
+		    <entry>604100</entry>
+		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after bump of all shared library
 		      versions that had not been changed since
 		      RELENG_5.</entry>
 		    <entry>700001</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after credential argument is added to
 		      dev_clone event handler.</entry>
 		    <entry>700002</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after memmem(3) is added to libc.</entry>
 		    <entry>700003</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after solisten(9) kernel arguments
 		      are modified to accept a backlog parameter.</entry>
 		    <entry>700004</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after IFP2ENADDR() was changed to return
 		      a pointer to IF_LLADDR().</entry>
 		    <entry>700005</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of <literal>if_addr</literal>
 		      member to <literal>struct ifnet</literal> and IFP2ENADDR()
 		      removal.</entry>
 		    <entry>700006</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after incorporating scripts from the
 		      local_startup directories into the base &man.rcorder.8;.</entry>
 		    <entry>700007</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after removal of MNT_NODEV mount
 		      option.</entry>
 		    <entry>700008</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after ELF-64 type changes and symbol
 		      versioning.</entry>
 		    <entry>700009</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of hostb and vgapci
 		      drivers, addition of pci_find_extcap(), and changing
 		      the AGP drivers to no longer map the aperture.</entry>
 		    <entry>700010</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after tv_sec was made time_t on
 		      all platforms but Alpha.</entry>
 		    <entry>700011</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after ldconfig_local_dirs change.</entry>
 		    <entry>700012</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after changes to
 		      <filename>/etc/rc.d/abi</filename> to support
@@ -11294,174 +11488,209 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		      being a symlink in a readonly filesystem.</entry>
 		    <entry>700013</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after pts import.</entry>
 		    <entry>700014</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the introduction of version 2
 		      of &man.hwpmc.4;'s ABI.</entry>
 		    <entry>700015</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of &man.fcloseall.3;
 		      to libc.</entry>
 		    <entry>700016</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after removal of ip6fw.</entry>
 		    <entry>700017</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after import of snd_emu10kx.</entry>
 		    <entry>700018</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after import of OpenSSL 0.9.8b.</entry>
 		    <entry>700019</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of bus_dma_get_tag
                       function</entry>
                     <entry>700020</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after libpcap 0.9.4 and
                       tcpdump 3.9.4 import.</entry>
                     <entry>700021</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after dlsym change to look
 		      for a requested symbol both
 		      in specified dso and its implicit dependencies.</entry>
                     <entry>700022</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after adding new sound IOCTLs.</entry>
 		    <entry>700023</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after import of OpenSSL 0.9.8d.</entry>
 		    <entry>700024</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the addition of libelf.</entry>
 		    <entry>700025</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after major changes on sound
 		      sysctls.</entry>
 		    <entry>700026</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the addition of Wi-Spy
 		      quirk.</entry>
 		    <entry>700027</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the addition of sctp calls to libc
 		    </entry>
 		    <entry>700028</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the GNU &man.gzip.1; implementation was
 		      replaced with a BSD licensed version ported from NetBSD.</entry>
 		    <entry>700029</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the removal of IPIP tunnel encapsulation (VIFF_TUNNEL) from the IPv4 multicast forwarding code.
 		    </entry>
 		    <entry>700030</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the modification of bus_setup_intr() (newbus).
 		    </entry>
 		    <entry>700031</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the inclusion of ipw(4) and iwi(4) firmwares.
 		    </entry>
 		    <entry>700032</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the inclusion of ncurses wide character support.
 		    </entry>
 		    <entry>700033</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after changes to how insmntque(),
 		      getnewvnode(), and vfs_hash_insert() work.
 		    </entry>
 		    <entry>700034</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of a notify mechanism
 		      for CPU frequency changes.
 		    </entry>
 		    <entry>700035</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after import of the ZFS filesystem.</entry>
 		    <entry>700036</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after addition of CAM 'SG' peripheral device,
 		      which implements a subset of Linux SCSI SG passthrough device API.</entry>
 		    <entry>700037</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after changing &man.getenv.3;, &man.putenv.3;,
 		      &man.setenv.3; and &man.unsetenv.3; to be POSIX
 		      conformant.</entry>
 		    <entry>700038</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the changes in 700038 were
 		      backed out.</entry>
 		    <entry>700039</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the addition of &man.flopen.3;
 		      to libutil.</entry>
 		    <entry>700040</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after enabling symbol versioning, and changing
 		      the default thread library to libthr.</entry>
 		    <entry>700041</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the import of gcc 4.2.0.</entry>
 		    <entry>700042</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after bump of all shared library
 		      versions that had not been changed since
 		      RELENG_6.</entry>
 		    <entry>700043</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after changing the argument for
 		      vn_open()/VOP_OPEN() from filedescriptor index to the
 		      struct file *.</entry>
 		    <entry>700044</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after changing &man.pam.nologin.8; to
 		      provide an account management function instead of an
 		      authentication function to the PAM framework.</entry>
 		    <entry>700045</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after updated 802.11 wireless
 		      support.</entry>
 		    <entry>700046</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after adding TCP LRO interface
 		      capabilities.</entry>
 		    <entry>700047</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after
 		      RFC 3678 API support added to the IPv4 stack.
@@ -11471,42 +11700,439 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		      struct ipmreqn should be used instead.</entry>
 		    <entry>700048</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after importing pf from OpenBSD
 		      4.1</entry>
 		    <entry>700049</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after adding IPv6 support for
 		      FAST_IPSEC, deleting KAME IPSEC, and renaming
 		      FAST_IPSEC to IPSEC.</entry>
 		    <entry>(not changed)</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after converting setenv/putenv/etc.
 		      calls from traditional BSD to POSIX.</entry>
 		    <entry>700050</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after adding new mmap/lseek/etc
 		      syscalls.</entry>
 		    <entry>700051</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after moving I4B headers to
 		      include/i4b.</entry>
 		    <entry>700052</entry>
 		  </row>
+
 		  <row>
 		    <entry>7.0-CURRENT after the addition of support for
 		      PCI domains</entry>
 		    <entry>700053</entry>
 		  </row>
+
 		  <row>
-		    <entry>8.0-CURRENT.</entry>
+		    <entry>7.0-CURRENT after MFC of wide and single byte
+		      ctype separation.</entry>
+		    <entry>700054</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-RELEASE, and 7.0-CURRENT after ABI backwards compatibility
+		      to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
+		      PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which
+		      required the ABI of the PCIOCGETCONF IOCTL to be
+		      broken again</entry>
+		    <entry>700055</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after 7.0-RELEASE</entry>
+		    <entry>700100</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of m_collapse().</entry>
+		    <entry>700101</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of kdb_enter_why().</entry>
+		    <entry>700102</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after adding l_sysid to struct flock.</entry>
+		    <entry>700103</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of procstat(1).</entry>
+		    <entry>700104</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of umtx features. </entry>
+		    <entry>700105</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of &man.write.2; support
+		      to &man.psm.4;.</entry>
+		    <entry>700106</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after the MFC of F_DUP2FD command
+		      to &man.fcntl.2;.</entry>
+		    <entry>700107</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after some &man.lockmgr.9; changes, which
+		      makes it necessary to include
+		      <filename>sys/lock.h</filename> in order to use
+		      &man.lockmgr.9;.</entry>
+		    <entry>700108</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after MFC of the
+		      <function>memrchr</function> function.</entry>
+		    <entry>700109</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after MFC of kernel NFS lockd client.
+		      </entry>
+		    <entry>700110</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after addition of physically contiguous
+		      jumbo frame support.</entry>
+		    <entry>700111</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.0-STABLE after MFC of kernel DTrace support.
+		      </entry>
+		    <entry>700112</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.1-RELEASE</entry>
+		    <entry>701000</entry>
+		  </row>
+
+		  <row>
+		    <entry>7.1-STABLE after 7.1-RELEASE.</entry>
+		    <entry>701100</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT. Separating wide and single byte
+		      ctype.</entry>
 		    <entry>800000</entry>
 		  </row>
 
+		  <row>
+		    <entry>8.0-CURRENT after libpcap 0.9.8 and tcpdump 3.9.8
+		      import.</entry>
+		    <entry>800001</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after renaming kthread_create()
+		      and friends to kproc_create() etc.</entry>
+		    <entry>800002</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after ABI backwards compatibility
+		      to the FreeBSD 4/5/6 versions of the PCIOCGETCONF,
+		      PCIOCREAD and PCIOCWRITE IOCTLs was added, which
+		      required the ABI of the PCIOCGETCONF IOCTL to be
+		      broken again</entry>
+		    <entry>800003</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after agp(4) driver moved from
+		      src/sys/pci to src/sys/dev/agp</entry>
+		    <entry>800004</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after
+		      <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/kern/kern_mbuf.c#rev1.35">changes
+		      to the jumbo frame allocator</ulink>.</entry>
+		    <entry>800005</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after the addition of callgraph
+		      capture functionality to &man.hwpmc.4;.</entry>
+		    <entry>800006</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after kdb_enter() gains a "why"
+		      argument.</entry>
+		    <entry>800007</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after LK_EXCLUPGRADE option
+		      removal.</entry>
+		    <entry>800008</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after introduction of
+		      &man.lockmgr.disown.9;</entry>
+		    <entry>800009</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after the &man.vn.lock.9; prototype
+		      change.</entry>
+		    <entry>800010</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after the &man.VOP.LOCK.9; and
+		      &man.VOP.UNLOCK.9; prototype changes.</entry>
+		    <entry>800011</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after introduction of
+		      &man.lockmgr.recursed.9;, &man.BUF.RECURSED.9; and
+		      &man.BUF.ISLOCKED.9; and the removal of
+		      <function>BUF_REFCNT()</function>.</entry>
+		    <entry>800012</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after introduction of the
+		      <quote>ASCII</quote> encoding.</entry>
+		    <entry>800013</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after changing the prototype of
+		      &man.lockmgr.9; and removal of
+		      <function>lockcount()</function> and
+		      <function>LOCKMGR_ASSERT()</function>.</entry>
+		    <entry>800014</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after extending the types
+		      of the &man.fts.3; structures.</entry>
+		    <entry>800015</entry>
+		  </row>
+
+		  <row>
+		    <entry>8.0-CURRENT after adding an argumentt to MEXTADD(9)
+		      </entry>
+		    <entry>800016</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the introduction of
+		      LK_NODUP and LK_NOWITNESS options in the
+		      &man.lockmgr.9; space.</entry>
+		    <entry>800017</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the addition of
+		      m_collapse.</entry>
+		    <entry>800018</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the addition of current
+		      working directory, root directory, and jail
+		      directory support to the kern.proc.filedesc
+		      sysctl.</entry>
+		    <entry>800019</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after introduction of
+		      &man.lockmgr.assert.9; and
+		      <function>BUF_ASSERT</function> functions.</entry>
+		    <entry>800020</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after introduction of
+		      &man.lockmgr.args.9; and LK_INTERNAL flag
+		      removal.</entry>
+		    <entry>800021</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after changing the default system ar
+		      to BSD &man.ar.1;.</entry>
+		    <entry>800022</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after changing the prototypes of
+		      &man.lockstatus.9; and &man.VOP.ISLOCKED.9;, more
+		      specifically retiring the
+		      <literal>struct thread</literal> argument.</entry>
+		    <entry>800023</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after axing out the
+		      <function>lockwaiters</function> and
+		      <function>BUF_LOCKWAITERS</function> functions,
+		      changing the return value fo <function>brelvp</function>
+		      from void to int and introducing new flags for
+		      &man.lockinit.9;.</entry>
+		    <entry>800024</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after adding F_DUP2FD command
+		      to &man.fcntl.2;.</entry>
+		    <entry>800025</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after changing the priority parameter
+		      to cv_broadcastpri such that 0 means no priority.
+		    </entry>
+		    <entry>800026</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after changing the bpf monitoring ABI
+		     when zerocopy bpf buffers were added.
+		    </entry>
+		    <entry>800027</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after adding l_sysid to struct flock.
+		    </entry>
+		    <entry>800028</entry>
+		  </row> 
+		  <row>
+		    <entry>8.0-CURRENT after reintegration of the
+		      <function>BUF_LOCKWAITERS</function> function and the
+		      addition of &man.lockmgr.waiters.9;.</entry>
+		    <entry>800029</entry>
+		  </row> 
+		  <row>
+		    <entry>8.0-CURRENT after the introduction of the
+		      &man.rw.try.rlock.9; and &man.rw.try.wlock.9; functions.
+		    </entry>
+		    <entry>800030</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the introduction of the
+		      <function>lockmgr_rw</function> and
+		      <function>lockmgr_args_rw</function> functions.</entry>
+		    <entry>800031</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the implementation of the
+		      openat and related syscalls, introduction of the O_EXEC
+		      flag for the &man.open.2;, and providing the
+		      corresponding linux compatibility syscalls.</entry>
+		    <entry>800032</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after added &man.write.2; support for
+		      &man.psm.4; in native operation level.  Now arbitrary
+		      commands can be written to <devicename>/dev/psm%d</devicename>
+		      and status can be read back from it.</entry>
+		    <entry>800033</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after introduction of the
+		      <function>memrchr</function> function.</entry>
+		    <entry>800034</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after introduction of the
+		      <function>fdopendir</function> function.</entry>
+		    <entry>800035</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after switchover of 802.11 wireless
+		      to multi-bss support (aka vaps).</entry>
+		    <entry>800036</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after addition of multi routing
+		      table support (a.k.a. setfib(1), setfib(2)).</entry>
+		    <entry>800037</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after removal of netatm and
+		      ISDN4BSD.</entry>
+		    <entry>800038</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after removal of sgtty.</entry>
+		    <entry>800039</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT with kernel NFS lockd client.</entry>
+		    <entry>800040</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after addition of arc4random_buf(3)
+		      and arc4random_uniform(3).</entry>
+		    <entry>800041</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after addition of cpuctl(4).</entry>
+		    <entry>800042</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after changing bpf(4) to use a
+		      single device node, instead of device cloning.</entry>
+		    <entry>800043</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the commit of the first step of 
+		      the vimage project renaming global variables to be
+		      virtualized with a V_ prefix with macros to map them
+		      back to their global names.</entry>
+		    <entry>800044</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the integration of the
+		      MPSAFE TTY layer, including changes to various
+		      drivers and utilities that interact with it.</entry>
+		    <entry>800045</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the separation of the GDT
+		      per CPU on amd64 architecture.</entry>
+		    <entry>800046</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after removal of VSVTX, VSGID
+		      and VSUID.</entry>
+		    <entry>800047</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after converting the kernel NFS mount
+		      code to accept individual mount options in the
+		      nmount() iovec, not just one big
+		      struct nfs_args.</entry>
+		    <entry>800048</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the removal of &man.suser.9; and
+		      &man.suser.cred.9;.</entry>
+		    <entry>800049</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>
@@ -11601,12 +12227,6 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		  <literal>/usr/local/</literal>)</entry>
 	      </row>
 
-	      <row>
-		<entry><makevar>X11BASE</makevar></entry>
-		<entry>The base of the <quote>X11</quote> tree (e.g.,
-		  <literal>/usr/X11R6</literal>)</entry>
-	      </row>
-
 	      <row>
 		<entry><makevar>PREFIX</makevar></entry>
 		<entry>Where the port installs itself (see <link
@@ -11896,8 +12516,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
 
 	      <listitem>
 		<para>installs files outside of
-		  <filename>${LOCALBASE}</filename> and
-		  <filename>${X11BASE}</filename></para>
+		  <filename>${LOCALBASE}</filename></para>
 	      </listitem>
 
 	      <listitem>