summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/phpmyadmin/Makefile4
-rw-r--r--databases/phpmyadmin/PLIST4
-rw-r--r--databases/phpmyadmin/distinfo8
3 files changed, 8 insertions, 8 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 1a197ba8acb..2d0e69f5004 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129.2.1 2014/07/15 06:53:41 spz Exp $
+# $NetBSD: Makefile,v 1.129.2.2 2014/07/27 06:37:19 spz Exp $
DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages
PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
@@ -28,7 +28,7 @@ MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
EXDIR=${EXDIR:Q}
CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION= 4.2.5
+DIST_VERSION= 4.2.6
DOC_FILES= ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
APACHE_USER?= www
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 373ef32d747..b9a6ebc58c3 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2014/06/04 20:40:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.36.2.1 2014/07/27 06:37:19 spz Exp $
share/doc/phpmyadmin/ChangeLog
share/doc/phpmyadmin/LICENSE
share/doc/phpmyadmin/README
@@ -87,7 +87,6 @@ share/phpmyadmin/js/codemirror/LICENSE
share/phpmyadmin/js/codemirror/addon/runmode/runmode.js
share/phpmyadmin/js/codemirror/lib/codemirror.js
share/phpmyadmin/js/codemirror/mode/sql/sql.js
-share/phpmyadmin/js/columndelete.js
share/phpmyadmin/js/common.js
share/phpmyadmin/js/config.js
share/phpmyadmin/js/cross_framing_protection.js
@@ -197,6 +196,7 @@ share/phpmyadmin/js/keyhandler.js
share/phpmyadmin/js/line_counts.php
share/phpmyadmin/js/makegrid.js
share/phpmyadmin/js/messages.php
+share/phpmyadmin/js/multi_column_sort.js
share/phpmyadmin/js/navigation.js
share/phpmyadmin/js/openlayers/OpenLayers.js
share/phpmyadmin/js/openlayers/img/blank.gif
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index e8bf251179c..023666acb36 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86.2.1 2014/07/15 06:53:41 spz Exp $
+$NetBSD: distinfo,v 1.86.2.2 2014/07/27 06:37:19 spz Exp $
-SHA1 (phpMyAdmin-4.2.5-all-languages.tar.xz) = 5fb995b9e8d0239ad2d2f7f536bb67f7ca46177f
-RMD160 (phpMyAdmin-4.2.5-all-languages.tar.xz) = 2dff82dcba61cdadad9d29e57a47734654b7e0b3
-Size (phpMyAdmin-4.2.5-all-languages.tar.xz) = 5200328 bytes
+SHA1 (phpMyAdmin-4.2.6-all-languages.tar.xz) = 8cf175f19ed820444501a68f94c3349be607941a
+RMD160 (phpMyAdmin-4.2.6-all-languages.tar.xz) = 7695fc90c3d33bfa1908a06eaa93066f2a76110f
+Size (phpMyAdmin-4.2.6-all-languages.tar.xz) = 5134224 bytes
SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2