Update "phpmyadmin" package to version 2.5.3rc3. This version provides

numerous bug fixes and enhancements over version 2.3.3pl1. The include
file "ChangeLog" will provide detailed information.

3 files changed, 170 insertions, 103 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 1c9cc7472ce..58a1b5d3315 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/09/01 12:37:14 tron Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/01 14:00:30 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-php
-PKGNAME=	phpmyadmin-2.3.3.1
-PKGREVISION=	1
+PKGNAME=	phpmyadmin-2.5.3rc3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
@@ -20,7 +19,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
 		PMDIR=${PMDIR} EXDIR=${EXDIR}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.3.3pl1
+DIST_VERSION=	2.5.3-rc3
 DOC_FILES=	ANNOUNCE.txt CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
@@ -42,9 +41,11 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/lang
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/auth
+	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/dbg
+	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/export
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/fpdf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/fpdf/font
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/xpath
+	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/transformations
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/scripts
 	${RM} -f ${CONF_INC_PHP}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/phpmyadmin
@@ -57,9 +58,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PREFIX}/share/phpmyadmin/lang
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.* ${PREFIX}/share/phpmyadmin/libraries
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/auth/*.php ${PREFIX}/share/phpmyadmin/libraries/auth
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/dbg/*.php ${PREFIX}/share/phpmyadmin/libraries/dbg
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/export/*.php ${PREFIX}/share/phpmyadmin/libraries/export
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/*.php ${PREFIX}/share/phpmyadmin/libraries/fpdf
 	${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/font/*.php ${PREFIX}/share/phpmyadmin/libraries/fpdf/font
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/xpath/*.php ${PREFIX}/share/phpmyadmin/libraries/xpath
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/transformations/*.php ${PREFIX}/share/phpmyadmin/libraries/transformations
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.* ${PREFIX}/share/phpmyadmin/scripts
 	cd ${WRKSRC}; \
 	${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/phpmyadmin
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index cf6ab359b5f..1e4b1fe0cba 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/12 14:04:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/09/01 14:00:31 tron Exp $
 share/doc/phpmyadmin/ANNOUNCE.txt
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
@@ -12,11 +12,68 @@ share/examples/phpmyadmin/config.inc.php
 @exec ${MKDIR} ${PMCONFDIR}
 @exec ${TEST} -f ${PMCONFFILE} || ${CP} -p %D/%F ${PMCONFFILE}
 share/examples/phpmyadmin/phpmyadmin.conf
+share/phpmyadmin/Documentation.html
+share/phpmyadmin/badwords.txt
+share/phpmyadmin/browse_foreigners.php
+share/phpmyadmin/chk_rel.php
+share/phpmyadmin/db_create.php
+share/phpmyadmin/db_datadict.php
+share/phpmyadmin/db_details.php
+share/phpmyadmin/db_details_common.php
+share/phpmyadmin/db_details_db_info.php
+share/phpmyadmin/db_details_export.php
+share/phpmyadmin/db_details_importdocsql.php
+share/phpmyadmin/db_details_links.php
+share/phpmyadmin/db_details_qbe.php
+share/phpmyadmin/db_details_structure.php
+share/phpmyadmin/db_printview.php
+share/phpmyadmin/db_search.php
+share/phpmyadmin/export.php
+share/phpmyadmin/footer.inc.php
+share/phpmyadmin/header.inc.php
+share/phpmyadmin/header_printview.inc.php
+share/phpmyadmin/images/arrow_ltr.gif
+share/phpmyadmin/images/arrow_rtl.gif
+share/phpmyadmin/images/asc_order.png
+share/phpmyadmin/images/browse.png
+share/phpmyadmin/images/button_browse.png
+share/phpmyadmin/images/button_drop.png
+share/phpmyadmin/images/button_edit.png
+share/phpmyadmin/images/button_empty.png
+share/phpmyadmin/images/button_fulltext.png
+share/phpmyadmin/images/button_index.png
+share/phpmyadmin/images/button_insert.png
+share/phpmyadmin/images/button_nobrowse.png
+share/phpmyadmin/images/button_nodrop.png
+share/phpmyadmin/images/button_noempty.png
+share/phpmyadmin/images/button_nofulltext.png
+share/phpmyadmin/images/button_noindex.png
+share/phpmyadmin/images/button_noprimary.png
+share/phpmyadmin/images/button_noselect.png
+share/phpmyadmin/images/button_nounique.png
+share/phpmyadmin/images/button_primary.png
+share/phpmyadmin/images/button_properties.png
+share/phpmyadmin/images/button_select.png
+share/phpmyadmin/images/button_smallbrowse.png
+share/phpmyadmin/images/button_unique.png
+share/phpmyadmin/images/desc_order.png
+share/phpmyadmin/images/fulltext.png
+share/phpmyadmin/images/item_ltr.png
+share/phpmyadmin/images/item_rtl.png
+share/phpmyadmin/images/minus.png
+share/phpmyadmin/images/partialtext.png
+share/phpmyadmin/images/plus.png
+share/phpmyadmin/images/pma_logo.png
+share/phpmyadmin/images/spacer.gif
+share/phpmyadmin/images/vertical_line.png
+share/phpmyadmin/index.php
+share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php
 share/phpmyadmin/lang/afrikaans-utf-8.inc.php
 share/phpmyadmin/lang/albanian-iso-8859-1.inc.php
 share/phpmyadmin/lang/albanian-utf-8.inc.php
 share/phpmyadmin/lang/arabic-utf-8.inc.php
 share/phpmyadmin/lang/arabic-windows-1256.inc.php
+share/phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php
 share/phpmyadmin/lang/brazilian_portuguese-utf-8.inc.php
 share/phpmyadmin/lang/bulgarian-koi8-r.inc.php
 share/phpmyadmin/lang/bulgarian-utf-8.inc.php
@@ -78,12 +135,14 @@ share/phpmyadmin/lang/portuguese-iso-8859-1.inc.php
 share/phpmyadmin/lang/portuguese-utf-8.inc.php
 share/phpmyadmin/lang/romanian-iso-8859-1.inc.php
 share/phpmyadmin/lang/romanian-utf-8.inc.php
+share/phpmyadmin/lang/russian-dos-866.inc.php
 share/phpmyadmin/lang/russian-koi8-r.inc.php
 share/phpmyadmin/lang/russian-utf-8.inc.php
-share/phpmyadmin/lang/serbian-utf-8.inc.php
-share/phpmyadmin/lang/russian-dos-866.inc.php
 share/phpmyadmin/lang/russian-windows-1251.inc.php
-share/phpmyadmin/lang/serbian-windows-1250.inc.php
+share/phpmyadmin/lang/serbian_cyrillic-utf-8.inc.php
+share/phpmyadmin/lang/serbian_cyrillic-windows-1251.inc.php
+share/phpmyadmin/lang/serbian_latin-utf-8.inc.php
+share/phpmyadmin/lang/serbian_latin-windows-1250.inc.php
 share/phpmyadmin/lang/slovak-iso-8859-2.inc.php
 share/phpmyadmin/lang/slovak-utf-8.inc.php
 share/phpmyadmin/lang/slovak-windows-1250.inc.php
@@ -100,137 +159,142 @@ share/phpmyadmin/lang/turkish-iso-8859-9.inc.php
 share/phpmyadmin/lang/turkish-utf-8.inc.php
 share/phpmyadmin/lang/ukrainian-utf-8.inc.php
 share/phpmyadmin/lang/ukrainian-windows-1251.inc.php
-share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php
-share/phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php
-share/phpmyadmin/Documentation.html
-share/phpmyadmin/badwords.txt
-share/phpmyadmin/db_create.php
-share/phpmyadmin/db_datadict.php
-share/phpmyadmin/db_details.php
-share/phpmyadmin/db_details_common.php
-share/phpmyadmin/db_details_db_info.php
-share/phpmyadmin/db_details_export.php
-share/phpmyadmin/db_details_importdocsql.php
-share/phpmyadmin/db_details_links.php
-share/phpmyadmin/db_search.php
-share/phpmyadmin/db_details_qbe.php
-share/phpmyadmin/db_details_structure.php
-share/phpmyadmin/db_printview.php
-share/phpmyadmin/db_stats.php
-share/phpmyadmin/footer.inc.php
-share/phpmyadmin/header.inc.php
-share/phpmyadmin/header_printview.inc.php
-share/phpmyadmin/index.php
 share/phpmyadmin/ldi_check.php
 share/phpmyadmin/ldi_table.php
 share/phpmyadmin/left.php
-share/phpmyadmin/main.php
-share/phpmyadmin/mult_submits.inc.php
-share/phpmyadmin/pdf_pages.php
-share/phpmyadmin/pdf_schema.php
-share/phpmyadmin/phpinfo.php
-share/phpmyadmin/read_dump.php
-share/phpmyadmin/sql.php
-share/phpmyadmin/tbl_addfield.php
-share/phpmyadmin/tbl_alter.php
-share/phpmyadmin/tbl_change.php
-share/phpmyadmin/tbl_create.php
-share/phpmyadmin/tbl_dump.php
-share/phpmyadmin/tbl_indexes.php
-share/phpmyadmin/tbl_move_copy.php
-share/phpmyadmin/tbl_printview.php
-share/phpmyadmin/tbl_properties.inc.php
-share/phpmyadmin/tbl_properties.php
-share/phpmyadmin/tbl_properties_common.php
-share/phpmyadmin/tbl_properties_export.php
-share/phpmyadmin/tbl_properties_links.php
-share/phpmyadmin/tbl_properties_operations.php
-share/phpmyadmin/tbl_properties_options.php
-share/phpmyadmin/tbl_properties_structure.php
-share/phpmyadmin/tbl_properties_table_info.php
-share/phpmyadmin/tbl_query_box.php
-share/phpmyadmin/tbl_relation.php
-share/phpmyadmin/tbl_rename.php
-share/phpmyadmin/tbl_replace.php
-share/phpmyadmin/tbl_select.php
-share/phpmyadmin/user_details.php
-share/phpmyadmin/user_password.php
-share/phpmyadmin/chk_rel.php
-share/phpmyadmin/config.inc.php
-share/phpmyadmin/images/arrow_ltr.gif
-share/phpmyadmin/images/arrow_rtl.gif
-share/phpmyadmin/images/asc_order.gif
-share/phpmyadmin/images/browse.gif
-share/phpmyadmin/images/desc_order.gif
-share/phpmyadmin/images/fulltext.png
-share/phpmyadmin/images/item_ltr.gif
-share/phpmyadmin/images/item_rtl.gif
-share/phpmyadmin/images/minus.gif
-share/phpmyadmin/images/partialtext.png
-share/phpmyadmin/images/plus.gif
-share/phpmyadmin/images/pma_logo.png
-share/phpmyadmin/images/spacer.gif
-share/phpmyadmin/images/vertical_line.gif
+share/phpmyadmin/libraries/auth/config.auth.lib.php
 share/phpmyadmin/libraries/auth/cookie.auth.lib.php
 share/phpmyadmin/libraries/auth/http.auth.lib.php
-share/phpmyadmin/libraries/auth/config.auth.lib.php
+share/phpmyadmin/libraries/blowfish.php
+share/phpmyadmin/libraries/bookmark.lib.php
+share/phpmyadmin/libraries/charset_conversion.lib.php
+share/phpmyadmin/libraries/common.lib.php
+share/phpmyadmin/libraries/config_import.lib.php
+share/phpmyadmin/libraries/db_config.lib.php
+share/phpmyadmin/libraries/db_table_exists.lib.php
+share/phpmyadmin/libraries/dbg/profiling.php
+share/phpmyadmin/libraries/dbg/setup.php
+share/phpmyadmin/libraries/defines.lib.php
+share/phpmyadmin/libraries/defines_php.lib.php
+share/phpmyadmin/libraries/display_export.lib.php
+share/phpmyadmin/libraries/display_tbl.lib.php
+share/phpmyadmin/libraries/dom-drag.js
+share/phpmyadmin/libraries/export/csv.php
+share/phpmyadmin/libraries/export/latex.php
+share/phpmyadmin/libraries/export/sql.php
+share/phpmyadmin/libraries/export/xml.php
 share/phpmyadmin/libraries/fpdf/font/courier.php
 share/phpmyadmin/libraries/fpdf/font/helvetica.php
 share/phpmyadmin/libraries/fpdf/font/helveticab.php
 share/phpmyadmin/libraries/fpdf/font/helveticabi.php
 share/phpmyadmin/libraries/fpdf/font/helveticai.php
 share/phpmyadmin/libraries/fpdf/font/symbol.php
+share/phpmyadmin/libraries/fpdf/font/tahoma.php
+share/phpmyadmin/libraries/fpdf/font/tahomab.php
 share/phpmyadmin/libraries/fpdf/font/times.php
 share/phpmyadmin/libraries/fpdf/font/timesb.php
 share/phpmyadmin/libraries/fpdf/font/timesbi.php
 share/phpmyadmin/libraries/fpdf/font/timesi.php
 share/phpmyadmin/libraries/fpdf/font/zapfdingbats.php
 share/phpmyadmin/libraries/fpdf/fpdf.php
-share/phpmyadmin/libraries/build_dump.lib.php
-share/phpmyadmin/libraries/common.lib.php
-share/phpmyadmin/libraries/config_import.lib.php
-share/phpmyadmin/libraries/db_config.lib.php
-share/phpmyadmin/libraries/db_table_exists.lib.php
-share/phpmyadmin/libraries/defines.lib.php
-share/phpmyadmin/libraries/defines_php.lib.php
-share/phpmyadmin/libraries/display_tbl.lib.php
+share/phpmyadmin/libraries/functions.js
 share/phpmyadmin/libraries/get_foreign.lib.php
 share/phpmyadmin/libraries/grab_globals.lib.php
-share/phpmyadmin/libraries/functions.js
-share/phpmyadmin/libraries/ip_allow_deny.lib.php
-share/phpmyadmin/libraries/ob.lib.php
+share/phpmyadmin/libraries/header_http.inc.php
+share/phpmyadmin/libraries/header_meta_style.inc.php
 share/phpmyadmin/libraries/indexes.js
+share/phpmyadmin/libraries/ip_allow_deny.lib.php
 share/phpmyadmin/libraries/kanji-encoding.lib.php
-share/phpmyadmin/libraries/mysql_wrappers.lib.php
 share/phpmyadmin/libraries/left.js
+share/phpmyadmin/libraries/mysql_charsets.lib.php
+share/phpmyadmin/libraries/mysql_wrappers.lib.php
+share/phpmyadmin/libraries/ob.lib.php
+share/phpmyadmin/libraries/read_dump.lib.php
 share/phpmyadmin/libraries/relation.lib.php
+share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/select_lang.lib.php
+share/phpmyadmin/libraries/server_privileges.js
 share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
 share/phpmyadmin/libraries/sqlvalidator.class.php
 share/phpmyadmin/libraries/sqlvalidator.lib.php
 share/phpmyadmin/libraries/string.lib.php
-share/phpmyadmin/libraries/zip.lib.php
 share/phpmyadmin/libraries/tbl_change.js
-share/phpmyadmin/libraries/user_details.js
-share/phpmyadmin/libraries/xpath/XPath.class.php
-share/phpmyadmin/libraries/bookmark.lib.php
-share/phpmyadmin/libraries/charset_conversion.lib.php
+share/phpmyadmin/libraries/transformations.lib.php
+share/phpmyadmin/libraries/transformations/global.inc.php
+share/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php
+share/phpmyadmin/libraries/transformations/image_jpeg__link.inc.php
+share/phpmyadmin/libraries/transformations/image_png__inline.inc.php
+share/phpmyadmin/libraries/transformations/overview.php
+share/phpmyadmin/libraries/transformations/text_plain__dateformat.inc.php
+share/phpmyadmin/libraries/transformations/text_plain__external.inc.php
+share/phpmyadmin/libraries/transformations/text_plain__formatted.inc.php
+share/phpmyadmin/libraries/transformations/text_plain__imagelink.inc.php
+share/phpmyadmin/libraries/transformations/text_plain__link.inc.php
+share/phpmyadmin/libraries/transformations/text_plain__substr.inc.php
+share/phpmyadmin/libraries/url_generating.lib.php
+share/phpmyadmin/libraries/user_password.js
+share/phpmyadmin/libraries/zip.lib.php
+share/phpmyadmin/main.php
+share/phpmyadmin/mult_submits.inc.php
+share/phpmyadmin/pdf_pages.php
+share/phpmyadmin/pdf_schema.php
+share/phpmyadmin/phpinfo.php
+share/phpmyadmin/queryframe.php
+share/phpmyadmin/querywindow.php
+share/phpmyadmin/read_dump.php
 share/phpmyadmin/scripts/check_lang.php
-share/phpmyadmin/scripts/decode_bug.php
 share/phpmyadmin/scripts/convertcfg.pl
 share/phpmyadmin/scripts/create-release.sh
 share/phpmyadmin/scripts/create_tables.sql
+share/phpmyadmin/scripts/decode_bug.php
 share/phpmyadmin/scripts/extchg.sh
+share/phpmyadmin/scripts/inno2pma.sh
 share/phpmyadmin/scripts/remove_control_m.sh
+share/phpmyadmin/scripts/updatedocs.sh
+share/phpmyadmin/server_collations.php
+share/phpmyadmin/server_common.inc.php
+share/phpmyadmin/server_databases.php
+share/phpmyadmin/server_export.php
+share/phpmyadmin/server_links.inc.php
+share/phpmyadmin/server_privileges.php
+share/phpmyadmin/server_processlist.php
+share/phpmyadmin/server_status.php
+share/phpmyadmin/server_variables.php
+share/phpmyadmin/sql.php
+share/phpmyadmin/tbl_addfield.php
+share/phpmyadmin/tbl_alter.php
+share/phpmyadmin/tbl_change.php
+share/phpmyadmin/tbl_create.php
+share/phpmyadmin/tbl_indexes.php
+share/phpmyadmin/tbl_move_copy.php
+share/phpmyadmin/tbl_printview.php
+share/phpmyadmin/tbl_properties.inc.php
+share/phpmyadmin/tbl_properties.php
+share/phpmyadmin/tbl_properties_common.php
+share/phpmyadmin/tbl_properties_export.php
+share/phpmyadmin/tbl_properties_links.php
+share/phpmyadmin/tbl_properties_operations.php
+share/phpmyadmin/tbl_properties_structure.php
+share/phpmyadmin/tbl_properties_table_info.php
+share/phpmyadmin/tbl_query_box.php
+share/phpmyadmin/tbl_relation.php
+share/phpmyadmin/tbl_rename.php
+share/phpmyadmin/tbl_replace.php
+share/phpmyadmin/tbl_replace_fields.php
+share/phpmyadmin/tbl_select.php
+share/phpmyadmin/transformation_wrapper.php
+share/phpmyadmin/user_password.php
 @dirrm share/phpmyadmin/lang
 @dirrm share/phpmyadmin/images
-@dirrm share/phpmyadmin/libraries/auth
+@dirrm share/phpmyadmin/libraries/transformations
 @dirrm share/phpmyadmin/libraries/fpdf/font
 @dirrm share/phpmyadmin/libraries/fpdf
-@dirrm share/phpmyadmin/libraries/xpath
+@dirrm share/phpmyadmin/libraries/export
+@dirrm share/phpmyadmin/libraries/dbg
+@dirrm share/phpmyadmin/libraries/auth
 @dirrm share/phpmyadmin/libraries
 @dirrm share/phpmyadmin/scripts
-@dirrm share/phpmyadmin
+@exec ${RMDIR} %D/share/phpmyadmin >/dev/null 2>&1 || ${TRUE}
 @dirrm share/examples/phpmyadmin
 @dirrm share/doc/phpmyadmin
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index e459fa13ade..169238b130f 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/01/05 14:25:18 tron Exp $
+$NetBSD: distinfo,v 1.5 2003/09/01 14:00:31 tron Exp $
 
-SHA1 (phpMyAdmin-2.3.3pl1-php.tar.bz2) = 10275c59e687a320c553c5aa8aff63855bfef325
-Size (phpMyAdmin-2.3.3pl1-php.tar.bz2) = 634325 bytes
+SHA1 (phpMyAdmin-2.5.3-rc3-php.tar.bz2) = b68c3d21ed2ad2dba8a3f0b3a7a02904aad08d0c
+Size (phpMyAdmin-2.5.3-rc3-php.tar.bz2) = 995406 bytes