4 files changed, 42 insertions, 26 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 87e5db041dd4..2984fe8f3435 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.7.0.2
-#DISTVERSION=	2.7.0-pl2
+PORTVERSION=	2.8.0.1
+#DISTVERSION=	2.8.0.1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-pl\1/}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	A set of PHP-scripts to manage MySQL over the web
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 486ecbe638e8..36b733a869af 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-2.7.0-pl2.tar.bz2) = 19a46b06254276f4e7c3803ea2d9b335
-SHA256 (phpMyAdmin-2.7.0-pl2.tar.bz2) = 19ba6032a266cc74866d1cc5bd5d196f5b14b092b515485faad405e3c8ea2cd4
-SIZE (phpMyAdmin-2.7.0-pl2.tar.bz2) = 1968200
+MD5 (phpMyAdmin-2.8.0.1.tar.bz2) = 1ef0b82402b1d43c2be32521baef8b7e
+SHA256 (phpMyAdmin-2.8.0.1.tar.bz2) = b5cef57d5bcde5efb271db24745f991e67e4ed8f5fd3c5541a845cdba0b07921
+SIZE (phpMyAdmin-2.8.0.1.tar.bz2) = 2012071
diff --git a/databases/phpmyadmin/files/config.inc.php.sample b/databases/phpmyadmin/files/config.inc.php.sample
index 4bad2997e619..815c376355c3 100644
--- a/databases/phpmyadmin/files/config.inc.php.sample
+++ b/databases/phpmyadmin/files/config.inc.php.sample
@@ -5,6 +5,7 @@
  * installaton of phpmyadmin.
  * 
  * Copy any settings you want to override from config.defaults.php
+ * or use scripts/setup.php to generate a basic configuration file.
  * 
  */
 
diff --git a/databases/phpmyadmin/pkg-descr b/databases/phpmyadmin/pkg-descr
index 5d106eb9dd91..34be1ebef458 100644
--- a/databases/phpmyadmin/pkg-descr
+++ b/databases/phpmyadmin/pkg-descr
@@ -1,24 +1,39 @@
 
-     phpMyAdmin handles the administration of MySQL over the Web. It
-     can manage a whole MySQL server as well as a single database.
+   phpMyAdmin can manage a whole MySQL server (needs a super-user) as
+   well as a single database. To accomplish the latter you'll need a
+   properly set up MySQL user who can read/write only the desired
+   database. It's up to you to look up the appropriate part in the
+   MySQL manual.
 
-       Currently it can:
-         - create, copy, rename and drop databases
-         - create, copy, drop, rename and alter tables
-         - do table maintenance
-         - 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 data to CSV, XML and Latex formats
-         - administer multiple servers
-         - manage MySQL users and privileges
-         - check referential integrity
-         - using Query-by-example (QBE), create complex queries automatically
-           connecting required tables
-         - create PDF graphics of your Database layout
-         - search globally in a database or a subset of it
-         - communicate in 50 different languages
+   Currently phpMyAdmin can:
+     - easily browse through databases and tables
+     - create, copy, rename, alter and drop databases
+     - create, copy, rename, alter and drop tables
+     - do table maintenance
+     - add, edit and drop fields
+     - execute any SQL-statement, even multiple queries
+     - create, alter and drop indexes
+     - load text files into tables
+     - create (*) and read dumps of tables or databases
+     - export (*) data to SQL, CSV, XML, Word, Excel, PDF and Latex
+       formats
+     - administer multiple servers
+     - manage MySQL users and privileges
+     - check server settings and runtime information with
+       configuration hints
+     - check referential integrity in MyISAM tables
+     - using Query-by-example (QBE), create complex queries
+       automatically connecting required tables
+     - create PDF graphics of your Database layout
+     - search globally in a database or a subset of it
+     - transform stored data into any format using a set of predefined
+       functions, like displaying BLOB-data as image or download-link
+     - support InnoDB tables and foreign keys (see FAQ 3.6)
+     - support mysqli, the improved MySQL extension (see FAQ 1.17)
+     - communicate in 50 different languages
+
+   (*) phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 formats)
+   dumps and CSV exports if you use PHP4 >= 4.0.4 with Zlib support
+   (--with-zli b) and/or Bzip2 support (--with-bz2).
 
 WWW: http://www.phpmyadmin.net/