- Update to 2.18

PR:		ports/76531
Submitted by:	"Choe, Cheng-Dae" <whitekid@gmail.com>

6 files changed, 251 insertions, 149 deletions

diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index e1fba4a40db9..ac7f59f0ef57 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.16.7
+PORTVERSION?=	2.18
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -14,14 +14,19 @@ MASTER_SITE_SUBDIR=	webtools webtools/archived
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql \
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
+		${SITE_PERL}/Data/Dumper/Simple.pm:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
+		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
 .if !defined(WITHOUT_BUG_CHARTING_MODULES)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
-		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart
+		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
+		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
+		${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
 .if defined(WITH_BUG_MAILING_MODULES)
@@ -48,8 +53,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 BUGZILLADIR?=	www/data/bugzilla
 BUGZILLADOCS=	html images txt rel_notes.txt
-BONSAIPERLWC=	*.cgi *.pl *.pm processmail syncshadowdb contrib/*.pl
-SENDMAILWC=	*.pl *.pm processmail contrib/*.pl
+SENDMAILWC=	*.pl *.pm contrib/*.pl Bugzilla/*.pm
 
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR}
 
@@ -78,10 +82,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
 	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
 	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
-.for i in ${BONSAIPERLWC}
-	@${REINPLACE_CMD} -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
-		${WRKSRC}/$i
-.endfor
 .for i in ${SENDMAILWC}
 	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
 		${WRKSRC}/$i
@@ -97,24 +97,25 @@ do-install:
 	${MKDIR} ${PREFIX}/${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
-	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template css js skins | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
 .endif
+
 .if defined(WITH_CONTRIB)
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib ${PREFIX}/${BUGZILLADIR}/contrib/cmdline
-	cd ${WRKSRC}/contrib; ${INSTALL_SCRIPT} BugzillaEmail.pm bug_email.pl \
-		bugzilla_email_append.pl cvs-update.sh gnats2bz.pl jb2bz.py \
-		mysqld-watcher.pl yp_nomail.sh ${PREFIX}/${BUGZILLADIR}/contrib
-	cd ${WRKSRC}/contrib/cmdline; ${INSTALL_SCRIPT} buglist bugs \
-		query.conf ${PREFIX}/${BUGZILLADIR}/contrib/cmdline
+	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib
+	@cd ${WRKSRC}/contrib && \
+		${FIND} . -type d -exec ${MKDIR} "${PREFIX}/${BUGZILLADIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${BUGZILLADIR}/contrib/{}" \;
+.endif
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/contrib
 	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
 		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
 .endif
-.endif
 
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
diff --git a/devel/bugzilla2/distinfo b/devel/bugzilla2/distinfo
index 4bea4993636b..7d0369a5d06a 100644
--- a/devel/bugzilla2/distinfo
+++ b/devel/bugzilla2/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.16.7.tar.gz) = ee4c92bfd940521cc68ea91917f9f0dd
-SIZE (bugzilla-2.16.7.tar.gz) = 1368799
+MD5 (bugzilla-2.18.tar.gz) = 243089e2137ecfc8f857dbbeae0ad1d7
+SIZE (bugzilla-2.18.tar.gz) = 1490302
diff --git a/devel/bugzilla2/files/patch-checksetup.pl b/devel/bugzilla2/files/patch-checksetup.pl
index 2beed10bacaf..c35d3bf4708e 100644
--- a/devel/bugzilla2/files/patch-checksetup.pl
+++ b/devel/bugzilla2/files/patch-checksetup.pl
@@ -1,11 +1,11 @@
---- checksetup.pl~	Fri Apr 16 02:48:51 2004
-+++ checksetup.pl	Thu Jul 15 23:37:09 2004
-@@ -399,7 +399,7 @@
- # and you cannot set this up any other way. YOU HAVE BEEN WARNED.
- # If you set this to anything besides "", you will need to run checksetup.pl
- # as root, or as a user who is a member of the specified group.
--$webservergroup = "apache";
-+$webservergroup = "nogroup";
- ');
- 
+--- checksetup.pl.orig	Fri Jan 14 10:51:36 2005
++++ checksetup.pl	Mon Jan 24 17:39:29 2005
+@@ -616,7 +616,7 @@
  
+ my $webservergroup_default;
+ if ($^O !~ /MSWin32/i) {
+-    $webservergroup_default = 'apache';
++    $webservergroup_default = 'nogroup';
+ } else {
+     $webservergroup_default = '';
+ }
diff --git a/devel/bugzilla2/files/patch-runtests.sh b/devel/bugzilla2/files/patch-runtests.sh
deleted file mode 100644
index 5ccf3dbeeef0..000000000000
--- a/devel/bugzilla2/files/patch-runtests.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- runtests.sh~	Tue Jan  8 12:58:39 2002
-+++ runtests.sh	Tue Jan  8 12:58:47 2002
-@@ -9,4 +9,4 @@
-   fi
- done
- 
--/usr/bonsaitools/bin/perl -e "${PART1}${TEST_VERBOSE}${PART2}" t/*.t
-+/usr/bin/perl -e "${PART1}${TEST_VERBOSE}${PART2}" t/*.t
diff --git a/devel/bugzilla2/files/patch-t-002goodperl.t b/devel/bugzilla2/files/patch-t-002goodperl.t
deleted file mode 100644
index cf9fe9e930ce..000000000000
--- a/devel/bugzilla2/files/patch-t-002goodperl.t
+++ /dev/null
@@ -1,11 +0,0 @@
---- t/002goodperl.t~	Mon Feb  3 20:29:23 2003
-+++ t/002goodperl.t	Mon Feb  3 20:29:37 2003
-@@ -60,7 +60,7 @@
-     $file =~ m/.*\.(.*)/;
-     my $ext = $1;
- 
--    if ($file_line1 !~ /\/usr\/bonsaitools\/bin\/perl/) {
-+    if ($file_line1 !~ /\/usr\/bin\/perl/) {
-         ok(1,"$file does not have a shebang");	
-     } else {
-         my $flags;
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index b5557cad826a..c54770de1fe0 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -1,17 +1,31 @@
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
+%%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/administration.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bug_page.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bugreports.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cmdline-bugmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cmdline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/components.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/html/conventions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/html/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cust-change-permissions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cust-hooks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cust-templates.html
-%%PORTDOCS%%%%DOCSDIR%%/html/database.html
+%%PORTDOCS%%%%DOCSDIR%%/html/customization.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dbdoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dbschema.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dbmodify.html
 %%PORTDOCS%%%%DOCSDIR%%/html/disclaimer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/extraconfig.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/flags-overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/flags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/general-advice.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gfdl-0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gfdl-1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gfdl-10.html
@@ -28,39 +42,56 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/groups.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hintsandtips.html
-%%PORTDOCS%%%%DOCSDIR%%/html/how.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install-perlmodules-manual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/installing-bugzilla.html
 %%PORTDOCS%%%%DOCSDIR%%/html/integration.html
-%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lifecycle.html
+%%PORTDOCS%%%%DOCSDIR%%/html/list.html
+%%PORTDOCS%%%%DOCSDIR%%/html/milestones.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules-manual-download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules-manual-instructions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules-manual-optional.html
+%%PORTDOCS%%%%DOCSDIR%%/html/myaccount.html
 %%PORTDOCS%%%%DOCSDIR%%/html/newversions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/nonroot.html
-%%PORTDOCS%%%%DOCSDIR%%/html/osx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/os-specific.html
 %%PORTDOCS%%%%DOCSDIR%%/html/parameters.html
+%%PORTDOCS%%%%DOCSDIR%%/html/paranoid-security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/patches.html
-%%PORTDOCS%%%%DOCSDIR%%/html/programadmin.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/html/patchviewer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/products.html
+%%PORTDOCS%%%%DOCSDIR%%/html/query.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quips.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reporting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/security-bugzilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/security-mysql.html
+%%PORTDOCS%%%%DOCSDIR%%/html/security-os.html
+%%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
-%%PORTDOCS%%%%DOCSDIR%%/html/stepbystep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/html/useradmin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/userpreferences.html
+%%PORTDOCS%%%%DOCSDIR%%/html/using-intro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-fenris.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-scarab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-issuezilla.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-perforce.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-redhat.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variant-sourceforge.html
-%%PORTDOCS%%%%DOCSDIR%%/html/variants.html
-%%PORTDOCS%%%%DOCSDIR%%/html/whatis.html
-%%PORTDOCS%%%%DOCSDIR%%/html/why.html
-%%PORTDOCS%%%%DOCSDIR%%/html/win32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2868.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2875.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2885.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2890.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2944.html
+%%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
+%%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/dbschema.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/dbschema.ps
 %%PORTDOCS%%%%DOCSDIR%%/images/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/tip.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
@@ -72,60 +103,77 @@
 %%PORTDOCS%%%%DOCSDIR%%/xml/about.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/administration.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/conventions.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/database.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/customization.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/dbschema.mysql
 %%PORTDOCS%%%%DOCSDIR%%/xml/faq.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/filetemp.patch
-%%PORTDOCS%%%%DOCSDIR%%/xml/gd-makefile.patch
 %%PORTDOCS%%%%DOCSDIR%%/xml/gfdl.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/glossary.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/index.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/installation.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/integration.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/introduction.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/modules.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/patches.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/requiredsoftware.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/security.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/troubleshooting.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/using.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/variants.xml
-%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/README
-%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/README.Mailif
-%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/bugmail_help.html
-%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/bug_email.pl
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/cvs-update.sh
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnats2bz.pl
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/jb2bz.py
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/mysqld-watcher.pl
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/yp_nomail.sh
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/buglist
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugs
-%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/query.conf
-%%BUGZILLADIR%%/buglist.cgi
 %%BUGZILLADIR%%/1x1.gif
+%%BUGZILLADIR%%/Bugzilla.pm
+%%BUGZILLADIR%%/CGI.pl
+%%BUGZILLADIR%%/QUICKSTART
+%%BUGZILLADIR%%/README
 %%BUGZILLADIR%%/ant.jpg
 %%BUGZILLADIR%%/attachment.cgi
-%%BUGZILLADIR%%/Attachment.pm
-%%BUGZILLADIR%%/Bug.pm
-%%BUGZILLADIR%%/bug_form.pl
-%%BUGZILLADIR%%/bug_status.html
-%%BUGZILLADIR%%/bugwritinghelp.html
+%%BUGZILLADIR%%/buglist.cgi
 %%BUGZILLADIR%%/bugzilla.dtd
-%%BUGZILLADIR%%/CGI.pl
-%%BUGZILLADIR%%/changepassword.cgi
+%%BUGZILLADIR%%/chart.cgi
 %%BUGZILLADIR%%/checksetup.pl
 %%BUGZILLADIR%%/colchange.cgi
 %%BUGZILLADIR%%/collectstats.pl
-%%BUGZILLADIR%%/confirmhelp.html
+%%BUGZILLADIR%%/config.cgi
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/README
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/README.Mailif
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bug_email.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugmail_help.html
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla-submit/README
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla-submit/bugdata.txt
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla-submit/bugzilla-submit
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla-submit/bugzilla-submit.xml
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla.procmailrc
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_ldapsync.rb
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/buglist
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugs
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/query.conf
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cvs-update.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnats2bz.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnatsparse/README
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnatsparse/gnatsparse.py
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnatsparse/magic.py
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/gnatsparse/specialuu.py
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/jb2bz.py
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/mysqld-watcher.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/sendbugmail.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/sendunsentbugmail.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/syncLDAP.pl
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/yp_nomail.sh
 %%BUGZILLADIR%%/createaccount.cgi
+%%BUGZILLADIR%%/css/buglist.css
+%%BUGZILLADIR%%/css/duplicates.css
+%%BUGZILLADIR%%/css/global.css
+%%BUGZILLADIR%%/css/panel.css
+%%BUGZILLADIR%%/css/show_multiple.css
 %%BUGZILLADIR%%/defparams.pl
 %%BUGZILLADIR%%/describecomponents.cgi
 %%BUGZILLADIR%%/describekeywords.cgi
-%%BUGZILLADIR%%/move.pl
 %%BUGZILLADIR%%/doeditparams.cgi
 %%BUGZILLADIR%%/duplicates.cgi
-%%BUGZILLADIR%%/editattachstatuses.cgi
+%%BUGZILLADIR%%/duplicates.xul
 %%BUGZILLADIR%%/editcomponents.cgi
+%%BUGZILLADIR%%/editflagtypes.cgi
 %%BUGZILLADIR%%/editgroups.cgi
 %%BUGZILLADIR%%/editkeywords.cgi
 %%BUGZILLADIR%%/editmilestones.cgi
@@ -135,26 +183,25 @@
 %%BUGZILLADIR%%/editversions.cgi
 %%BUGZILLADIR%%/enter_bug.cgi
 %%BUGZILLADIR%%/globals.pl
-%%BUGZILLADIR%%/help.html
-%%BUGZILLADIR%%/helpemailquery.html
-%%BUGZILLADIR%%/how_to_mail.html
 %%BUGZILLADIR%%/importxml.pl
 %%BUGZILLADIR%%/index.cgi
 %%BUGZILLADIR%%/localconfig.js
 %%BUGZILLADIR%%/long_list.cgi
-%%BUGZILLADIR%%/notargetmilestone.html
+%%BUGZILLADIR%%/move.pl
+%%BUGZILLADIR%%/padlock.png
+%%BUGZILLADIR%%/page.cgi
 %%BUGZILLADIR%%/post_bug.cgi
 %%BUGZILLADIR%%/process_bug.cgi
-%%BUGZILLADIR%%/processmail
-%%BUGZILLADIR%%/queryhelp.cgi
+%%BUGZILLADIR%%/productmenu.js
+%%BUGZILLADIR%%/query.cgi
 %%BUGZILLADIR%%/quicksearch.html
 %%BUGZILLADIR%%/quicksearch.js
 %%BUGZILLADIR%%/quicksearchhack.html
 %%BUGZILLADIR%%/quips.cgi
-%%BUGZILLADIR%%/README
-%%BUGZILLADIR%%/RelationSet.pm
 %%BUGZILLADIR%%/relogin.cgi
+%%BUGZILLADIR%%/report.cgi
 %%BUGZILLADIR%%/reports.cgi
+%%BUGZILLADIR%%/request.cgi
 %%BUGZILLADIR%%/robots.txt
 %%BUGZILLADIR%%/runtests.pl
 %%BUGZILLADIR%%/runtests.sh
@@ -163,17 +210,10 @@
 %%BUGZILLADIR%%/show_bug.cgi
 %%BUGZILLADIR%%/showattachment.cgi
 %%BUGZILLADIR%%/showdependencygraph.cgi
-%%BUGZILLADIR%%/sidebar.cgi
 %%BUGZILLADIR%%/showdependencytree.cgi
-%%BUGZILLADIR%%/syncshadowdb
-%%BUGZILLADIR%%/token.cgi
-%%BUGZILLADIR%%/Token.pm
-%%BUGZILLADIR%%/userprefs.cgi
-%%BUGZILLADIR%%/votehelp.html
-%%BUGZILLADIR%%/votes.cgi
-%%BUGZILLADIR%%/whineatnews.pl
-%%BUGZILLADIR%%/xml.cgi
-%%BUGZILLADIR%%/query.cgi
+%%BUGZILLADIR%%/sidebar.cgi
+%%BUGZILLADIR%%/template/en/default/account/auth/ldap-error.html.tmpl
+%%BUGZILLADIR%%/template/en/default/account/auth/login.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/cancel-token.txt.tmpl
 %%BUGZILLADIR%%/template/en/default/account/create.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/created.html.tmpl
@@ -188,23 +228,37 @@
 %%BUGZILLADIR%%/template/en/default/account/prefs/footer.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/permissions.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/prefs.html.tmpl
-%%BUGZILLADIR%%/template/en/default/admin/attachstatus/create.html.tmpl
-%%BUGZILLADIR%%/template/en/default/admin/attachstatus/delete.html.tmpl
-%%BUGZILLADIR%%/template/en/default/admin/attachstatus/edit.html.tmpl
-%%BUGZILLADIR%%/template/en/default/admin/attachstatus/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/account/prefs/saved-searches.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/flag-type/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/flag-type/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/keywords/rebuild-cache.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/attachment/choose.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/content-types.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/create.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/attachment/diff-file.html.tmpl
+%%BUGZILLADIR%%/template/en/default/attachment/diff-footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/attachment/diff-header.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/edit.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/list.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/show-multiple.html.tmpl
 %%BUGZILLADIR%%/template/en/default/attachment/updated.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/activity/show.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/activity/table.html.tmpl
-%%BUGZILLADIR%%/template/en/default/bug/choose-xml.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/choose.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/comments.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/create/comment-guided.txt.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/create/comment.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/create/create-guided.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/create/create.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/create/created.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/create/make-template.html.tmpl
@@ -212,75 +266,141 @@
 %%BUGZILLADIR%%/template/en/default/bug/dependency-graph.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/dependency-tree.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/knob.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/navigate.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/process/bugmail.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/process/confirm-duplicate.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/process/header.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/process/midair.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/process/next.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/process/results.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/process/verify-new-product.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/show-multiple.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/show.html.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/show.xml.tmpl
+%%BUGZILLADIR%%/template/en/default/bug/time.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/votes/delete-all.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/votes/list-for-bug.html.tmpl
 %%BUGZILLADIR%%/template/en/default/bug/votes/list-for-user.html.tmpl
+%%BUGZILLADIR%%/template/en/default/config.js.tmpl
+%%BUGZILLADIR%%/template/en/default/config.rdf.tmpl
 %%BUGZILLADIR%%/template/en/default/filterexceptions.pl
+%%BUGZILLADIR%%/template/en/default/flag/list.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/banner.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/choose-product.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/code-error.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/confirm-user-match.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/field-descs.none.tmpl
 %%BUGZILLADIR%%/template/en/default/global/footer.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/header.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/help-header.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/help.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/hidden-fields.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/initialize.none.tmpl
 %%BUGZILLADIR%%/template/en/default/global/message.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/messages.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/select-menu.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/site-navigation.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/useful-links.html.tmpl
 %%BUGZILLADIR%%/template/en/default/global/user-error.html.tmpl
+%%BUGZILLADIR%%/template/en/default/global/variables.none.tmpl
 %%BUGZILLADIR%%/template/en/default/index.html.tmpl
 %%BUGZILLADIR%%/template/en/default/list/change-columns.html.tmpl
 %%BUGZILLADIR%%/template/en/default/list/edit-multiple.html.tmpl
-%%BUGZILLADIR%%/template/en/default/list/list-rdf.rdf.tmpl
 %%BUGZILLADIR%%/template/en/default/list/list-simple.html.tmpl
+%%BUGZILLADIR%%/template/en/default/list/list.csv.tmpl
 %%BUGZILLADIR%%/template/en/default/list/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/list/list.ics.tmpl
+%%BUGZILLADIR%%/template/en/default/list/list.js.tmpl
+%%BUGZILLADIR%%/template/en/default/list/list.rdf.tmpl
 %%BUGZILLADIR%%/template/en/default/list/quips.html.tmpl
 %%BUGZILLADIR%%/template/en/default/list/server-push.html.tmpl
 %%BUGZILLADIR%%/template/en/default/list/table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/pages/bug-writing.html.tmpl
+%%BUGZILLADIR%%/template/en/default/pages/fields.html.tmpl
+%%BUGZILLADIR%%/template/en/default/pages/linked.html.tmpl
+%%BUGZILLADIR%%/template/en/default/pages/linkify.html.tmpl
+%%BUGZILLADIR%%/template/en/default/pages/voting.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/chart.csv.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/chart.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/chart.png.tmpl
 %%BUGZILLADIR%%/template/en/default/reports/components.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/create-chart.html.tmpl
 %%BUGZILLADIR%%/template/en/default/reports/duplicates-simple.html.tmpl
 %%BUGZILLADIR%%/template/en/default/reports/duplicates-table.html.tmpl
 %%BUGZILLADIR%%/template/en/default/reports/duplicates.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/duplicates.rdf.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/edit-series.html.tmpl
 %%BUGZILLADIR%%/template/en/default/reports/keywords.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/menu.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report-bar.png.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report-line.png.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report-pie.png.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report-table.csv.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report-table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report.csv.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/report.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/series-common.html.tmpl
+%%BUGZILLADIR%%/template/en/default/reports/series.html.tmpl
+%%BUGZILLADIR%%/template/en/default/request/email.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/request/queue.html.tmpl
 %%BUGZILLADIR%%/template/en/default/search/boolean-charts.html.tmpl
 %%BUGZILLADIR%%/template/en/default/search/form.html.tmpl
 %%BUGZILLADIR%%/template/en/default/search/knob.html.tmpl
-%%BUGZILLADIR%%/template/en/default/search/search.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-advanced.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-create-series.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-help.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-report-graph.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-report-select.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-report-table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/search-specific.html.tmpl
+%%BUGZILLADIR%%/template/en/default/search/tabs.html.tmpl
 %%BUGZILLADIR%%/template/en/default/sidebar.xul.tmpl
-%%BUGZILLADIR%%/css/buglist.css
-%%BUGZILLADIR%%/css/panel.css
-%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
-%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib
-@dirrm %%BUGZILLADIR%%/template/en/default/account/email
-@dirrm %%BUGZILLADIR%%/template/en/default/account/password
-@dirrm %%BUGZILLADIR%%/template/en/default/account/prefs
-@dirrm %%BUGZILLADIR%%/template/en/default/account
-@dirrm %%BUGZILLADIR%%/template/en/default/admin/attachstatus
-@dirrm %%BUGZILLADIR%%/template/en/default/admin
-@dirrm %%BUGZILLADIR%%/template/en/default/attachment
-@dirrm %%BUGZILLADIR%%/template/en/default/bug/activity
-@dirrm %%BUGZILLADIR%%/template/en/default/bug/create
-@dirrm %%BUGZILLADIR%%/template/en/default/bug/process
+%%BUGZILLADIR%%/testagent.cgi
+%%BUGZILLADIR%%/testserver.pl
+%%BUGZILLADIR%%/token.cgi
+%%BUGZILLADIR%%/userprefs.cgi
+%%BUGZILLADIR%%/votes.cgi
+%%BUGZILLADIR%%/whineatnews.pl
+%%BUGZILLADIR%%/xml.cgi
+@dirrm %%BUGZILLADIR%%/template/en/default/search
+@dirrm %%BUGZILLADIR%%/template/en/default/request
+@dirrm %%BUGZILLADIR%%/template/en/default/reports
+@dirrm %%BUGZILLADIR%%/template/en/default/pages
+@dirrm %%BUGZILLADIR%%/template/en/default/list
+@dirrm %%BUGZILLADIR%%/template/en/default/global
+@dirrm %%BUGZILLADIR%%/template/en/default/flag
 @dirrm %%BUGZILLADIR%%/template/en/default/bug/votes
+@dirrm %%BUGZILLADIR%%/template/en/default/bug/process
+@dirrm %%BUGZILLADIR%%/template/en/default/bug/create
+@dirrm %%BUGZILLADIR%%/template/en/default/bug/activity
 @dirrm %%BUGZILLADIR%%/template/en/default/bug
-@dirrm %%BUGZILLADIR%%/template/en/default/global
-@dirrm %%BUGZILLADIR%%/template/en/default/list
-@dirrm %%BUGZILLADIR%%/template/en/default/reports
-@dirrm %%BUGZILLADIR%%/template/en/default/search
+@dirrm %%BUGZILLADIR%%/template/en/default/attachment
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/products
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/keywords
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/groups
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/flag-type
+@dirrm %%BUGZILLADIR%%/template/en/default/admin
+@dirrm %%BUGZILLADIR%%/template/en/default/account/prefs
+@dirrm %%BUGZILLADIR%%/template/en/default/account/password
+@dirrm %%BUGZILLADIR%%/template/en/default/account/email
+@dirrm %%BUGZILLADIR%%/template/en/default/account/auth
+@dirrm %%BUGZILLADIR%%/template/en/default/account
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
 @dirrm %%BUGZILLADIR%%/template
 @dirrm %%BUGZILLADIR%%/css
+%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
+%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
+%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/bugzilla-submit
+%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib
 @dirrm %%BUGZILLADIR%%
-%%PORTDOCS%%%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/xml
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/txt
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/pdf
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images/callouts
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/contrib
+@dirrm %%PORTDOCS%%%%DOCSDIR%%