3 files changed, 36 insertions, 13 deletions

diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 5ebe8b0a4968..06a7e18b31bf 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adminer
-PORTVERSION=	3.7.1
+PORTVERSION=	4.1.0
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
 
@@ -16,17 +16,16 @@ NO_BUILD=	yes
 USE_PHP=	mssql mysql odbc pgsql session pdo_sqlite
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' \
 		>> ${TMPPLIST}
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+#post-install:
+#	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/databases/adminer/distinfo b/databases/adminer/distinfo
index b3d0d288ddf7..e18a7c5223cc 100644
--- a/databases/adminer/distinfo
+++ b/databases/adminer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (adminer-3.7.1.zip) = ceb9d1d28b61d362f51fae1748c866fb09560b23cfca61998113a9756e245797
-SIZE (adminer-3.7.1.zip) = 501407
+SHA256 (adminer-4.1.0.zip) = 166a5c4a0eaaacc9727e4391f53cde24250ca5a2f11db99b9e80e3823750c98c
+SIZE (adminer-4.1.0.zip) = 559339
diff --git a/databases/adminer/pkg-plist b/databases/adminer/pkg-plist
index 8e1f435591c7..dea8fc2937f5 100644
--- a/databases/adminer/pkg-plist
+++ b/databases/adminer/pkg-plist
@@ -3,10 +3,13 @@
 %%WWWDIR%%/adminer/database.inc.php
 %%WWWDIR%%/adminer/db.inc.php
 %%WWWDIR%%/adminer/download.inc.php
+%%WWWDIR%%/adminer/drivers/elastic.inc.php
+%%WWWDIR%%/adminer/drivers/mongo.inc.php
 %%WWWDIR%%/adminer/drivers/mssql.inc.php
 %%WWWDIR%%/adminer/drivers/mysql.inc.php
 %%WWWDIR%%/adminer/drivers/oracle.inc.php
 %%WWWDIR%%/adminer/drivers/pgsql.inc.php
+%%WWWDIR%%/adminer/drivers/simpledb.inc.php
 %%WWWDIR%%/adminer/drivers/sqlite.inc.php
 %%WWWDIR%%/adminer/dump.inc.php
 %%WWWDIR%%/adminer/edit.inc.php
@@ -19,6 +22,7 @@
 %%WWWDIR%%/adminer/include/connect.inc.php
 %%WWWDIR%%/adminer/include/coverage.inc.php
 %%WWWDIR%%/adminer/include/design.inc.php
+%%WWWDIR%%/adminer/include/driver.inc.php
 %%WWWDIR%%/adminer/include/editing.inc.php
 %%WWWDIR%%/adminer/include/functions.inc.php
 %%WWWDIR%%/adminer/include/lang.inc.php
@@ -44,17 +48,21 @@
 %%WWWDIR%%/adminer/lang/ja.inc.php
 %%WWWDIR%%/adminer/lang/ko.inc.php
 %%WWWDIR%%/adminer/lang/lt.inc.php
+%%WWWDIR%%/adminer/lang/no.inc.php
 %%WWWDIR%%/adminer/lang/nl.inc.php
 %%WWWDIR%%/adminer/lang/pl.inc.php
 %%WWWDIR%%/adminer/lang/pt.inc.php
+%%WWWDIR%%/adminer/lang/pt-br.inc.php
 %%WWWDIR%%/adminer/lang/ro.inc.php
 %%WWWDIR%%/adminer/lang/ru.inc.php
 %%WWWDIR%%/adminer/lang/sk.inc.php
 %%WWWDIR%%/adminer/lang/sl.inc.php
 %%WWWDIR%%/adminer/lang/sr.inc.php
 %%WWWDIR%%/adminer/lang/ta.inc.php
+%%WWWDIR%%/adminer/lang/th.inc.php
 %%WWWDIR%%/adminer/lang/tr.inc.php
 %%WWWDIR%%/adminer/lang/uk.inc.php
+%%WWWDIR%%/adminer/lang/vi.inc.php
 %%WWWDIR%%/adminer/lang/xx.inc.php
 %%WWWDIR%%/adminer/lang/zh.inc.php
 %%WWWDIR%%/adminer/lang/zh-tw.inc.php
@@ -98,6 +106,7 @@
 %%WWWDIR%%/designs/ng9/adminer.css
 %%WWWDIR%%/designs/pappu687/adminer.css
 %%WWWDIR%%/designs/paranoiq/adminer.css
+%%WWWDIR%%/designs/pepa-linha/adminer.css
 %%WWWDIR%%/designs/pilot/adminer.css
 %%WWWDIR%%/designs/pokorny/adminer.css
 %%WWWDIR%%/designs/price/adminer.css
@@ -112,7 +121,21 @@
 %%WWWDIR%%/editor/static/editing.js
 %%WWWDIR%%/externals/JsShrink/jsShrink.php
 %%WWWDIR%%/externals/jush/jush.css
-%%WWWDIR%%/externals/jush/jush.js
+%%WWWDIR%%/externals/jush/modules/jush-cnf.js
+%%WWWDIR%%/externals/jush/modules/jush-css.js
+%%WWWDIR%%/externals/jush/modules/jush-htm.js
+%%WWWDIR%%/externals/jush/modules/jush-http.js
+%%WWWDIR%%/externals/jush/modules/jush-js.js
+%%WWWDIR%%/externals/jush/modules/jush-mssql.js
+%%WWWDIR%%/externals/jush/modules/jush-oracle.js
+%%WWWDIR%%/externals/jush/modules/jush-pgsql.js
+%%WWWDIR%%/externals/jush/modules/jush-php.js
+%%WWWDIR%%/externals/jush/modules/jush-simpledb.js
+%%WWWDIR%%/externals/jush/modules/jush-sql.js
+%%WWWDIR%%/externals/jush/modules/jush-sqlite.js
+%%WWWDIR%%/externals/jush/modules/jush-textarea.js
+%%WWWDIR%%/externals/jush/modules/jush-txt.js
+%%WWWDIR%%/externals/jush/modules/jush.js
 %%WWWDIR%%/lang.php
 %%WWWDIR%%/plugins/database-hide.php
 %%WWWDIR%%/plugins/dump-alter.php
@@ -134,7 +157,6 @@
 %%WWWDIR%%/plugins/login-servers.php
 %%WWWDIR%%/plugins/login-table.php
 %%WWWDIR%%/plugins/master-slave.php
-%%WWWDIR%%/plugins/password-sha1.php
 %%WWWDIR%%/plugins/plugin.php
 %%WWWDIR%%/plugins/readme.txt
 %%WWWDIR%%/plugins/slugify.php
@@ -191,6 +213,7 @@
 @dirrm %%WWWDIR%%/designs/ng9
 @dirrm %%WWWDIR%%/designs/pappu687
 @dirrm %%WWWDIR%%/designs/paranoiq
+@dirrm %%WWWDIR%%/designs/pepa-linha
 @dirrm %%WWWDIR%%/designs/price
 @dirrm %%WWWDIR%%/designs/pilot
 @dirrm %%WWWDIR%%/designs/pokorny
@@ -199,6 +222,7 @@
 @dirrm %%WWWDIR%%/editor/static
 @dirrm %%WWWDIR%%/editor
 @dirrm %%WWWDIR%%/externals/JsShrink
+@dirrm %%WWWDIR%%/externals/jush/modules
 @dirrm %%WWWDIR%%/externals/jush
 @dirrm %%WWWDIR%%/externals
 @dirrm %%WWWDIR%%/plugins