From owner-svn-src-user@FreeBSD.ORG  Fri Oct 31 11:47:53 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8DFB1065673;
	Fri, 31 Oct 2008 11:47:53 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C31C58FC25;
	Fri, 31 Oct 2008 11:47:53 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9VBlrwY079838;
	Fri, 31 Oct 2008 11:47:53 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9VBlp9u079793;
	Fri, 31 Oct 2008 11:47:51 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200810311147.m9VBlp9u079793@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Fri, 31 Oct 2008 11:47:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184503 - in user/edwin/releasenotes: .
	head/release/doc/en_US.ISO8859-1/relnotes
	releng-6.0/release/doc/en_US.ISO8859-1/relnotes/alpha
	releng-6.0/release/doc/en_US.ISO8859-1/relnotes/a...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2008 11:47:53 -0000

Author: edwin
Date: Fri Oct 31 11:47:51 2008
New Revision: 184503
URL: http://svn.freebsd.org/changeset/base/184503

Log:
  Commit everything of this project before I take this laptop on a
  trip overseas. It produces the right output for all versions which
  are not .0 versions, and has a good overview of when all tzdata
  data was imported, MFVd and MFCd.

Modified:
  user/edwin/releasenotes/Makefile
  user/edwin/releasenotes/contrib-xmltoent.pl
  user/edwin/releasenotes/contrib.xml
  user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml
  user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml
  user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml
  user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
  user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile

Modified: user/edwin/releasenotes/Makefile
==============================================================================
--- user/edwin/releasenotes/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -2,23 +2,26 @@
 
 DIRS=head 
 STABLE=7 6
-RELENG=7.0 6.4 6.3 6.2 6.1 6.0
+RELENG=7.0 6.3 6.2 6.1 6.0
 
 build:
 .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} 
-	@cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
+	@echo "==>> BUILDING IN ${d}"; \
+	cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
 	make
 .endfor
 
 clean:
 .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} 
-	@cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
+	@echo "==>> CLEANING IN ${d}"; \
+	cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
 	make clean
 .endfor
 
 perl:
 .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} 
-	@cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
+	@echo "==>> PERL IN ${d}"; \
+	cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \
 	make contrib.ent
 .endfor
 

Modified: user/edwin/releasenotes/contrib-xmltoent.pl
==============================================================================
--- user/edwin/releasenotes/contrib-xmltoent.pl	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/contrib-xmltoent.pl	Fri Oct 31 11:47:51 2008	(r184503)
@@ -4,6 +4,29 @@ use XML::Parser;
 use Data::Dumper;
 use POSIX;
 use strict;
+use Getopt::Std;
+
+my $CONTRIBXML;
+my $CONTRIBENT;
+my $RELEASEENT;
+my $DEBUG;
+{
+	my %opts;
+	$opts{o} = "contrib.ent";
+	$opts{r} = "relnotes.ent";
+	$opts{x} = "contrib.xml";
+
+	getopts("do:r:x:", \%opts);
+
+	$opts{o} = "/dev/tty" if (!defined $opts{o});
+	$opts{r} = "release.ent" if (!defined $opts{r});
+	$opts{x} = "contrib.xml" if (!defined $opts{x});
+
+	$DEBUG = $opts{d};
+	$CONTRIBENT = $opts{o};
+	$RELEASEENT = $opts{r};
+	$CONTRIBXML = $opts{x};
+}
 
 my @tree = ();
 my @values = ();
