Upgrade to 2.5.1

PR:		53405
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>

4 files changed, 266 insertions, 223 deletions

diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 8589e83f2527..3bff58af4b9a 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -6,50 +6,45 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.3.2
+PORTVERSION=	2.5.1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc/-rc/}
-DISTFILES=	${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-${PHP_SUFX}${EXTRACT_SUFX}
 
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	A set of PHP-scripts to adminstrate MySQL over the web
 
-RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
-.if !defined(WITH_PHP3)
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
-PHP_VERSION=	php
-.else
+.if defined(WITH_PHP3)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
-PHP_VERSION=	php3
 .endif
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-MYADMDIR?=	www/data.default/phpMyAdmin
+MYADMDIR?=	www/data/phpMyAdmin
+
+.if defined(WITH_PHP3)
+PHP_SUFX=	php3
+.else
+PHP_SUFX=	php
+.endif
+
+PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
 
-ORIG_PLIST=	${PKGDIR}/pkg-plist
-PLIST=		${WRKDIR}/PLIST
-PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_VERSION=${PHP_VERSION}
+.include <bsd.port.pre.mk>
+.if !defined(WITH_PHP3)
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
+.endif
 
 post-patch:
-	@${MV}	${WRKSRC}/config.inc.${PHP_VERSION} ${WRKSRC}/config.inc.${PHP_VERSION}.sample
+	@${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
 
 do-install:
-	@${CP}	${ORIG_PLIST} ${PLIST}
-	@f=${MYADMDIR}; while ${TEST} $${#f} -gt 0; do \
-		${ECHO} "@unexec rmdir %D/$$f || true"; \
-		f=`${ECHO} $$f | ${SED} -e 's,/*[^/]*$$,,'`; \
-	done >> ${PLIST}
 	@${MKDIR} ${PREFIX}/${MYADMDIR}
-	@${FIND} ${WRKSRC} ! -path '*/CVS*' | ${XARGS} -n1 ${SH} -c 'if ${TEST} -d $$0; \
+	@${FIND} ${WRKSRC} ! -path '*/CVS*' ! -path '*/.cvsignore' | \
+		${XARGS} -n1 ${SH} -c 'if ${TEST} -d $$0; \
 			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
 			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index 3621be6fb5e9..929594e2e9d0 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.3.2-php.tar.bz2) = c792f905ed5ae8858d470dbffb530adc
-MD5 (phpMyAdmin-2.3.2-php3.tar.bz2) = 9fb514e9953c69c8f2e3d0546584ab59
+MD5 (phpMyAdmin-2.5.1-php.tar.bz2) = 746f4a515bd0a8d7a71a6e5bdb68b601
+MD5 (phpMyAdmin-2.5.1-php3.tar.bz2) = 2bdff38733f582c5fa4d24b5016d1a73
diff --git a/databases/phpmyadmin211/pkg-descr b/databases/phpmyadmin211/pkg-descr
index 6b1743763ae0..c89033172805 100644
--- a/databases/phpmyadmin211/pkg-descr
+++ b/databases/phpmyadmin211/pkg-descr
@@ -10,5 +10,6 @@ Currently it can:
  - create and read dumps of tables
  - export and import CSV data
  - administer multiple servers and single databases
+ - communicate in more than 38 different languages
 
-WWW: http://phpwizard.net/projects/phpMyAdmin/
+WWW: http://www.phpmyadmin.net/
diff --git a/databases/phpmyadmin211/pkg-plist b/databases/phpmyadmin211/pkg-plist
index ff5419b5013e..579678607af7 100644
--- a/databases/phpmyadmin211/pkg-plist
+++ b/databases/phpmyadmin211/pkg-plist
@@ -1,4 +1,3 @@
-%%MYADMDIR%%/.cvsignore
 %%MYADMDIR%%/ANNOUNCE.txt
 %%MYADMDIR%%/CREDITS
 %%MYADMDIR%%/ChangeLog
@@ -7,229 +6,277 @@
 %%MYADMDIR%%/INSTALL
 %%MYADMDIR%%/LICENSE
 %%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.3.2
+%%MYADMDIR%%/RELEASE-DATE-2.5.1
 %%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_importdocsql.%%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%%/chk_rel.%%PHP_SUFX%%
+%%MYADMDIR%%/config.inc.%%PHP_SUFX%%.sample
+%%MYADMDIR%%/css/phpmyadmin.css.%%PHP_SUFX%%
+%%MYADMDIR%%/db_create.%%PHP_SUFX%%
+%%MYADMDIR%%/db_datadict.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_common.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_db_info.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_export.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_importdocsql.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_links.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_qbe.%%PHP_SUFX%%
+%%MYADMDIR%%/db_details_structure.%%PHP_SUFX%%
+%%MYADMDIR%%/db_printview.%%PHP_SUFX%%
+%%MYADMDIR%%/db_search.%%PHP_SUFX%%
+%%MYADMDIR%%/docSQL/README
+%%MYADMDIR%%/docs.css
+%%MYADMDIR%%/footer.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/header.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/header_printview.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/images/arrow_ltr.gif
 %%MYADMDIR%%/images/arrow_rtl.gif
-%%MYADMDIR%%/images/asc_order.gif
-%%MYADMDIR%%/images/browse.gif
-%%MYADMDIR%%/images/desc_order.gif
+%%MYADMDIR%%/images/asc_order.png
+%%MYADMDIR%%/images/browse.png
+%%MYADMDIR%%/images/desc_order.png
 %%MYADMDIR%%/images/fulltext.png
-%%MYADMDIR%%/images/item_ltr.gif
-%%MYADMDIR%%/images/item_rtl.gif
-%%MYADMDIR%%/images/minus.gif
+%%MYADMDIR%%/images/item_ltr.png
+%%MYADMDIR%%/images/item_rtl.png
+%%MYADMDIR%%/images/minus.png
 %%MYADMDIR%%/images/partialtext.png
-%%MYADMDIR%%/images/plus.gif
+%%MYADMDIR%%/images/plus.png
 %%MYADMDIR%%/images/pma_logo.png
 %%MYADMDIR%%/images/spacer.gif
-%%MYADMDIR%%/images/vertical_line.gif
-%%MYADMDIR%%/index.%%PHP_VERSION%%
+%%MYADMDIR%%/images/vertical_line.png
+%%MYADMDIR%%/index.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/add_message.sh
 %%MYADMDIR%%/lang/add_message_file.sh
-%%MYADMDIR%%/lang/afrikaans-iso-8859-1.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/afrikaans-utf-8.inc.%%PHP_VERSION%%
-%%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/afrikaans-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/afrikaans-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/albanian-iso-8859-1.inc.%%PHP_SUFX%%
+%%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/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%%
+%%MYADMDIR%%/lang/bulgarian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/bulgarian-windows-1251.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/catalan-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/catalan-utf-8.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/check_lang.sh
-%%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/hindi-utf-8.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/malay-iso-8859-1.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/lang/malay-utf-8.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/chinese_big5-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/chinese_big5.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/chinese_gb-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/chinese_gb.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/croatian-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/croatian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/croatian-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/czech-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/czech-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/czech-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/danish-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/danish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/dutch-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/dutch-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/english-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/english-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/estonian-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/estonian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/finnish-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/finnish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/french-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/french-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/galician-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/galician-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/georgian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/german-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/german-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/greek-iso-8859-7.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/greek-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/hebrew-iso-8859-8-i.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/hindi-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/hungarian-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/hungarian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/indonesian-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/indonesian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/italian-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/italian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/japanese-euc.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/japanese-sjis.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/japanese-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/korean-ks_c_5601-1987.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/latvian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/latvian-windows-1257.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/lithuanian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/lithuanian-windows-1257.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/malay-iso-8859-1.inc.%%PHP_SUFX%%
+%%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/polish-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/polish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/portuguese-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/portuguese-utf-8.inc.%%PHP_SUFX%%
 %%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/romanian-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/romanian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/russian-dos-866.inc.%%PHP_SUFX%%
+%%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/slovak-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/slovak-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/slovak-windows-1250.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/slovenian-iso-8859-2.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/slovenian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/slovenian-windows-1250.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/lang/sort_lang.sh
-%%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/spanish-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/spanish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/swedish-iso-8859-1.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/swedish-utf-8.inc.%%PHP_SUFX%%
 %%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%%/lang/thai-tis-620.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/thai-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/translatecount.sh
+%%MYADMDIR%%/lang/turkish-iso-8859-9.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/turkish-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/ukrainian-utf-8.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/lang/ukrainian-windows-1251.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/ldi_check.%%PHP_SUFX%%
+%%MYADMDIR%%/ldi_table.%%PHP_SUFX%%
+%%MYADMDIR%%/left.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/auth/config.auth.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/auth/cookie.auth.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/auth/http.auth.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/bookmark.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/build_dump.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/charset_conversion.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/common.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/config_import.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/db_config.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/db_table_exists.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/dbg/profiling.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/dbg/setup.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/defines.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/defines_php.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/display_export.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/display_tbl.lib.%%PHP_SUFX%%
 %%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/fpdf/font/courier.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/helvetica.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticab.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticabi.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/helveticai.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/symbol.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/tahoma.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/tahomab.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/times.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/timesb.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/timesbi.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/timesi.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/functions.js
-%%MYADMDIR%%/libraries/get_foreign.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/get_foreign.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/header_http.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/header_meta_style.inc.%%PHP_SUFX%%
 %%MYADMDIR%%/libraries/indexes.js
-%%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/kanji-encoding.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/kanji-encoding.lib.%%PHP_SUFX%%
 %%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/sqlvalidator.class.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/sqlvalidator.lib.%%PHP_VERSION%%
-%%MYADMDIR%%/libraries/string.lib.%%PHP_VERSION%%
+%%MYADMDIR%%/libraries/mysql_wrappers.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/ob.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/read_dump.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/relation.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/select_lang.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/server_privileges.js
+%%MYADMDIR%%/libraries/sqlparser.data.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/sqlparser.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/sqlvalidator.class.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/sqlvalidator.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/string.lib.%%PHP_SUFX%%
 %%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%%/libraries/transformations/README
+%%MYADMDIR%%/libraries/transformations/TEMPLATE
+%%MYADMDIR%%/libraries/transformations/TEMPLATE_MIMETYPE
+%%MYADMDIR%%/libraries/transformations/generator.sh
+%%MYADMDIR%%/libraries/transformations/global.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/image_jpeg__inline.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/image_jpeg__link.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/image_png__inline.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/overview.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/template_generator.sh
+%%MYADMDIR%%/libraries/transformations/template_generator_mimetype.sh
+%%MYADMDIR%%/libraries/transformations/text_plain__dateformat.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__external.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__formatted.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__imagelink.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__link.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations/text_plain__substr.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/transformations.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/url_generating.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/libraries/user_password.js
+%%MYADMDIR%%/libraries/zip.lib.%%PHP_SUFX%%
+%%MYADMDIR%%/main.%%PHP_SUFX%%
+%%MYADMDIR%%/mult_submits.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/pdf_pages.%%PHP_SUFX%%
+%%MYADMDIR%%/pdf_schema.%%PHP_SUFX%%
+%%MYADMDIR%%/phpinfo.%%PHP_SUFX%%
+%%MYADMDIR%%/queryframe.%%PHP_SUFX%%
+%%MYADMDIR%%/querywindow.%%PHP_SUFX%%
+%%MYADMDIR%%/read_dump.%%PHP_SUFX%%
+%%MYADMDIR%%/scripts/check_lang.%%PHP_SUFX%%
 %%MYADMDIR%%/scripts/convertcfg.pl
 %%MYADMDIR%%/scripts/create-release.sh
 %%MYADMDIR%%/scripts/create_tables.sql
-%%MYADMDIR%%/scripts/decode_bug.%%PHP_VERSION%%
+%%MYADMDIR%%/scripts/decode_bug.%%PHP_SUFX%%
 %%MYADMDIR%%/scripts/extchg.sh
+%%MYADMDIR%%/scripts/inno2pma.sh
 %%MYADMDIR%%/scripts/remove_control_m.sh
-%%MYADMDIR%%/sql.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_addfield.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_alter.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_change.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_create.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_dump.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_indexes.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_move_copy.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_printview.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_properties.inc.%%PHP_VERSION%%
-%%MYADMDIR%%/tbl_properties.%%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%%/scripts/updatedocs.sh
+%%MYADMDIR%%/server_common.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/server_databases.%%PHP_SUFX%%
+%%MYADMDIR%%/server_links.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/server_privileges.%%PHP_SUFX%%
+%%MYADMDIR%%/server_processlist.%%PHP_SUFX%%
+%%MYADMDIR%%/server_status.%%PHP_SUFX%%
+%%MYADMDIR%%/server_variables.%%PHP_SUFX%%
+%%MYADMDIR%%/sql.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_addfield.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_alter.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_change.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_create.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_dump.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_indexes.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_move_copy.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_printview.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties.inc.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_common.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_export.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_links.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_operations.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_options.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_structure.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_properties_table_info.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_query_box.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_relation.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_rename.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_replace.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_replace_fields.%%PHP_SUFX%%
+%%MYADMDIR%%/tbl_select.%%PHP_SUFX%%
+%%MYADMDIR%%/transformation_wrapper.%%PHP_SUFX%%
 %%MYADMDIR%%/translators.html
-%%MYADMDIR%%/user_details.%%PHP_VERSION%%
-%%MYADMDIR%%/user_password.%%PHP_VERSION%%
+%%MYADMDIR%%/user_password.%%PHP_SUFX%%
 @dirrm %%MYADMDIR%%/scripts
-@dirrm %%MYADMDIR%%/libraries/xpath
+@dirrm %%MYADMDIR%%/libraries/transformations
 @dirrm %%MYADMDIR%%/libraries/fpdf/font
 @dirrm %%MYADMDIR%%/libraries/fpdf
+@dirrm %%MYADMDIR%%/libraries/dbg
 @dirrm %%MYADMDIR%%/libraries/auth
 @dirrm %%MYADMDIR%%/libraries
 @dirrm %%MYADMDIR%%/lang
 @dirrm %%MYADMDIR%%/images
+@dirrm %%MYADMDIR%%/docSQL
+@dirrm %%MYADMDIR%%/css
+@dirrm %%MYADMDIR%%