- Update to 2.3.2

- Update my email to FreeBSD

4 files changed, 119 insertions, 63 deletions

diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index fbac00de9639..ae44aa9c5666 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	adminer
-PORTVERSION=	1.11.1
+PORTVERSION=	2.3.2
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A full-featured MySQL management tool written in PHP
 
 USE_ZIP=	yes
diff --git a/databases/adminer/distinfo b/databases/adminer/distinfo
index 7c20916fe587..77cffc771ae1 100644
--- a/databases/adminer/distinfo
+++ b/databases/adminer/distinfo
@@ -1,3 +1,3 @@
-MD5 (adminer-1.11.1.zip) = 2373f4c87849d2a04930f8036fae4218
-SHA256 (adminer-1.11.1.zip) = ed46f7fa6d5e8eb977aa470c9fdbe8c50a87baec9ae93d3429f6d37a62c7cf95
-SIZE (adminer-1.11.1.zip) = 98384
+MD5 (adminer-2.3.2.zip) = 397c2d13ac0f8b0150110eb720611b7c
+SHA256 (adminer-2.3.2.zip) = 140e9c8368a75460a6da1706968648f1b727b2aceae7029887e1b10482fa8736
+SIZE (adminer-2.3.2.zip) = 206918
diff --git a/databases/adminer/files/pkg-message.in b/databases/adminer/files/pkg-message.in
index 2b6cf39c9ce3..18119e4fd09b 100644
--- a/databases/adminer/files/pkg-message.in
+++ b/databases/adminer/files/pkg-message.in
@@ -6,7 +6,7 @@ Please add the following to your Apache configuration,
 and restart the server:
 
 ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later.
-   Alias /adminer %%WWWDIR%%
+   Alias /adminer %%WWWDIR%%/adminer
    AcceptPathInfo On
    <Directory %%WWWDIR%%>
       AllowOverride None
