Update "phpmyadmin" package to version 2.2.0. This version fixes many

bugs found since version 2.2.0rc1 was released, works better with the
JavaScript implementations of Opera and Konqueror and adds news
translations.

3 files changed, 80 insertions, 65 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 8805e9bf8c9..e1a9d6ea3fe 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/07/10 18:40:37 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/03 08:20:37 tron Exp $
 
-DISTNAME=	phpMyAdmin-2.2.0rc1
-PKGNAME=	phpmyadmin-2.1.99.1nb1
+DISTNAME=	phpMyAdmin-2.2.0-php
+PKGNAME=	phpmyadmin-2.2.0
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://phpwizard.net/projects/phpMyAdmin/
@@ -13,8 +14,10 @@ DEPENDS+=	php-mysql>=4.0.5:../../www/php4-mysql
 DEPENDS+=	php-pcre>=4.0.5:../../www/php4-pcre
 
 NO_BUILD=	YES
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 
-DOC_FILES=	CREDITS DEVELOPERS Documentation.html INSTALL LICENSE README \
+DOC_FILES=	ANNOUNCE.txt CREDITS ChangeLog Documentation.html \
+		Documentation.txt INSTALL LICENSE README RELEASE-DATE-2.2.0 \
 		TODO
 
 do-install:
