Update to 2.20

12 files changed, 444 insertions, 144 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index b346ac5149ff..250f58b272bc 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18.3
+PORTVERSION?=	2.20
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -49,6 +49,8 @@ BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+DATA_DIRS_LIST=	images js skins/standard skins/standard/global \
+		skins/standard/index
 
 .include <bsd.port.pre.mk>
 
@@ -82,6 +84,8 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
+	@${PERL} -pi -e "s!(?<=webservergroup_default = ')apache!www!" \
+		${WRKSRC}/checksetup.pl
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
@@ -95,8 +99,8 @@ do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
-.for D in css js skins/standard
-	@${MKDIR} ${BUGZILLADIR}/${D}
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${BUGZILLADIR}/!}
+.for D in ${DATA_DIRS_LIST}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index b9dea92a7919..2bc7e955bea1 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.3.tar.gz) = 96590c260212f22ffcf0e8abace11d33
-SIZE (bugzilla-2.18.3.tar.gz) = 1649951
+MD5 (bugzilla-2.20.tar.gz) = bd8638501bc3f6ce93499ae0227d1ec2
+SIZE (bugzilla-2.20.tar.gz) = 1924992
diff --git a/devel/bugzilla/files/patch-checksetup.pl b/devel/bugzilla/files/patch-checksetup.pl
deleted file mode 100644
index d16ef40ac58f..000000000000
--- a/devel/bugzilla/files/patch-checksetup.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- checksetup.pl.orig
-+++ checksetup.pl
-@@ -288,7 +288,7 @@
-     }, 
-     { 
-         name => 'File::Spec', 
--        version => '0.82' 
-+        version => '0' 
-     }, 
-     {
-         name => 'File::Temp',
-@@ -616,7 +616,7 @@
- 
- my $webservergroup_default;
- if ($^O !~ /MSWin32/i) {
--    $webservergroup_default = 'apache';
-+    $webservergroup_default = 'www';
- } else {
-     $webservergroup_default = '';
- }
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index b283e34fcb15..541a04723f33 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -70,9 +70,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-os.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-bundlebugzilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-dbdsponge.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-perlmodule.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-testserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
@@ -82,11 +86,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2941.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2948.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2958.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2963.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x3017.html
+%%PORTDOCS%%%%DOCSDIR%%/html/whining.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x3196.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -120,13 +121,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/xml/security.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/troubleshooting.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/using.xml
-%%BUGZILLADIR%%/1x1.gif
-%%BUGZILLADIR%%/Bugzilla/Auth/Cookie.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/CGI.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/DB.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Attachment.pm
 %%BUGZILLADIR%%/Bugzilla/Auth.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/Env.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/README
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/DB.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Bug.pm
 %%BUGZILLADIR%%/Bugzilla/BugMail.pm
 %%BUGZILLADIR%%/Bugzilla/CGI.pm
@@ -134,10 +137,15 @@
 %%BUGZILLADIR%%/Bugzilla/Config.pm
 %%BUGZILLADIR%%/Bugzilla/Constants.pm
 %%BUGZILLADIR%%/Bugzilla/DB.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Pg.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Pg.pm
 %%BUGZILLADIR%%/Bugzilla/Error.pm
 %%BUGZILLADIR%%/Bugzilla/Flag.pm
 %%BUGZILLADIR%%/Bugzilla/FlagType.pm
-%%BUGZILLADIR%%/Bugzilla/RelationSet.pm
+%%BUGZILLADIR%%/Bugzilla/Group.pm
 %%BUGZILLADIR%%/Bugzilla/Search.pm
 %%BUGZILLADIR%%/Bugzilla/Series.pm
 %%BUGZILLADIR%%/Bugzilla/Template.pm
@@ -146,6 +154,8 @@
 %%BUGZILLADIR%%/Bugzilla/Util.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Bugzilla.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Hook.pm
+%%BUGZILLADIR%%/Bugzilla/Template/Plugin/User.pm
+%%BUGZILLADIR%%/Bugzilla/User/Setting.pm
 %%BUGZILLADIR%%/Bugzilla.pm
 %%BUGZILLADIR%%/CGI.pl
 %%BUGZILLADIR%%/QUICKSTART
@@ -160,9 +170,21 @@
 %%BUGZILLADIR%%/collectstats.pl
 %%BUGZILLADIR%%/config.cgi
 %%BUGZILLADIR%%/js/duplicates.js
+%%BUGZILLADIR%%/js/productform.js
+%%BUGZILLADIR%%/skins/standard/admin.css
+%%BUGZILLADIR%%/skins/standard/buglist.css
 %%BUGZILLADIR%%/skins/standard/duplicates.css
+%%BUGZILLADIR%%/skins/standard/editusers.css
 %%BUGZILLADIR%%/skins/standard/global.css
+%%BUGZILLADIR%%/skins/standard/index.css
+%%BUGZILLADIR%%/skins/standard/panel.css
 %%BUGZILLADIR%%/skins/standard/show_multiple.css
+%%BUGZILLADIR%%/skins/standard/summarize-time.css
+%%BUGZILLADIR%%/skins/standard/voting.css
+%%BUGZILLADIR%%/skins/standard/global/body-back.gif
+%%BUGZILLADIR%%/skins/standard/global/header.png
+%%BUGZILLADIR%%/skins/standard/index/front.jpg
+%%BUGZILLADIR%%/skins/standard/index/front.png
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README.Mailif
@@ -195,17 +217,13 @@
 %%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%%/doeditparams.cgi
 %%BUGZILLADIR%%/duplicates.cgi
 %%BUGZILLADIR%%/duplicates.xul
+%%BUGZILLADIR%%/editclassifications.cgi
 %%BUGZILLADIR%%/editcomponents.cgi
 %%BUGZILLADIR%%/editflagtypes.cgi
 %%BUGZILLADIR%%/editgroups.cgi
@@ -213,16 +231,19 @@
 %%BUGZILLADIR%%/editmilestones.cgi
 %%BUGZILLADIR%%/editparams.cgi
 %%BUGZILLADIR%%/editproducts.cgi
+%%BUGZILLADIR%%/editsettings.cgi
 %%BUGZILLADIR%%/editusers.cgi
+%%BUGZILLADIR%%/editvalues.cgi
 %%BUGZILLADIR%%/editversions.cgi
+%%BUGZILLADIR%%/editwhines.cgi
 %%BUGZILLADIR%%/enter_bug.cgi
 %%BUGZILLADIR%%/globals.pl
+%%BUGZILLADIR%%/images/padlock.png
 %%BUGZILLADIR%%/importxml.pl
 %%BUGZILLADIR%%/index.cgi
 %%BUGZILLADIR%%/localconfig.js
 %%BUGZILLADIR%%/long_list.cgi
 %%BUGZILLADIR%%/move.pl
-%%BUGZILLADIR%%/padlock.png
 %%BUGZILLADIR%%/page.cgi
 %%BUGZILLADIR%%/post_bug.cgi
 %%BUGZILLADIR%%/process_bug.cgi
@@ -238,7 +259,6 @@
 %%BUGZILLADIR%%/request.cgi
 %%BUGZILLADIR%%/robots.txt
 %%BUGZILLADIR%%/runtests.pl
-%%BUGZILLADIR%%/runtests.sh
 %%BUGZILLADIR%%/sanitycheck.cgi
 %%BUGZILLADIR%%/show_activity.cgi
 %%BUGZILLADIR%%/show_bug.cgi
@@ -246,8 +266,10 @@
 %%BUGZILLADIR%%/showdependencygraph.cgi
 %%BUGZILLADIR%%/showdependencytree.cgi
 %%BUGZILLADIR%%/sidebar.cgi
+%%BUGZILLADIR%%/summarize_time.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/auth/login-small.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
@@ -263,18 +285,85 @@
 %%BUGZILLADIR%%/template/en/default/account/prefs/permissions.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/prefs.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/saved-searches.html.tmpl
+%%BUGZILLADIR%%/template/en/default/account/prefs/settings.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/add.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/del.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/new.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/reclassify.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/select.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/update.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/select-field.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/updated.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/change.html.tmpl
 %%BUGZILLADIR%%/template/en/default/admin/groups/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/remove.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/milestones/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list-classifications.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list.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/admin/settings/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/settings/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/listselectvars.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/search.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/userdata.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/updated.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
@@ -312,6 +401,7 @@
 %%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/summarize-time.html.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
@@ -321,6 +411,7 @@
 %%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-classification.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
@@ -334,9 +425,11 @@
 %%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/setting-descs.none.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/userselect.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
@@ -347,6 +440,7 @@
 %%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/list.rss.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
@@ -370,6 +464,7 @@
 %%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-simple.html.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
@@ -390,13 +485,21 @@
 %%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%%/template/en/default/whine/mail.html.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/mail.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/multipart-mime.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/schedule.html.tmpl
+%%BUGZILLADIR%%/template/en/extension/filterexceptions.pl
 %%BUGZILLADIR%%/testagent.cgi
 %%BUGZILLADIR%%/testserver.pl
 %%BUGZILLADIR%%/token.cgi
 %%BUGZILLADIR%%/userprefs.cgi
 %%BUGZILLADIR%%/votes.cgi
+%%BUGZILLADIR%%/whine.pl
 %%BUGZILLADIR%%/whineatnews.pl
 %%BUGZILLADIR%%/xml.cgi
+@dirrm %%BUGZILLADIR%%/template/en/extension
+@dirrm %%BUGZILLADIR%%/template/en/default/whine
 @dirrm %%BUGZILLADIR%%/template/en/default/search
 @dirrm %%BUGZILLADIR%%/template/en/default/request
 @dirrm %%BUGZILLADIR%%/template/en/default/reports
@@ -410,11 +513,18 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/bug/activity
 @dirrm %%BUGZILLADIR%%/template/en/default/bug
 @dirrm %%BUGZILLADIR%%/template/en/default/attachment
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/versions
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/users
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/settings
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/milestones
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/keywords
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/groups
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/fieldvalues
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/flag-type
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/components
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/classifications
 @dirrm %%BUGZILLADIR%%/template/en/default/admin
 @dirrm %%BUGZILLADIR%%/template/en/default/account/prefs
 @dirrm %%BUGZILLADIR%%/template/en/default/account/password
@@ -424,18 +534,27 @@
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
 @unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
-@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%%/Bugzilla/Auth
+@dirrm %%BUGZILLADIR%%/Bugzilla/User
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB/Schema
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Verify
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrm %%BUGZILLADIR%%/images
 @dirrm %%BUGZILLADIR%%/js
+@dirrm %%BUGZILLADIR%%/skins/standard/index
+@dirrm %%BUGZILLADIR%%/skins/standard/global
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
 @unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index b346ac5149ff..250f58b272bc 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18.3
+PORTVERSION?=	2.20
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -49,6 +49,8 @@ BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+DATA_DIRS_LIST=	images js skins/standard skins/standard/global \
+		skins/standard/index
 
 .include <bsd.port.pre.mk>
 
@@ -82,6 +84,8 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
+	@${PERL} -pi -e "s!(?<=webservergroup_default = ')apache!www!" \
+		${WRKSRC}/checksetup.pl
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
@@ -95,8 +99,8 @@ do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
-.for D in css js skins/standard
-	@${MKDIR} ${BUGZILLADIR}/${D}
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${BUGZILLADIR}/!}
+.for D in ${DATA_DIRS_LIST}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
diff --git a/devel/bugzilla2/distinfo b/devel/bugzilla2/distinfo
index b9dea92a7919..2bc7e955bea1 100644
--- a/devel/bugzilla2/distinfo
+++ b/devel/bugzilla2/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.3.tar.gz) = 96590c260212f22ffcf0e8abace11d33
-SIZE (bugzilla-2.18.3.tar.gz) = 1649951
+MD5 (bugzilla-2.20.tar.gz) = bd8638501bc3f6ce93499ae0227d1ec2
+SIZE (bugzilla-2.20.tar.gz) = 1924992
diff --git a/devel/bugzilla2/files/patch-checksetup.pl b/devel/bugzilla2/files/patch-checksetup.pl
deleted file mode 100644
index d16ef40ac58f..000000000000
--- a/devel/bugzilla2/files/patch-checksetup.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- checksetup.pl.orig
-+++ checksetup.pl
-@@ -288,7 +288,7 @@
-     }, 
-     { 
-         name => 'File::Spec', 
--        version => '0.82' 
-+        version => '0' 
-     }, 
-     {
-         name => 'File::Temp',
-@@ -616,7 +616,7 @@
- 
- my $webservergroup_default;
- if ($^O !~ /MSWin32/i) {
--    $webservergroup_default = 'apache';
-+    $webservergroup_default = 'www';
- } else {
-     $webservergroup_default = '';
- }
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index b283e34fcb15..541a04723f33 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -70,9 +70,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-os.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-bundlebugzilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-dbdsponge.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-perlmodule.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-testserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
@@ -82,11 +86,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2941.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2948.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2958.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2963.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x3017.html
+%%PORTDOCS%%%%DOCSDIR%%/html/whining.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x3196.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -120,13 +121,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/xml/security.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/troubleshooting.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/using.xml
-%%BUGZILLADIR%%/1x1.gif
-%%BUGZILLADIR%%/Bugzilla/Auth/Cookie.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/CGI.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/DB.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Attachment.pm
 %%BUGZILLADIR%%/Bugzilla/Auth.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/Env.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/README
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/DB.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Bug.pm
 %%BUGZILLADIR%%/Bugzilla/BugMail.pm
 %%BUGZILLADIR%%/Bugzilla/CGI.pm
@@ -134,10 +137,15 @@
 %%BUGZILLADIR%%/Bugzilla/Config.pm
 %%BUGZILLADIR%%/Bugzilla/Constants.pm
 %%BUGZILLADIR%%/Bugzilla/DB.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Pg.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Pg.pm
 %%BUGZILLADIR%%/Bugzilla/Error.pm
 %%BUGZILLADIR%%/Bugzilla/Flag.pm
 %%BUGZILLADIR%%/Bugzilla/FlagType.pm
-%%BUGZILLADIR%%/Bugzilla/RelationSet.pm
+%%BUGZILLADIR%%/Bugzilla/Group.pm
 %%BUGZILLADIR%%/Bugzilla/Search.pm
 %%BUGZILLADIR%%/Bugzilla/Series.pm
 %%BUGZILLADIR%%/Bugzilla/Template.pm
@@ -146,6 +154,8 @@
 %%BUGZILLADIR%%/Bugzilla/Util.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Bugzilla.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Hook.pm
+%%BUGZILLADIR%%/Bugzilla/Template/Plugin/User.pm
+%%BUGZILLADIR%%/Bugzilla/User/Setting.pm
 %%BUGZILLADIR%%/Bugzilla.pm
 %%BUGZILLADIR%%/CGI.pl
 %%BUGZILLADIR%%/QUICKSTART
@@ -160,9 +170,21 @@
 %%BUGZILLADIR%%/collectstats.pl
 %%BUGZILLADIR%%/config.cgi
 %%BUGZILLADIR%%/js/duplicates.js
+%%BUGZILLADIR%%/js/productform.js
+%%BUGZILLADIR%%/skins/standard/admin.css
+%%BUGZILLADIR%%/skins/standard/buglist.css
 %%BUGZILLADIR%%/skins/standard/duplicates.css
+%%BUGZILLADIR%%/skins/standard/editusers.css
 %%BUGZILLADIR%%/skins/standard/global.css
+%%BUGZILLADIR%%/skins/standard/index.css
+%%BUGZILLADIR%%/skins/standard/panel.css
 %%BUGZILLADIR%%/skins/standard/show_multiple.css
+%%BUGZILLADIR%%/skins/standard/summarize-time.css
+%%BUGZILLADIR%%/skins/standard/voting.css
+%%BUGZILLADIR%%/skins/standard/global/body-back.gif
+%%BUGZILLADIR%%/skins/standard/global/header.png
+%%BUGZILLADIR%%/skins/standard/index/front.jpg
+%%BUGZILLADIR%%/skins/standard/index/front.png
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README.Mailif
@@ -195,17 +217,13 @@
 %%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%%/doeditparams.cgi
 %%BUGZILLADIR%%/duplicates.cgi
 %%BUGZILLADIR%%/duplicates.xul
+%%BUGZILLADIR%%/editclassifications.cgi
 %%BUGZILLADIR%%/editcomponents.cgi
 %%BUGZILLADIR%%/editflagtypes.cgi
 %%BUGZILLADIR%%/editgroups.cgi
@@ -213,16 +231,19 @@
 %%BUGZILLADIR%%/editmilestones.cgi
 %%BUGZILLADIR%%/editparams.cgi
 %%BUGZILLADIR%%/editproducts.cgi
+%%BUGZILLADIR%%/editsettings.cgi
 %%BUGZILLADIR%%/editusers.cgi
+%%BUGZILLADIR%%/editvalues.cgi
 %%BUGZILLADIR%%/editversions.cgi
+%%BUGZILLADIR%%/editwhines.cgi
 %%BUGZILLADIR%%/enter_bug.cgi
 %%BUGZILLADIR%%/globals.pl
+%%BUGZILLADIR%%/images/padlock.png
 %%BUGZILLADIR%%/importxml.pl
 %%BUGZILLADIR%%/index.cgi
 %%BUGZILLADIR%%/localconfig.js
 %%BUGZILLADIR%%/long_list.cgi
 %%BUGZILLADIR%%/move.pl
-%%BUGZILLADIR%%/padlock.png
 %%BUGZILLADIR%%/page.cgi
 %%BUGZILLADIR%%/post_bug.cgi
 %%BUGZILLADIR%%/process_bug.cgi
@@ -238,7 +259,6 @@
 %%BUGZILLADIR%%/request.cgi
 %%BUGZILLADIR%%/robots.txt
 %%BUGZILLADIR%%/runtests.pl
-%%BUGZILLADIR%%/runtests.sh
 %%BUGZILLADIR%%/sanitycheck.cgi
 %%BUGZILLADIR%%/show_activity.cgi
 %%BUGZILLADIR%%/show_bug.cgi
@@ -246,8 +266,10 @@
 %%BUGZILLADIR%%/showdependencygraph.cgi
 %%BUGZILLADIR%%/showdependencytree.cgi
 %%BUGZILLADIR%%/sidebar.cgi
+%%BUGZILLADIR%%/summarize_time.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/auth/login-small.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
@@ -263,18 +285,85 @@
 %%BUGZILLADIR%%/template/en/default/account/prefs/permissions.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/prefs.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/saved-searches.html.tmpl
+%%BUGZILLADIR%%/template/en/default/account/prefs/settings.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/add.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/del.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/new.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/reclassify.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/select.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/update.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/select-field.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/updated.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/change.html.tmpl
 %%BUGZILLADIR%%/template/en/default/admin/groups/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/remove.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/milestones/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list-classifications.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list.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/admin/settings/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/settings/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/listselectvars.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/search.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/userdata.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/updated.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
@@ -312,6 +401,7 @@
 %%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/summarize-time.html.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
@@ -321,6 +411,7 @@
 %%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-classification.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
@@ -334,9 +425,11 @@
 %%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/setting-descs.none.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/userselect.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
@@ -347,6 +440,7 @@
 %%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/list.rss.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
@@ -370,6 +464,7 @@
 %%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-simple.html.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
@@ -390,13 +485,21 @@
 %%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%%/template/en/default/whine/mail.html.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/mail.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/multipart-mime.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/schedule.html.tmpl
+%%BUGZILLADIR%%/template/en/extension/filterexceptions.pl
 %%BUGZILLADIR%%/testagent.cgi
 %%BUGZILLADIR%%/testserver.pl
 %%BUGZILLADIR%%/token.cgi
 %%BUGZILLADIR%%/userprefs.cgi
 %%BUGZILLADIR%%/votes.cgi
+%%BUGZILLADIR%%/whine.pl
 %%BUGZILLADIR%%/whineatnews.pl
 %%BUGZILLADIR%%/xml.cgi
+@dirrm %%BUGZILLADIR%%/template/en/extension
+@dirrm %%BUGZILLADIR%%/template/en/default/whine
 @dirrm %%BUGZILLADIR%%/template/en/default/search
 @dirrm %%BUGZILLADIR%%/template/en/default/request
 @dirrm %%BUGZILLADIR%%/template/en/default/reports
@@ -410,11 +513,18 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/bug/activity
 @dirrm %%BUGZILLADIR%%/template/en/default/bug
 @dirrm %%BUGZILLADIR%%/template/en/default/attachment
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/versions
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/users
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/settings
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/milestones
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/keywords
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/groups
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/fieldvalues
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/flag-type
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/components
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/classifications
 @dirrm %%BUGZILLADIR%%/template/en/default/admin
 @dirrm %%BUGZILLADIR%%/template/en/default/account/prefs
 @dirrm %%BUGZILLADIR%%/template/en/default/account/password
@@ -424,18 +534,27 @@
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
 @unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
-@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%%/Bugzilla/Auth
+@dirrm %%BUGZILLADIR%%/Bugzilla/User
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB/Schema
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Verify
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrm %%BUGZILLADIR%%/images
 @dirrm %%BUGZILLADIR%%/js
+@dirrm %%BUGZILLADIR%%/skins/standard/index
+@dirrm %%BUGZILLADIR%%/skins/standard/global
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
 @unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index b346ac5149ff..250f58b272bc 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18.3
+PORTVERSION?=	2.20
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -49,6 +49,8 @@ BUGZILLADIR=	${PREFIX}/www/data/bugzilla
 PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
 
 CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+DATA_DIRS_LIST=	images js skins/standard skins/standard/global \
+		skins/standard/index
 
 .include <bsd.port.pre.mk>
 
@@ -82,6 +84,8 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 post-patch:
+	@${PERL} -pi -e "s!(?<=webservergroup_default = ')apache!www!" \
+		${WRKSRC}/checksetup.pl
 	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
 		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
 	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
@@ -95,8 +99,8 @@ do-install:
 	${MKDIR} ${BUGZILLADIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
-.for D in css js skins/standard
-	@${MKDIR} ${BUGZILLADIR}/${D}
+	@${MKDIR} ${DATA_DIRS_LIST:S!^!${BUGZILLADIR}/!}
+.for D in ${DATA_DIRS_LIST}
 	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
diff --git a/devel/bugzilla3/distinfo b/devel/bugzilla3/distinfo
index b9dea92a7919..2bc7e955bea1 100644
--- a/devel/bugzilla3/distinfo
+++ b/devel/bugzilla3/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.3.tar.gz) = 96590c260212f22ffcf0e8abace11d33
-SIZE (bugzilla-2.18.3.tar.gz) = 1649951
+MD5 (bugzilla-2.20.tar.gz) = bd8638501bc3f6ce93499ae0227d1ec2
+SIZE (bugzilla-2.20.tar.gz) = 1924992
diff --git a/devel/bugzilla3/files/patch-checksetup.pl b/devel/bugzilla3/files/patch-checksetup.pl
deleted file mode 100644
index d16ef40ac58f..000000000000
--- a/devel/bugzilla3/files/patch-checksetup.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- checksetup.pl.orig
-+++ checksetup.pl
-@@ -288,7 +288,7 @@
-     }, 
-     { 
-         name => 'File::Spec', 
--        version => '0.82' 
-+        version => '0' 
-     }, 
-     {
-         name => 'File::Temp',
-@@ -616,7 +616,7 @@
- 
- my $webservergroup_default;
- if ($^O !~ /MSWin32/i) {
--    $webservergroup_default = 'apache';
-+    $webservergroup_default = 'www';
- } else {
-     $webservergroup_default = '';
- }
diff --git a/devel/bugzilla3/pkg-plist b/devel/bugzilla3/pkg-plist
index b283e34fcb15..541a04723f33 100644
--- a/devel/bugzilla3/pkg-plist
+++ b/devel/bugzilla3/pkg-plist
@@ -70,9 +70,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-os.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-bundlebugzilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-dbdsponge.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-perlmodule.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-testserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
@@ -82,11 +86,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2941.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2948.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2958.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2963.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x3017.html
+%%PORTDOCS%%%%DOCSDIR%%/html/whining.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x3196.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -120,13 +121,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/xml/security.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/troubleshooting.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/using.xml
-%%BUGZILLADIR%%/1x1.gif
-%%BUGZILLADIR%%/Bugzilla/Auth/Cookie.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/CGI.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/DB.pm
-%%BUGZILLADIR%%/Bugzilla/Auth/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Attachment.pm
 %%BUGZILLADIR%%/Bugzilla/Auth.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/Env.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/README
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/DB.pm
+%%BUGZILLADIR%%/Bugzilla/Auth/Verify/LDAP.pm
 %%BUGZILLADIR%%/Bugzilla/Bug.pm
 %%BUGZILLADIR%%/Bugzilla/BugMail.pm
 %%BUGZILLADIR%%/Bugzilla/CGI.pm
@@ -134,10 +137,15 @@
 %%BUGZILLADIR%%/Bugzilla/Config.pm
 %%BUGZILLADIR%%/Bugzilla/Constants.pm
 %%BUGZILLADIR%%/Bugzilla/DB.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Pg.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Mysql.pm
+%%BUGZILLADIR%%/Bugzilla/DB/Schema/Pg.pm
 %%BUGZILLADIR%%/Bugzilla/Error.pm
 %%BUGZILLADIR%%/Bugzilla/Flag.pm
 %%BUGZILLADIR%%/Bugzilla/FlagType.pm
-%%BUGZILLADIR%%/Bugzilla/RelationSet.pm
+%%BUGZILLADIR%%/Bugzilla/Group.pm
 %%BUGZILLADIR%%/Bugzilla/Search.pm
 %%BUGZILLADIR%%/Bugzilla/Series.pm
 %%BUGZILLADIR%%/Bugzilla/Template.pm
@@ -146,6 +154,8 @@
 %%BUGZILLADIR%%/Bugzilla/Util.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Bugzilla.pm
 %%BUGZILLADIR%%/Bugzilla/Template/Plugin/Hook.pm
+%%BUGZILLADIR%%/Bugzilla/Template/Plugin/User.pm
+%%BUGZILLADIR%%/Bugzilla/User/Setting.pm
 %%BUGZILLADIR%%/Bugzilla.pm
 %%BUGZILLADIR%%/CGI.pl
 %%BUGZILLADIR%%/QUICKSTART
@@ -160,9 +170,21 @@
 %%BUGZILLADIR%%/collectstats.pl
 %%BUGZILLADIR%%/config.cgi
 %%BUGZILLADIR%%/js/duplicates.js
+%%BUGZILLADIR%%/js/productform.js
+%%BUGZILLADIR%%/skins/standard/admin.css
+%%BUGZILLADIR%%/skins/standard/buglist.css
 %%BUGZILLADIR%%/skins/standard/duplicates.css
+%%BUGZILLADIR%%/skins/standard/editusers.css
 %%BUGZILLADIR%%/skins/standard/global.css
+%%BUGZILLADIR%%/skins/standard/index.css
+%%BUGZILLADIR%%/skins/standard/panel.css
 %%BUGZILLADIR%%/skins/standard/show_multiple.css
+%%BUGZILLADIR%%/skins/standard/summarize-time.css
+%%BUGZILLADIR%%/skins/standard/voting.css
+%%BUGZILLADIR%%/skins/standard/global/body-back.gif
+%%BUGZILLADIR%%/skins/standard/global/header.png
+%%BUGZILLADIR%%/skins/standard/index/front.jpg
+%%BUGZILLADIR%%/skins/standard/index/front.png
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/README.Mailif
@@ -195,17 +217,13 @@
 %%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%%/doeditparams.cgi
 %%BUGZILLADIR%%/duplicates.cgi
 %%BUGZILLADIR%%/duplicates.xul
+%%BUGZILLADIR%%/editclassifications.cgi
 %%BUGZILLADIR%%/editcomponents.cgi
 %%BUGZILLADIR%%/editflagtypes.cgi
 %%BUGZILLADIR%%/editgroups.cgi
@@ -213,16 +231,19 @@
 %%BUGZILLADIR%%/editmilestones.cgi
 %%BUGZILLADIR%%/editparams.cgi
 %%BUGZILLADIR%%/editproducts.cgi
+%%BUGZILLADIR%%/editsettings.cgi
 %%BUGZILLADIR%%/editusers.cgi
+%%BUGZILLADIR%%/editvalues.cgi
 %%BUGZILLADIR%%/editversions.cgi
+%%BUGZILLADIR%%/editwhines.cgi
 %%BUGZILLADIR%%/enter_bug.cgi
 %%BUGZILLADIR%%/globals.pl
+%%BUGZILLADIR%%/images/padlock.png
 %%BUGZILLADIR%%/importxml.pl
 %%BUGZILLADIR%%/index.cgi
 %%BUGZILLADIR%%/localconfig.js
 %%BUGZILLADIR%%/long_list.cgi
 %%BUGZILLADIR%%/move.pl
-%%BUGZILLADIR%%/padlock.png
 %%BUGZILLADIR%%/page.cgi
 %%BUGZILLADIR%%/post_bug.cgi
 %%BUGZILLADIR%%/process_bug.cgi
@@ -238,7 +259,6 @@
 %%BUGZILLADIR%%/request.cgi
 %%BUGZILLADIR%%/robots.txt
 %%BUGZILLADIR%%/runtests.pl
-%%BUGZILLADIR%%/runtests.sh
 %%BUGZILLADIR%%/sanitycheck.cgi
 %%BUGZILLADIR%%/show_activity.cgi
 %%BUGZILLADIR%%/show_bug.cgi
@@ -246,8 +266,10 @@
 %%BUGZILLADIR%%/showdependencygraph.cgi
 %%BUGZILLADIR%%/showdependencytree.cgi
 %%BUGZILLADIR%%/sidebar.cgi
+%%BUGZILLADIR%%/summarize_time.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/auth/login-small.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
@@ -263,18 +285,85 @@
 %%BUGZILLADIR%%/template/en/default/account/prefs/permissions.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/prefs.html.tmpl
 %%BUGZILLADIR%%/template/en/default/account/prefs/saved-searches.html.tmpl
+%%BUGZILLADIR%%/template/en/default/account/prefs/settings.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/table.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/add.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/del.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/new.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/reclassify.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/select.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/classifications/update.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/components/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/select-field.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/fieldvalues/updated.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/change.html.tmpl
 %%BUGZILLADIR%%/template/en/default/admin/groups/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/groups/remove.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/milestones/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/milestones/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list-classifications.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/products/list.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/admin/settings/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/settings/updated.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/listselectvars.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/search.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/users/userdata.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/confirm-delete.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/create.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/created.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/deleted.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/edit.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/footer.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/list.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/select-product.html.tmpl
+%%BUGZILLADIR%%/template/en/default/admin/versions/updated.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
@@ -312,6 +401,7 @@
 %%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/summarize-time.html.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
@@ -321,6 +411,7 @@
 %%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-classification.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
@@ -334,9 +425,11 @@
 %%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/setting-descs.none.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/userselect.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
@@ -347,6 +440,7 @@
 %%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/list.rss.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
@@ -370,6 +464,7 @@
 %%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-simple.html.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
@@ -390,13 +485,21 @@
 %%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%%/template/en/default/whine/mail.html.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/mail.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/multipart-mime.txt.tmpl
+%%BUGZILLADIR%%/template/en/default/whine/schedule.html.tmpl
+%%BUGZILLADIR%%/template/en/extension/filterexceptions.pl
 %%BUGZILLADIR%%/testagent.cgi
 %%BUGZILLADIR%%/testserver.pl
 %%BUGZILLADIR%%/token.cgi
 %%BUGZILLADIR%%/userprefs.cgi
 %%BUGZILLADIR%%/votes.cgi
+%%BUGZILLADIR%%/whine.pl
 %%BUGZILLADIR%%/whineatnews.pl
 %%BUGZILLADIR%%/xml.cgi
+@dirrm %%BUGZILLADIR%%/template/en/extension
+@dirrm %%BUGZILLADIR%%/template/en/default/whine
 @dirrm %%BUGZILLADIR%%/template/en/default/search
 @dirrm %%BUGZILLADIR%%/template/en/default/request
 @dirrm %%BUGZILLADIR%%/template/en/default/reports
@@ -410,11 +513,18 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/bug/activity
 @dirrm %%BUGZILLADIR%%/template/en/default/bug
 @dirrm %%BUGZILLADIR%%/template/en/default/attachment
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/versions
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/users
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/settings
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products/groupcontrol
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/products
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/milestones
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/keywords
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/groups
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/fieldvalues
 @dirrm %%BUGZILLADIR%%/template/en/default/admin/flag-type
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/components
+@dirrm %%BUGZILLADIR%%/template/en/default/admin/classifications
 @dirrm %%BUGZILLADIR%%/template/en/default/admin
 @dirrm %%BUGZILLADIR%%/template/en/default/account/prefs
 @dirrm %%BUGZILLADIR%%/template/en/default/account/password
@@ -424,18 +534,27 @@
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
 @unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
-@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%%/Bugzilla/Auth
+@dirrm %%BUGZILLADIR%%/Bugzilla/User
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB/Schema
+@dirrm %%BUGZILLADIR%%/Bugzilla/DB
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Verify
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW/CGI
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
+@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
 @unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrm %%BUGZILLADIR%%/images
 @dirrm %%BUGZILLADIR%%/js
+@dirrm %%BUGZILLADIR%%/skins/standard/index
+@dirrm %%BUGZILLADIR%%/skins/standard/global
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
 @unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true