From owner-svn-src-user@FreeBSD.ORG Tue Oct 21 10:54:13 2008 Return-Path: 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 DDCC9106567C; Tue, 21 Oct 2008 10:54:13 +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 CA2DC8FC19; Tue, 21 Oct 2008 10:54:13 +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 m9LAsDPK097296; Tue, 21 Oct 2008 10:54:13 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9LAsCD9097276; Tue, 21 Oct 2008 10:54:12 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810211054.m9LAsCD9097276@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 21 Oct 2008 10:54:12 +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: r184121 - in user/edwin/releasenotes: . head/release/doc/en_US.ISO8859-1/relnotes releng-6.0/release/doc/en_US.ISO8859-1/relnotes releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common ... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2008 10:54:14 -0000 Author: edwin Date: Tue Oct 21 10:54:12 2008 New Revision: 184121 URL: http://svn.freebsd.org/changeset/base/184121 Log: Automatic generation of Contributed Software overview. First working code, will check the correctness tomorrow. Added: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile 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/Makefile user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile 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/Makefile user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Modified: user/edwin/releasenotes/Makefile ============================================================================== --- user/edwin/releasenotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -6,14 +6,26 @@ RELENG=7.0 6.4 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/; \ + @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/; \ + make clean +.endfor + +perl: +.for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} + @cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \ + make contrib.ent +.endfor + html: > links.html .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} - A=$$(find ${d} -name article.html | egrep '(relnotes/article|i386)'); \ + @A=$$(find ${d} -name article.html | egrep '(relnotes/article|i386)'); \ echo "${d}
" >> links.html .endfor Modified: user/edwin/releasenotes/contrib-xmltoent.pl ============================================================================== --- user/edwin/releasenotes/contrib-xmltoent.pl Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/contrib-xmltoent.pl Tue Oct 21 10:54:12 2008 (r184121) @@ -2,6 +2,7 @@ use XML::Parser; use Data::Dumper; +use POSIX; use strict; my @tree = (); @@ -12,6 +13,7 @@ my %branches = (); my %softwares = (); my $software = ""; my $mfcbranch = ""; +my $mfvbranch = ""; my $swversion = ""; my %releaseent = (); @@ -35,6 +37,11 @@ sub xml_start { if ($element eq "mfc") { $mfcbranch = $values[$treeindex]{branch}; } + if ($element eq "mfv") { + $mfvbranch = ""; + $mfvbranch = $values[$treeindex]{branch} + if (defined $values[$treeindex]{branch}); + } } @@ -89,6 +96,8 @@ sub xml_char { } if ($tree[5] eq "mfv") { $softwares{$software}{versions}{$swversion}{mfv} = $value; + $softwares{$software}{versions}{$swversion}{mfc}{$mfvbranch} = $value + if ($mfvbranch); return; } if ($tree[5] eq "desc") { @@ -116,7 +125,7 @@ my $p = new XML::Parser( End => \&xml_end, Char => \&xml_char, }); -$p->parsefile("../../../../../contrib.xml"); +$p->parsefile(defined $ARGV[0] ? $ARGV[0] : "../../../../../contrib.xml"); { my %r = ( @@ -144,25 +153,41 @@ $p->parsefile("../../../../../contrib.xm # # If we are in -current, then release.current doesn't exist yet. -# In that case copy all MFVs into MFC{release.branch}. The date +# In that case copy all MFVs into MFC{branchitwasinMFVin}. The date # of the new MFC is the date of the release.prev. # # release.current is then assigned with release.branch. # -# the creation date of branches{release.current} will be -# branches{release.prev} +# 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}); - $softwares{$sw}{versions}{$vs}{mfc}{$releaseent{"release.branch"}} = $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"}} +# $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]); } @@ -189,8 +214,57 @@ if ($thisversion =~ /^(\d+)\.(\d+)/) { $prevversion = $1 - 1; } -print "$thisversion - $prevversion\n"; -print "$branches{$thisversion} - $branches{$prevversion}\n"; -#print Dumper(%branches); -#print Dumper(%releaseent); -#print Dumper(%softwares); +# +# Now we know the branches to compare, we know the dates between +# which the changes have to be displayed. +# +# Let's find the software which has been updated +# + +my $T1 = $branches{$prevversion}; +my $T2 = $branches{$thisversion}; +my @T1 = split(/\-/, $T1); +my @T2 = split(/\-/, $T2); + +my %updated = (); + +#print $releaseent{"release.current"}, " - $thisversion - $prevversion\n"; +#print "$branches{$thisversion} - $branches{$prevversion}\n"; + +my %versions = (); +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 ne $prevversion && + $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"; + if (!defined $versions{$sw}{f_date} || + $versions{$sw}{f_date} ge $date) { + $versions{$sw}{f_date} = $date; + $versions{$sw}{f_version} = $vs; + } + if (!defined $versions{$sw}{l_date} || + $versions{$sw}{l_date} le $date) { + $versions{$sw}{l_date} = $date; + $versions{$sw}{l_version} = $vs; + } + } + } +} + +foreach my $sw (sort(keys(%versions))) { + my $a = $softwares{$sw}{desc}; + print "\n"; + print "\n"; + print "\n"; +} + +print "\n"; Modified: user/edwin/releasenotes/contrib.xml ============================================================================== --- user/edwin/releasenotes/contrib.xml Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/contrib.xml Tue Oct 21 10:54:12 2008 (r184121) @@ -8,62 +8,63 @@ 2006-11-14 2007-10-24 2008-10-02 + 2003-01-15 less has been updated from - %v1% to %v2%. + &contrib.less1; to &contrib.less2; ]]> 2007-11-26 - 2007-11-26 + 2007-11-26 2007-12-05 2007-12-05 2007-11-17 - 2007-11-17 + 2007-11-17 2007-10-13 - 2007-10-13 + 2007-10-13 2007-10-18 2007-10-16 2007-10-09 - 2007-10-09 + 2007-10-09 2007-10-12 2007-06-21 - 2007-06-21 + 2007-06-21 2007-07-03 2007-06-04 - 2007-06-04 + 2007-06-04 2006-08-21 - 2006-08-21 + 2006-08-21 2006-08-30 2004-04-17 - 2004-04-17 + 2004-04-17 2002-01-08 - 2002-01-08 + 2002-01-08 2000-07-14 - 2000-07-14 + 2000-07-14 2000-05-22 @@ -74,123 +75,123 @@ The timezone database has been updated from - the %v1% release to the - %v2% release. + the &contrib.tzdata1; release to the + &contrib.tzdata2; release. ]]> 2008-10-14 - 2008-10-14 + 2008-10-14 2008-10-14 2008-10-14 2008-10-14 2008-10-14 - 2008-10-14 + 2008-10-14 2008-10-14 2008-10-14 2008-10-14 2008-09-16 - 2008-09-16 + 2008-09-16 2008-09-16 2008-09-16 2008-08-08 - 2008-08-08 + 2008-08-08 2008-08-08 2008-08-15 2008-08-08 - 2008-08-08 + 2008-08-08 2008-08-08 2008-08-15 2008-08-08 - 2008-08-08 + 2008-08-08 2008-08-08 2008-08-15 2008-03-25 - 2008-08-08 + 2008-08-08 2008-03-25 2008-03-25 2008-03-09 - 2008-03-09 + 2008-03-09 2008-03-09 2008-03-09 2008-01-01 - 2008-01-01 + 2008-01-01 2008-01-06 2008-01-06 2008-01-06 2007-12-04 - 2007-12-04 + 2007-12-04 2007-11-04 - 2007-11-04 + 2007-11-04 2007-10-09 - 2007-10-09 + 2007-10-09 2007-10-18 2007-08-24 - 2007-08-24 + 2007-08-24 2007-09-02 2007-05-21 - 2007-05-21 + 2007-05-21 2006-05-11 - 2006-05-21 + 2006-05-21 2006-10-16 2006-05-11 - + x 2005-05-11 2005-12-27 - 2005-12-27 + 2005-12-27 2005-12-27 2005-12-22 - 2005-12-22 + 2005-12-22 2005-12-22 2005-08-26 - 2005-08-29 + 2005-08-29 2005-12-22 2005-08-26 - 2005-08-27 + 2005-08-27 2005-12-22 2004-12-03 - 2004-12-03 + 2004-12-03 2004-12-02 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 Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -19,10 +19,11 @@ JADEFLAGS+= -V %generate-article-toc% SRCS+= article.sgml # Contributed software -SRCS+= contrib.ent +SRCS+= contrib.ent +CLEANFILES+= contrib.ent contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../.. Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,12 +2,16 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 @@ -10,5 +11,8 @@ SUBDIR+= pc98 SUBDIR+= powerpc SUBDIR+= sparc64 +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -18,8 +18,12 @@ JADEFLAGS+= -V %generate-article-toc% # SGML content SRCS+= article.sgml +# Contributes software +SRCS+= contrib.ent +CLEANFILES+= contrib.ent + contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../.. Modified: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +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 + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: 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/common/new.sgml Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml Tue Oct 21 10:54:12 2008 (r184121) @@ -198,6 +198,12 @@ Contributed Software + &contrib.softwares; + + + + + Contributed Software bzip2 has been updated from 1.0.4 to 1.0.5. Modified: user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -18,8 +18,12 @@ JADEFLAGS+= -V %generate-article-toc% # SGML content SRCS+= article.sgml +# Contributed software +SRCS+= contrib.ent +CLEANFILES+= contrib.ent + contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../..