Move to bugzilla 2.20

From the release-notes.html:

What's New?
 New User-Interface Color/Style
 Higher-Level Categorization of Bugs (above "Product")
 Regular Reports by Email of Complex Queries ("Whining")
 "Environment Variable" Authentication Method
 User-List Drop-Down Menus
 Server-Side Comment Wrapping
 UI for Editing Priority, OS, Platform, and Severity
 Bugzilla Queries as RSS
 Choice of E-Mail Sending Methods
 "Large Attachment" Storage
 and lots of Miscellaneous Improvements

See http://www.bugzilla.org/releases/2.20/release-notes.html for
all the details.

6 files changed, 229 insertions, 208 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 9a197b4b8f1..5bfe3f10c90 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/05 15:09:23 salo Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/26 10:16:09 adrianp Exp $
 #
 
-DISTNAME=	bugzilla-2.18.4
+DISTNAME=	bugzilla-2.20
 CATEGORIES=	www devel
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/webtools/
 
@@ -11,13 +11,15 @@ COMMENT=	Web based bug tracking system
 
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
-DEPENDS+=	p5-DBD-mysql>=2.1010:../../databases/p5-DBD-mysql
-DEPENDS+=	p5-DBI>=1.36:../../databases/p5-DBI
-DEPENDS+=	p5-File-Spec>=0.82:../../devel/p5-File-Spec
+DEPENDS+=	p5-DBD-mysql>=2.9003:../../databases/p5-DBD-mysql
+DEPENDS+=	p5-DBI>=1.38:../../databases/p5-DBI
+DEPENDS+=	p5-File-Spec>=0.84:../../devel/p5-File-Spec
 DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
 DEPENDS+=	p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-Tabs+Wrap>=2001.0131:../../textproc/p5-Text-Tabs+Wrap
-DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
+DEPENDS+=	p5-Storable-[0-9]*:../../devel/p5-Storable
+DEPENDS+=	p5-TimeDate>=1.16:../../time/p5-TimeDate
+DEPENDS+=	p5-MailTools>=1.65:../../mail/p5-MailTools
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -25,7 +27,7 @@ DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 NO_BUILD=	YES
 USE_PKGINSTALL=	YES
 
-BZ_WEB_GROUP?=	www
+BZ_WEB_GROUP?=	${APACHE_GROUP}
 SENDMAIL?=	/usr/sbin/sendmail
 
 BUILD_DEFS+= 	BZ_WEB_GROUP SENDMAIL APACHE_USER
@@ -38,6 +40,7 @@ DOCDIR=		${PREFIX}/share/doc/bugzilla
 CONF_FILES=	${EGDIR}/bugzilla.conf ${PKG_SYSCONFDIR}/bugzilla.conf \
 		${EGDIR}/localconfig ${BZDIR}/localconfig
 SPECIAL_PERMS=	${BZDIR}/localconfig ${APACHE_USER} ${SHAREGRP} 0400
+PAX_DIRS=	Bugzilla skins template
 
 REPLACE_PERL=	*.pl *.cgi
 
@@ -51,9 +54,8 @@ SUBST_SED.conf=		-e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"		\
 SUBST_MESSAGE.conf=	"Fixing configuration files."
 
 post-extract:
-	@${FIND} ${WRKSRC}/template -type d -name CVS | ${XARGS} ${RM} -rf
-	@${FIND} ${WRKSRC}/template -type f -name ".cvsignore" | ${XARGS} \
-		${RM} -f
+	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f
 	@${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC}
 	@${CP} ${FILESDIR}/localconfig ${WRKSRC}
 
@@ -62,53 +64,44 @@ do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${BZDIR}
 	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla
-	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla/Auth
-	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla/Template/Plugin
-	${INSTALL_DATA_DIR} ${BZDIR}/css
+
 	${INSTALL_DATA_DIR} ${BZDIR}/js
 	${INSTALL_DATA_DIR} ${BZDIR}/template
 	${INSTALL_DATA_DIR} ${BZDIR}/skins
-	${INSTALL_DATA_DIR} ${BZDIR}/skins/standard
+	${INSTALL_DATA_DIR} ${BZDIR}/docs
 	${INSTALL_DATA_DIR} ${BZDIR}/docs/html
-	${INSTALL_DATA_DIR} ${BZDIR}/docs/images
-	${INSTALL_DATA_DIR} ${BZDIR}/docs/images/callouts
+	${INSTALL_DATA_DIR} ${BZDIR}/images
+
 	${INSTALL_DATA} ${WRKSRC}/docs/txt/Bugzilla-Guide.txt ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/rel_notes.txt ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADING-pre-2.8 ${DOCDIR}