@@ -22,9 +25,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/images
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/lang
 	${INSTALL_SCRIPT} ${WRKSRC}/*.js ${PREFIX}/share/phpmyadmin
-	${INSTALL_SCRIPT} ${WRKSRC}/*.php3 ${PREFIX}/share/phpmyadmin
+	${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/phpmyadmin
 	${INSTALL_DATA} ${WRKSRC}/images/*.* ${PREFIX}/share/phpmyadmin/images
-	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php3 ${PREFIX}/share/phpmyadmin/lang
+	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PREFIX}/share/phpmyadmin/lang
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin
 	for FILE in ${DOC_FILES}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/phpmyadmin; \
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 21040c89f88..ed7ce4f29ef 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/07/08 20:53:04 tron Exp $
+$NetBSD: distinfo,v 1.2 2001/10/03 08:20:37 tron Exp $
 
-SHA1 (phpMyAdmin-2.2.0rc1.tar.gz) = 6bdedf1498756e52eb276405c6373e52d3a85623
-Size (phpMyAdmin-2.2.0rc1.tar.gz) = 128432 bytes
+SHA1 (phpMyAdmin-2.2.0-php.tar.bz2) = 4d752fc60e0194d894cf00cc1946b805cf903e06
+Size (phpMyAdmin-2.2.0-php.tar.bz2) = 162246 bytes
diff --git a/databases/phpmyadmin/pkg/PLIST b/databases/phpmyadmin/pkg/PLIST
index 1c4e46552c9..4f865ed4e18 100644
--- a/databases/phpmyadmin/pkg/PLIST
+++ b/databases/phpmyadmin/pkg/PLIST
@@ -1,72 +1,84 @@
-@comment $NetBSD: PLIST,v 1.3 2001/07/10 13:56:43 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/10/03 08:20:37 tron Exp $
+share/doc/phpmyadmin/ANNOUNCE.txt
 share/doc/phpmyadmin/CREDITS
-share/doc/phpmyadmin/DEVELOPERS
+share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.html
+share/doc/phpmyadmin/Documentation.txt
 share/doc/phpmyadmin/INSTALL
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
+share/doc/phpmyadmin/RELEASE-DATE-2.2.0
 share/doc/phpmyadmin/TODO
-share/phpmyadmin/config.inc.php3
-share/phpmyadmin/db_create.php3
-share/phpmyadmin/db_details.php3
-share/phpmyadmin/db_printview.php3
-share/phpmyadmin/db_readdump.php3
-share/phpmyadmin/defines.inc.php3
-share/phpmyadmin/footer.inc.php3
+share/phpmyadmin/config.inc.php
+share/phpmyadmin/db_create.php
+share/phpmyadmin/db_details.php
+share/phpmyadmin/db_printview.php
+share/phpmyadmin/db_readdump.php
+share/phpmyadmin/db_stats.php
+share/phpmyadmin/defines.inc.php
+share/phpmyadmin/footer.inc.php
 share/phpmyadmin/functions.js
-share/phpmyadmin/grab_globals.inc.php3
-share/phpmyadmin/header.inc.php3
+share/phpmyadmin/grab_globals.inc.php
+share/phpmyadmin/header.inc.php
+share/phpmyadmin/images/asc_order.gif
 share/phpmyadmin/images/bkg.gif
 share/phpmyadmin/images/browse.gif
+share/phpmyadmin/images/desc_order.gif
+share/phpmyadmin/images/item.gif
 share/phpmyadmin/images/minus.gif
 share/phpmyadmin/images/plus.gif
 share/phpmyadmin/images/spacer.gif
-share/phpmyadmin/index.php3
-share/phpmyadmin/lang/brazilian_portuguese.inc.php3
-share/phpmyadmin/lang/bulgarian-win1251.inc.php3
-share/phpmyadmin/lang/catala.inc.php3
-share/phpmyadmin/lang/chinese_big5.inc.php3
-share/phpmyadmin/lang/chinese_gb.inc.php3
-share/phpmyadmin/lang/czech-iso.inc.php3
-share/phpmyadmin/lang/czech-win1250.inc.php3
-share/phpmyadmin/lang/danish.inc.php3
-share/phpmyadmin/lang/dutch.inc.php3
-share/phpmyadmin/lang/english.inc.php3
-share/phpmyadmin/lang/french.inc.php3
-share/phpmyadmin/lang/german.inc.php3
-share/phpmyadmin/lang/italian.inc.php3
-share/phpmyadmin/lang/japanese.inc.php3
-share/phpmyadmin/lang/korean.inc.php3
-share/phpmyadmin/lang/norwegian.inc.php3
-share/phpmyadmin/lang/polish.inc.php3
-share/phpmyadmin/lang/portuguese.inc.php3
-share/phpmyadmin/lang/russian-koi8.inc.php3
-share/phpmyadmin/lang/russian-win1251.inc.php3
-share/phpmyadmin/lang/spanish.inc.php3
-share/phpmyadmin/lang/swedish.inc.php3
-share/phpmyadmin/lang/thai.inc.php3
-share/phpmyadmin/ldi_check.php3
-share/phpmyadmin/ldi_table.php3
+share/phpmyadmin/index.php
+share/phpmyadmin/lang/brazilian_portuguese.inc.php
+share/phpmyadmin/lang/bulgarian-win1251.inc.php
+share/phpmyadmin/lang/catala.inc.php
+share/phpmyadmin/lang/chinese_big5.inc.php
+share/phpmyadmin/lang/chinese_gb.inc.php
+share/phpmyadmin/lang/czech-iso.inc.php
+share/phpmyadmin/lang/czech-win1250.inc.php
+share/phpmyadmin/lang/danish.inc.php
+share/phpmyadmin/lang/dutch.inc.php
+share/phpmyadmin/lang/english.inc.php
+share/phpmyadmin/lang/french.inc.php
+share/phpmyadmin/lang/galician.inc.php
+share/phpmyadmin/lang/german.inc.php
+share/phpmyadmin/lang/italian.inc.php
+share/phpmyadmin/lang/japanese.inc.php
+share/phpmyadmin/lang/korean.inc.php
+share/phpmyadmin/lang/norwegian.inc.php
+share/phpmyadmin/lang/polish.inc.php
+share/phpmyadmin/lang/portuguese.inc.php
+share/phpmyadmin/lang/romanian.inc.php
+share/phpmyadmin/lang/russian-koi8.inc.php
+share/phpmyadmin/lang/russian-win1251.inc.php
+share/phpmyadmin/lang/slovak-iso.inc.php
+share/phpmyadmin/lang/spanish.inc.php
+share/phpmyadmin/lang/swedish.inc.php
+share/phpmyadmin/lang/thai.inc.php
+share/phpmyadmin/ldi_check.php
+share/phpmyadmin/ldi_table.php
 share/phpmyadmin/left.js
-share/phpmyadmin/left.php3
-share/phpmyadmin/lib.inc.php3
-share/phpmyadmin/main.php3
-share/phpmyadmin/select_lang.inc.php3
-share/phpmyadmin/sql.php3
-share/phpmyadmin/tbl_addfield.php3
-share/phpmyadmin/tbl_alter.php3
-share/phpmyadmin/tbl_change.php3
-share/phpmyadmin/tbl_copy.php3
-share/phpmyadmin/tbl_create.php3
-share/phpmyadmin/tbl_dump.php3
-share/phpmyadmin/tbl_printview.php3
-share/phpmyadmin/tbl_properties.inc.php3
-share/phpmyadmin/tbl_properties.php3
-share/phpmyadmin/tbl_qbe.php3
-share/phpmyadmin/tbl_rename.php3
-share/phpmyadmin/tbl_replace.php3
-share/phpmyadmin/tbl_select.php3
-share/phpmyadmin/user_details.php3
+share/phpmyadmin/left.php
+share/phpmyadmin/lib.inc.php
+share/phpmyadmin/main.php
+share/phpmyadmin/ob_lib.inc.php
+share/phpmyadmin/phpinfo.php
+share/phpmyadmin/select_lang.inc.php
+share/phpmyadmin/sql.php
+share/phpmyadmin/tbl_addfield.php
+share/phpmyadmin/tbl_alter.php
+share/phpmyadmin/tbl_change.php
+share/phpmyadmin/tbl_copy.php
+share/phpmyadmin/tbl_create.php
+share/phpmyadmin/tbl_dump.php
+share/phpmyadmin/tbl_printview.php
+share/phpmyadmin/tbl_properties.inc.php
+share/phpmyadmin/tbl_properties.php
+share/phpmyadmin/tbl_qbe.php
+share/phpmyadmin/tbl_rename.php
+share/phpmyadmin/tbl_replace.php
+share/phpmyadmin/tbl_select.php
+share/phpmyadmin/user_details.php
 @dirrm share/phpmyadmin/lang
 @dirrm share/phpmyadmin/images
 @dirrm share/phpmyadmin