From 5bcddc1f4b49bcf1817a2ef7894cee7cba84c1c6 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Sun, 4 Aug 2002 19:18:54 +0000
Subject: [PATCH] Upgrade to phpmyadmin 2.3.0 release candidate 4.

---
 databases/phpmyadmin/Makefile     |   3 +-
 databases/phpmyadmin/distinfo     |   3 +-
 databases/phpmyadmin/pkg-plist    | 259 +++++++++++++++++++++---------
 databases/phpmyadmin211/Makefile  |   3 +-
 databases/phpmyadmin211/distinfo  |   3 +-
 databases/phpmyadmin211/pkg-plist | 259 +++++++++++++++++++++---------
 6 files changed, 368 insertions(+), 162 deletions(-)

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 694c6b444fc9..1ebd9edf16f5 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.2.4
+PORTVERSION=	2.3.0.rc4
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc/-rc/}
 DISTFILES=	${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nbm@FreeBSD.org
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index da7cc50f2e3f..fd297b998f70 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,2 +1 @@
-MD5 (phpMyAdmin-2.2.4-php.tar.bz2) = e0177fb4c2c38b2e6ce37e268bea49b3
-MD5 (phpMyAdmin-2.2.4-php3.tar.bz2) = 80496ff809cd3a9a8a123962920cc6b6
+MD5 (phpMyAdmin-2.3.0-rc4-php.tar.bz2) = dfc48c6082dbe02c438c04d6c3dee96b
diff --git a/databases/phpmyadmin/pkg-plist b/databases/phpmyadmin/pkg-plist
index b0183e75488e..77c0261393a7 100644
--- a/databases/phpmyadmin/pkg-plist
+++ b/databases/phpmyadmin/pkg-plist
@@ -1,7 +1,34 @@
+%%MYADMDIR%%/.cvsignore
+%%MYADMDIR%%/ANNOUNCE.txt
+%%MYADMDIR%%/CREDITS
+%%MYADMDIR%%/ChangeLog
+%%MYADMDIR%%/Documentation.html
+%%MYADMDIR%%/Documentation.txt
+%%MYADMDIR%%/INSTALL
+%%MYADMDIR%%/LICENSE
+%%MYADMDIR%%/README
+%%MYADMDIR%%/RELEASE-DATE-2.3.0-rc4
+%%MYADMDIR%%/TODO
+%%MYADMDIR%%/badwords.txt
+%%MYADMDIR%%/chk_rel.%%PHP_VERSION%%
+%%MYADMDIR%%/config.inc.%%PHP_VERSION%%.sample
+%%MYADMDIR%%/db_create.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_common.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_db_info.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_export.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_links.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_qbe.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_structure.%%PHP_VERSION%%
+%%MYADMDIR%%/db_printview.%%PHP_VERSION%%
+%%MYADMDIR%%/db_search.%%PHP_VERSION%%
+%%MYADMDIR%%/db_stats.%%PHP_VERSION%%
+%%MYADMDIR%%/footer.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/header.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/header_printview.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/images/arrow_ltr.gif
 %%MYADMDIR%%/images/arrow_rtl.gif
 %%MYADMDIR%%/images/asc_order.gif
-%%MYADMDIR%%/images/bkg.gif
 %%MYADMDIR%%/images/browse.gif
 %%MYADMDIR%%/images/desc_order.gif
 %%MYADMDIR%%/images/fulltext.png
@@ -11,30 +38,153 @@
 %%MYADMDIR%%/images/partialtext.png
 %%MYADMDIR%%/images/plus.gif
 %%MYADMDIR%%/images/spacer.gif
-%%MYADMDIR%%/ANNOUNCE.txt
-%%MYADMDIR%%/CREDITS
-%%MYADMDIR%%/ChangeLog
-%%MYADMDIR%%/Documentation.html
-%%MYADMDIR%%/Documentation.txt
-%%MYADMDIR%%/INSTALL
-%%MYADMDIR%%/LICENSE
-%%MYADMDIR%%/README
-%%MYADMDIR%%/TODO
-%%MYADMDIR%%/badwords.txt
-%%MYADMDIR%%/db_create.%%PHP_VERSION%%
-%%MYADMDIR%%/db_details.%%PHP_VERSION%%
-%%MYADMDIR%%/db_printview.%%PHP_VERSION%%
-%%MYADMDIR%%/db_stats.%%PHP_VERSION%%
-%%MYADMDIR%%/footer.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/header.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/images/vertical_line.gif
 %%MYADMDIR%%/index.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/add_message.sh
+%%MYADMDIR%%/lang/add_message_file.sh
+%%MYADMDIR%%/lang/albanian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/albanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/arabic-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/arabic-windows-1256.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-koi8-r.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-windows-1251.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/catalan-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/catalan-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_big5-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_gb-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/danish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/danish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/dutch-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/dutch-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/english-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/english-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/estonian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/estonian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/finnish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/finnish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/french-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/french-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/galician-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/galician-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/georgian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/german-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/german-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/greek-iso-8859-7.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/greek-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hebrew-iso-8859-8-i.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hungarian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hungarian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/indonesian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/indonesian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/italian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/italian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/korean-ks_c_5601-1987.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/latvian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/latvian-windows-1257.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/lithuanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/lithuanian-windows-1257.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/norwegian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/polish-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/portuguese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/remove_message.sh
+%%MYADMDIR%%/lang/romanian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/romanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-koi8-r.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-windows-1251.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/serbian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/serbian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/spanish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/spanish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/swedish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/swedish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/sync_lang.sh
+%%MYADMDIR%%/lang/thai-tis-620.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/thai-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/turkish-iso-8859-9.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/turkish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/ukrainian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/ukrainian-windows-1251.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/ldi_check.%%PHP_VERSION%%
 %%MYADMDIR%%/ldi_table.%%PHP_VERSION%%
 %%MYADMDIR%%/left.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/build_dump.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/charset_conversion.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/common.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/config_import.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/db_config.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/db_table_exists.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/defines.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/defines_php.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/README
+%%MYADMDIR%%/libraries/fpdf/font/courier.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helvetica.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticab.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticabi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticai.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/symbol.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/times.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesb.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesbi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/functions.js
+%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/indexes.js
+%%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/kanji-encoding.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/left.js
+%%MYADMDIR%%/libraries/mysql_wrappers.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/ob.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/relation.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/sqlparser.data.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/sqlparser.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/string.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/tbl_change.js
+%%MYADMDIR%%/libraries/user_details.js
+%%MYADMDIR%%/libraries/xpath/XPath.class.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/zip.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/main.%%PHP_VERSION%%
 %%MYADMDIR%%/mult_submits.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/pdf_pages.%%PHP_VERSION%%
+%%MYADMDIR%%/pdf_schema.%%PHP_VERSION%%
 %%MYADMDIR%%/phpinfo.%%PHP_VERSION%%
 %%MYADMDIR%%/read_dump.%%PHP_VERSION%%
+%%MYADMDIR%%/scripts/check_lang.%%PHP_VERSION%%
+%%MYADMDIR%%/scripts/convertcfg.pl
+%%MYADMDIR%%/scripts/create-release.sh
+%%MYADMDIR%%/scripts/extchg.sh
+%%MYADMDIR%%/scripts/remove_control_m.sh
 %%MYADMDIR%%/sql.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_addfield.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_alter.%%PHP_VERSION%%
@@ -46,72 +196,25 @@
 %%MYADMDIR%%/tbl_printview.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_properties.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_properties.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_qbe.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_common.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_export.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_links.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_operations.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_options.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_structure.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_table_info.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_query_box.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_relation.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_rename.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_replace.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_select.%%PHP_VERSION%%
+%%MYADMDIR%%/translators.html
 %%MYADMDIR%%/user_details.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/arabic.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/add_message.sh
-%%MYADMDIR%%/lang/add_message_file.sh
-%%MYADMDIR%%/lang/bulgarian-koi8.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/bulgarian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/catala.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/czech-iso.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/czech-win1250.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/danish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/dutch.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/english.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/finnish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/french.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/galician.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/german.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/greek.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/hebrew.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/hungarian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/italian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/korean.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/norwegian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/polish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/portuguese.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/romanian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/russian-koi8.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/spanish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/remove_message.sh
-%%MYADMDIR%%/lang/russian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/slovak-iso.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/slovak-win1250.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/swedish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/thai.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/turkish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/ukrainian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/brazilian_portuguese.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/build_dump.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/common.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/defines.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/functions.js
-%%MYADMDIR%%/libraries/ob.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/indexes.js
-%%MYADMDIR%%/libraries/left.js
-%%MYADMDIR%%/libraries/zip.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/user_details.js
-%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/scripts/create-release.sh
-%%MYADMDIR%%/scripts/extchg.sh
-%%MYADMDIR%%/scripts/remove_control_m.sh
-%%MYADMDIR%%/RELEASE-DATE-2.2.4
-%%MYADMDIR%%/config.inc.%%PHP_VERSION%%.sample
+%%MYADMDIR%%/user_password.%%PHP_VERSION%%
 @dirrm %%MYADMDIR%%/scripts
+@dirrm %%MYADMDIR%%/libraries/xpath
+@dirrm %%MYADMDIR%%/libraries/fpdf/font
+@dirrm %%MYADMDIR%%/libraries/fpdf
 @dirrm %%MYADMDIR%%/libraries/auth
 @dirrm %%MYADMDIR%%/libraries
 @dirrm %%MYADMDIR%%/lang
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 694c6b444fc9..1ebd9edf16f5 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.2.4
+PORTVERSION=	2.3.0.rc4
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc/-rc/}
 DISTFILES=	${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nbm@FreeBSD.org
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index da7cc50f2e3f..fd297b998f70 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1,2 +1 @@
-MD5 (phpMyAdmin-2.2.4-php.tar.bz2) = e0177fb4c2c38b2e6ce37e268bea49b3
-MD5 (phpMyAdmin-2.2.4-php3.tar.bz2) = 80496ff809cd3a9a8a123962920cc6b6
+MD5 (phpMyAdmin-2.3.0-rc4-php.tar.bz2) = dfc48c6082dbe02c438c04d6c3dee96b
diff --git a/databases/phpmyadmin211/pkg-plist b/databases/phpmyadmin211/pkg-plist
index b0183e75488e..77c0261393a7 100644
--- a/databases/phpmyadmin211/pkg-plist
+++ b/databases/phpmyadmin211/pkg-plist
@@ -1,7 +1,34 @@
+%%MYADMDIR%%/.cvsignore
+%%MYADMDIR%%/ANNOUNCE.txt
+%%MYADMDIR%%/CREDITS
+%%MYADMDIR%%/ChangeLog
+%%MYADMDIR%%/Documentation.html
+%%MYADMDIR%%/Documentation.txt
+%%MYADMDIR%%/INSTALL
+%%MYADMDIR%%/LICENSE
+%%MYADMDIR%%/README
+%%MYADMDIR%%/RELEASE-DATE-2.3.0-rc4
+%%MYADMDIR%%/TODO
+%%MYADMDIR%%/badwords.txt
+%%MYADMDIR%%/chk_rel.%%PHP_VERSION%%
+%%MYADMDIR%%/config.inc.%%PHP_VERSION%%.sample
+%%MYADMDIR%%/db_create.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_common.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_db_info.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_export.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_links.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_qbe.%%PHP_VERSION%%
+%%MYADMDIR%%/db_details_structure.%%PHP_VERSION%%
+%%MYADMDIR%%/db_printview.%%PHP_VERSION%%
+%%MYADMDIR%%/db_search.%%PHP_VERSION%%
+%%MYADMDIR%%/db_stats.%%PHP_VERSION%%
+%%MYADMDIR%%/footer.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/header.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/header_printview.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/images/arrow_ltr.gif
 %%MYADMDIR%%/images/arrow_rtl.gif
 %%MYADMDIR%%/images/asc_order.gif
-%%MYADMDIR%%/images/bkg.gif
 %%MYADMDIR%%/images/browse.gif
 %%MYADMDIR%%/images/desc_order.gif
 %%MYADMDIR%%/images/fulltext.png
@@ -11,30 +38,153 @@
 %%MYADMDIR%%/images/partialtext.png
 %%MYADMDIR%%/images/plus.gif
 %%MYADMDIR%%/images/spacer.gif
-%%MYADMDIR%%/ANNOUNCE.txt
-%%MYADMDIR%%/CREDITS
-%%MYADMDIR%%/ChangeLog
-%%MYADMDIR%%/Documentation.html
-%%MYADMDIR%%/Documentation.txt
-%%MYADMDIR%%/INSTALL
-%%MYADMDIR%%/LICENSE
-%%MYADMDIR%%/README
-%%MYADMDIR%%/TODO
-%%MYADMDIR%%/badwords.txt
-%%MYADMDIR%%/db_create.%%PHP_VERSION%%
-%%MYADMDIR%%/db_details.%%PHP_VERSION%%
-%%MYADMDIR%%/db_printview.%%PHP_VERSION%%
-%%MYADMDIR%%/db_stats.%%PHP_VERSION%%
-%%MYADMDIR%%/footer.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/header.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/images/vertical_line.gif
 %%MYADMDIR%%/index.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/add_message.sh
+%%MYADMDIR%%/lang/add_message_file.sh
+%%MYADMDIR%%/lang/albanian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/albanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/arabic-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/arabic-windows-1256.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-koi8-r.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/bulgarian-windows-1251.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/catalan-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/catalan-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_big5-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_gb-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/croatian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/czech-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/danish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/danish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/dutch-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/dutch-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/english-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/english-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/estonian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/estonian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/finnish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/finnish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/french-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/french-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/galician-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/galician-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/georgian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/german-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/german-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/greek-iso-8859-7.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/greek-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hebrew-iso-8859-8-i.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hungarian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/hungarian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/indonesian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/indonesian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/italian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/italian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/japanese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/korean-ks_c_5601-1987.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/latvian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/latvian-windows-1257.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/lithuanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/lithuanian-windows-1257.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/norwegian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/polish-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/portuguese-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/remove_message.sh
+%%MYADMDIR%%/lang/romanian-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/romanian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-koi8-r.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/russian-windows-1251.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/serbian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/serbian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-iso-8859-2.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/slovenian-windows-1250.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/spanish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/spanish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/swedish-iso-8859-1.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/swedish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/sync_lang.sh
+%%MYADMDIR%%/lang/thai-tis-620.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/thai-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/turkish-iso-8859-9.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/turkish-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/ukrainian-utf-8.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/lang/ukrainian-windows-1251.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/ldi_check.%%PHP_VERSION%%
 %%MYADMDIR%%/ldi_table.%%PHP_VERSION%%
 %%MYADMDIR%%/left.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/build_dump.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/charset_conversion.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/common.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/config_import.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/db_config.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/db_table_exists.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/defines.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/defines_php.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/README
+%%MYADMDIR%%/libraries/fpdf/font/courier.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helvetica.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticab.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticabi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticai.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/symbol.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/times.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesb.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesbi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/timesi.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/functions.js
+%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/indexes.js
+%%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/kanji-encoding.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/left.js
+%%MYADMDIR%%/libraries/mysql_wrappers.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/ob.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/relation.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/sqlparser.data.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/sqlparser.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/string.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/tbl_change.js
+%%MYADMDIR%%/libraries/user_details.js
+%%MYADMDIR%%/libraries/xpath/XPath.class.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/zip.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/main.%%PHP_VERSION%%
 %%MYADMDIR%%/mult_submits.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/pdf_pages.%%PHP_VERSION%%
+%%MYADMDIR%%/pdf_schema.%%PHP_VERSION%%
 %%MYADMDIR%%/phpinfo.%%PHP_VERSION%%
 %%MYADMDIR%%/read_dump.%%PHP_VERSION%%
+%%MYADMDIR%%/scripts/check_lang.%%PHP_VERSION%%
+%%MYADMDIR%%/scripts/convertcfg.pl
+%%MYADMDIR%%/scripts/create-release.sh
+%%MYADMDIR%%/scripts/extchg.sh
+%%MYADMDIR%%/scripts/remove_control_m.sh
 %%MYADMDIR%%/sql.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_addfield.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_alter.%%PHP_VERSION%%
@@ -46,72 +196,25 @@
 %%MYADMDIR%%/tbl_printview.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_properties.inc.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_properties.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_qbe.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_common.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_export.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_links.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_operations.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_options.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_structure.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_properties_table_info.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_query_box.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_relation.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_rename.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_replace.%%PHP_VERSION%%
 %%MYADMDIR%%/tbl_select.%%PHP_VERSION%%
+%%MYADMDIR%%/translators.html
 %%MYADMDIR%%/user_details.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/arabic.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/add_message.sh
-%%MYADMDIR%%/lang/add_message_file.sh
-%%MYADMDIR%%/lang/bulgarian-koi8.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/bulgarian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/catala.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/czech-iso.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/czech-win1250.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/danish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/dutch.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/english.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/finnish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/french.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/galician.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/german.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/greek.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/hebrew.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/hungarian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/italian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/korean.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/norwegian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/polish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/portuguese.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/romanian.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/russian-koi8.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/spanish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/remove_message.sh
-%%MYADMDIR%%/lang/russian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/slovak-iso.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/slovak-win1250.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/swedish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/thai.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/turkish.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/ukrainian-win1251.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/brazilian_portuguese.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/build_dump.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/common.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/defines.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/functions.js
-%%MYADMDIR%%/libraries/ob.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/indexes.js
-%%MYADMDIR%%/libraries/left.js
-%%MYADMDIR%%/libraries/zip.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/user_details.js
-%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/scripts/create-release.sh
-%%MYADMDIR%%/scripts/extchg.sh
-%%MYADMDIR%%/scripts/remove_control_m.sh
-%%MYADMDIR%%/RELEASE-DATE-2.2.4
-%%MYADMDIR%%/config.inc.%%PHP_VERSION%%.sample
+%%MYADMDIR%%/user_password.%%PHP_VERSION%%
 @dirrm %%MYADMDIR%%/scripts
+@dirrm %%MYADMDIR%%/libraries/xpath
+@dirrm %%MYADMDIR%%/libraries/fpdf/font
+@dirrm %%MYADMDIR%%/libraries/fpdf
 @dirrm %%MYADMDIR%%/libraries/auth
 @dirrm %%MYADMDIR%%/libraries
 @dirrm %%MYADMDIR%%/lang