2 files changed, 87 insertions, 112 deletions

diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index 5c3badc1c2bb..509dd6dbad01 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -16,8 +16,6 @@ COMMENT=	Bug-tracking system developed in PHP
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
-BROKEN=		Incorrect pkg-plist
-
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
 .endif
diff --git a/devel/phpbt/pkg-plist b/devel/phpbt/pkg-plist
index 4acce09214fa..868062219842 100644
--- a/devel/phpbt/pkg-plist
+++ b/devel/phpbt/pkg-plist
@@ -1,4 +1,35 @@
-%%PHPBT%%/docs/html/images/callouts/9.gif
+%%PHPBT%%/CHANGELOG
+%%PHPBT%%/COPYING
+%%PHPBT%%/INSTALL
+%%PHPBT%%/README
+%%PHPBT%%/TODO
+%%PHPBT%%/UPGRADING
+%%PHPBT%%/admin/configure.php
+%%PHPBT%%/admin/database.php
+%%PHPBT%%/admin/group.php
+%%PHPBT%%/admin/os.php
+%%PHPBT%%/admin/project.php
+%%PHPBT%%/admin/removetemplates.php
+%%PHPBT%%/admin/resolution.php
+%%PHPBT%%/admin/severity.php
+%%PHPBT%%/admin/site.php
+%%PHPBT%%/admin/status.php
+%%PHPBT%%/admin/user.php
+%%PHPBT%%/attachment.php
+%%PHPBT%%/bug.php
+%%PHPBT%%/config-dist.php
+%%PHPBT%%/config.php
+%%PHPBT%%/contrib/.htaccess
+%%PHPBT%%/contrib/gnats-to-phpbt.py
+%%PHPBT%%/docs/html/adminguide.html
+%%PHPBT%%/docs/html/bugdetail.html
+%%PHPBT%%/docs/html/bugsearch.html
+%%PHPBT%%/docs/html/configuration.html
+%%PHPBT%%/docs/html/dependencies.html
+%%PHPBT%%/docs/html/devguide.html
+%%PHPBT%%/docs/html/devstandards.html
+%%PHPBT%%/docs/html/docs.css
+%%PHPBT%%/docs/html/images/callouts/1.gif
 %%PHPBT%%/docs/html/images/callouts/10.gif
 %%PHPBT%%/docs/html/images/callouts/2.gif
 %%PHPBT%%/docs/html/images/callouts/3.gif
@@ -7,37 +38,29 @@
 %%PHPBT%%/docs/html/images/callouts/6.gif
 %%PHPBT%%/docs/html/images/callouts/7.gif
 %%PHPBT%%/docs/html/images/callouts/8.gif
-%%PHPBT%%/docs/html/images/callouts/1.gif
-%%PHPBT%%/docs/html/images/shots/user/bugdetail.jpg
-%%PHPBT%%/docs/html/images/shots/user/enterbug-chooseproject.jpg
-%%PHPBT%%/docs/html/images/shots/user/enterbug-detail.jpg
-%%PHPBT%%/docs/html/images/shots/user/query.jpg
+%%PHPBT%%/docs/html/images/callouts/9.gif
 %%PHPBT%%/docs/html/images/caution.gif
+%%PHPBT%%/docs/html/images/home.gif
 %%PHPBT%%/docs/html/images/important.gif
 %%PHPBT%%/docs/html/images/logo.jpg
 %%PHPBT%%/docs/html/images/next.gif
 %%PHPBT%%/docs/html/images/note.gif
 %%PHPBT%%/docs/html/images/prev.gif
+%%PHPBT%%/docs/html/images/shots/user/bugdetail.jpg
+%%PHPBT%%/docs/html/images/shots/user/enterbug-chooseproject.jpg
+%%PHPBT%%/docs/html/images/shots/user/enterbug-detail.jpg
+%%PHPBT%%/docs/html/images/shots/user/query.jpg
 %%PHPBT%%/docs/html/images/tip.gif
 %%PHPBT%%/docs/html/images/toc-blank.gif
 %%PHPBT%%/docs/html/images/toc-minus.gif
 %%PHPBT%%/docs/html/images/toc-plus.gif
 %%PHPBT%%/docs/html/images/up.gif
 %%PHPBT%%/docs/html/images/warning.gif
