Update phpMyAdmin package to 2.6.0-pl2. Changes since 2.5.7 seem to be

only UI changes according to release announcements.

While here, introduce some package changes:
* handle config.inc.php via CONF_FILES mechanism instead of PLIST magick,
  the symlink config.inc.php -> ${PKG_SYSCONFDIR}/config.inc.php is now
  included in PLIST
* use NO_BUILD, NO_CONFIGURE
* Apache config fragment file is now installed as ${EXDIR}/apache.conf, not
  copied to ${PKG_SYSCONFDIR} and MESSAGE points to the ${EXDIR} location
* do not install any *.sh files - they are developer stuff only
* use INSTALL_DATA for all files except scripts/convertcfg.pl

5 files changed, 333 insertions, 103 deletions

diff --git a/databases/phpmyadmin/DESCR b/databases/phpmyadmin/DESCR
index 2e25da0aceb..2f514505690 100644
--- a/databases/phpmyadmin/DESCR
+++ b/databases/phpmyadmin/DESCR
@@ -1,11 +1,13 @@
 phpMyAdmin is a tool written in PHP intended to handle the administration of 
 MySQL over the Web. Currently it can:
 
-- create and drop databases, 
-- create/drop/alter tables, 
-- delete/edit/add fields, 
-- execute any SQL statement, 
-- manage keys on fields, 
-- manage privileges,
-- export data into various formats and 
-- is available in 47 languages.
+- create and drop databases
+- create, copy, drop and alter tables
+- delete, edit and add fields
+- execute any SQL-statement, even batch-queries
+- manage keys on fields
+- load text files into tables
+- create and read dumps of tables
+- export and import CSV data
+- administer one single database as well as a whole database server
+- communicate in 47 different languages
diff --git a/databases/phpmyadmin/MESSAGE b/databases/phpmyadmin/MESSAGE
index f76ac0e37d5..d8eae677317 100644
--- a/databases/phpmyadmin/MESSAGE
+++ b/databases/phpmyadmin/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2004/08/07 11:31:14 adrianp Exp $
+$NetBSD: MESSAGE,v 1.7 2004/11/06 13:28:32 jdolecek Exp $
 
 Do *not* edit "${PMDIR}/config.inc.php" to customize
 this package because it is a link which will removed during upgrades.
@@ -9,7 +9,7 @@ You will need to make phpMyAdmin accessible through your HTTP server.
 If you are running Apache and ap-php, then you can add the following line
 to httpd.conf:
        
-	Include ${PKG_SYSCONFDIR}/phpmyadmin.conf
+	Include ${EXDIR}/apache.conf
 
 to make phpMyAdmin accessible through:
 				
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index c30976ac3b5..f98a59d9e80 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/10/31 23:47:32 jdolecek Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/06 13:28:32 jdolecek Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}
 PKGNAME=	phpmyadmin-${DIST_VERSION}
@@ -18,7 +18,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
 		PMDIR=${PMDIR} EXDIR=${EXDIR}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	2.5.7-pl1
+DIST_VERSION=	2.6.0-pl2
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
@@ -27,62 +27,59 @@ EXDIR=		${PREFIX}/share/examples/phpmyadmin
 PMCONFFILE=	${PKG_SYSCONFDIR}/config.inc.php
 PMDIR=		${PREFIX}/share/phpmyadmin
 NO_BUILDLINK=	YES
-CONF_FILES=	${EXDIR}/phpmyadmin.conf ${PKG_SYSCONFDIR}/phpmyadmin.conf
+CONF_FILES=	${EXDIR}/config.inc.php ${PKG_SYSCONFDIR}/config.inc.php
 
 USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR?=	phpmyadmin
 
 SUBST_CLASSES=		paths
-SUBST_STAGE.paths=	post-build
+SUBST_STAGE.paths=	post-extract
 SUBST_FILES.paths=	${WRKDIR}/phpmyadmin.conf	
 SUBST_SED.paths=	-e "s|@PMDIR@|${PMDIR}|g"
 SUBST_MESSAGE.paths=	"Fixing paths."
 
