>Number:         19012
>Category:       pkg
>Synopsis:       phpmyadmin package is out of date
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 11 00:43:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Portelli
>Release:        NetBSD 1.6
>Organization:
STIndustries
>Environment:
NetBSD krusty.mdc.stindustries.net 1.6 NetBSD 1.6 (KRUSTY) #1: Mon Nov 11 08:56:20 EST 2002     root@krusty.mdc.stindustries.net:/usr/src/sys/arch/i386/compile/KRUSTY i386
>Description:
The phpmyadmin package in pkgsrc is at version 2.2.0 and 2.3.2 is the latest version available from www.phpwizard.net/projects/phpMyAdmin.
>How-To-Repeat:
Updated files to build 2.3.2 - tested ok on i386.

>Fix:
These are the patches for PLIST, Makefile and distinfo.

--- Makefile.orig       Mon Nov 11 19:36:41 2002
+++ Makefile    Mon Nov 11 19:21:05 2002
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2001/10/16 12:49:41 tron Exp $
 
-DISTNAME=      phpMyAdmin-2.2.0-php
-PKGNAME=       phpmyadmin-2.2.0
+DISTNAME=      phpMyAdmin-2.3.2-php
+PKGNAME=       phpmyadmin-2.3.2
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
 EXTRACT_SUFX=  .tar.bz2
@@ -17,17 +17,29 @@
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-php//}
 
 DOC_FILES=     ANNOUNCE.txt CREDITS ChangeLog Documentation.html \
-               Documentation.txt INSTALL LICENSE README RELEASE-DATE-2.2.0 \
+               Documentation.txt INSTALL LICENSE README RELEASE-DATE-2.3.2 \
                TODO
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/images
        ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/lang