-%%PHPBT%%/docs/html/images/home.gif
-%%PHPBT%%/docs/html/adminguide.html
-%%PHPBT%%/docs/html/bugdetail.html
-%%PHPBT%%/docs/html/bugsearch.html
-%%PHPBT%%/docs/html/configuration.html
-%%PHPBT%%/docs/html/dependencies.html
-%%PHPBT%%/docs/html/devguide.html
-%%PHPBT%%/docs/html/devstandards.html
-%%PHPBT%%/docs/html/docs.css
 %%PHPBT%%/docs/html/index.html
 %%PHPBT%%/docs/html/installation.html
 %%PHPBT%%/docs/html/schema.html
 %%PHPBT%%/docs/html/userguide.html
-%%PHPBT%%/docs/sgml/template.sgml
+%%PHPBT%%/docs/sgml/bugdetail.sgml
 %%PHPBT%%/docs/sgml/bugsearch.sgml
 %%PHPBT%%/docs/sgml/configuration.sgml
 %%PHPBT%%/docs/sgml/devstandards.sgml
@@ -48,85 +71,58 @@
 %%PHPBT%%/docs/sgml/primer.sgml
 %%PHPBT%%/docs/sgml/requirements.sgml
 %%PHPBT%%/docs/sgml/schema.sgml
-%%PHPBT%%/docs/sgml/bugdetail.sgml
-%%PHPBT%%/admin/user.php
-%%PHPBT%%/admin/database.php
-%%PHPBT%%/admin/group.php
-%%PHPBT%%/admin/os.php
-%%PHPBT%%/admin/project.php
-%%PHPBT%%/admin/removetemplates.php
-%%PHPBT%%/admin/resolution.php
-%%PHPBT%%/admin/severity.php
-%%PHPBT%%/admin/site.php
-%%PHPBT%%/admin/status.php
-%%PHPBT%%/admin/configure.php
-%%PHPBT%%/schemas/old/perms.sql
-%%PHPBT%%/schemas/old/table_rename.sql
-%%PHPBT%%/schemas/mysql.in
-%%PHPBT%%/schemas/oci8.in
-%%PHPBT%%/schemas/pgsql.in
+%%PHPBT%%/docs/sgml/template.sgml
+%%PHPBT%%/inc/auth.php
+%%PHPBT%%/inc/db/mssql.php
 %%PHPBT%%/inc/db/mysql.php
+%%PHPBT%%/inc/db/mysqli.php
 %%PHPBT%%/inc/db/oci8.php
 %%PHPBT%%/inc/db/pgsql.php
-%%PHPBT%%/inc/pear/DB/sybase.php
-%%PHPBT%%/inc/pear/DB/dbase.php
-%%PHPBT%%/inc/pear/DB/fbsql.php
-%%PHPBT%%/inc/pear/DB/ibase.php
-%%PHPBT%%/inc/pear/DB/ifx.php
-%%PHPBT%%/inc/pear/DB/msql.php
-%%PHPBT%%/inc/pear/DB/mssql.php
-%%PHPBT%%/inc/pear/DB/mysql.php
-%%PHPBT%%/inc/pear/DB/oci8.php
-%%PHPBT%%/inc/pear/DB/odbc.php
-%%PHPBT%%/inc/pear/DB/pgsql.php
-%%PHPBT%%/inc/pear/DB/storage.php
-%%PHPBT%%/inc/pear/DB/common.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/BIFFwriter.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/Format.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/Parser.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/Validator.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/Workbook.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer/Worksheet.php
-%%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer.php
-%%PHPBT%%/inc/pear/PEAR.php
-%%PHPBT%%/inc/pear/DB.php
+%%PHPBT%%/inc/functions.php
 %%PHPBT%%/inc/htmlMimeMail/RFC822.php
 %%PHPBT%%/inc/htmlMimeMail/htmlMimeMail.php
 %%PHPBT%%/inc/htmlMimeMail/mimePart.php
 %%PHPBT%%/inc/htmlMimeMail/smtp.php