-do-build:
+NO_BUILD=		# defined
+NO_CONFIGURE=		# defined
+
+INSTALL_DIRS=	css lang libraries libraries/auth libraries/dbg \
+		libraries/dbi libraries/export libraries/fpdf	\
+		libraries/fpdf/font libraries/transformations	\
+		themes themes/darkblue_orange \
+		themes/darkblue_orange/css themes/darkblue_orange/img \
+		themes/original themes/original/css themes/original/img
+
+pre-extract:
 	@${CP} ${FILESDIR}/phpmyadmin.conf ${WRKDIR}/phpmyadmin.conf
 
 do-install:
-	#${INSTALL_DATA_DIR} ${PMCONFDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpmyadmin
 	${INSTALL_DATA_DIR} ${PMDIR}
-	${INSTALL_DATA_DIR} ${PMDIR}/css
-	${INSTALL_DATA_DIR} ${PMDIR}/images
-	${INSTALL_DATA_DIR} ${PMDIR}/lang
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/auth
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/dbg
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/export
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/fpdf
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/fpdf/font
-	${INSTALL_DATA_DIR} ${PMDIR}/libraries/transformations
+	for dir in ${INSTALL_DIRS}; do \
+		${INSTALL_DATA_DIR} ${PMDIR}/$$dir; \
+	done
 	${INSTALL_DATA_DIR} ${PMDIR}/scripts
 
