Update to 2.22

New features include:
* Complete PostgreSQL Support
* Parameters In Sections
* One Codebase, Multiple Databases
* UTF-8 for New Installations
* Admins Can Impersonate Users
* Bug Import and Moving Improvements
* Adding Individual Bugs to Saved Searches
* Attach URLs
* Optional "Strict Isolation" for Groups
* "editcomponents" Change
* "shutdownhtml" Change
* Miscellaneous Improvements

For further details see:
	http://www.bugzilla.org/releases/2.22/new-features.html
	http://www.bugzilla.org/releases/2.22/release-notes.html

6 files changed, 122 insertions, 37 deletions

diff --git a/devel/bugzilla/MESSAGE b/devel/bugzilla/MESSAGE
index 6323100bdb6..a6609db6e40 100644
--- a/devel/bugzilla/MESSAGE
+++ b/devel/bugzilla/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/05/15 17:04:32 adrianp Exp $
+$NetBSD: MESSAGE,v 1.3 2006/10/15 12:21:13 adrianp Exp $
 
 To complete the setup you will need to read the Bugzilla-Guide.txt in order
 to setup mySQL properly.  In particular secion 2.2.2 of the document deals
@@ -17,7 +17,7 @@ If you are running Apache then you may add the following lines to httpd.conf:
 
 to make Bugzilla accessible through:
 
-	http://www.domain.com/bugzilla/index.cgi
+	http://localhost/bugzilla/index.cgi
 
 IMPORTANTLY: CHANGE YOUR DATABASE PASSWORD FROM THE DEFAULT !!
 
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 8bd67a733bf..2113d8f9d38 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/07/07 22:10:07 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/15 12:21:13 adrianp Exp $
 #
 
-DISTNAME=	bugzilla-2.20.1
-PKGREVISION=	1
+DISTNAME=	bugzilla-2.22
 CATEGORIES=	www devel
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/webtools/
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=webtools/}
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.bugzilla.org/
@@ -12,7 +11,6 @@ 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.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
@@ -20,7 +18,9 @@ DEPENDS+=	p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-Tabs+Wrap>=2001.0131:../../textproc/p5-Text-Tabs+Wrap
 DEPENDS+=	p5-Storable-[0-9]*:../../devel/p5-Storable
 DEPENDS+=	p5-TimeDate>=1.16:../../time/p5-TimeDate
-DEPENDS+=	p5-MailTools>=1.65:../../mail/p5-MailTools
+DEPENDS+=	p5-MailTools>=1.74:../../mail/p5-MailTools
+DEPENDS+=	p5-MIME-Base64>=3.01:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-MIME-tools>=5.406:../../mail/p5-MIME-tools
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -30,8 +30,9 @@ NO_BUILD=	YES
 
 BZ_WEB_GROUP?=	${APACHE_GROUP}
 SENDMAIL?=	/usr/sbin/sendmail
+CVS?=		/usr/bin/cvs
 
