- Update to 2.7.0

PR:		ports/89962
Submitted by:	maintainer

8 files changed, 80 insertions, 38 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 714c256ee1f4..d6cec760c591 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.6.4.4
-#DISTVERSION=	2.6.4-pl4
+PORTVERSION=	2.7.0
+#DISTVERSION=	2.7.0
 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
@@ -107,7 +107,7 @@ pre-everything::
 	${ECHO_MSG} "with PHP5 and MySQL 4.1.x"
 
 post-patch:
-	${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample
+	${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample
 	cd ${WRKSRC} ; \
 	${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
 	    ${SED} -e "s,^\.,%%MYADMDIR%%,"           >${PLIST} ; \
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 9934ecc7b612..92e6944fa8f9 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-2.6.4-pl4.tar.bz2) = a49885849bec79d35f6bdae73cdb813d
-SHA256 (phpMyAdmin-2.6.4-pl4.tar.bz2) = 897ed5eb11b6846cd06f8e291d729634cde192f4a80a7bdd716f53c9b7c32728
-SIZE (phpMyAdmin-2.6.4-pl4.tar.bz2) = 1722973
+MD5 (phpMyAdmin-2.7.0.tar.bz2) = 960c78c00655d24c48be231a52fe5716
+SHA256 (phpMyAdmin-2.7.0.tar.bz2) = d819122c5e015398faf3d25e9870054e583e3fb794a5a7108674d7a9aa5f2ee8
+SIZE (phpMyAdmin-2.7.0.tar.bz2) = 1962828
diff --git a/databases/phpmyadmin/files/config.inc.php.sample b/databases/phpmyadmin/files/config.inc.php.sample
new file mode 100644
index 000000000000..4bad2997e619
--- /dev/null
+++ b/databases/phpmyadmin/files/config.inc.php.sample
@@ -0,0 +1,12 @@
+<?php
+/* $FreeBSD$
+ *
+ * Skeleton configuration file -- this file is empty on a fresh
+ * installaton of phpmyadmin.
+ * 
+ * Copy any settings you want to override from config.defaults.php
+ * 
+ */
+
+
+?>
diff --git a/databases/phpmyadmin/pkg-descr b/databases/phpmyadmin/pkg-descr
index 40a69e789814..5d106eb9dd91 100644
--- a/databases/phpmyadmin/pkg-descr
+++ b/databases/phpmyadmin/pkg-descr
@@ -1,15 +1,24 @@
 
-    phpMyAdmin is intended to handle the administration of MySQL over the WWW.
-    Currently it can:
-      - 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 50 different languages
+     phpMyAdmin handles the administration of MySQL over the Web. It
+     can manage a whole MySQL server as well as a single database.
+
+       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
 
 WWW: http://www.phpmyadmin.net/
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 714c256ee1f4..d6cec760c591 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.6.4.4
-#DISTVERSION=	2.6.4-pl4
+PORTVERSION=	2.7.0
+#DISTVERSION=	2.7.0
 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
@@ -107,7 +107,7 @@ pre-everything::
 	${ECHO_MSG} "with PHP5 and MySQL 4.1.x"
 
 post-patch:
-	${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample
+	${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample
 	cd ${WRKSRC} ; \
 	${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
 	    ${SED} -e "s,^\.,%%MYADMDIR%%,"           >${PLIST} ; \
diff --git a/databases/phpmyadmin211/distinfo b/databases/phpmyadmin211/distinfo
index 9934ecc7b612..92e6944fa8f9 100644
--- a/databases/phpmyadmin211/distinfo
+++ b/databases/phpmyadmin211/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-2.6.4-pl4.tar.bz2) = a49885849bec79d35f6bdae73cdb813d
-SHA256 (phpMyAdmin-2.6.4-pl4.tar.bz2) = 897ed5eb11b6846cd06f8e291d729634cde192f4a80a7bdd716f53c9b7c32728
-SIZE (phpMyAdmin-2.6.4-pl4.tar.bz2) = 1722973
+MD5 (phpMyAdmin-2.7.0.tar.bz2) = 960c78c00655d24c48be231a52fe5716
+SHA256 (phpMyAdmin-2.7.0.tar.bz2) = d819122c5e015398faf3d25e9870054e583e3fb794a5a7108674d7a9aa5f2ee8
+SIZE (phpMyAdmin-2.7.0.tar.bz2) = 1962828
diff --git a/databases/phpmyadmin211/files/config.inc.php.sample b/databases/phpmyadmin211/files/config.inc.php.sample
new file mode 100644
index 000000000000..4bad2997e619
--- /dev/null
+++ b/databases/phpmyadmin211/files/config.inc.php.sample
@@ -0,0 +1,12 @@
+<?php
+/* $FreeBSD$
+ *
+ * Skeleton configuration file -- this file is empty on a fresh
+ * installaton of phpmyadmin.
+ * 
+ * Copy any settings you want to override from config.defaults.php
+ * 
+ */
+
+
+?>
diff --git a/databases/phpmyadmin211/pkg-descr b/databases/phpmyadmin211/pkg-descr
index 40a69e789814..5d106eb9dd91 100644
--- a/databases/phpmyadmin211/pkg-descr
+++ b/databases/phpmyadmin211/pkg-descr
@@ -1,15 +1,24 @@
 
-    phpMyAdmin is intended to handle the administration of MySQL over the WWW.
-    Currently it can:
-      - 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 50 different languages
+     phpMyAdmin handles the administration of MySQL over the Web. It
+     can manage a whole MySQL server as well as a single database.
+
+       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
 
 WWW: http://www.phpmyadmin.net/