-       ${INSTALL_SCRIPT} ${WRKSRC}/*.js ${PREFIX}/share/phpmyadmin
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/auth
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/fpdf
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/fpdf/font
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/libraries/xpath
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpmyadmin/scripts
        ${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/phpmyadmin
+       ${INSTALL_DATA} ${WRKSRC}/badwords.txt ${PREFIX}/share/phpmyadmin
        ${INSTALL_DATA} ${WRKSRC}/images/*.* ${PREFIX}/share/phpmyadmin/images
        ${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PREFIX}/share/phpmyadmin/lang
+       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.* ${PREFIX}/share/phpmyadmin/libraries
+       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/auth/*.php ${PREFIX}/share/phpmyadmin/libraries/auth
+       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/*.php ${PREFIX}/share/phpmyadmin/libraries/fpdf
+       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/font/*.php ${PREFIX}/share/phpmyadmin/libraries/fpdf/font
+       ${INSTALL_SCRIPT} ${WRKSRC}/libraries/xpath/*.php ${PREFIX}/share/phpmyadmin/libraries/xpath
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.* ${PREFIX}/share/phpmyadmin/scripts
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin
        for FILE in ${DOC_FILES}; do \
          ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/phpmyadmin; \

--- distinfo.orig       Mon Nov 11 19:37:11 2002
+++ distinfo    Mon Nov 11 18:15:14 2002
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.2 2001/10/03 08:20:37 tron Exp $
 
-SHA1 (phpMyAdmin-2.2.0-php.tar.bz2) = 4d752fc60e0194d894cf00cc1946b805cf903e06
-Size (phpMyAdmin-2.2.0-php.tar.bz2) = 162246 bytes
+SHA1 (phpMyAdmin-2.3.2-php.tar.bz2) = f025ad27feb21b58fb45a42798daffa55c430730
+Size (phpMyAdmin-2.3.2-php.tar.bz2) = 606882 bytes

--- PLIST.orig  Mon Nov 11 19:36:59 2002
+++ PLIST       Mon Nov 11 19:25:19 2002
@@ -1,4 +1,92 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:31 zuntum Exp $
+share/phpmyadmin/lang/afrikaans-utf-8.inc.php
+share/phpmyadmin/lang/albanian-iso-8859-1.inc.php
+share/phpmyadmin/lang/albanian-utf-8.inc.php
+share/phpmyadmin/lang/arabic-utf-8.inc.php
+share/phpmyadmin/lang/arabic-windows-1256.inc.php
+share/phpmyadmin/lang/brazilian_portuguese-utf-8.inc.php
+share/phpmyadmin/lang/bulgarian-koi8-r.inc.php
+share/phpmyadmin/lang/bulgarian-utf-8.inc.php
+share/phpmyadmin/lang/bulgarian-windows-1251.inc.php
+share/phpmyadmin/lang/catalan-iso-8859-1.inc.php
+share/phpmyadmin/lang/catalan-utf-8.inc.php
+share/phpmyadmin/lang/chinese_big5-utf-8.inc.php
+share/phpmyadmin/lang/chinese_big5.inc.php
+share/phpmyadmin/lang/chinese_gb-utf-8.inc.php
+share/phpmyadmin/lang/chinese_gb.inc.php
+share/phpmyadmin/lang/croatian-iso-8859-2.inc.php
+share/phpmyadmin/lang/croatian-utf-8.inc.php
+share/phpmyadmin/lang/croatian-windows-1250.inc.php
+share/phpmyadmin/lang/czech-iso-8859-2.inc.php
+share/phpmyadmin/lang/czech-utf-8.inc.php
+share/phpmyadmin/lang/czech-windows-1250.inc.php
+share/phpmyadmin/lang/danish-iso-8859-1.inc.php
+share/phpmyadmin/lang/danish-utf-8.inc.php
+share/phpmyadmin/lang/dutch-iso-8859-1.inc.php
+share/phpmyadmin/lang/dutch-utf-8.inc.php
+share/phpmyadmin/lang/english-iso-8859-1.inc.php
+share/phpmyadmin/lang/english-utf-8.inc.php
+share/phpmyadmin/lang/estonian-iso-8859-1.inc.php
+share/phpmyadmin/lang/estonian-utf-8.inc.php
+share/phpmyadmin/lang/finnish-iso-8859-1.inc.php
+share/phpmyadmin/lang/finnish-utf-8.inc.php
+share/phpmyadmin/lang/french-iso-8859-1.inc.php
+share/phpmyadmin/lang/french-utf-8.inc.php
+share/phpmyadmin/lang/galician-iso-8859-1.inc.php
+share/phpmyadmin/lang/galician-utf-8.inc.php
+share/phpmyadmin/lang/georgian-utf-8.inc.php
+share/phpmyadmin/lang/german-iso-8859-1.inc.php
+share/phpmyadmin/lang/german-utf-8.inc.php
+share/phpmyadmin/lang/greek-iso-8859-7.inc.php
+share/phpmyadmin/lang/greek-utf-8.inc.php
+share/phpmyadmin/lang/hebrew-iso-8859-8-i.inc.php
+share/phpmyadmin/lang/hindi-utf-8.inc.php
+share/phpmyadmin/lang/hungarian-iso-8859-2.inc.php
+share/phpmyadmin/lang/hungarian-utf-8.inc.php
+share/phpmyadmin/lang/indonesian-iso-8859-1.inc.php
+share/phpmyadmin/lang/indonesian-utf-8.inc.php
+share/phpmyadmin/lang/italian-iso-8859-1.inc.php
+share/phpmyadmin/lang/italian-utf-8.inc.php
+share/phpmyadmin/lang/japanese-euc.inc.php
+share/phpmyadmin/lang/japanese-sjis.inc.php
+share/phpmyadmin/lang/japanese-utf-8.inc.php
+share/phpmyadmin/lang/korean-ks_c_5601-1987.inc.php
+share/phpmyadmin/lang/latvian-utf-8.inc.php
+share/phpmyadmin/lang/latvian-windows-1257.inc.php
+share/phpmyadmin/lang/lithuanian-utf-8.inc.php
+share/phpmyadmin/lang/lithuanian-windows-1257.inc.php
+share/phpmyadmin/lang/malay-iso-8859-1.inc.php
+share/phpmyadmin/lang/malay-utf-8.inc.php
+share/phpmyadmin/lang/norwegian-iso-8859-1.inc.php
+share/phpmyadmin/lang/norwegian-utf-8.inc.php
+share/phpmyadmin/lang/polish-iso-8859-2.inc.php
+share/phpmyadmin/lang/polish-utf-8.inc.php
+share/phpmyadmin/lang/portuguese-iso-8859-1.inc.php
+share/phpmyadmin/lang/portuguese-utf-8.inc.php
+share/phpmyadmin/lang/romanian-iso-8859-1.inc.php
+share/phpmyadmin/lang/romanian-utf-8.inc.php
+share/phpmyadmin/lang/russian-koi8-r.inc.php
+share/phpmyadmin/lang/russian-utf-8.inc.php
+share/phpmyadmin/lang/serbian-utf-8.inc.php
+share/phpmyadmin/lang/russian-windows-1251.inc.php
+share/phpmyadmin/lang/serbian-windows-1250.inc.php
+share/phpmyadmin/lang/slovak-iso-8859-2.inc.php
+share/phpmyadmin/lang/slovak-utf-8.inc.php
+share/phpmyadmin/lang/slovak-windows-1250.inc.php
+share/phpmyadmin/lang/slovenian-iso-8859-2.inc.php
+share/phpmyadmin/lang/slovenian-utf-8.inc.php
+share/phpmyadmin/lang/slovenian-windows-1250.inc.php
+share/phpmyadmin/lang/spanish-iso-8859-1.inc.php
+share/phpmyadmin/lang/spanish-utf-8.inc.php
+share/phpmyadmin/lang/swedish-iso-8859-1.inc.php
+share/phpmyadmin/lang/swedish-utf-8.inc.php
+share/phpmyadmin/lang/thai-tis-620.inc.php
+share/phpmyadmin/lang/thai-utf-8.inc.php
+share/phpmyadmin/lang/turkish-iso-8859-9.inc.php
+share/phpmyadmin/lang/turkish-utf-8.inc.php
+share/phpmyadmin/lang/ukrainian-utf-8.inc.php
+share/phpmyadmin/lang/ukrainian-windows-1251.inc.php
+share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php
+share/phpmyadmin/lang/brazilian_portuguese-iso-8859-1.inc.php
 share/doc/phpmyadmin/ANNOUNCE.txt
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
@@ -7,79 +95,134 @@
 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.php
+share/doc/phpmyadmin/RELEASE-DATE-2.3.2
+share/phpmyadmin/badwords.txt
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_details.php
+share/phpmyadmin/db_details_common.php
+share/phpmyadmin/db_details_db_info.php
+share/phpmyadmin/db_details_export.php
+share/phpmyadmin/db_details_importdocsql.php
+share/phpmyadmin/db_details_links.php
+share/phpmyadmin/db_search.php
+share/phpmyadmin/db_details_qbe.php
+share/phpmyadmin/db_details_structure.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.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/header_printview.inc.php
 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.php
-share/phpmyadmin/lib.inc.php
 share/phpmyadmin/main.php
-share/phpmyadmin/ob_lib.inc.php
+share/phpmyadmin/mult_submits.inc.php
+share/phpmyadmin/pdf_pages.php
+share/phpmyadmin/pdf_schema.php
 share/phpmyadmin/phpinfo.php
-share/phpmyadmin/select_lang.inc.php
+share/phpmyadmin/read_dump.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_indexes.php
+share/phpmyadmin/tbl_move_copy.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_properties_common.php
+share/phpmyadmin/tbl_properties_export.php
+share/phpmyadmin/tbl_properties_links.php
+share/phpmyadmin/tbl_properties_operations.php
+share/phpmyadmin/tbl_properties_options.php
+share/phpmyadmin/tbl_properties_structure.php
+share/phpmyadmin/tbl_properties_table_info.php
+share/phpmyadmin/tbl_query_box.php
+share/phpmyadmin/tbl_relation.php
 share/phpmyadmin/tbl_rename.php
 share/phpmyadmin/tbl_replace.php
 share/phpmyadmin/tbl_select.php
 share/phpmyadmin/user_details.php
+share/phpmyadmin/user_password.php
+share/phpmyadmin/chk_rel.php
+share/phpmyadmin/config.inc.php
+share/phpmyadmin/images/arrow_ltr.gif
+share/phpmyadmin/images/arrow_rtl.gif
+share/phpmyadmin/images/asc_order.gif
+share/phpmyadmin/images/browse.gif
+share/phpmyadmin/images/desc_order.gif
+share/phpmyadmin/images/fulltext.png
+share/phpmyadmin/images/item_ltr.gif
+share/phpmyadmin/images/item_rtl.gif
+share/phpmyadmin/images/minus.gif
+share/phpmyadmin/images/partialtext.png
+share/phpmyadmin/images/plus.gif
+share/phpmyadmin/images/pma_logo.png
+share/phpmyadmin/images/spacer.gif
+share/phpmyadmin/images/vertical_line.gif
+share/phpmyadmin/libraries/auth/cookie.auth.lib.php
+share/phpmyadmin/libraries/auth/http.auth.lib.php
+share/phpmyadmin/libraries/auth/config.auth.lib.php
+share/phpmyadmin/libraries/fpdf/font/courier.php
+share/phpmyadmin/libraries/fpdf/font/helvetica.php
+share/phpmyadmin/libraries/fpdf/font/helveticab.php
+share/phpmyadmin/libraries/fpdf/font/helveticabi.php
+share/phpmyadmin/libraries/fpdf/font/helveticai.php
+share/phpmyadmin/libraries/fpdf/font/symbol.php
+share/phpmyadmin/libraries/fpdf/font/times.php
+share/phpmyadmin/libraries/fpdf/font/timesb.php
+share/phpmyadmin/libraries/fpdf/font/timesbi.php
+share/phpmyadmin/libraries/fpdf/font/timesi.php
+share/phpmyadmin/libraries/fpdf/font/zapfdingbats.php
+share/phpmyadmin/libraries/fpdf/fpdf.php
+share/phpmyadmin/libraries/build_dump.lib.php
+share/phpmyadmin/libraries/common.lib.php
+share/phpmyadmin/libraries/config_import.lib.php
+share/phpmyadmin/libraries/db_config.lib.php
+share/phpmyadmin/libraries/db_table_exists.lib.php
+share/phpmyadmin/libraries/defines.lib.php
+share/phpmyadmin/libraries/defines_php.lib.php
+share/phpmyadmin/libraries/display_tbl.lib.php
+share/phpmyadmin/libraries/get_foreign.lib.php
+share/phpmyadmin/libraries/grab_globals.lib.php
+share/phpmyadmin/libraries/functions.js
+share/phpmyadmin/libraries/ip_allow_deny.lib.php
+share/phpmyadmin/libraries/ob.lib.php
+share/phpmyadmin/libraries/indexes.js
+share/phpmyadmin/libraries/kanji-encoding.lib.php
+share/phpmyadmin/libraries/mysql_wrappers.lib.php
+share/phpmyadmin/libraries/left.js
+share/phpmyadmin/libraries/relation.lib.php
+share/phpmyadmin/libraries/select_lang.lib.php
+share/phpmyadmin/libraries/sqlparser.data.php
+share/phpmyadmin/libraries/sqlparser.lib.php
+share/phpmyadmin/libraries/sqlvalidator.class.php
+share/phpmyadmin/libraries/sqlvalidator.lib.php
+share/phpmyadmin/libraries/string.lib.php
+share/phpmyadmin/libraries/zip.lib.php
+share/phpmyadmin/libraries/tbl_change.js
+share/phpmyadmin/libraries/user_details.js
+share/phpmyadmin/libraries/xpath/XPath.class.php
+share/phpmyadmin/libraries/bookmark.lib.php
+share/phpmyadmin/libraries/charset_conversion.lib.php
+share/phpmyadmin/scripts/check_lang.php
+share/phpmyadmin/scripts/decode_bug.php
+share/phpmyadmin/scripts/convertcfg.pl
+share/phpmyadmin/scripts/create-release.sh
+share/phpmyadmin/scripts/create_tables.sql
+share/phpmyadmin/scripts/extchg.sh
+share/phpmyadmin/scripts/remove_control_m.sh
 @dirrm share/phpmyadmin/lang
 @dirrm share/phpmyadmin/images
+@dirrm share/phpmyadmin/libraries/auth
+@dirrm share/phpmyadmin/libraries/fpdf/font
+@dirrm share/phpmyadmin/libraries/fpdf
+@dirrm share/phpmyadmin/libraries/xpath
+@dirrm share/phpmyadmin/libraries
+@dirrm share/phpmyadmin/scripts
 @dirrm share/phpmyadmin
 @dirrm share/doc/phpmyadmin
>Release-Note:
>Audit-Trail:
>Unformatted: