1) Upgrade phpmyadmin to 2.3.2

2) Make databases/phpmyadmin operate with apache2

PR:		43706 (2)
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk> (2)

6 files changed, 42 insertions, 8 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 1ebd9edf16f5..fbc954bf0619 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.3.0.rc4
+PORTVERSION=	2.3.2
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
@@ -17,7 +17,11 @@ MAINTAINER=	nbm@FreeBSD.org
 
 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
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 41678dd1abec..1d4da0f77930 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,2 +1 @@
-MD5 (phpMyAdmin-2.3.0-rc4-php.tar.bz2) = dfc48c6082dbe02c438c04d6c3dee96b
-MD5 (phpMyAdmin-2.3.0-rc4-php3.tar.bz2) = fe202b38a6b0e980405bf5d2f102eec0
+MD5 (phpMyAdmin-2.3.2-php.tar.bz2) = c792f905ed5ae8858d470dbffb530adc
diff --git a/databases/phpmyadmin/pkg-plist b/databases/phpmyadmin/pkg-plist
index 77c0261393a7..ff5419b5013e 100644
--- a/databases/phpmyadmin/pkg-plist
+++ b/databases/phpmyadmin/pkg-plist
@@ -7,7 +7,7 @@
 %%MYADMDIR%%/INSTALL
 %%MYADMDIR%%/LICENSE
 %%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.3.0-rc4
+%%MYADMDIR%%/RELEASE-DATE-2.3.2
 %%MYADMDIR%%/TODO
 %%MYADMDIR%%/badwords.txt
 %%MYADMDIR%%/chk_rel.%%PHP_VERSION%%
@@ -17,6 +17,7 @@
 %%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%%
@@ -37,11 +38,14 @@
 %%MYADMDIR%%/images/minus.gif
 %%MYADMDIR%%/images/partialtext.png
 %%MYADMDIR%%/images/plus.gif
+%%MYADMDIR%%/images/pma_logo.png
 %%MYADMDIR%%/images/spacer.gif
 %%MYADMDIR%%/images/vertical_line.gif
 %%MYADMDIR%%/index.%%PHP_VERSION%%
 %%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%%
@@ -53,6 +57,7 @@
 %%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/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%%
@@ -83,6 +88,7 @@
 %%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%%
@@ -97,6 +103,8 @@
 %%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%%
@@ -117,6 +125,7 @@
 %%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/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%%
@@ -158,6 +167,7 @@
 %%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/functions.js
+%%MYADMDIR%%/libraries/get_foreign.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/indexes.js
 %%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_VERSION%%
@@ -169,6 +179,8 @@
 %%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/tbl_change.js
 %%MYADMDIR%%/libraries/user_details.js
@@ -183,6 +195,8 @@
 %%MYADMDIR%%/scripts/check_lang.%%PHP_VERSION%%
 %%MYADMDIR%%/scripts/convertcfg.pl
 %%MYADMDIR%%/scripts/create-release.sh
+%%MYADMDIR%%/scripts/create_tables.sql
+%%MYADMDIR%%/scripts/decode_bug.%%PHP_VERSION%%
 %%MYADMDIR%%/scripts/extchg.sh
 %%MYADMDIR%%/scripts/remove_control_m.sh
 %%MYADMDIR%%/sql.%%PHP_VERSION%%
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 1ebd9edf16f5..fbc954bf0619 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.3.0.rc4
+PORTVERSION=	2.3.2
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
@@ -17,7 +17,11 @@ MAINTAINER=	nbm@FreeBSD.org
 
 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
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index 41678dd1abec..1d4da0f77930 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1,2 +1 @@
-MD5 (phpMyAdmin-2.3.0-rc4-php.tar.bz2) = dfc48c6082dbe02c438c04d6c3dee96b
-MD5 (phpMyAdmin-2.3.0-rc4-php3.tar.bz2) = fe202b38a6b0e980405bf5d2f102eec0
+MD5 (phpMyAdmin-2.3.2-php.tar.bz2) = c792f905ed5ae8858d470dbffb530adc
diff --git a/databases/phpmyadmin211/pkg-plist b/databases/phpmyadmin211/pkg-plist
index 77c0261393a7..ff5419b5013e 100644
--- a/databases/phpmyadmin211/pkg-plist
+++ b/databases/phpmyadmin211/pkg-plist
@@ -7,7 +7,7 @@
 %%MYADMDIR%%/INSTALL
 %%MYADMDIR%%/LICENSE
 %%MYADMDIR%%/README
-%%MYADMDIR%%/RELEASE-DATE-2.3.0-rc4
+%%MYADMDIR%%/RELEASE-DATE-2.3.2
 %%MYADMDIR%%/TODO
 %%MYADMDIR%%/badwords.txt
 %%MYADMDIR%%/chk_rel.%%PHP_VERSION%%
@@ -17,6 +17,7 @@
 %%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%%
@@ -37,11 +38,14 @@
 %%MYADMDIR%%/images/minus.gif
 %%MYADMDIR%%/images/partialtext.png
 %%MYADMDIR%%/images/plus.gif
+%%MYADMDIR%%/images/pma_logo.png
 %%MYADMDIR%%/images/spacer.gif
 %%MYADMDIR%%/images/vertical_line.gif
 %%MYADMDIR%%/index.%%PHP_VERSION%%
 %%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%%
@@ -53,6 +57,7 @@
 %%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/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%%
@@ -83,6 +88,7 @@
 %%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%%
@@ -97,6 +103,8 @@
 %%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%%
@@ -117,6 +125,7 @@
 %%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/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%%
@@ -158,6 +167,7 @@
 %%MYADMDIR%%/libraries/fpdf/font/zapfdingbats.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/fpdf/fpdf.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/functions.js
+%%MYADMDIR%%/libraries/get_foreign.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/grab_globals.lib.%%PHP_VERSION%%
 %%MYADMDIR%%/libraries/indexes.js
 %%MYADMDIR%%/libraries/ip_allow_deny.lib.%%PHP_VERSION%%
@@ -169,6 +179,8 @@
 %%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/tbl_change.js
 %%MYADMDIR%%/libraries/user_details.js
@@ -183,6 +195,8 @@
 %%MYADMDIR%%/scripts/check_lang.%%PHP_VERSION%%
 %%MYADMDIR%%/scripts/convertcfg.pl
 %%MYADMDIR%%/scripts/create-release.sh
+%%MYADMDIR%%/scripts/create_tables.sql
+%%MYADMDIR%%/scripts/decode_bug.%%PHP_VERSION%%
 %%MYADMDIR%%/scripts/extchg.sh
 %%MYADMDIR%%/scripts/remove_control_m.sh
 %%MYADMDIR%%/sql.%%PHP_VERSION%%