@@ -91,10 +114,14 @@ sub xml_char {
 						return if ($treeindex == 4);
 
 						if ($tree[5] eq "import") {
+							die "Already got import of $software - $swversion"
+								if (defined $softwares{$software}{versions}{$swversion}{import});
 							$softwares{$software}{versions}{$swversion}{import} = $value;
 							return;
 						}
 						if ($tree[5] eq "mfv") {
+							die "Already got mfv of $software - $swversion"
+								if (defined $softwares{$software}{versions}{$swversion}{mfv});
 							$softwares{$software}{versions}{$swversion}{mfv} = $value;
 							$softwares{$software}{versions}{$swversion}{mfc}{$mfvbranch} = $value
 								if ($mfvbranch);
@@ -125,7 +152,7 @@ my $p = new XML::Parser(
 		End     => \&xml_end,
 		Char    => \&xml_char,
 	});
-$p->parsefile(defined $ARGV[0] ? $ARGV[0] : "../../../../../contrib.xml");
+$p->parsefile($CONTRIBXML);
 
 {
 	my %r = (
@@ -134,7 +161,7 @@ $p->parsefile(defined $ARGV[0] ? $ARGV[0
 		"release.prev"		=> 1,
 		"release.branch"	=> 1,
 	);
-	open(FIN, "../../share/sgml/release.ent");
+	open(FIN, $RELEASEENT) or die("Cannot open $RELEASEENT for reading");
 	my @lines = <FIN>;
 	close(FIN);
 	chomp(@lines);
@@ -161,34 +188,10 @@ $p->parsefile(defined $ARGV[0] ? $ARGV[0
 # the creation date of branches{release.current} will be today.
 #
 if (!defined $branches{$releaseent{"release.current"}}) {
-	foreach my $sw (keys(%softwares)) {
-		foreach my $vs (keys(%{$softwares{$sw}{versions}})) {
-			next;
-			# XXX
-			next if (!defined $softwares{$sw}{versions}{$vs}{mfv});
-			my $date = $softwares{$sw}{versions}{$vs}{mfv};
-			my $branch = 0;
-
-			foreach my $b (sort(keys(%branches))) {
-				if ($b !~ /\./ &&
-				    $date lt $branches{$b} &&
-				    ($branch eq "0" || $date lt $branches{$branch})) {
-					$branch = $b;
-				}
-			}
-
-			$softwares{$sw}{versions}{$vs}{mfc}{$branch} =
-				$softwares{$sw}{versions}{$vs}{mfv};
-		}
-	}
-
 	$releaseent{"release.current"} = $releaseent{"release.branch"};
-#	$branches{$releaseent{"release.current"}} =
-#		$branches{$releaseent{"release.prev"}}
 	my @lt = localtime();
 	$branches{$releaseent{"release.current"}} = strftime("%Y-%m-%d",
 	    0, 0, 0, $lt[3], $lt[4], $lt[5]);
-
 }
 
 #
@@ -200,6 +203,7 @@ if (!defined $branches{$releaseent{"rele
 #
 my $thisversion = $releaseent{"release.current"};
 my $prevversion = "";
+my $branchversion = $releaseent{"release.current"};
 
 # XXX - This fails for 5.2.1
 if ($thisversion =~ /^(\d+)\.(\d+)/) {
@@ -210,6 +214,7 @@ if ($thisversion =~ /^(\d+)\.(\d+)/) {
 	} else {
 		$prevversion = sprintf("%d.%d", $major, $minor - 1);
 	}
+	$branchversion =~ s/\..*$//;
 } elsif ($thisversion =~ /^(\d+)$/) {
 	$prevversion = $1 - 1;
 }
@@ -228,9 +233,43 @@ my @T2 = split(/\-/, $T2);
 
 my %updated = ();
 
-#print $releaseent{"release.current"}, " - $thisversion - $prevversion\n";
-#print "$branches{$thisversion} - $branches{$prevversion}\n";
+if ($DEBUG) {
+	print "release.current: ", $releaseent{"release.current"}, " - ",
+	    "branchversion - $branchversion - ",
+	    "thisversion: $thisversion - ",
+	    "prevversion: $prevversion\n";
+	print "branches: thisversion: $branches{$thisversion} - ",
+	    "prevversion: $branches{$prevversion} - ",
+	    "branchversion: $branches{$branchversion}\n";
+}
+
+#
+# During the period of $branch{prevversion} and $branch{thisversion},
+# everything commited to $branch{branchversion} is also commited to
+# $branch{thisversion}.
+#
+
+foreach my $sw (sort(keys(%softwares))) {
+	foreach my $vs (sort(keys(%{$softwares{$sw}{versions}}))) {
+		foreach my $branch (sort(keys(%{$softwares{$sw}{versions}{$vs}{mfc}}))) {
+			next if ($branch !~ /^\d+$/);
+			next if ($branch ne $branchversion);
+			my $thisdate =
+			    $softwares{$sw}{versions}{$vs}{mfc}{$branch};
+			my $destversion = "";
+			if ($branches{$prevversion} lt $thisdate &&
+			    $thisdate lt $branches{$thisversion}) {
+				$softwares{$sw}{versions}{$vs}{mfc}{$thisversion} = $thisdate;
+				print "Transfering $sw version $vs from $branch to $thisversion\n"
+					if ($DEBUG);
+			}
+		}
+	}
+}
 
+#
+# Find all the versions between $prevversion and $thisversion
+#
 my %versions = ();
 foreach my $sw (sort(keys(%softwares))) {
 	foreach my $vs (sort(keys(%{$softwares{$sw}{versions}}))) {
@@ -239,9 +278,12 @@ foreach my $sw (sort(keys(%softwares))) 
 			    $branch ne $thisversion);
 
 			my $date = $softwares{$sw}{versions}{$vs}{mfc}{$branch};
-			next if ($date lt $branches{$prevversion} ||
-			    $date gt $branches{$thisversion});
-#			print "$date - $branch - $vs -> $sw\n";
+#			next if ($date lt $branches{$prevversion} ||
+#			    $date gt $branches{$thisversion});
+			if ($DEBUG) {
+				print "Found $sw $vs on $date\n";
+			#	lbetween $date - $branch - $vs -> $sw\n";
+			}
 			if (!defined $versions{$sw}{f_date} ||
 			    $versions{$sw}{f_date} ge $date) {
 				$versions{$sw}{f_date} = $date;
@@ -256,15 +298,28 @@ foreach my $sw (sort(keys(%softwares))) 
 	}
 }
 
-foreach my $sw (sort(keys(%versions))) {
-	my $a = $softwares{$sw}{desc};
-	print "<!ENTITY contrib.${sw}1 \"$versions{$sw}{f_version}\">\n";
-	print "<!ENTITY contrib.${sw}2 \"$versions{$sw}{l_version}\">\n";
-	print "<!ENTITY contrib.${sw}text \"$softwares{$sw}{desc}\">\n";
-}
+#print Dumper(%versions);
+#exit;
 
-print "<!ENTITY contrib.softwares \"";
-foreach my $sw (sort(keys(%versions))) {
-	print "&contrib.${sw}text; ";
+{
+	open(FOUT, ">$CONTRIBENT") or
+		die("Cannot open $CONTRIBENT for writing");
+	foreach my $sw (sort(keys(%versions))) {
+		my $a = $softwares{$sw}{desc};
+		print FOUT <<EOF;
+<!ENTITY contrib.${sw}1 "$versions{$sw}{f_version}">
+<!ENTITY contrib.${sw}2 "$versions{$sw}{l_version}">
+<!ENTITY contrib.${sw}text "$softwares{$sw}{desc}">
+EOF
+	}
+
+	print FOUT "<!ENTITY contrib.softwares \"";
+	my $i = 0;
+	foreach my $sw (sort(keys(%versions))) {
+		print FOUT " " if ($i++ != 0);
+		print FOUT "&contrib.${sw}text;";
+	}
+	print FOUT "<para></para>\n" if ($i == 0);
+	print FOUT "\">\n";
+	close(FOUT);
 }
-print "\">\n";

Modified: user/edwin/releasenotes/contrib.xml
==============================================================================
--- user/edwin/releasenotes/contrib.xml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/contrib.xml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -1,14 +1,41 @@
+<!-- Dates are retrieved from SVN with TZ=UTC -->
+
 <freebsd>
   <branches>
-    <branch name="7">2007-10-11</branch>
+
+    <branch name="7">2007-10-10</branch>
     <branch name="7.0">2007-12-22</branch>
+
     <branch name="6">2005-07-11</branch>
     <branch name="6.0">2005-10-09</branch>
     <branch name="6.1">2006-04-30</branch>
     <branch name="6.2">2006-11-14</branch>
-    <branch name="6.3">2007-10-24</branch>
+    <branch name="6.3">2007-11-24</branch>
     <branch name="6.4">2008-10-02</branch>
-    <branch name="5">2003-01-15</branch>
+
+    <!-- RELENG_5 is best guess, first occurence in CVS log -->
+    <branch name="5">2000-10-29</branch>
+    <branch name="5.0">2002-12-13</branch>
+    <branch name="5.1">2003-05-31</branch>
+    <branch name="5.2">2003-12-07</branch>
+    <branch name="5.3">2004-10-16</branch>
+    <branch name="5.4">2004-04-20</branch>
+    <branch name="5.5">2006-05-12</branch>
+
+    <branch name="4">2000-03-13</branch>
+    <branch name="4.3">2001-04-21</branch>
+    <branch name="4.4">2001-08-17</branch>
+    <branch name="4.5">2002-02-04</branch>
+    <branch name="4.6">2002-07-03</branch>
+    <branch name="4.7">2002-10-05</branch>
+    <branch name="4.8">2003-03-22</branch>
+    <branch name="4.9">2003-10-22</branch>
+    <branch name="4.10">2004-04-21</branch>
+    <branch name="4.11">2004-12-18</branch>
+
+    <branch name="3">1999-01-21</branch>
+    <branch name="2.1">1995-06-13</branch>
+    <branch name="2.2">1996-11-19</branch>
   </branches>
 
   <softwares>
@@ -99,43 +126,54 @@
 	  <mfv branch="8">2008-09-16</mfv>
 	  <mfc branch="7">2008-09-16</mfc>
 	  <mfc branch="6">2008-09-16</mfc>
+	  <mfc branch="4">2008-09-16</mfc>
 	</version>
 	<version version="tzdata2008e">
 	  <import>2008-08-08</import>
 	  <mfv branch="8">2008-08-08</mfv>
 	  <mfc branch="7">2008-08-08</mfc>
 	  <mfc branch="6">2008-08-15</mfc>
+	  <mfc branch="4">2008-03-25</mfc>
 	</version>
 	<version version="tzdata2008d">
 	  <import>2008-08-08</import>
 	  <mfv branch="8">2008-08-08</mfv>
 	  <mfc branch="7">2008-08-08</mfc>
 	  <mfc branch="6">2008-08-15</mfc>
+	  <mfc branch="4">2008-03-25</mfc>
 	</version>
 	<version version="tzdata2008c">
 	  <import>2008-08-08</import>
 	  <mfv branch="8">2008-08-08</mfv>
 	  <mfc branch="7">2008-08-08</mfc>
 	  <mfc branch="6">2008-08-15</mfc>
+	  <mfc branch="4">2008-03-25</mfc>
 	</version>
 	<version version="tzdata2008b">
 	  <import>2008-03-25</import>
 	  <mfv branch="8">2008-08-08</mfv>
 	  <mfc branch="7">2008-03-25</mfc>
 	  <mfc branch="6">2008-03-25</mfc>
+	  <mfc branch="5">2008-03-25</mfc>
+	  <mfc branch="4">2008-03-25</mfc>
 	</version>
 	<version version="tzdata2008a">
 	  <import>2008-03-09</import>
 	  <mfv branch="8">2008-03-09</mfv>
 	  <mfc branch="7">2008-03-09</mfc>
 	  <mfc branch="6">2008-03-09</mfc>
+	  <mfc branch="5">2008-03-09</mfc>
+	  <mfc branch="4">2008-03-10</mfc>
 	</version>
 	<version version="tzdata2007k">
 	  <import>2008-01-01</import>
 	  <mfv branch="8">2008-01-01</mfv>
 	  <mfc branch="7">2008-01-06</mfc>
+	  <mfc branch="7.0">2008-01-06</mfc>
 	  <mfc branch="6">2008-01-06</mfc>
 	  <mfc branch="6.3">2008-01-06</mfc>
+	  <mfc branch="5">2008-01-06</mfc>
+	  <mfc branch="4">2008-01-07</mfc>
 	</version>
 	<version version="tzdata2007j">
 	  <import>2007-12-04</import>
@@ -149,11 +187,15 @@
 	  <import>2007-10-09</import>
 	  <mfv branch="7">2007-10-09</mfv>
 	  <mfc branch="6">2007-10-18</mfc>
+	  <mfc branch="5">2007-10-18</mfc>
+	  <mfc branch="4">2007-10-18</mfc>
 	</version>
 	<version version="tzdata2007g">
 	  <import>2007-08-24</import>
 	  <mfv branch="7">2007-08-24</mfv>
 	  <mfc branch="6">2007-09-02</mfc>
+	  <mfc branch="5">2007-09-02</mfc>
+	  <mfc branch="4">2007-09-18</mfc>
 	</version>
 	<version version="tzdata2007f">
 	  <import>2007-05-21</import>
@@ -163,76 +205,94 @@
 	  <import>2006-05-11</import>
 	  <mfv branch="7">2006-05-21</mfv>
 	  <mfc branch="6">2006-10-16</mfc>
+	  <mfc branch="5">2006-10-13</mfc>
+	  <mfc branch="4">2006-10-13</mfc>
 	</version>
 	<version version="tzdata2006g">
 	  <import>2006-05-11</import>
-	  <mfv branch="7">x</mfv>
+	  <mfv branch="7">2005-05-11</mfv>
 	  <mfc branch="6">2005-05-11</mfc>
+	  <mfc branch="5">2006-05-12</mfc>
 	</version>
 	<version version="tzdata2005r">
 	  <import>2005-12-27</import>
 	  <mfv branch="7">2005-12-27</mfv>
 	  <mfc branch="6">2005-12-27</mfc>
+	  <mfc branch="5">2005-12-27</mfc>
 	</version>
 	<version version="tzdata2005q">
 	  <import>2005-12-22</import>
 	  <mfv branch="7">2005-12-22</mfv>
 	  <mfc branch="6">2005-12-22</mfc>
+	  <mfc branch="5">2005-12-22</mfc>
 	</version>
 	<version version="tzdata2005m">
 	  <import>2005-08-26</import>
 	  <mfv branch="7">2005-08-29</mfv>
 	  <mfc branch="6">2005-12-22</mfc>
+	  <mfc branch="5">2005-08-29</mfc>
 	</version>
 	<version version="tzdata2005l">
 	  <import>2005-08-26</import>
 	  <mfv branch="7">2005-08-27</mfv>
 	  <mfc branch="6">2005-12-22</mfc>
+	  <mfc branch="5">2005-08-28</mfc>
 	</version>
 	<version version="tzdata2004g">
 	  <import>2004-12-03</import>
 	  <mfv branch="7">2004-12-03</mfv>
 	  <mfc branch="6">2004-12-02</mfc>
+	  <mfc branch="5">2004-12-02</mfc>
+	  <mfc branch="4">2004-12-02</mfc>
 	</version>
 	<version version="tzdata2004e">
 	  <import>2004-10-18</import>
-	  <mfv>2004-10-18</mfv>
+	  <mfv branch="5">2004-10-23</mfv>
+	  <mfc branch="5.3">2004-10-23</mfc>
+	  <mfc branch="4">2004-12-02</mfc>
 	</version>
 	<version version="tzdata2003d">
 	  <import>2003-10-14</import>
-	  <mfv>2003-10-15</mfv>
+	  <mfv branch="5">2003-10-15</mfv>
+	  <mfc branch="4">2003-10-16</mfc>
 	</version>
 	<version version="tzdata2003a">
 	  <import>2003-04-28</import>
-	  <mfv>2003-04-29</mfv>
+	  <mfv branch="5">2003-04-28</mfv>
+	  <mfc branch="4">2003-04-28</mfc>
 	</version>
 	<version version="tzdata2002d">
 	  <import>2002-10-16</import>
-	  <mfv>2002-10-16</mfv>
+	  <mfv branch="5">2002-10-16</mfv>
+	  <mfc branch="4">2002-10-21</mfc>
 	</version>
 	<version version="tzdata2002c">
 	  <import>2002-04-04</import>
-	  <mfv>2002-04-05</mfv>
+	  <mfv branch="5">2002-04-05</mfv>
+	  <mfc branch="4">2002-04-05</mfc>
 	</version>
 	<version version="tzdata2001d">
 	  <import>2001-11-10</import>
-	  <mfv>2001-11-10</mfv>
+	  <mfv branch="5">2001-11-16</mfv>
+	  <mfc branch="4">2001-11-16</mfc>
 	</version>
 	<version version="tzdata2001b">
 	  <import>2001-04-06</import>
-	  <mfv>2001-04-07</mfv>
+	  <mfv branch="5">2001-04-07</mfv>
+	  <mfc branch="4">2001-11-16</mfc>
 	</version>
 	<version version="tzdata2000g">
 	  <import>2000-10-25</import>
-	  <mfv>2000-10-26</mfv>
+	  <mfv branch="4">2000-10-26</mfv>
 	</version>
 	<version version="tzdata2000f">
 	  <import>2000-03-29</import>
-	  <mfv>2000-08-11</mfv>
+	  <mfv branch="4">2000-08-11</mfv>
 	</version>
 	<version version="tzdata2000d">
 	  <import>2000-03-29</import>
-	  <mfv>2000-03-30</mfv>
+	  <mfv branch="4">2000-03-30</mfv>
+	  <mfc branch="3">2000-03-30</mfc>
 	</version>
 	<version version="tzdata1999b">
 	  <import>1999-02-02</import>

Modified: user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile
==============================================================================
--- user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -22,8 +22,8 @@ SRCS+=	article.sgml
 SRCS+=	contrib.ent
 CLEANFILES+= contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../..
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,18 +8,12 @@ DESTDIR?=	${DOCDIR}/relnotes
 DESTDIR?=	${DOCDIR}/en_US.ISO8859-1/relnotes
 .endif
 
-DOC?=	article
-FORMATS?=	html
-INSTALL_COMPRESSED?=	gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
 CLEANFILES+=	contrib.ent
 SRCS+=		contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent
+all: contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../../..
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -1427,6 +1427,11 @@ moused_ums0_port="/dev/ums0"</programlis
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>awk</application> has been updated from the 7
       February 2004 release to the 24 April 2005 release.</para>

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,18 +8,12 @@ DESTDIR?=	${DOCDIR}/relnotes
 DESTDIR?=	${DOCDIR}/en_US.ISO8859-1/relnotes
 .endif
 
-DOC?=	article
-FORMATS?=	html
-INSTALL_COMPRESSED?=	gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
 CLEANFILES+=	contrib.ent
 SRCS+=		contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent
+all: contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../../..
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -636,8 +636,13 @@ geli_da1s3a_keyfile0_name="/boot/keys/da
     </sect3>
   </sect2>
 
-  <sect2>
+  <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>BIND</application> has been updated from 9.3.1
       to 9.3.2.</para>

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,18 +8,12 @@ DESTDIR?=	${DOCDIR}/relnotes
 DESTDIR?=	${DOCDIR}/en_US.ISO8859-1/relnotes
 .endif
 
-DOC?=	article
-FORMATS?=	html
-INSTALL_COMPRESSED?=	gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
 CLEANFILES+=	contrib.ent
 SRCS+=		contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent
+all: contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../../..
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -555,6 +555,11 @@
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>BIND</application> has been updated from 9.3.1
       to 9.3.3.</para>

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,18 +8,12 @@ DESTDIR?=	${DOCDIR}/relnotes
 DESTDIR?=	${DOCDIR}/en_US.ISO8859-1/relnotes
 .endif
 
-DOC?=	article
-FORMATS?=	html
-INSTALL_COMPRESSED?=	gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
 CLEANFILES+=	contrib.ent
 SRCS+=		contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent
+all: contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../../..
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -380,6 +380,11 @@
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>awk</application> has been updated from the 24
       April 2005 release to the 1 May 2007 release.</para>

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,18 +8,12 @@ DESTDIR?=	${DOCDIR}/relnotes
 DESTDIR?=	${DOCDIR}/en_US.ISO8859-1/relnotes
 .endif
 
-DOC?=	article
-FORMATS?=	html
-INSTALL_COMPRESSED?=	gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
 CLEANFILES+=	contrib.ent
 SRCS+=		contrib.ent
 
-contrib.ent: ${RELN_ROOT}/../../../contrib.xml
-	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent
+all: contrib.ent
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml ${RELN_ROOT}/share/sgml/release.ent
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl -x ${RELN_ROOT}/../../../contrib.xml -r ${RELN_ROOT}/share/sgml/release.ent -o contrib.ent
 
 URL_RELPREFIX?=	../../../../..
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -198,6 +198,11 @@
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>bzip2</application> has been updated from 1.0.4
       to 1.0.5.</para>

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)
+++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml	Fri Oct 31 11:47:51 2008	(r184503)
@@ -8,6 +8,8 @@
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
+<!ENTITY % contrib SYSTEM "../common/contrib.ent">
+%contrib;
 
 <!-- Architecture-specific customization -->
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml	Fri Oct 31 11:27:54 2008	(r184502)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***