-	${RM} -f ${CONF_INC_PHP}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PMDIR}
-	${TEST} -f ${PMCONFFILE} || ${CP} -p ${CONF_INC_PHP} ${PMCONFFILE}
+	${INSTALL_DATA} ${WRKSRC}/*.php ${PMDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.css ${PMDIR}
 	${MV} ${CONF_INC_PHP} ${EXDIR}
 	${LN} -s ${PMCONFFILE} ${CONF_INC_PHP}
 
 	${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PMDIR}
-	${INSTALL_DATA} ${WRKSRC}/images/*.* ${PMDIR}/images
-	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PMDIR}/lang
-	${INSTALL_SCRIPT} ${WRKSRC}/css/*.php ${PMDIR}/css
-
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.* ${PMDIR}/libraries
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/auth/*.php ${PMDIR}/libraries/auth
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/dbg/*.php ${PMDIR}/libraries/dbg
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/export/*.php \
-		${PMDIR}/libraries/export
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/*.php ${PMDIR}/libraries/fpdf
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/fpdf/font/*.php \
-		${PMDIR}/libraries/fpdf/font
-	${INSTALL_SCRIPT} ${WRKSRC}/libraries/transformations/*.php \
-		${PMDIR}/libraries/transformations
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.* ${PMDIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/translators.html ${PMDIR}
+
+	for dir in ${INSTALL_DIRS}; do					\
+		for file in "${WRKSRC}/$$dir"/*; do			\
+			${TEST} -f "$$file" -a `${BASENAME} "$$file" .sh` = `${BASENAME} "$$file"` &&				\
+			${INSTALL_DATA} $$file ${PMDIR}/$$dir;		\
+		done							\
+	done
+
+	${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${PMDIR}/scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl ${PMDIR}/scripts
 
 	cd ${WRKSRC} && \
 	${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/phpmyadmin
-	${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR}
+	${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${EXDIR}/apache.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 5f3ec962aad..f2f925ebb7c 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/08/07 11:31:14 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/11/06 13:28:32 jdolecek Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -8,13 +8,18 @@ share/doc/phpmyadmin/README
 share/doc/phpmyadmin/TODO
 share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION}
 share/examples/phpmyadmin/config.inc.php
-@exec ${MKDIR} ${PMCONFDIR}
-@exec ${TEST} -f ${PMCONFFILE} || ${CP} -p %D/%F ${PMCONFFILE}
-share/examples/phpmyadmin/phpmyadmin.conf
+share/examples/phpmyadmin/apache.conf
 share/phpmyadmin/Documentation.html
 share/phpmyadmin/browse_foreigners.php
+share/phpmyadmin/calendar.php
+share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
+share/phpmyadmin/config.default.php
+share/phpmyadmin/config.footer.inc.php
+share/phpmyadmin/config.header.inc.php
+share/phpmyadmin/config.inc.php
 share/phpmyadmin/css/phpmyadmin.css.php
+share/phpmyadmin/docs.css
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
 share/phpmyadmin/db_details.php
@@ -31,41 +36,6 @@ share/phpmyadmin/export.php
 share/phpmyadmin/footer.inc.php
 share/phpmyadmin/header.inc.php
 share/phpmyadmin/header_printview.inc.php
-share/phpmyadmin/images/arrow_ltr.gif
-share/phpmyadmin/images/arrow_rtl.gif
-share/phpmyadmin/images/asc_order.png
-share/phpmyadmin/images/browse.png
-share/phpmyadmin/images/button_bookmark.png
-share/phpmyadmin/images/button_browse.png
-share/phpmyadmin/images/button_drop.png
-share/phpmyadmin/images/button_edit.png
-share/phpmyadmin/images/button_empty.png
-share/phpmyadmin/images/button_fulltext.png
-share/phpmyadmin/images/button_index.png
-share/phpmyadmin/images/button_insert.png
-share/phpmyadmin/images/button_nobrowse.png
-share/phpmyadmin/images/button_nodrop.png
-share/phpmyadmin/images/button_noempty.png
-share/phpmyadmin/images/button_nofulltext.png
-share/phpmyadmin/images/button_noindex.png
-share/phpmyadmin/images/button_noprimary.png
-share/phpmyadmin/images/button_noselect.png
-share/phpmyadmin/images/button_nounique.png
-share/phpmyadmin/images/button_primary.png
-share/phpmyadmin/images/button_properties.png
-share/phpmyadmin/images/button_select.png
-share/phpmyadmin/images/button_smallbrowse.png
-share/phpmyadmin/images/button_unique.png
-share/phpmyadmin/images/desc_order.png
-share/phpmyadmin/images/fulltext.png
-share/phpmyadmin/images/item_ltr.png
-share/phpmyadmin/images/item_rtl.png
-share/phpmyadmin/images/minus.png
-share/phpmyadmin/images/partialtext.png
-share/phpmyadmin/images/plus.png
-share/phpmyadmin/images/pma_logo.png
-share/phpmyadmin/images/spacer.gif
-share/phpmyadmin/images/vertical_line.png
 share/phpmyadmin/index.php
 share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php
 share/phpmyadmin/lang/afrikaans-utf-8.inc.php
@@ -86,10 +56,10 @@ 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/chinese_simplified-gb2312.inc.php
+share/phpmyadmin/lang/chinese_simplified-utf-8.inc.php
+share/phpmyadmin/lang/chinese_traditional-big5.inc.php
+share/phpmyadmin/lang/chinese_traditional-utf-8.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
@@ -116,6 +86,7 @@ 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/hebrew-utf-8.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
@@ -126,7 +97,8 @@ 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/korean-euc-kr.inc.php
+share/phpmyadmin/lang/korean-utf-8.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
@@ -143,7 +115,7 @@ 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-dos-866.inc.php
+share/phpmyadmin/lang/russian-cp-866.inc.php
 share/phpmyadmin/lang/russian-koi8-r.inc.php
 share/phpmyadmin/lang/russian-utf-8.inc.php
 share/phpmyadmin/lang/russian-windows-1251.inc.php
@@ -178,12 +150,14 @@ share/phpmyadmin/libraries/bookmark.lib.php
 share/phpmyadmin/libraries/charset_conversion.lib.php
 share/phpmyadmin/libraries/common.lib.php
 share/phpmyadmin/libraries/config_import.lib.php
+share/phpmyadmin/libraries/database_interface.lib.php
 share/phpmyadmin/libraries/db_config.lib.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
 share/phpmyadmin/libraries/dbg/profiling.php
 share/phpmyadmin/libraries/dbg/setup.php
+share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
+share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
 share/phpmyadmin/libraries/defines.lib.php
-share/phpmyadmin/libraries/defines_mysql.lib.php
 share/phpmyadmin/libraries/display_export.lib.php
 share/phpmyadmin/libraries/display_tbl.lib.php
 share/phpmyadmin/libraries/display_tbl_links.lib.php
@@ -191,7 +165,9 @@ share/phpmyadmin/libraries/dom-drag.js
 share/phpmyadmin/libraries/export/csv.php
 share/phpmyadmin/libraries/export/latex.php
 share/phpmyadmin/libraries/export/sql.php
+share/phpmyadmin/libraries/export/xls.php
 share/phpmyadmin/libraries/export/xml.php
+share/phpmyadmin/libraries/fpdf/README
 share/phpmyadmin/libraries/fpdf/font/courier.php
 share/phpmyadmin/libraries/fpdf/font/helvetica.php
 share/phpmyadmin/libraries/fpdf/font/helveticab.php
@@ -216,12 +192,13 @@ share/phpmyadmin/libraries/ip_allow_deny.lib.php
 share/phpmyadmin/libraries/kanji-encoding.lib.php
 share/phpmyadmin/libraries/left.js
 share/phpmyadmin/libraries/mysql_charsets.lib.php
-share/phpmyadmin/libraries/mysql_wrappers.lib.php
 share/phpmyadmin/libraries/ob.lib.php
 share/phpmyadmin/libraries/read_dump.lib.php
 share/phpmyadmin/libraries/relation.lib.php
 share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/select_lang.lib.php
+share/phpmyadmin/libraries/select_server.lib.php
+share/phpmyadmin/libraries/select_theme.lib.php
 share/phpmyadmin/libraries/server_privileges.js
 share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
@@ -230,6 +207,9 @@ share/phpmyadmin/libraries/sqlvalidator.lib.php
 share/phpmyadmin/libraries/string.lib.php
 share/phpmyadmin/libraries/tbl_change.js
 share/phpmyadmin/libraries/transformations.lib.php
+share/phpmyadmin/libraries/transformations/README
+share/phpmyadmin/libraries/transformations/TEMPLATE
+share/phpmyadmin/libraries/transformations/TEMPLATE_MIMETYPE
 share/phpmyadmin/libraries/transformations/application_octetstream__download.inc.php
 share/phpmyadmin/libraries/transformations/global.inc.php
 share/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php
@@ -253,14 +233,10 @@ share/phpmyadmin/phpinfo.php
 share/phpmyadmin/queryframe.php
 share/phpmyadmin/querywindow.php
 share/phpmyadmin/read_dump.php
-share/phpmyadmin/scripts/check_lang.php
 share/phpmyadmin/scripts/convertcfg.pl
-share/phpmyadmin/scripts/create-release.sh
 share/phpmyadmin/scripts/create_tables.sql
-share/phpmyadmin/scripts/decode_bug.php
-share/phpmyadmin/scripts/extchg.sh
-share/phpmyadmin/scripts/inno2pma.sh
-share/phpmyadmin/scripts/remove_control_m.sh
+share/phpmyadmin/scripts/create_tables_mysql_4_1_2+.sql
+share/phpmyadmin/scripts/upgrade_tables_mysql_4_1_2+.sql
 share/phpmyadmin/server_collations.php
 share/phpmyadmin/server_common.inc.php
 share/phpmyadmin/server_databases.php
@@ -293,19 +269,274 @@ share/phpmyadmin/tbl_replace.php
 share/phpmyadmin/tbl_replace_fields.php
 share/phpmyadmin/tbl_row_delete.php
 share/phpmyadmin/tbl_select.php
+share/phpmyadmin/themes.php
+share/phpmyadmin/themes/darkblue_orange/css/theme_left.css.php
+share/phpmyadmin/themes/darkblue_orange/css/theme_print.css.php
+share/phpmyadmin/themes/darkblue_orange/css/theme_right.css.php
+share/phpmyadmin/themes/darkblue_orange/img/arrow_ltr.gif
+share/phpmyadmin/themes/darkblue_orange/img/arrow_ltr.png
+share/phpmyadmin/themes/darkblue_orange/img/arrow_rtl.gif
+share/phpmyadmin/themes/darkblue_orange/img/arrow_rtl.png
+share/phpmyadmin/themes/darkblue_orange/img/asc_order.png
+share/phpmyadmin/themes/darkblue_orange/img/b_bookmark.png
+share/phpmyadmin/themes/darkblue_orange/img/b_browse.png
+share/phpmyadmin/themes/darkblue_orange/img/b_calendar.png
+share/phpmyadmin/themes/darkblue_orange/img/b_comment.png
+share/phpmyadmin/themes/darkblue_orange/img/b_dbstatistics.png
+share/phpmyadmin/themes/darkblue_orange/img/b_deltbl.png
+share/phpmyadmin/themes/darkblue_orange/img/b_docs.png
+share/phpmyadmin/themes/darkblue_orange/img/b_docsql.png
+share/phpmyadmin/themes/darkblue_orange/img/b_drop.png
+share/phpmyadmin/themes/darkblue_orange/img/b_edit.png
+share/phpmyadmin/themes/darkblue_orange/img/b_empty.png
+share/phpmyadmin/themes/darkblue_orange/img/b_export.png
+share/phpmyadmin/themes/darkblue_orange/img/b_firstpage.png
+share/phpmyadmin/themes/darkblue_orange/img/b_ftext.png
+share/phpmyadmin/themes/darkblue_orange/img/b_help.png
+share/phpmyadmin/themes/darkblue_orange/img/b_home.png
+share/phpmyadmin/themes/darkblue_orange/img/b_import.png
+share/phpmyadmin/themes/darkblue_orange/img/b_index.png
+share/phpmyadmin/themes/darkblue_orange/img/b_info.png
+share/phpmyadmin/themes/darkblue_orange/img/b_insrow.png
+share/phpmyadmin/themes/darkblue_orange/img/b_lastpage.png
+share/phpmyadmin/themes/darkblue_orange/img/b_minus.png
+share/phpmyadmin/themes/darkblue_orange/img/b_newdb.png
+share/phpmyadmin/themes/darkblue_orange/img/b_newtbl.png
+share/phpmyadmin/themes/darkblue_orange/img/b_nextpage.png
+share/phpmyadmin/themes/darkblue_orange/img/b_pdfdoc.png
+share/phpmyadmin/themes/darkblue_orange/img/b_plus.png
+share/phpmyadmin/themes/darkblue_orange/img/b_prevpage.png
+share/phpmyadmin/themes/darkblue_orange/img/b_primary.png
+share/phpmyadmin/themes/darkblue_orange/img/b_print.png
+share/phpmyadmin/themes/darkblue_orange/img/b_props.png
+share/phpmyadmin/themes/darkblue_orange/img/b_relations.png
+share/phpmyadmin/themes/darkblue_orange/img/b_save.png
+share/phpmyadmin/themes/darkblue_orange/img/b_sbrowse.png
+share/phpmyadmin/themes/darkblue_orange/img/b_sdb.png
+share/phpmyadmin/themes/darkblue_orange/img/b_search.png
+share/phpmyadmin/themes/darkblue_orange/img/b_selboard.png
+share/phpmyadmin/themes/darkblue_orange/img/b_select.png
+share/phpmyadmin/themes/darkblue_orange/img/b_sql.png
+share/phpmyadmin/themes/darkblue_orange/img/b_sqldoc.png
+share/phpmyadmin/themes/darkblue_orange/img/b_sqlhelp.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tblanalyse.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tblexport.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tblimport.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tblops.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tbloptimize.png
+share/phpmyadmin/themes/darkblue_orange/img/b_tipp.png
+share/phpmyadmin/themes/darkblue_orange/img/b_unique.png
+share/phpmyadmin/themes/darkblue_orange/img/b_usradd.png
+share/phpmyadmin/themes/darkblue_orange/img/b_usrcheck.png
+share/phpmyadmin/themes/darkblue_orange/img/b_usrdrop.png
+share/phpmyadmin/themes/darkblue_orange/img/b_usredit.png
+share/phpmyadmin/themes/darkblue_orange/img/b_usrlist.png
+share/phpmyadmin/themes/darkblue_orange/img/b_view.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_browse.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_empty.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_firstpage.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_ftext.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_index.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_lastpage.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_nextpage.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_prevpage.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_primary.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_sbrowse.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_select.png
+share/phpmyadmin/themes/darkblue_orange/img/bd_unique.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_black.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_blue.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_green.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_red.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_violet.png
+share/phpmyadmin/themes/darkblue_orange/img/dot_yellow.png
+share/phpmyadmin/themes/darkblue_orange/img/frm_linevrlt.png
+share/phpmyadmin/themes/darkblue_orange/img/item.png
+share/phpmyadmin/themes/darkblue_orange/img/item_ltr.png
+share/phpmyadmin/themes/darkblue_orange/img/item_rtl.png
+share/phpmyadmin/themes/darkblue_orange/img/logo_left.png
+share/phpmyadmin/themes/darkblue_orange/img/logo_right.png
+share/phpmyadmin/themes/darkblue_orange/img/php_sym.png
+share/phpmyadmin/themes/darkblue_orange/img/pma_logo2.png
+share/phpmyadmin/themes/darkblue_orange/img/s_asc.png
+share/phpmyadmin/themes/darkblue_orange/img/s_asci.png
+share/phpmyadmin/themes/darkblue_orange/img/s_attention.png
+share/phpmyadmin/themes/darkblue_orange/img/s_cancel.png
+share/phpmyadmin/themes/darkblue_orange/img/s_cancel2.png
+share/phpmyadmin/themes/darkblue_orange/img/s_db.png
+share/phpmyadmin/themes/darkblue_orange/img/s_desc.png
+share/phpmyadmin/themes/darkblue_orange/img/s_error.png
+share/phpmyadmin/themes/darkblue_orange/img/s_error2.png
+share/phpmyadmin/themes/darkblue_orange/img/s_fulltext.png
+share/phpmyadmin/themes/darkblue_orange/img/s_host.png
+share/phpmyadmin/themes/darkblue_orange/img/s_info.png
+share/phpmyadmin/themes/darkblue_orange/img/s_lang.png
+share/phpmyadmin/themes/darkblue_orange/img/s_loggoff.png
+share/phpmyadmin/themes/darkblue_orange/img/s_notice.png
+share/phpmyadmin/themes/darkblue_orange/img/s_okay.png
+share/phpmyadmin/themes/darkblue_orange/img/s_partialtext.png
+share/phpmyadmin/themes/darkblue_orange/img/s_passwd.png
+share/phpmyadmin/themes/darkblue_orange/img/s_process.png
+share/phpmyadmin/themes/darkblue_orange/img/s_really.png
+share/phpmyadmin/themes/darkblue_orange/img/s_reload.png
+share/phpmyadmin/themes/darkblue_orange/img/s_rights.png
+share/phpmyadmin/themes/darkblue_orange/img/s_status.png
+share/phpmyadmin/themes/darkblue_orange/img/s_tbl.png
+share/phpmyadmin/themes/darkblue_orange/img/s_theme.png
+share/phpmyadmin/themes/darkblue_orange/img/s_vars.png
+share/phpmyadmin/themes/darkblue_orange/img/s_warn.png
+share/phpmyadmin/themes/darkblue_orange/img/spacer.png
+share/phpmyadmin/themes/darkblue_orange/img/tbl_error.png
+share/phpmyadmin/themes/darkblue_orange/img/tbl_header.png
+share/phpmyadmin/themes/darkblue_orange/img/tbl_th.png
+share/phpmyadmin/themes/darkblue_orange/img/vertical_line.png
+share/phpmyadmin/themes/darkblue_orange/info.inc.php
+share/phpmyadmin/themes/darkblue_orange/layout.inc.php
+share/phpmyadmin/themes/darkblue_orange/screen.png
+share/phpmyadmin/themes/original/css/theme_left.css.php
+share/phpmyadmin/themes/original/css/theme_print.css.php
+share/phpmyadmin/themes/original/css/theme_right.css.php
+share/phpmyadmin/themes/original/img/arrow_ltr.gif
+share/phpmyadmin/themes/original/img/arrow_ltr.png
+share/phpmyadmin/themes/original/img/arrow_rtl.gif
+share/phpmyadmin/themes/original/img/arrow_rtl.png
+share/phpmyadmin/themes/original/img/asc_order.png
+share/phpmyadmin/themes/original/img/b_bookmark.png
+share/phpmyadmin/themes/original/img/b_browse.png
+share/phpmyadmin/themes/original/img/b_calendar.png
+share/phpmyadmin/themes/original/img/b_comment.png
+share/phpmyadmin/themes/original/img/b_dbstatistics.png
+share/phpmyadmin/themes/original/img/b_deltbl.png
+share/phpmyadmin/themes/original/img/b_docs.png
+share/phpmyadmin/themes/original/img/b_docsql.png
+share/phpmyadmin/themes/original/img/b_drop.png
+share/phpmyadmin/themes/original/img/b_edit.png
+share/phpmyadmin/themes/original/img/b_empty.png
+share/phpmyadmin/themes/original/img/b_export.png
+share/phpmyadmin/themes/original/img/b_firstpage.png
+share/phpmyadmin/themes/original/img/b_ftext.png
+share/phpmyadmin/themes/original/img/b_help.png
+share/phpmyadmin/themes/original/img/b_home.png
+share/phpmyadmin/themes/original/img/b_import.png
+share/phpmyadmin/themes/original/img/b_index.png
+share/phpmyadmin/themes/original/img/b_info.png
+share/phpmyadmin/themes/original/img/b_insrow.png
+share/phpmyadmin/themes/original/img/b_lastpage.png
+share/phpmyadmin/themes/original/img/b_minus.png
+share/phpmyadmin/themes/original/img/b_newdb.png
+share/phpmyadmin/themes/original/img/b_newtbl.png
+share/phpmyadmin/themes/original/img/b_nextpage.png
+share/phpmyadmin/themes/original/img/b_pdfdoc.png
+share/phpmyadmin/themes/original/img/b_plus.png
+share/phpmyadmin/themes/original/img/b_prevpage.png
+share/phpmyadmin/themes/original/img/b_primary.png
+share/phpmyadmin/themes/original/img/b_print.png
+share/phpmyadmin/themes/original/img/b_props.png
+share/phpmyadmin/themes/original/img/b_relations.png
+share/phpmyadmin/themes/original/img/b_save.png
+share/phpmyadmin/themes/original/img/b_sbrowse.png
+share/phpmyadmin/themes/original/img/b_sdb.png
+share/phpmyadmin/themes/original/img/b_search.png
+share/phpmyadmin/themes/original/img/b_selboard.png
+share/phpmyadmin/themes/original/img/b_select.png
+share/phpmyadmin/themes/original/img/b_sql.png
+share/phpmyadmin/themes/original/img/b_sqldoc.png
+share/phpmyadmin/themes/original/img/b_sqlhelp.png
+share/phpmyadmin/themes/original/img/b_tblanalyse.png
+share/phpmyadmin/themes/original/img/b_tblexport.png
+share/phpmyadmin/themes/original/img/b_tblimport.png
+share/phpmyadmin/themes/original/img/b_tblops.png
+share/phpmyadmin/themes/original/img/b_tbloptimize.png
+share/phpmyadmin/themes/original/img/b_tipp.png
+share/phpmyadmin/themes/original/img/b_unique.png
+share/phpmyadmin/themes/original/img/b_usradd.png
+share/phpmyadmin/themes/original/img/b_usrcheck.png
+share/phpmyadmin/themes/original/img/b_usrdrop.png
+share/phpmyadmin/themes/original/img/b_usredit.png
+share/phpmyadmin/themes/original/img/b_usrlist.png
+share/phpmyadmin/themes/original/img/b_view.png
+share/phpmyadmin/themes/original/img/bd_browse.png
+share/phpmyadmin/themes/original/img/bd_empty.png
+share/phpmyadmin/themes/original/img/bd_firstpage.png
+share/phpmyadmin/themes/original/img/bd_ftext.png
+share/phpmyadmin/themes/original/img/bd_index.png
+share/phpmyadmin/themes/original/img/bd_lastpage.png
+share/phpmyadmin/themes/original/img/bd_nextpage.png
+share/phpmyadmin/themes/original/img/bd_prevpage.png
+share/phpmyadmin/themes/original/img/bd_primary.png
+share/phpmyadmin/themes/original/img/bd_sbrowse.png
+share/phpmyadmin/themes/original/img/bd_select.png
+share/phpmyadmin/themes/original/img/bd_unique.png
+share/phpmyadmin/themes/original/img/dot_black.png
+share/phpmyadmin/themes/original/img/dot_blue.png
+share/phpmyadmin/themes/original/img/dot_green.png
+share/phpmyadmin/themes/original/img/dot_red.png
+share/phpmyadmin/themes/original/img/dot_violet.png
+share/phpmyadmin/themes/original/img/dot_yellow.png
+share/phpmyadmin/themes/original/img/frm_linevrlt.png
+share/phpmyadmin/themes/original/img/item.png
+share/phpmyadmin/themes/original/img/item_ltr.png
+share/phpmyadmin/themes/original/img/item_rtl.png
+share/phpmyadmin/themes/original/img/logo_left.png
+share/phpmyadmin/themes/original/img/logo_right.png
+share/phpmyadmin/themes/original/img/php_sym.png
+share/phpmyadmin/themes/original/img/pma_logo2.png
+share/phpmyadmin/themes/original/img/s_asc.png
+share/phpmyadmin/themes/original/img/s_asci.png
+share/phpmyadmin/themes/original/img/s_attention.png
+share/phpmyadmin/themes/original/img/s_cancel.png
+share/phpmyadmin/themes/original/img/s_cancel2.png
+share/phpmyadmin/themes/original/img/s_db.png
+share/phpmyadmin/themes/original/img/s_desc.png
+share/phpmyadmin/themes/original/img/s_error.png
+share/phpmyadmin/themes/original/img/s_error2.png
+share/phpmyadmin/themes/original/img/s_fulltext.png
+share/phpmyadmin/themes/original/img/s_host.png
+share/phpmyadmin/themes/original/img/s_info.png
+share/phpmyadmin/themes/original/img/s_lang.png
+share/phpmyadmin/themes/original/img/s_loggoff.png
+share/phpmyadmin/themes/original/img/s_notice.png
+share/phpmyadmin/themes/original/img/s_okay.png
+share/phpmyadmin/themes/original/img/s_partialtext.png
+share/phpmyadmin/themes/original/img/s_passwd.png
+share/phpmyadmin/themes/original/img/s_process.png
+share/phpmyadmin/themes/original/img/s_really.png
+share/phpmyadmin/themes/original/img/s_reload.png
+share/phpmyadmin/themes/original/img/s_rights.png
+share/phpmyadmin/themes/original/img/s_status.png
+share/phpmyadmin/themes/original/img/s_tbl.png
+share/phpmyadmin/themes/original/img/s_theme.png
+share/phpmyadmin/themes/original/img/s_vars.png
+share/phpmyadmin/themes/original/img/s_warn.png
+share/phpmyadmin/themes/original/img/spacer.png
+share/phpmyadmin/themes/original/img/tbl_error.png
+share/phpmyadmin/themes/original/img/tbl_header.png
+share/phpmyadmin/themes/original/img/tbl_th.png
+share/phpmyadmin/themes/original/img/vertical_line.png
+share/phpmyadmin/themes/original/info.inc.php
+share/phpmyadmin/themes/original/layout.inc.php
+share/phpmyadmin/themes/original/screen.png
 share/phpmyadmin/transformation_wrapper.php
+share/phpmyadmin/translators.html
 share/phpmyadmin/user_password.php
+@dirrm share/phpmyadmin/themes/original/img
+@dirrm share/phpmyadmin/themes/original/css
+@dirrm share/phpmyadmin/themes/original
+@dirrm share/phpmyadmin/themes/darkblue_orange/img
+@dirrm share/phpmyadmin/themes/darkblue_orange/css
+@dirrm share/phpmyadmin/themes/darkblue_orange
+@dirrm share/phpmyadmin/themes
 @dirrm share/phpmyadmin/scripts
 @dirrm share/phpmyadmin/libraries/transformations
 @dirrm share/phpmyadmin/libraries/fpdf/font
 @dirrm share/phpmyadmin/libraries/fpdf
 @dirrm share/phpmyadmin/libraries/export
+@dirrm share/phpmyadmin/libraries/dbi
 @dirrm share/phpmyadmin/libraries/dbg
 @dirrm share/phpmyadmin/libraries/auth
 @dirrm share/phpmyadmin/libraries
 @dirrm share/phpmyadmin/lang
-@dirrm share/phpmyadmin/images
 @dirrm share/phpmyadmin/css
-@exec ${RMDIR} %D/share/phpmyadmin >/dev/null 2>&1 || ${TRUE}
+@dirrm share/phpmyadmin
 @dirrm share/examples/phpmyadmin
 @dirrm share/doc/phpmyadmin
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index f15c9074899..357200c57c5 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/08/07 11:31:14 adrianp Exp $
+$NetBSD: distinfo,v 1.7 2004/11/06 13:28:32 jdolecek Exp $
 
-SHA1 (phpMyAdmin-2.5.7-pl1.tar.bz2) = ca616465669f9ba29586085072f3f88fbe4ba515
-Size (phpMyAdmin-2.5.7-pl1.tar.bz2) = 1123591 bytes
+SHA1 (phpMyAdmin-2.6.0-pl2.tar.bz2) = 0d3028d7c6cff2a16e9b28bd087ffc2413471434
+Size (phpMyAdmin-2.6.0-pl2.tar.bz2) = 1278267 bytes