5 files changed, 153 insertions, 74 deletions

diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index f2e1f895c54e..694c6b444fc9 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -5,26 +5,45 @@
 # $FreeBSD$
 #
 
-PORTNAME=	phpmyadmin
-PORTVERSION=	2.1.0
+PORTNAME=	phpMyAdmin
+PORTVERSION=	2.2.4
 CATEGORIES=	databases www
-MASTER_SITES=	http://phpwizard.net/projects/phpMyAdmin/
-DISTNAME=	phpMyAdmin_${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	phpmyadmin
+DISTFILES=	${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nbm@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
-.if defined(WITH_PHP4)
+.if !defined(WITH_PHP3)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
+PHP_VERSION=	php
 .else
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
+PHP_VERSION=	php3
 .endif
 
-WRKSRC=		${WRKDIR}/phpMyAdmin
-NO_BUILD=	YES
+USE_BZIP2=	yes
+NO_BUILD=	yes
+
+MYADMDIR?=	www/data.default/phpMyAdmin
+
+ORIG_PLIST=	${PKGDIR}/pkg-plist
+PLIST=		${WRKDIR}/PLIST
+PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_VERSION=${PHP_VERSION}
+
+post-patch:
+	@${MV}	${WRKSRC}/config.inc.${PHP_VERSION} ${WRKSRC}/config.inc.${PHP_VERSION}.sample
 
 do-install:
-	${MKDIR} ${PREFIX}/www/data.default/phpMyAdmin/
-	${CP} -R ${WRKSRC}/* ${PREFIX}/www/data.default/phpMyAdmin/
+	@${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; \
+			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
+			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
 
 .include <bsd.port.mk>
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index 4dff071389ac..da7cc50f2e3f 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1 +1,2 @@
-MD5 (phpMyAdmin_2.1.0.tar.gz) = c12a91d796dd6246b131eb0e34041796
+MD5 (phpMyAdmin-2.2.4-php.tar.bz2) = e0177fb4c2c38b2e6ce37e268bea49b3
+MD5 (phpMyAdmin-2.2.4-php3.tar.bz2) = 80496ff809cd3a9a8a123962920cc6b6
diff --git a/databases/phpmyadmin211/pkg-comment b/databases/phpmyadmin211/pkg-comment
index 24b6187dde84..e1a824eab440 100644
--- a/databases/phpmyadmin211/pkg-comment
+++ b/databases/phpmyadmin211/pkg-comment
@@ -1 +1 @@
-A set of PHP3-scripts to adminstrate MySQL over the WWW
+A set of PHP-scripts to adminstrate MySQL over the web
diff --git a/databases/phpmyadmin211/pkg-descr b/databases/phpmyadmin211/pkg-descr
index 484e4f27baee..6b1743763ae0 100644
--- a/databases/phpmyadmin211/pkg-descr
+++ b/databases/phpmyadmin211/pkg-descr
@@ -1,4 +1,4 @@
-phpMyAdmin is intended to handle the adminstration of MySQL over the WWW.
+phpMyAdmin is intended to handle the adminstration of MySQL over the web.
 
 Currently it can:
  - create and drop databases
@@ -9,4 +9,6 @@ Currently it can:
  - load text files into tables
  - create and read dumps of tables
  - export and import CSV data
- - administer one single database
+ - administer multiple servers and single databases
+
+WWW: http://phpwizard.net/projects/phpMyAdmin/
diff --git a/databases/phpmyadmin211/pkg-plist b/databases/phpmyadmin211/pkg-plist
index cfaa59966ca3..b0183e75488e 100644
--- a/databases/phpmyadmin211/pkg-plist
+++ b/databases/phpmyadmin211/pkg-plist
@@ -1,61 +1,118 @@
-www/data.default/phpMyAdmin/ChangeLog
-www/data.default/phpMyAdmin/DEVELOPERS
-www/data.default/phpMyAdmin/Documentation.html
-www/data.default/phpMyAdmin/INSTALL
-www/data.default/phpMyAdmin/LICENSE
-www/data.default/phpMyAdmin/README
-www/data.default/phpMyAdmin/TODO
-www/data.default/phpMyAdmin/bulgarian-win1251.inc.php3
-www/data.default/phpMyAdmin/catala.inc.php3
-www/data.default/phpMyAdmin/chinese_big5.inc.php3
-www/data.default/phpMyAdmin/chinese_gb.inc.php3
-www/data.default/phpMyAdmin/config.inc.php3
-www/data.default/phpMyAdmin/danish.inc.php3
-www/data.default/phpMyAdmin/db_create.php3
-www/data.default/phpMyAdmin/db_details.php3
-www/data.default/phpMyAdmin/db_dump.php3
-www/data.default/phpMyAdmin/db_printview.php3
-www/data.default/phpMyAdmin/db_readdump.php3
-www/data.default/phpMyAdmin/dutch.inc.php3
-www/data.default/phpMyAdmin/english.inc.php3
-www/data.default/phpMyAdmin/extchg.sh
-www/data.default/phpMyAdmin/footer.inc.php3
-www/data.default/phpMyAdmin/french.inc.php3
-www/data.default/phpMyAdmin/functions.js
-www/data.default/phpMyAdmin/header.inc.php3
-www/data.default/phpMyAdmin/images/bkg.gif
-www/data.default/phpMyAdmin/images/browse.gif
-www/data.default/phpMyAdmin/images/minus.gif
-www/data.default/phpMyAdmin/images/plus.gif
-www/data.default/phpMyAdmin/images/spacer.gif
-www/data.default/phpMyAdmin/index.php3
-www/data.default/phpMyAdmin/italian.inc.php3
-www/data.default/phpMyAdmin/ldi_check.php3
-www/data.default/phpMyAdmin/ldi_table.php3
-www/data.default/phpMyAdmin/left.php3
-www/data.default/phpMyAdmin/lib.inc.php3
-www/data.default/phpMyAdmin/main.php3
-www/data.default/phpMyAdmin/norwegian.inc.php3
-www/data.default/phpMyAdmin/polish.inc.php3
-www/data.default/phpMyAdmin/portuguese.inc.php3
-www/data.default/phpMyAdmin/russian-koi8.inc.php3
-www/data.default/phpMyAdmin/russian-win1251.inc.php3
-www/data.default/phpMyAdmin/spanish.inc.php3
-www/data.default/phpMyAdmin/sql.php3
-www/data.default/phpMyAdmin/tbl_addfield.php3
-www/data.default/phpMyAdmin/tbl_alter.php3
-www/data.default/phpMyAdmin/tbl_change.php3
-www/data.default/phpMyAdmin/tbl_copy.php3
-www/data.default/phpMyAdmin/tbl_create.php3
-www/data.default/phpMyAdmin/tbl_dump.php3
-www/data.default/phpMyAdmin/tbl_printview.php3
-www/data.default/phpMyAdmin/tbl_properties.inc.php3
-www/data.default/phpMyAdmin/tbl_properties.php3
-www/data.default/phpMyAdmin/tbl_qbe.php3
-www/data.default/phpMyAdmin/tbl_rename.php3
-www/data.default/phpMyAdmin/tbl_replace.php3
-www/data.default/phpMyAdmin/tbl_select.php3
-@dirrm www/data.default/phpMyAdmin/images
-@dirrm www/data.default/phpMyAdmin
-@dirrm www/data.default
-@dirrm www
+%%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
+%%MYADMDIR%%/images/item_ltr.gif
+%%MYADMDIR%%/images/item_rtl.gif
+%%MYADMDIR%%/images/minus.gif
+%%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%%/index.%%PHP_VERSION%%
+%%MYADMDIR%%/ldi_check.%%PHP_VERSION%%
+%%MYADMDIR%%/ldi_table.%%PHP_VERSION%%
+%%MYADMDIR%%/left.%%PHP_VERSION%%
+%%MYADMDIR%%/main.%%PHP_VERSION%%
+%%MYADMDIR%%/mult_submits.inc.%%PHP_VERSION%%
+%%MYADMDIR%%/phpinfo.%%PHP_VERSION%%
+%%MYADMDIR%%/read_dump.%%PHP_VERSION%%
+%%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_qbe.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_rename.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_replace.%%PHP_VERSION%%
+%%MYADMDIR%%/tbl_select.%%PHP_VERSION%%
+%%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
+@dirrm %%MYADMDIR%%/scripts
+@dirrm %%MYADMDIR%%/libraries/auth
+@dirrm %%MYADMDIR%%/libraries
+@dirrm %%MYADMDIR%%/lang
+@dirrm %%MYADMDIR%%/images