3 files changed, 41 insertions, 8 deletions

diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 81303d09a50e..705eada12dd1 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.5.2
+PORTVERSION=	2.5.4
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
@@ -26,8 +26,10 @@ MYADMDIR?=	www/data/phpMyAdmin
 
 .if defined(WITH_PHP3)
 PHP_SUFX=	php3
+EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3
 .else
 PHP_SUFX=	php
+EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php
 .endif
 
 PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
@@ -39,6 +41,7 @@ PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
 
 post-patch:
 	@${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
+	@${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig
 
 do-install:
 	@${MKDIR} ${PREFIX}/${MYADMDIR}
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index 6411559988bb..288086ed65a7 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.5.2-php.tar.bz2) = c8998f5ef17b8ee9cbf6ed67e9441359
-MD5 (phpMyAdmin-2.5.2-php3.tar.bz2) = e8d61008e9807cf07a41bbff6a2d26cf
+MD5 (phpMyAdmin-2.5.4-php3.tar.bz2) = 7b6b5dcb9071ebfcd71f5db7785db865
+MD5 (phpMyAdmin-2.5.4-php.tar.bz2) = c3a8d771c9846dd95b7283c7ce0f20dd
diff --git a/databases/phpmyadmin211/pkg-plist b/databases/phpmyadmin211/pkg-plist
index 2f61762a2b32..d6adfea48a50 100644
--- a/databases/phpmyadmin211/pkg-plist
+++ b/databases/phpmyadmin211/pkg-plist
@@ -6,9 +6,10 @@
 %%MYADMDIR%%/INSTALL
 %%MYADMDIR%%/LICENSE
 %%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.5.2
+%%MYADMDIR%%/RELEASE-DATE-2.5.4
 %%MYADMDIR%%/TODO
 %%MYADMDIR%%/badwords.txt
+%%MYADMDIR%%/browse_foreigners.%%PHP_SUFX%%
 %%MYADMDIR%%/chk_rel.%%PHP_SUFX%%
 %%MYADMDIR%%/config.inc.%%PHP_SUFX%%.sample
 %%MYADMDIR%%/css/phpmyadmin.css.%%PHP_SUFX%%
@@ -24,7 +25,6 @@
 %%MYADMDIR%%/db_details_structure.%%PHP_SUFX%%
 %%MYADMDIR%%/db_printview.%%PHP_SUFX%%
 %%MYADMDIR%%/db_search.%%PHP_SUFX%%
-%%MYADMDIR%%/docSQL/README
 %%MYADMDIR%%/docs.css
 %%MYADMDIR%%/export.%%PHP_SUFX%%
 %%MYADMDIR%%/footer.inc.%%PHP_SUFX%%
@@ -34,6 +34,26 @@
 %%MYADMDIR%%/images/arrow_rtl.gif
 %%MYADMDIR%%/images/asc_order.png
 %%MYADMDIR%%/images/browse.png
+%%MYADMDIR%%/images/button_browse.png
+%%MYADMDIR%%/images/button_drop.png
+%%MYADMDIR%%/images/button_edit.png
+%%MYADMDIR%%/images/button_empty.png
+%%MYADMDIR%%/images/button_fulltext.png
+%%MYADMDIR%%/images/button_index.png
+%%MYADMDIR%%/images/button_insert.png
+%%MYADMDIR%%/images/button_nobrowse.png
+%%MYADMDIR%%/images/button_nodrop.png
+%%MYADMDIR%%/images/button_noempty.png
+%%MYADMDIR%%/images/button_nofulltext.png
+%%MYADMDIR%%/images/button_noindex.png
+%%MYADMDIR%%/images/button_noprimary.png
+%%MYADMDIR%%/images/button_noselect.png
+%%MYADMDIR%%/images/button_nounique.png
+%%MYADMDIR%%/images/button_primary.png
+%%MYADMDIR%%/images/button_properties.png
+%%MYADMDIR%%/images/button_select.png
+%%MYADMDIR%%/images/button_smallbrowse.png
+%%MYADMDIR%%/images/button_unique.png
 %%MYADMDIR%%/images/desc_order.png
 %%MYADMDIR%%/images/fulltext.png
 %%MYADMDIR%%/images/item_ltr.png
@@ -53,6 +73,10 @@
 %%MYADMDIR%%/lang/albanian-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/arabic-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/arabic-windows-1256.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/azerbaijani-iso-8859-9.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/azerbaijani-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/bosnian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/bosnian-windows-1250.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/brazilian_portuguese-iso-8859-1.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/brazilian_portuguese-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/bulgarian-koi8-r.inc.%%PHP_SUFX%%
@@ -110,6 +134,8 @@
 %%MYADMDIR%%/lang/malay-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/norwegian-iso-8859-1.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/norwegian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/persian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/persian-windows-1256.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/polish-iso-8859-2.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_SUFX%%
@@ -121,8 +147,10 @@
 %%MYADMDIR%%/lang/russian-koi8-r.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/russian-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/russian-windows-1251.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian-utf-8.inc.%%PHP_SUFX%%
-%%MYADMDIR%%/lang/serbian-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_cyrillic-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_cyrillic-windows-1251.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_latin-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/serbian_latin-windows-1250.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/slovak-iso-8859-2.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_SUFX%%
@@ -161,6 +189,7 @@
 %%MYADMDIR%%/libraries/defines_php.lib.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/display_export.lib.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/display_tbl_links.lib.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/dom-drag.js
 %%MYADMDIR%%/libraries/export/csv.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/export/latex.%%PHP_SUFX%%
@@ -242,6 +271,7 @@
 %%MYADMDIR%%/scripts/inno2pma.sh
 %%MYADMDIR%%/scripts/remove_control_m.sh
 %%MYADMDIR%%/scripts/updatedocs.sh
+%%MYADMDIR%%/server_collations.%%PHP_SUFX%%
 %%MYADMDIR%%/server_common.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/server_databases.%%PHP_SUFX%%
 %%MYADMDIR%%/server_export.%%PHP_SUFX%%
@@ -271,6 +301,7 @@
 %%MYADMDIR%%/tbl_rename.%%PHP_SUFX%%
 %%MYADMDIR%%/tbl_replace.%%PHP_SUFX%%
 %%MYADMDIR%%/tbl_replace_fields.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_row_delete.%%PHP_SUFX%%
 %%MYADMDIR%%/tbl_select.%%PHP_SUFX%%
 %%MYADMDIR%%/transformation_wrapper.%%PHP_SUFX%%
 %%MYADMDIR%%/translators.html
@@ -285,6 +316,5 @@
 @dirrm %%MYADMDIR%%/libraries
 @dirrm %%MYADMDIR%%/lang
 @dirrm %%MYADMDIR%%/images
-@dirrm %%MYADMDIR%%/docSQL
 @dirrm %%MYADMDIR%%/css
 @dirrm %%MYADMDIR%%