diff --git a/databases/adminer/pkg-plist b/databases/adminer/pkg-plist
index 31fc81aa8cbd..1a4dcf20315d 100644
--- a/databases/adminer/pkg-plist
+++ b/databases/adminer/pkg-plist
@@ -1,58 +1,114 @@
-%%WWWDIR%%/SciTEAbbrev.properties
-%%WWWDIR%%/SciTEDirectory.properties
-%%WWWDIR%%/arrow.gif
-%%WWWDIR%%/call.inc.php
-%%WWWDIR%%/coverage.inc.php
-%%WWWDIR%%/create.inc.php
-%%WWWDIR%%/createv.inc.php
-%%WWWDIR%%/cross.gif
-%%WWWDIR%%/database.inc.php
-%%WWWDIR%%/db.inc.php
-%%WWWDIR%%/default.css
-%%WWWDIR%%/down.gif
-%%WWWDIR%%/download.inc.php
-%%WWWDIR%%/dump.inc.php
-%%WWWDIR%%/edit.inc.php
-%%WWWDIR%%/event.inc.php
-%%WWWDIR%%/favicon.ico
-%%WWWDIR%%/foreign.inc.php
-%%WWWDIR%%/functions.js
-%%WWWDIR%%/include/auth.inc.php
-%%WWWDIR%%/include/connect.inc.php
-%%WWWDIR%%/include/design.inc.php
-%%WWWDIR%%/include/editing.inc.php
-%%WWWDIR%%/include/export.inc.php
-%%WWWDIR%%/include/functions.inc.php
-%%WWWDIR%%/include/lang.inc.php
-%%WWWDIR%%/include/mysql.inc.php
-%%WWWDIR%%/include/pdo.inc.php
-%%WWWDIR%%/include/version.inc.php
-%%WWWDIR%%/index.php
-%%WWWDIR%%/indexes.inc.php
-%%WWWDIR%%/lang/cs.inc.php
-%%WWWDIR%%/lang/de.inc.php
-%%WWWDIR%%/lang/en.inc.php
-%%WWWDIR%%/lang/es.inc.php
-%%WWWDIR%%/lang/et.inc.php
-%%WWWDIR%%/lang/fr.inc.php
-%%WWWDIR%%/lang/it.inc.php
-%%WWWDIR%%/lang/nl.inc.php
-%%WWWDIR%%/lang/ru.inc.php
-%%WWWDIR%%/lang/sk.inc.php
-%%WWWDIR%%/lang/zh.inc.php
-%%WWWDIR%%/plus.gif
-%%WWWDIR%%/privileges.inc.php
-%%WWWDIR%%/procedure.inc.php
-%%WWWDIR%%/processlist.inc.php
-%%WWWDIR%%/schema.inc.php
-%%WWWDIR%%/select.inc.php
-%%WWWDIR%%/sql.inc.php
-%%WWWDIR%%/table.inc.php
-%%WWWDIR%%/trigger.inc.php
-%%WWWDIR%%/up.gif
-%%WWWDIR%%/user.inc.php
-%%WWWDIR%%/variables.inc.php
-%%WWWDIR%%/view.inc.php
-@dirrm %%WWWDIR%%/include
-@dirrm %%WWWDIR%%/lang
+%%WWWDIR%%/adminer/call.inc.php
+%%WWWDIR%%/adminer/create.inc.php
+%%WWWDIR%%/adminer/database.inc.php
+%%WWWDIR%%/adminer/db.inc.php
+%%WWWDIR%%/adminer/download.inc.php
+%%WWWDIR%%/adminer/dump.inc.php
+%%WWWDIR%%/adminer/edit.inc.php
+%%WWWDIR%%/adminer/event.inc.php
+%%WWWDIR%%/adminer/foreign.inc.php
+%%WWWDIR%%/adminer/include/adminer.inc.php
+%%WWWDIR%%/adminer/include/auth.inc.php
+%%WWWDIR%%/adminer/include/bootstrap.inc.php
+%%WWWDIR%%/adminer/include/connect.inc.php
+%%WWWDIR%%/adminer/include/coverage.inc.php
+%%WWWDIR%%/adminer/include/design.inc.php
+%%WWWDIR%%/adminer/include/editing.inc.php
+%%WWWDIR%%/adminer/include/export.inc.php
+%%WWWDIR%%/adminer/include/functions.inc.php
+%%WWWDIR%%/adminer/include/lang.inc.php
+%%WWWDIR%%/adminer/include/mysql.inc.php
+%%WWWDIR%%/adminer/include/pdo.inc.php
+%%WWWDIR%%/adminer/include/version.inc.php
+%%WWWDIR%%/adminer/include/xxtea.inc.php
+%%WWWDIR%%/adminer/index.php
+%%WWWDIR%%/adminer/indexes.inc.php
+%%WWWDIR%%/adminer/lang/cs.inc.php
+%%WWWDIR%%/adminer/lang/de.inc.php
+%%WWWDIR%%/adminer/lang/en.inc.php
+%%WWWDIR%%/adminer/lang/es.inc.php
+%%WWWDIR%%/adminer/lang/et.inc.php
+%%WWWDIR%%/adminer/lang/fr.inc.php
+%%WWWDIR%%/adminer/lang/it.inc.php
+%%WWWDIR%%/adminer/lang/nl.inc.php
+%%WWWDIR%%/adminer/lang/ru.inc.php
+%%WWWDIR%%/adminer/lang/sk.inc.php
+%%WWWDIR%%/adminer/lang/zh-tw.inc.php
+%%WWWDIR%%/adminer/lang/zh.inc.php
+%%WWWDIR%%/adminer/privileges.inc.php
+%%WWWDIR%%/adminer/procedure.inc.php
+%%WWWDIR%%/adminer/processlist.inc.php
+%%WWWDIR%%/adminer/schema.inc.php
+%%WWWDIR%%/adminer/select.inc.php
+%%WWWDIR%%/adminer/sql.inc.php
+%%WWWDIR%%/adminer/static/arrow.gif
+%%WWWDIR%%/adminer/static/cross.gif
+%%WWWDIR%%/adminer/static/default.css
+%%WWWDIR%%/adminer/static/down.gif
+%%WWWDIR%%/adminer/static/editing.js
+%%WWWDIR%%/adminer/static/favicon.ico
+%%WWWDIR%%/adminer/static/functions.js
+%%WWWDIR%%/adminer/static/plus.gif
+%%WWWDIR%%/adminer/static/up.gif
+%%WWWDIR%%/adminer/table.inc.php
+%%WWWDIR%%/adminer/trigger.inc.php
+%%WWWDIR%%/adminer/user.inc.php
+%%WWWDIR%%/adminer/variables.inc.php
+%%WWWDIR%%/adminer/view.inc.php
+%%WWWDIR%%/changes.txt
+%%WWWDIR%%/compile.php
+%%WWWDIR%%/coverage.php
+%%WWWDIR%%/editor/db.inc.php
+%%WWWDIR%%/editor/example.php
+%%WWWDIR%%/editor/include/adminer.inc.php
+%%WWWDIR%%/editor/include/connect.inc.php
+%%WWWDIR%%/editor/include/editing.inc.php
+%%WWWDIR%%/editor/include/export.inc.php
+%%WWWDIR%%/editor/index.php
+%%WWWDIR%%/editor/static/editing.js
+%%WWWDIR%%/externals/jsmin-php/jsmin.php
+%%WWWDIR%%/externals/jush/jush.css
+%%WWWDIR%%/externals/jush/jush.js
+%%WWWDIR%%/lang.php
+%%WWWDIR%%/tests/0-login.html
+%%WWWDIR%%/tests/1-create-database.html
+%%WWWDIR%%/tests/10-clone.html
+%%WWWDIR%%/tests/11-reference.html
+%%WWWDIR%%/tests/12-update.html
+%%WWWDIR%%/tests/13-delete.html
+%%WWWDIR%%/tests/14-truncate.html
+%%WWWDIR%%/tests/15-privileges.html
+%%WWWDIR%%/tests/16-processlist.html
+%%WWWDIR%%/tests/17-export.html
+%%WWWDIR%%/tests/18-events.html
+%%WWWDIR%%/tests/19-procedures.html
+%%WWWDIR%%/tests/2-create-table.html
+%%WWWDIR%%/tests/20-partitioning.html
+%%WWWDIR%%/tests/21-variables.html
+%%WWWDIR%%/tests/22-history.html
+%%WWWDIR%%/tests/23-editor.html
+%%WWWDIR%%/tests/24-explain.html
+%%WWWDIR%%/tests/3-create-index.html
+%%WWWDIR%%/tests/4-create-table-2.html
+%%WWWDIR%%/tests/5-foreign-key.html
+%%WWWDIR%%/tests/6-alter-table.html
+%%WWWDIR%%/tests/7-create-trigger.html
+%%WWWDIR%%/tests/8-create-view.html
+%%WWWDIR%%/tests/9-insert.html
+%%WWWDIR%%/tests/iexplore.bat
+%%WWWDIR%%/tests/logout.html
+%%WWWDIR%%/tests/selenium.html
+%%WWWDIR%%/todo.txt
+%%WWWDIR%%/version.js
+@dirrm %%WWWDIR%%/adminer/include
+@dirrm %%WWWDIR%%/adminer/lang
+@dirrm %%WWWDIR%%/adminer/static
+@dirrm %%WWWDIR%%/adminer
+@dirrm %%WWWDIR%%/editor/include
+@dirrm %%WWWDIR%%/editor/static
+@dirrm %%WWWDIR%%/editor
+@dirrm %%WWWDIR%%/externals/jsmin-php
+@dirrm %%WWWDIR%%/externals/jush
+@dirrm %%WWWDIR%%/externals
+@dirrm %%WWWDIR%%/tests
 @dirrm %%WWWDIR%%