-BUILD_DEFS+=	BZ_WEB_GROUP SENDMAIL APACHE_USER
+BUILD_DEFS+=	BZ_WEB_GROUP SENDMAIL APACHE_USER APACHE_GROUP CVS
 
 MESSAGE_SUBST+=	BZDIR=${BZDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
@@ -52,6 +53,8 @@ SUBST_FILES.conf=	bugzilla.conf localconfig Bugzilla/BugMail.pm
 SUBST_SED.conf=		-e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"
 SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_SED.conf+=	-e "s|@BZDIR@|${BZDIR}|g"
+SUBST_SED.conf+=	-e "s|@CVS@|${CVS}|g"
+SUBST_SED.conf+=	-e "s|@DBDRIVER@|${DBDRIVER}|g"
 SUBST_SED.conf+=	-e "s|/usr/lib/sendmail|${SENDMAIL}|g"
 
 post-extract:
@@ -82,10 +85,8 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${BZDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.html ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.js ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/robots.txt ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/ant.jpg ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/bugzilla.dtd ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/duplicates.xul ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/Bugzilla.pm ${BZDIR}
@@ -104,5 +105,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${BZDIR}/${i}
 .endfor
 
-# .include "../../mk/apache.mk"
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bugzilla/PLIST b/devel/bugzilla/PLIST
index 35e104b85e5..24560147482 100644
--- a/devel/bugzilla/PLIST
+++ b/devel/bugzilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/06/17 19:03:05 rillig Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/10/15 12:21:13 adrianp Exp $
 share/bugzilla/Bugzilla.pm
 share/bugzilla/Bugzilla/Attachment.pm
 share/bugzilla/Bugzilla/Auth.pm
@@ -13,7 +13,26 @@ share/bugzilla/Bugzilla/Bug.pm
 share/bugzilla/Bugzilla/BugMail.pm
 share/bugzilla/Bugzilla/CGI.pm
 share/bugzilla/Bugzilla/Chart.pm
+share/bugzilla/Bugzilla/Classification.pm
+share/bugzilla/Bugzilla/Component.pm
 share/bugzilla/Bugzilla/Config.pm
+share/bugzilla/Bugzilla/Config/Admin.pm
+share/bugzilla/Bugzilla/Config/Attachment.pm
+share/bugzilla/Bugzilla/Config/Auth.pm
+share/bugzilla/Bugzilla/Config/BugChange.pm
+share/bugzilla/Bugzilla/Config/BugFields.pm
+share/bugzilla/Bugzilla/Config/BugMove.pm
+share/bugzilla/Bugzilla/Config/Common.pm
+share/bugzilla/Bugzilla/Config/Core.pm
+share/bugzilla/Bugzilla/Config/DependencyGraph.pm
+share/bugzilla/Bugzilla/Config/GroupSecurity.pm
+share/bugzilla/Bugzilla/Config/L10n.pm
+share/bugzilla/Bugzilla/Config/LDAP.pm
+share/bugzilla/Bugzilla/Config/MTA.pm
+share/bugzilla/Bugzilla/Config/PatchViewer.pm
+share/bugzilla/Bugzilla/Config/Query.pm
+share/bugzilla/Bugzilla/Config/ShadowDB.pm
+share/bugzilla/Bugzilla/Config/UserMatch.pm
 share/bugzilla/Bugzilla/Constants.pm
 share/bugzilla/Bugzilla/DB.pm
 share/bugzilla/Bugzilla/DB/Mysql.pm
@@ -22,10 +41,14 @@ 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/Field.pm
 share/bugzilla/Bugzilla/Flag.pm
 share/bugzilla/Bugzilla/FlagType.pm
 share/bugzilla/Bugzilla/Group.pm
+share/bugzilla/Bugzilla/Milestone.pm
+share/bugzilla/Bugzilla/Product.pm
 share/bugzilla/Bugzilla/Search.pm
+share/bugzilla/Bugzilla/Search/Quicksearch.pm
 share/bugzilla/Bugzilla/Series.pm
 share/bugzilla/Bugzilla/Template.pm
 share/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm
@@ -35,8 +58,7 @@ 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
+share/bugzilla/Bugzilla/Version.pm
 share/bugzilla/attachment.cgi
 share/bugzilla/buglist.cgi
 share/bugzilla/bugzilla.dtd
@@ -46,7 +68,6 @@ share/bugzilla/colchange.cgi
 share/bugzilla/collectstats.pl
 share/bugzilla/config.cgi
 share/bugzilla/createaccount.cgi
-share/bugzilla/defparams.pl
 share/bugzilla/describecomponents.cgi
 share/bugzilla/describekeywords.cgi
 share/bugzilla/docs/html/Bugzilla-Guide.html
@@ -54,6 +75,7 @@ share/bugzilla/docs/html/about.html
 share/bugzilla/docs/html/administration.html
 share/bugzilla/docs/html/bug_page.html
 share/bugzilla/docs/html/bugreports.html
+share/bugzilla/docs/html/classifications.html
 share/bugzilla/docs/html/cmdline-bugmail.html
 share/bugzilla/docs/html/cmdline.html
 share/bugzilla/docs/html/components.html
@@ -134,8 +156,7 @@ share/bugzilla/docs/html/using.html
 share/bugzilla/docs/html/versions.html
 share/bugzilla/docs/html/voting.html
 share/bugzilla/docs/html/whining.html
-share/bugzilla/docs/html/x3190.html
-share/bugzilla/doeditparams.cgi
+share/bugzilla/docs/html/x3269.html
 share/bugzilla/duplicates.cgi
 share/bugzilla/duplicates.xul
 share/bugzilla/editclassifications.cgi
@@ -156,19 +177,15 @@ share/bugzilla/globals.pl
 share/bugzilla/images/padlock.png
 share/bugzilla/importxml.pl
 share/bugzilla/index.cgi
+share/bugzilla/js/TUI.js
 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/page.cgi
 share/bugzilla/post_bug.cgi
 share/bugzilla/process_bug.cgi
 share/bugzilla/productmenu.js
 share/bugzilla/query.cgi
-share/bugzilla/quicksearch.html
-share/bugzilla/quicksearch.js
-share/bugzilla/quicksearchhack.html
 share/bugzilla/quips.cgi
 share/bugzilla/relogin.cgi
 share/bugzilla/report.cgi
@@ -191,9 +208,9 @@ 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/params.css
 share/bugzilla/skins/standard/show_multiple.css
 share/bugzilla/skins/standard/summarize-time.css
 share/bugzilla/skins/standard/voting.css
@@ -269,15 +286,41 @@ 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/params/admin.html.tmpl
+share/bugzilla/template/en/default/admin/params/attachment.html.tmpl
+share/bugzilla/template/en/default/admin/params/auth.html.tmpl
+share/bugzilla/template/en/default/admin/params/bugchange.html.tmpl
+share/bugzilla/template/en/default/admin/params/bugfields.html.tmpl
+share/bugzilla/template/en/default/admin/params/bugmove.html.tmpl
+share/bugzilla/template/en/default/admin/params/common.html.tmpl
+share/bugzilla/template/en/default/admin/params/core.html.tmpl
+share/bugzilla/template/en/default/admin/params/dependencygraph.html.tmpl
+share/bugzilla/template/en/default/admin/params/editparams.html.tmpl
+share/bugzilla/template/en/default/admin/params/groupsecurity.html.tmpl
+share/bugzilla/template/en/default/admin/params/index.html.tmpl
+share/bugzilla/template/en/default/admin/params/l10n.html.tmpl
+share/bugzilla/template/en/default/admin/params/ldap.html.tmpl
+share/bugzilla/template/en/default/admin/params/mta.html.tmpl
+share/bugzilla/template/en/default/admin/params/patchviewer.html.tmpl
+share/bugzilla/template/en/default/admin/params/query.html.tmpl
+share/bugzilla/template/en/default/admin/params/shadowdb.html.tmpl
+share/bugzilla/template/en/default/admin/params/usermatch.html.tmpl
 share/bugzilla/template/en/default/admin/products/confirm-delete.html.tmpl
+share/bugzilla/template/en/default/admin/products/create.html.tmpl
+share/bugzilla/template/en/default/admin/products/created.html.tmpl
 share/bugzilla/template/en/default/admin/products/deleted.html.tmpl
+share/bugzilla/template/en/default/admin/products/edit-common.html.tmpl
+share/bugzilla/template/en/default/admin/products/edit.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/groupcontrol/updated.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/products/updated.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/sudo.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
@@ -326,7 +369,6 @@ share/bugzilla/template/en/default/bug/process/bugmail.html.tmpl
 share/bugzilla/template/en/default/bug/process/confirm-duplicate.html.tmpl
 share/bugzilla/template/en/default/bug/process/header.html.tmpl
 share/bugzilla/template/en/default/bug/process/midair.html.tmpl
-share/bugzilla/template/en/default/bug/process/next.html.tmpl
 share/bugzilla/template/en/default/bug/process/results.html.tmpl
 share/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl
 share/bugzilla/template/en/default/bug/show-multiple.html.tmpl
@@ -339,6 +381,7 @@ share/bugzilla/template/en/default/bug/votes/list-for-bug.html.tmpl
 share/bugzilla/template/en/default/bug/votes/list-for-user.html.tmpl
 share/bugzilla/template/en/default/config.js.tmpl
 share/bugzilla/template/en/default/config.rdf.tmpl
+share/bugzilla/template/en/default/email/sudo.txt.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
@@ -354,10 +397,13 @@ share/bugzilla/template/en/default/global/help.html.tmpl
 share/bugzilla/template/en/default/global/hidden-fields.html.tmpl
 share/bugzilla/template/en/default/global/initialize.none.tmpl
 share/bugzilla/template/en/default/global/message.html.tmpl
+share/bugzilla/template/en/default/global/message.txt.tmpl
 share/bugzilla/template/en/default/global/messages.html.tmpl
+share/bugzilla/template/en/default/global/per-bug-queries.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/tabs.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
@@ -379,6 +425,9 @@ share/bugzilla/template/en/default/pages/bug-writing.html.tmpl
 share/bugzilla/template/en/default/pages/fields.html.tmpl
 share/bugzilla/template/en/default/pages/linked.html.tmpl
 share/bugzilla/template/en/default/pages/linkify.html.tmpl
+share/bugzilla/template/en/default/pages/quicksearch.html.tmpl
+share/bugzilla/template/en/default/pages/quicksearchhack.html.tmpl
+share/bugzilla/template/en/default/pages/sudo.html.tmpl
 share/bugzilla/template/en/default/pages/voting.html.tmpl
 share/bugzilla/template/en/default/reports/chart.csv.tmpl
 share/bugzilla/template/en/default/reports/chart.html.tmpl
@@ -448,6 +497,7 @@ share/examples/bugzilla/localconfig
 @dirrm share/bugzilla/template/en/default/list
 @dirrm share/bugzilla/template/en/default/global
 @dirrm share/bugzilla/template/en/default/flag
+@dirrm share/bugzilla/template/en/default/email
 @dirrm share/bugzilla/template/en/default/bug/votes
 @dirrm share/bugzilla/template/en/default/bug/process
 @dirrm share/bugzilla/template/en/default/bug/create
@@ -459,6 +509,7 @@ share/examples/bugzilla/localconfig
 @dirrm share/bugzilla/template/en/default/admin/settings
 @dirrm share/bugzilla/template/en/default/admin/products/groupcontrol
 @dirrm share/bugzilla/template/en/default/admin/products
+@dirrm share/bugzilla/template/en/default/admin/params
 @dirrm share/bugzilla/template/en/default/admin/milestones
 @dirrm share/bugzilla/template/en/default/admin/keywords
 @dirrm share/bugzilla/template/en/default/admin/groups
@@ -486,8 +537,10 @@ share/examples/bugzilla/localconfig
 @dirrm share/bugzilla/Bugzilla/User
 @dirrm share/bugzilla/Bugzilla/Template/Plugin
 @dirrm share/bugzilla/Bugzilla/Template
+@dirrm share/bugzilla/Bugzilla/Search
 @dirrm share/bugzilla/Bugzilla/DB/Schema
 @dirrm share/bugzilla/Bugzilla/DB
+@dirrm share/bugzilla/Bugzilla/Config
 @dirrm share/bugzilla/Bugzilla/Auth/Verify
 @dirrm share/bugzilla/Bugzilla/Auth/Login/WWW/CGI
 @dirrm share/bugzilla/Bugzilla/Auth/Login/WWW
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index 9e85f3432dc..6f3d58da50f 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2006/02/21 16:48:55 adrianp Exp $
+$NetBSD: distinfo,v 1.11 2006/10/15 12:21:13 adrianp Exp $
 
-SHA1 (bugzilla-2.20.1.tar.gz) = 2c289a6794dac57d2b0351e382c7b92ca92c391b
-RMD160 (bugzilla-2.20.1.tar.gz) = 95881fddec6ef594a48fea3519b4eb3bb50ee553
-Size (bugzilla-2.20.1.tar.gz) = 1918866 bytes
+SHA1 (bugzilla-2.22.tar.gz) = 22a590583e2aec8ef6fcfcb05ee44b7064bfa65c
+RMD160 (bugzilla-2.22.tar.gz) = 2f9e5573e15d3ddcc4b997ac3a645d79585f9ea7
+Size (bugzilla-2.22.tar.gz) = 1956898 bytes
 SHA1 (patch-aa) = 1139740aac7497c85f274ae4153a867abe8194a2
diff --git a/devel/bugzilla/files/localconfig b/devel/bugzilla/files/localconfig
index d7db1a35117..4e21ee23d40 100644
--- a/devel/bugzilla/files/localconfig
+++ b/devel/bugzilla/files/localconfig
@@ -17,7 +17,7 @@ $index_html = 0;
 # viewer), we need the cvs binary to access files and revisions.
 # Because it's possible that this program is not in your path, you can specify
 # its location here.  Please specify the full path to the executable.
-$cvsbin = "/usr/bin/cvs";
+$cvsbin = "@CVS@";
 
 
 
@@ -71,7 +71,7 @@ $webservergroup = "@BZ_WEB_GROUP@";
 # can be obtained by listing Bugzilla/DB directory - every module corresponds
 # to one supported database and the name corresponds to a driver name.
 #
-$db_driver = "mysql";
+$db_driver = "@DBDRIVER@";
 
 
 
@@ -115,3 +115,5 @@ $db_sock = '';
 # doesn't work)
 #
 $db_check = 1;
+
+
diff --git a/devel/bugzilla/options.mk b/devel/bugzilla/options.mk
index 7b63247fa26..9c99688b776 100644
--- a/devel/bugzilla/options.mk
+++ b/devel/bugzilla/options.mk
@@ -1,11 +1,40 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/01/02 13:39:55 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2006/10/15 12:21:13 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bugzilla
-PKG_SUPPORTED_OPTIONS=	ldap charts patchviewer xmlimportbugs
+
+PKG_OPTIONS_REQUIRED_GROUPS=	db
+PKG_OPTIONS_GROUP.db=		mysql pgsql
+
+PKG_OPTIONS_LEGACY_OPTS+=	patchviewer:bugzilla-patchviewer
+PKG_OPTIONS_LEGACY_OPTS+=	xmlimportbugs:bugzilla-xmlimportbugs
+PKG_OPTIONS_LEGACY_OPTS+=	charts:bugzilla-charts
+
+PKG_SUPPORTED_OPTIONS=	ldap bugzilla-charts bugzilla-patchviewer mysql pgsql
+PKG_SUPPORTED_OPTIONS+=	bugzilla-xmlimportbugs bugzilla-imagemagick
+PKG_SUGGESTED_OPTIONS=	mysql
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### Use mysql or postgresql backend
+###
+.if !empty(PKG_OPTIONS:Mmysql)
+DEPENDS+=	p5-DBD-mysql>=2.9003:../../databases/p5-DBD-mysql
+DBDRIVER=	mysql
+.elif !empty(PKG_OPTIONS:Mpgsql)
+DEPENDS+=	p5-DBD-postgresql>=1.45:../../databases/p5-DBD-postgresql
+DBDRIVER=	pgsql
+.endif
+
+###
+### If you want to convert BMP image attachments to PNG to conserve
+### disk space.
+###
+.if !empty(PKG_OPTIONS:Mbugzilla-imagemagick)
+DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
+.endif
+
+###
 ### Use OpenLDAP for authentication
 ###
 .if !empty(PKG_OPTIONS:Mldap)
@@ -15,7 +44,7 @@ DEPENDS+=	p5-perl-ldap-[0-9]*:../../databases/p5-perl-ldap
 ###
 ### Generation of charts
 ###
-.if !empty(PKG_OPTIONS:Mcharts)
+.if !empty(PKG_OPTIONS:Mbugzilla-charts)
 DEPENDS+=	gd>=1.20:../../graphics/gd
 DEPENDS+=	p5-Chart>=1.0:../../graphics/p5-Chart
 DEPENDS+=	p5-GDTextUtil-[0-9]*:../../graphics/p5-GDTextUtil
@@ -25,7 +54,7 @@ DEPENDS+=	p5-GDGraph-[0-9]*:../../graphics/p5-GDGraph
 ###
 ### Patchviewer support
 ###
-.if !empty(PKG_OPTIONS:Mpatchviewer)
+.if !empty(PKG_OPTIONS:Mbugzilla-patchviewer)
 DEPENDS+=	p5-PatchReader>=0.9.4:../../devel/p5-PatchReader
 DEPENDS+=	patchutils-[0-9]*:../../devel/patchutils
 .endif
@@ -33,6 +62,6 @@ DEPENDS+=	patchutils-[0-9]*:../../devel/patchutils
 ###
 ### Add support for bulk import/export of bugs in XML format
 ###
-.if !empty(PKG_OPTIONS:Mxmlimportbugs)
-DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+.if !empty(PKG_OPTIONS:Mbugzilla-xmlimportbugs)
+DEPENDS+=	p5-XML-Twig-[0-9]*:../../textproc/p5-XML-Twig
 .endif