-%%PHPBT%%/inc/auth.php
-%%PHPBT%%/inc/functions.php
 %%PHPBT%%/inc/is_a.php
-%%PHPBT%%/styles/black.css
-%%PHPBT%%/styles/default.css
-%%PHPBT%%/styles/print.css
-%%PHPBT%%/languages/old/sl.php
+%%PHPBT%%/include.php
+%%PHPBT%%/index.php
+%%PHPBT%%/install.php
+%%PHPBT%%/languages/cn.php
+%%PHPBT%%/languages/de.php
+%%PHPBT%%/languages/en.php
+%%PHPBT%%/languages/es.php
+%%PHPBT%%/languages/fi.php
+%%PHPBT%%/languages/fr.php
+%%PHPBT%%/languages/it.php
+%%PHPBT%%/languages/ja.php
 %%PHPBT%%/languages/old/README
 %%PHPBT%%/languages/old/es.php
 %%PHPBT%%/languages/old/et.php
+%%PHPBT%%/languages/old/gb2312.php
 %%PHPBT%%/languages/old/it.php
 %%PHPBT%%/languages/old/no.php
-%%PHPBT%%/languages/old/se.php
 %%PHPBT%%/languages/old/pl_iso-8859-2.php
 %%PHPBT%%/languages/old/ru_koi8-r.php
 %%PHPBT%%/languages/old/ru_windows-1251.php
-%%PHPBT%%/languages/old/gb2312.php
-%%PHPBT%%/languages/cz.php
-%%PHPBT%%/languages/da.php
-%%PHPBT%%/languages/cz_iso-8859-2.php
-%%PHPBT%%/languages/de.php
-%%PHPBT%%/languages/du.php
-%%PHPBT%%/languages/pt-br.php
-%%PHPBT%%/languages/es.php
-%%PHPBT%%/languages/fr.php
-%%PHPBT%%/languages/ja.php
-%%PHPBT%%/languages/nl.php
-%%PHPBT%%/languages/no.php
-%%PHPBT%%/languages/en.php
-%%PHPBT%%/templates/default/base/removetemplates.html
-%%PHPBT%%/templates/default/base/smartymissing.html
-%%PHPBT%%/templates/default/base/templatesperm.html
-%%PHPBT%%/templates/default/admin/wrap.html
+%%PHPBT%%/languages/old/se.php
+%%PHPBT%%/languages/old/sl.php
+%%PHPBT%%/logo.jpg
+%%PHPBT%%/logout.php
+%%PHPBT%%/messages.po
+%%PHPBT%%/newaccount.php
+%%PHPBT%%/query.php
+%%PHPBT%%/report.php
+%%PHPBT%%/schemas/mssql.in
+%%PHPBT%%/schemas/mysql.in
+%%PHPBT%%/schemas/mysqli.in
+%%PHPBT%%/schemas/oci8.in
+%%PHPBT%%/schemas/old/perms.sql
+%%PHPBT%%/schemas/old/table_rename.sql
+%%PHPBT%%/schemas/pgsql.in
+%%PHPBT%%/styles/black.css
+%%PHPBT%%/styles/default.css
+%%PHPBT%%/styles/print.css
+%%PHPBT%%/templates/default/admin/badperm.html
 %%PHPBT%%/templates/default/admin/component-edit.html
 %%PHPBT%%/templates/default/admin/configure.html
 %%PHPBT%%/templates/default/admin/database-edit.html
@@ -152,10 +148,13 @@
 %%PHPBT%%/templates/default/admin/userlist.html
 %%PHPBT%%/templates/default/admin/version-edit.html
 %%PHPBT%%/templates/default/admin/wrap-popup.html