+
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${BZDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla.pm ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/*.pm ${BZDIR}/Bugzilla
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/Auth/*.pm ${BZDIR}/Bugzilla/Auth
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/Template/Plugin/*.pm \
-		${BZDIR}/Bugzilla/Template/Plugin
+	${INSTALL_DATA} ${WRKSRC}/*.js ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/robots.txt ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/1x1.gif ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/ant.jpg ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/padlock.png ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/bugzilla.dtd ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/duplicates.xul ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/Bugzilla.pm ${BZDIR}
+
 	${INSTALL_DATA} ${WRKSRC}/bugzilla.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/localconfig ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/bugzilla.dtd ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.js ${BZDIR}
+
+	${INSTALL_DATA} ${WRKSRC}/images/*.png ${BZDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/js/*.js ${BZDIR}/js
-	${INSTALL_DATA} ${WRKSRC}/duplicates.xul ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/css/*.css ${BZDIR}/css
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${BZDIR}/docs/html
-	cd ${WRKSRC}/template && ${PAX} -rw . ${BZDIR}/template
-	${FIND} ${BZDIR}/template -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${BZDIR}/template -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${CHMOD} ${BINMODE} ${BZDIR}/template/en/default/filterexceptions.pl
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${BZDIR}/template
-	${INSTALL_DATA} ${WRKSRC}/skins/standard/*.css ${BZDIR}/skins/standard
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.gif ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.png ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.xml ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/callouts/*.gif \
-		${BZDIR}/docs/images/callouts
-
-.include "../../mk/apache.mk"
+
+.	for i in ${PAX_DIRS}
+		cd ${WRKSRC}/${i} && ${PAX} -rw . ${BZDIR}/${i}
+		${FIND} ${BZDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+		${FIND} ${BZDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${BZDIR}/${i}
+.	endfor
+
+# .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bugzilla/PLIST b/devel/bugzilla/PLIST
index 91715d1cd2c..6e3249a771b 100644
--- a/devel/bugzilla/PLIST
+++ b/devel/bugzilla/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/23 15:44:28 rillig Exp $
-share/bugzilla/1x1.gif
+@comment $NetBSD: PLIST,v 1.6 2005/10/26 10:16:09 adrianp Exp $
 share/bugzilla/Bugzilla.pm
 share/bugzilla/Bugzilla/Attachment.pm
 share/bugzilla/Bugzilla/Auth.pm
-share/bugzilla/Bugzilla/Auth/CGI.pm
-share/bugzilla/Bugzilla/Auth/Cookie.pm
-share/bugzilla/Bugzilla/Auth/DB.pm
-share/bugzilla/Bugzilla/Auth/LDAP.pm
+share/bugzilla/Bugzilla/Auth/Login/WWW.pm
+share/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm
+share/bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+share/bugzilla/Bugzilla/Auth/Login/WWW/Env.pm
+share/bugzilla/Bugzilla/Auth/README
+share/bugzilla/Bugzilla/Auth/Verify/DB.pm
+share/bugzilla/Bugzilla/Auth/Verify/LDAP.pm
 share/bugzilla/Bugzilla/Bug.pm
 share/bugzilla/Bugzilla/BugMail.pm
 share/bugzilla/Bugzilla/CGI.pm
@@ -14,17 +16,24 @@ share/bugzilla/Bugzilla/Chart.pm
 share/bugzilla/Bugzilla/Config.pm
 share/bugzilla/Bugzilla/Constants.pm
 share/bugzilla/Bugzilla/DB.pm
+share/bugzilla/Bugzilla/DB/Mysql.pm
+share/bugzilla/Bugzilla/DB/Pg.pm
+share/bugzilla/Bugzilla/DB/Schema.pm
+share/bugzilla/Bugzilla/DB/Schema/Mysql.pm
+share/bugzilla/Bugzilla/DB/Schema/Pg.pm
 share/bugzilla/Bugzilla/Error.pm
 share/bugzilla/Bugzilla/Flag.pm
 share/bugzilla/Bugzilla/FlagType.pm
-share/bugzilla/Bugzilla/RelationSet.pm
+share/bugzilla/Bugzilla/Group.pm
 share/bugzilla/Bugzilla/Search.pm
 share/bugzilla/Bugzilla/Series.pm
 share/bugzilla/Bugzilla/Template.pm
 share/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm
 share/bugzilla/Bugzilla/Template/Plugin/Hook.pm
+share/bugzilla/Bugzilla/Template/Plugin/User.pm
 share/bugzilla/Bugzilla/Token.pm
 share/bugzilla/Bugzilla/User.pm
+share/bugzilla/Bugzilla/User/Setting.pm
 share/bugzilla/Bugzilla/Util.pm
 share/bugzilla/CGI.pl
 share/bugzilla/ant.jpg
@@ -37,11 +46,6 @@ share/bugzilla/colchange.cgi
 share/bugzilla/collectstats.pl
 share/bugzilla/config.cgi
 share/bugzilla/createaccount.cgi
-share/bugzilla/css/buglist.css
-share/bugzilla/css/duplicates.css
-share/bugzilla/css/global.css
-share/bugzilla/css/panel.css
-share/bugzilla/css/show_multiple.css
 share/bugzilla/defparams.pl
 share/bugzilla/describecomponents.cgi
 share/bugzilla/describekeywords.cgi
@@ -113,9 +117,13 @@ share/bugzilla/docs/html/security-mysql.html
 share/bugzilla/docs/html/security-os.html
 share/bugzilla/docs/html/security-webserver.html
 share/bugzilla/docs/html/security.html
+share/bugzilla/docs/html/trbl-bundlebugzilla.html
+share/bugzilla/docs/html/trbl-dbdsponge.html
 share/bugzilla/docs/html/trbl-index.html
 share/bugzilla/docs/html/trbl-passwd-encryption.html
+share/bugzilla/docs/html/trbl-perlmodule.html
 share/bugzilla/docs/html/trbl-relogin-everyone.html
+share/bugzilla/docs/html/trbl-testserver.html
 share/bugzilla/docs/html/trouble-filetemp.html
 share/bugzilla/docs/html/troubleshooting.html
 share/bugzilla/docs/html/upgrading.html
@@ -125,23 +133,12 @@ share/bugzilla/docs/html/using-intro.html
 share/bugzilla/docs/html/using.html
 share/bugzilla/docs/html/versions.html
 share/bugzilla/docs/html/voting.html
-share/bugzilla/docs/html/x2941.html
-share/bugzilla/docs/html/x2948.html
-share/bugzilla/docs/html/x2958.html
-share/bugzilla/docs/html/x2963.html
-share/bugzilla/docs/html/x3017.html
-share/bugzilla/docs/images/bzLifecycle.png
-share/bugzilla/docs/images/bzLifecycle.xml
-share/bugzilla/docs/images/callouts/1.gif
-share/bugzilla/docs/images/callouts/2.gif
-share/bugzilla/docs/images/callouts/3.gif
-share/bugzilla/docs/images/caution.gif
-share/bugzilla/docs/images/note.gif
-share/bugzilla/docs/images/tip.gif
-share/bugzilla/docs/images/warning.gif
+share/bugzilla/docs/html/whining.html
+share/bugzilla/docs/html/x3196.html
 share/bugzilla/doeditparams.cgi
 share/bugzilla/duplicates.cgi
 share/bugzilla/duplicates.xul
+share/bugzilla/editclassifications.cgi
 share/bugzilla/editcomponents.cgi
 share/bugzilla/editflagtypes.cgi
 share/bugzilla/editgroups.cgi
@@ -149,17 +146,21 @@ share/bugzilla/editkeywords.cgi
 share/bugzilla/editmilestones.cgi
 share/bugzilla/editparams.cgi
 share/bugzilla/editproducts.cgi
+share/bugzilla/editsettings.cgi
 share/bugzilla/editusers.cgi
+share/bugzilla/editvalues.cgi
 share/bugzilla/editversions.cgi
+share/bugzilla/editwhines.cgi
 share/bugzilla/enter_bug.cgi
 share/bugzilla/globals.pl
+share/bugzilla/images/padlock.png
 share/bugzilla/importxml.pl
 share/bugzilla/index.cgi
 share/bugzilla/js/duplicates.js
+share/bugzilla/js/productform.js
 share/bugzilla/localconfig.js
 share/bugzilla/long_list.cgi
 share/bugzilla/move.pl
-share/bugzilla/padlock.png
 share/bugzilla/page.cgi
 share/bugzilla/post_bug.cgi
 share/bugzilla/process_bug.cgi
@@ -182,10 +183,23 @@ share/bugzilla/showattachment.cgi
 share/bugzilla/showdependencygraph.cgi
 share/bugzilla/showdependencytree.cgi
 share/bugzilla/sidebar.cgi
+share/bugzilla/skins/standard/admin.css
+share/bugzilla/skins/standard/buglist.css
 share/bugzilla/skins/standard/duplicates.css
+share/bugzilla/skins/standard/editusers.css
 share/bugzilla/skins/standard/global.css
+share/bugzilla/skins/standard/global/body-back.gif
+share/bugzilla/skins/standard/global/header.png
+share/bugzilla/skins/standard/index.css
+share/bugzilla/skins/standard/index/front.jpg
+share/bugzilla/skins/standard/index/front.png
+share/bugzilla/skins/standard/panel.css
 share/bugzilla/skins/standard/show_multiple.css
+share/bugzilla/skins/standard/summarize-time.css
+share/bugzilla/skins/standard/voting.css
+share/bugzilla/summarize_time.cgi
 share/bugzilla/template/en/default/account/auth/ldap-error.html.tmpl
+share/bugzilla/template/en/default/account/auth/login-small.html.tmpl
 share/bugzilla/template/en/default/account/auth/login.html.tmpl
 share/bugzilla/template/en/default/account/cancel-token.txt.tmpl
 share/bugzilla/template/en/default/account/create.html.tmpl
@@ -202,18 +216,85 @@ share/bugzilla/template/en/default/account/prefs/footer.html.tmpl
 share/bugzilla/template/en/default/account/prefs/permissions.html.tmpl
 share/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
 share/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
+share/bugzilla/template/en/default/account/prefs/settings.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/add.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/del.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/delete.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/edit.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/new.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/reclassify.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/select.html.tmpl
+share/bugzilla/template/en/default/admin/classifications/update.html.tmpl
+share/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/components/create.html.tmpl
+share/bugzilla/template/en/default/admin/components/created.html.tmpl
+share/bugzilla/template/en/default/admin/components/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/components/edit.html.tmpl
+share/bugzilla/template/en/default/admin/components/footer.html.tmpl
+share/bugzilla/template/en/default/admin/components/list.html.tmpl
+share/bugzilla/template/en/default/admin/components/select-product.html.tmpl
+share/bugzilla/template/en/default/admin/components/updated.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/create.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/created.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/edit.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/footer.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/list.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/select-field.html.tmpl
+share/bugzilla/template/en/default/admin/fieldvalues/updated.html.tmpl
 share/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl
 share/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
 share/bugzilla/template/en/default/admin/flag-type/list.html.tmpl
+share/bugzilla/template/en/default/admin/groups/change.html.tmpl
 share/bugzilla/template/en/default/admin/groups/create.html.tmpl
+share/bugzilla/template/en/default/admin/groups/created.html.tmpl
+share/bugzilla/template/en/default/admin/groups/delete.html.tmpl
+share/bugzilla/template/en/default/admin/groups/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/groups/edit.html.tmpl
+share/bugzilla/template/en/default/admin/groups/list.html.tmpl
+share/bugzilla/template/en/default/admin/groups/remove.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/confirm-delete.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/create.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/created.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/edit.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/list.html.tmpl
 share/bugzilla/template/en/default/admin/keywords/rebuild-cache.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/create.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/created.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/edit.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/footer.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/list.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/select-product.html.tmpl
+share/bugzilla/template/en/default/admin/milestones/updated.html.tmpl
+share/bugzilla/template/en/default/admin/products/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/products/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/products/footer.html.tmpl
 share/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
 share/bugzilla/template/en/default/admin/products/groupcontrol/edit.html.tmpl
+share/bugzilla/template/en/default/admin/products/list-classifications.html.tmpl
+share/bugzilla/template/en/default/admin/products/list.html.tmpl
+share/bugzilla/template/en/default/admin/settings/edit.html.tmpl
+share/bugzilla/template/en/default/admin/settings/updated.html.tmpl
+share/bugzilla/template/en/default/admin/table.html.tmpl
+share/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/users/create.html.tmpl
+share/bugzilla/template/en/default/admin/users/edit.html.tmpl
+share/bugzilla/template/en/default/admin/users/list.html.tmpl
+share/bugzilla/template/en/default/admin/users/listselectvars.html.tmpl
+share/bugzilla/template/en/default/admin/users/search.html.tmpl
+share/bugzilla/template/en/default/admin/users/userdata.html.tmpl
+share/bugzilla/template/en/default/admin/versions/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/versions/create.html.tmpl
+share/bugzilla/template/en/default/admin/versions/created.html.tmpl
+share/bugzilla/template/en/default/admin/versions/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/versions/edit.html.tmpl
+share/bugzilla/template/en/default/admin/versions/footer.html.tmpl
+share/bugzilla/template/en/default/admin/versions/list.html.tmpl
+share/bugzilla/template/en/default/admin/versions/select-product.html.tmpl
+share/bugzilla/template/en/default/admin/versions/updated.html.tmpl
 share/bugzilla/template/en/default/attachment/choose.html.tmpl
 share/bugzilla/template/en/default/attachment/content-types.html.tmpl
 share/bugzilla/template/en/default/attachment/create.html.tmpl
@@ -251,6 +332,7 @@ share/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl
 share/bugzilla/template/en/default/bug/show-multiple.html.tmpl
 share/bugzilla/template/en/default/bug/show.html.tmpl
 share/bugzilla/template/en/default/bug/show.xml.tmpl
+share/bugzilla/template/en/default/bug/summarize-time.html.tmpl
 share/bugzilla/template/en/default/bug/time.html.tmpl
 share/bugzilla/template/en/default/bug/votes/delete-all.html.tmpl
 share/bugzilla/template/en/default/bug/votes/list-for-bug.html.tmpl
@@ -260,6 +342,7 @@ share/bugzilla/template/en/default/config.rdf.tmpl
 share/bugzilla/template/en/default/filterexceptions.pl
 share/bugzilla/template/en/default/flag/list.html.tmpl
 share/bugzilla/template/en/default/global/banner.html.tmpl
+share/bugzilla/template/en/default/global/choose-classification.html.tmpl
 share/bugzilla/template/en/default/global/choose-product.html.tmpl
 share/bugzilla/template/en/default/global/code-error.html.tmpl
 share/bugzilla/template/en/default/global/confirm-user-match.html.tmpl
@@ -273,9 +356,11 @@ share/bugzilla/template/en/default/global/initialize.none.tmpl
 share/bugzilla/template/en/default/global/message.html.tmpl
 share/bugzilla/template/en/default/global/messages.html.tmpl
 share/bugzilla/template/en/default/global/select-menu.html.tmpl
+share/bugzilla/template/en/default/global/setting-descs.none.tmpl
 share/bugzilla/template/en/default/global/site-navigation.html.tmpl
 share/bugzilla/template/en/default/global/useful-links.html.tmpl
 share/bugzilla/template/en/default/global/user-error.html.tmpl
+share/bugzilla/template/en/default/global/userselect.html.tmpl
 share/bugzilla/template/en/default/global/variables.none.tmpl
 share/bugzilla/template/en/default/index.html.tmpl
 share/bugzilla/template/en/default/list/change-columns.html.tmpl
@@ -286,6 +371,7 @@ share/bugzilla/template/en/default/list/list.html.tmpl
 share/bugzilla/template/en/default/list/list.ics.tmpl
 share/bugzilla/template/en/default/list/list.js.tmpl
 share/bugzilla/template/en/default/list/list.rdf.tmpl
+share/bugzilla/template/en/default/list/list.rss.tmpl
 share/bugzilla/template/en/default/list/quips.html.tmpl
 share/bugzilla/template/en/default/list/server-push.html.tmpl
 share/bugzilla/template/en/default/list/table.html.tmpl
@@ -309,6 +395,7 @@ share/bugzilla/template/en/default/reports/menu.html.tmpl
 share/bugzilla/template/en/default/reports/report-bar.png.tmpl
 share/bugzilla/template/en/default/reports/report-line.png.tmpl
 share/bugzilla/template/en/default/reports/report-pie.png.tmpl
+share/bugzilla/template/en/default/reports/report-simple.html.tmpl
 share/bugzilla/template/en/default/reports/report-table.csv.tmpl
 share/bugzilla/template/en/default/reports/report-table.html.tmpl
 share/bugzilla/template/en/default/reports/report.csv.tmpl
@@ -329,31 +416,55 @@ share/bugzilla/template/en/default/search/search-report-table.html.tmpl
 share/bugzilla/template/en/default/search/search-specific.html.tmpl
 share/bugzilla/template/en/default/search/tabs.html.tmpl
 share/bugzilla/template/en/default/sidebar.xul.tmpl
+share/bugzilla/template/en/default/whine/mail.html.tmpl
+share/bugzilla/template/en/default/whine/mail.txt.tmpl
+share/bugzilla/template/en/default/whine/multipart-mime.txt.tmpl
+share/bugzilla/template/en/default/whine/schedule.html.tmpl
+share/bugzilla/template/en/extension/filterexceptions.pl
 share/bugzilla/testagent.cgi
 share/bugzilla/testserver.pl
 share/bugzilla/token.cgi
 share/bugzilla/userprefs.cgi
 share/bugzilla/votes.cgi
+share/bugzilla/whine.pl
 share/bugzilla/whineatnews.pl
 share/bugzilla/xml.cgi
-share/doc/bugzilla/Bugzilla-Guide.txt
-share/doc/bugzilla/QUICKSTART
-share/doc/bugzilla/README
-share/doc/bugzilla/UPGRADING
-share/doc/bugzilla/UPGRADING-pre-2.8
-share/doc/bugzilla/rel_notes.txt
-share/examples/bugzilla/bugzilla.conf
-share/examples/bugzilla/localconfig
+@dirrm share/bugzilla/Bugzilla/Auth/Login/WWW/CGI
+@dirrm share/bugzilla/Bugzilla/Auth/Login/WWW
+@dirrm share/bugzilla/Bugzilla/Auth/Login
+@dirrm share/bugzilla/Bugzilla/Auth/Verify
+@dirrm share/bugzilla/Bugzilla/Auth
+@dirrm share/bugzilla/Bugzilla/DB/Schema
+@dirrm share/bugzilla/Bugzilla/DB
+@dirrm share/bugzilla/Bugzilla/Template/Plugin
+@dirrm share/bugzilla/Bugzilla/Template
+@dirrm share/bugzilla/Bugzilla/User
+@dirrm share/bugzilla/Bugzilla
+@dirrm share/bugzilla/docs/html
+@dirrm share/bugzilla/docs
+@dirrm share/bugzilla/images
+@dirrm share/bugzilla/js
+@dirrm share/bugzilla/skins/standard/global
+@dirrm share/bugzilla/skins/standard/index
+@dirrm share/bugzilla/skins/standard
+@dirrm share/bugzilla/skins
 @dirrm share/bugzilla/template/en/default/account/auth
 @dirrm share/bugzilla/template/en/default/account/email
 @dirrm share/bugzilla/template/en/default/account/password
 @dirrm share/bugzilla/template/en/default/account/prefs
 @dirrm share/bugzilla/template/en/default/account
+@dirrm share/bugzilla/template/en/default/admin/classifications
+@dirrm share/bugzilla/template/en/default/admin/components
+@dirrm share/bugzilla/template/en/default/admin/fieldvalues
 @dirrm share/bugzilla/template/en/default/admin/flag-type
 @dirrm share/bugzilla/template/en/default/admin/groups
 @dirrm share/bugzilla/template/en/default/admin/keywords
+@dirrm share/bugzilla/template/en/default/admin/milestones
 @dirrm share/bugzilla/template/en/default/admin/products/groupcontrol
 @dirrm share/bugzilla/template/en/default/admin/products
+@dirrm share/bugzilla/template/en/default/admin/settings
+@dirrm share/bugzilla/template/en/default/admin/users
+@dirrm share/bugzilla/template/en/default/admin/versions
 @dirrm share/bugzilla/template/en/default/admin
 @dirrm share/bugzilla/template/en/default/attachment
 @dirrm share/bugzilla/template/en/default/bug/activity
@@ -368,22 +479,9 @@ share/examples/bugzilla/localconfig
 @dirrm share/bugzilla/template/en/default/reports
 @dirrm share/bugzilla/template/en/default/request
 @dirrm share/bugzilla/template/en/default/search
+@dirrm share/bugzilla/template/en/default/whine
 @dirrm share/bugzilla/template/en/default
+@dirrm share/bugzilla/template/en/extension
 @dirrm share/bugzilla/template/en
 @dirrm share/bugzilla/template
-@exec ${MKDIR} %D/share/examples/bugzilla
-@dirrm share/examples/bugzilla
-@dirrm share/doc/bugzilla
-@dirrm share/bugzilla/js
-@dirrm share/bugzilla/docs/html
-@dirrm share/bugzilla/docs/images/callouts
-@dirrm share/bugzilla/docs/images
-@dirrm share/bugzilla/docs
-@dirrm share/bugzilla/css
-@dirrm share/bugzilla/Bugzilla/Auth
-@dirrm share/bugzilla/Bugzilla/Template/Plugin
-@dirrm share/bugzilla/Bugzilla/Template
-@dirrm share/bugzilla/Bugzilla
-@dirrm share/bugzilla/skins/standard
-@dirrm share/bugzilla/skins
 @dirrm share/bugzilla
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index d20e96ec3fd..d245273cb87 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/10/05 15:09:23 salo Exp $
+$NetBSD: distinfo,v 1.9 2005/10/26 10:16:09 adrianp Exp $
 
-SHA1 (bugzilla-2.18.4.tar.gz) = 44c916790b8721989b72dc906f41035412a1f35b
-RMD160 (bugzilla-2.18.4.tar.gz) = 6c6b5833acd25753707edc09a79663f730967cf3
-Size (bugzilla-2.18.4.tar.gz) = 1659552 bytes
-SHA1 (patch-aa) = 8b25ff33bb77ce226b52ccf97ec7c91c1e95a6a1
+SHA1 (bugzilla-2.20.tar.gz) = a4bb8ab156ca5483747a13c315e60fea7ed717d1
+RMD160 (bugzilla-2.20.tar.gz) = 872a681c49a638a0347db2d8c8c0559df0e4e1c7
+Size (bugzilla-2.20.tar.gz) = 1924992 bytes
+SHA1 (patch-aa) = 1139740aac7497c85f274ae4153a867abe8194a2
diff --git a/devel/bugzilla/files/bugzilla.conf b/devel/bugzilla/files/bugzilla.conf
index 349a6083e47..c5a1de483c0 100644
--- a/devel/bugzilla/files/bugzilla.conf
+++ b/devel/bugzilla/files/bugzilla.conf
@@ -1,4 +1,4 @@
-# $NetBSD: bugzilla.conf,v 1.1.1.1 2005/01/02 13:39:55 adrianp Exp $
+# $NetBSD: bugzilla.conf,v 1.2 2005/10/26 10:16:09 adrianp Exp $
 #
 # Bugzilla configuration file fragment for Apache
 
@@ -8,7 +8,7 @@
 
 <Directory "@BZDIR@">
     AddHandler cgi-script .cgi
-    Options +ExecCGI +FollowSymLinks
+    Options +ExecCGI
     AllowOverride Limit
     Order allow,deny
     Allow from all
diff --git a/devel/bugzilla/files/localconfig b/devel/bugzilla/files/localconfig
index 857ea8fbab6..d7db1a35117 100644
--- a/devel/bugzilla/files/localconfig
+++ b/devel/bugzilla/files/localconfig
@@ -2,13 +2,13 @@
 # With the introduction of a configurable index page using the
 # template toolkit, Bugzilla's main index page is now index.cgi.
 # Most web servers will allow you to use index.cgi as a directory
-# index and many come preconfigured that way, however if yours
-# doesn't you'll need an index.html file that provides redirection
+# index, and many come preconfigured that way, but if yours doesn't
+# then you'll need an index.html file that provides redirection
 # to index.cgi. Setting $index_html to 1 below will allow
 # checksetup.pl to create one for you if it doesn't exist.
 # NOTE: checksetup.pl will not replace an existing file, so if you
 #       wish to have checksetup.pl create one for you, you must
-#       make sure that there isn't already an index.html
+#       make sure that index.html doesn't already exist
 $index_html = 0;
 
 
@@ -32,12 +32,12 @@ $interdiffbin = "@PREFIX@/bin/interdiff";
 
 #
 # The interdiff feature needs diff, so we have to have that path.
-# Please specify only the directory name, with no trailing slash.
+# Please specify the directory name only; do not use trailing slash.
 $diffpath = "/usr/bin";
 
 
 #
-# If you are using Apache for your web server, Bugzilla can create .htaccess
+# If you are using Apache as your web server, Bugzilla can create .htaccess
 # files for you that will instruct Apache not to serve files that shouldn't
 # be accessed from the web (like your local configuration data and non-cgi
 # executable files).  For this to work, the directory your Bugzilla
@@ -52,136 +52,66 @@ $create_htaccess = 1;
 
 
 #
-# This is the group your web server runs on.
+# This is the group your web server runs as.
 # If you have a windows box, ignore this setting.
 # If you do not have access to the group your web server runs under,
 # set this to "". If you do set this to "", then your Bugzilla installation
 # will be _VERY_ insecure, because some files will be world readable/writable,
 # and so anyone who can get local access to your machine can do whatever they
 # want. You should only have this set to "" if this is a testing installation
-# 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
+# and you cannot set this up any other way. YOU HAVE BEEN WARNED!
+# If you set this to anything other than "", you will need to run checksetup.pl
 # as root, or as a user who is a member of the specified group.
 $webservergroup = "@BZ_WEB_GROUP@";
 
 
 
 #
-# How to access the SQL database:
-#
-$db_host = "localhost";         # where is the database?
-$db_port = 3306;           	# which port to use
-$db_name = "bugs";     		# name of the MySQL database
-$db_user = "user";         	# user to attach to the MySQL database
-
-
-
-#
-# Enter your database password here. It's normally advisable to specify
-# a password for your bugzilla database user.
-# If you use apostrophe (') or a backslash (\) in your password, you'll
-# need to escape it by preceding it with a \ character. (\') or (\\)
+# What SQL database to use. Default is mysql. List of supported databases
+# can be obtained by listing Bugzilla/DB directory - every module corresponds
+# to one supported database and the name corresponds to a driver name.
 #
-$db_pass = 'changemeplease';
-
-
-
-# Enter a path to the unix socket for mysql. If this is blank, then mysql's
-# compiled-in default will be used. You probably want that.
-$db_sock = '/tmp/mysql.sock';
+$db_driver = "mysql";
 
 
 
 #
-# Should checksetup.pl try to check if your MySQL setup is correct?
-# (with some combinations of MySQL/Msql-mysql/Perl/moonphase this doesn't work)
+# How to access the SQL database:
 #
-$db_check = 1;
-
+$db_host = 'localhost';         # where is the database?
+$db_name = 'bugs';              # name of the SQL database
+$db_user = 'bugs';              # user to attach to the SQL database
 
-
-#
-# Which bug and feature-request severities do you want?
-#
-@severities = (
-        "blocker",
-        "critical",
-        "major",
-        "normal",
-        "minor",
-        "trivial",
-        "enhancement"
-);
+# Sometimes the database server is running on a non-standard
+# port. If that's the case for your database server, set this
+# to the port number that your database server is running on.
+# Setting this to 0 means "use the default port for my database
+# server."
+$db_port = 0;
 
 
 
 #
-# Which priorities do you want to assign to bugs and feature-request?
+# Enter your database password here. It's normally advisable to specify
+# a password for your bugzilla database user.
+# If you use apostrophe (') or a backslash (\) in your password, you'll
+# need to escape it by preceding it with a '\' character. (\') or (\)
+# (Far simpler just not to use those characters.)
 #
-@priorities = (
-        "P1",
-        "P2",
-        "P3",
-        "P4",
-        "P5"
-);
+$db_pass = '';
 
 
 
-#
-# What operatings systems may your products run on?
-#
-@opsys = (
-        "All",
-        "Windows 3.1",
-        "Windows 95",
-        "Windows 98",
-        "Windows ME",  # Millenium Edition (upgrade of 98)
-        "Windows 2000",
-        "Windows NT",
-        "Windows XP",
-        "Windows Server 2003",
-        "Mac System 7",
-        "Mac System 7.5",
-        "Mac System 7.6.1",
-        "Mac System 8.0",
-        "Mac System 8.5",
-        "Mac System 8.6",
-        "Mac System 9.x",
-        "Mac OS X 10.0",
-        "Mac OS X 10.1",
-        "Mac OS X 10.2",
-        "Mac OS X 10.3",
-        "Linux",
-        "BSD/OS",
-        "FreeBSD",
-        "NetBSD",
-        "OpenBSD",
-        "AIX",
-        "BeOS",
-        "HP-UX",
-        "IRIX",
-        "Neutrino",
-        "OpenVMS",
-        "OS/2",
-        "OSF/1",
-        "Solaris",
-        "SunOS",
-        "other"
-);
+# MySQL Only: Enter a path to the unix socket for mysql. If this is 
+# blank, then mysql\'s compiled-in default will be used. You probably 
+# want that.
+$db_sock = '';
 
 
 
 #
-# What hardware platforms may your products run on?
+# Should checksetup.pl try to verify that your database setup is correct?
+# (with some combinations of database servers/Perl modules/moonphase this 
+# doesn't work)
 #
-@platforms = (
-        "All",
-        "DEC",
-        "HP",
-        "Macintosh",
-        "PC",
-        "SGI",
-        "Sun",
-        "Other"
-);
+$db_check = 1;
diff --git a/devel/bugzilla/patches/patch-aa b/devel/bugzilla/patches/patch-aa
index 2eb903b2658..bb62b1ddda1 100644
--- a/devel/bugzilla/patches/patch-aa
+++ b/devel/bugzilla/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2005/06/17 22:58:02 adrianp Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/26 10:16:09 adrianp Exp $
 
---- checksetup.pl.orig	2005-06-17 20:33:45.000000000 +0000
-+++ checksetup.pl	2005-06-17 22:36:27.000000000 +0000
-@@ -288,7 +288,7 @@
+--- checksetup.pl.orig	2005-10-26 09:43:38.000000000 +0100
++++ checksetup.pl
+@@ -301,7 +301,7 @@ my $modules = [ 
      }, 
      { 
          name => 'File::Spec', 
--        version => '0.82' 
+-        version => '0.84' 
 +        version => '0' 
      }, 
      {