-%%PHPBT%%/templates/default/admin/badperm.html
-%%PHPBT%%/templates/default/images/spacer.gif
-%%PHPBT%%/templates/default/images/title.gif
+%%PHPBT%%/templates/default/admin/wrap.html
 %%PHPBT%%/templates/default/badgroup.html
+%%PHPBT%%/templates/default/badperm.html
+%%PHPBT%%/templates/default/base/removetemplates.html
+%%PHPBT%%/templates/default/base/smartymissing.html
+%%PHPBT%%/templates/default/base/templatesperm.html
+%%PHPBT%%/templates/default/bugattachmentform.html
 %%PHPBT%%/templates/default/bugdisplay-printable.html
 %%PHPBT%%/templates/default/bugdisplay.html
 %%PHPBT%%/templates/default/bugemail-newbug.txt
@@ -166,12 +165,15 @@
 %%PHPBT%%/templates/default/bugvotes.html
 %%PHPBT%%/templates/default/changessaved.html
 %%PHPBT%%/templates/default/error.html
+%%PHPBT%%/templates/default/images/spacer.gif
+%%PHPBT%%/templates/default/images/title.gif
 %%PHPBT%%/templates/default/index.html
 %%PHPBT%%/templates/default/install-complete.html
 %%PHPBT%%/templates/default/install-dbfailure.html
 %%PHPBT%%/templates/default/install-dbsuccess.html
-%%PHPBT%%/templates/default/login.html
+%%PHPBT%%/templates/default/install-failure.html
 %%PHPBT%%/templates/default/install.html
+%%PHPBT%%/templates/default/login.html
 %%PHPBT%%/templates/default/logout.html
 %%PHPBT%%/templates/default/newaccount-disabled.html
 %%PHPBT%%/templates/default/newaccount.html
@@ -186,30 +188,10 @@
 %%PHPBT%%/templates/default/user.html
 %%PHPBT%%/templates/default/wrap-popup.html
 %%PHPBT%%/templates/default/wrap.html
-%%PHPBT%%/templates/default/badperm.html
-%%PHPBT%%/templates/default/bugattachmentform.html
-%%PHPBT%%/install.php
-%%PHPBT%%/index.php
-%%PHPBT%%/include.php
-%%PHPBT%%/config.php
-%%PHPBT%%/config-dist.php
-%%PHPBT%%/bug.php
-%%PHPBT%%/attachment.php
-%%PHPBT%%/UPGRADING
-%%PHPBT%%/TODO
-%%PHPBT%%/README
-%%PHPBT%%/INSTALL
-%%PHPBT%%/COPYING
-%%PHPBT%%/user.php
-%%PHPBT%%/CHANGELOG
 %%PHPBT%%/upgrade.php
-%%PHPBT%%/report.php
-%%PHPBT%%/query.php
-%%PHPBT%%/newaccount.php
-%%PHPBT%%/messages.po
-%%PHPBT%%/logout.php
-%%PHPBT%%/logo.jpg
+%%PHPBT%%/user.php
 @dirrm %%PHPBT%%/admin
+@dirrm %%PHPBT%%/contrib
 @dirrm %%PHPBT%%/docs/html/images/callouts
 @dirrm %%PHPBT%%/docs/html/images/shots/user
 @dirrm %%PHPBT%%/docs/html/images/shots
@@ -218,11 +200,6 @@
 @dirrm %%PHPBT%%/docs/sgml
 @dirrm %%PHPBT%%/docs
 @dirrm %%PHPBT%%/inc/db
-@dirrm %%PHPBT%%/inc/pear/DB
-@dirrm %%PHPBT%%/inc/pear/Spreadsheet/Excel/Writer
-@dirrm %%PHPBT%%/inc/pear/Spreadsheet/Excel
-@dirrm %%PHPBT%%/inc/pear/Spreadsheet
-@dirrm %%PHPBT%%/inc/pear
 @dirrm %%PHPBT%%/inc/htmlMimeMail
 @dirrm %%PHPBT%%/inc
 @dirrm %%PHPBT%%/schemas/old