10 files changed, 31 insertions, 200 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 4e9a1945b583..715cd4aaa1de 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -4,6 +4,7 @@
     COMMENT = Databases
 
     SUBDIR += WWWdb
+    SUBDIR += adminer
     SUBDIR += adodb
     SUBDIR += adodb5
     SUBDIR += adstudio
@@ -486,7 +487,6 @@
     SUBDIR += php5-rrdtool
     SUBDIR += php5-sqlite
     SUBDIR += php5-sybase_ct
-    SUBDIR += phpminadmin
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin
     SUBDIR += phpmyadmin211
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 9d214f8495e8..55c43016dbcb 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for:   phpMinAdmin
-# Date created:			28 August 2008
+# New ports collection makefile for:   adminer
+# Date created:			11 July, 2009
 # Whom:				Wen Heping <wenheping@gmail.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	phpminadmin
-PORTVERSION=	1.10.0
+PORTNAME=	adminer
+PORTVERSION=	1.11.1
 CATEGORIES=	databases www
 MASTER_SITES=	SF
-DISTNAME=	phpMinAdmin-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
-COMMENT=	A MySQL Management Tool Written in PHP
+COMMENT=	A full-featured MySQL management tool written in PHP
 
 USE_ZIP=	yes
 NO_BUILD=	yes
@@ -25,7 +24,7 @@ do-install:
 	@${CHMOD} -R 755 ${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} 755 -R ${WWWDIR}' \
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \
 		>> ${TMPPLIST}
 
 post-install:
diff --git a/databases/adminer/distinfo b/databases/adminer/distinfo
index 2e9f040469c8..7c20916fe587 100644
--- a/databases/adminer/distinfo
+++ b/databases/adminer/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpMinAdmin-1.10.0.zip) = 66359cedeaa5cb394e91cb3c1881fc1d
-SHA256 (phpMinAdmin-1.10.0.zip) = 6207094ec889e2dfc369ad14fe3d179e3bba268dfef867187ef4e99b468bde52
-SIZE (phpMinAdmin-1.10.0.zip) = 114214
+MD5 (adminer-1.11.1.zip) = 2373f4c87849d2a04930f8036fae4218
+SHA256 (adminer-1.11.1.zip) = ed46f7fa6d5e8eb977aa470c9fdbe8c50a87baec9ae93d3429f6d37a62c7cf95
+SIZE (adminer-1.11.1.zip) = 98384
diff --git a/databases/adminer/files/pkg-message.in b/databases/adminer/files/pkg-message.in
index d6d9712a7e5c..2b6cf39c9ce3 100644
--- a/databases/adminer/files/pkg-message.in
+++ b/databases/adminer/files/pkg-message.in
@@ -1,12 +1,12 @@
 
-POST-INSTALL CONFIGURATION FOR phpminadmin
+POST-INSTALL CONFIGURATION FOR Adminer
 =====================================
 
 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 /phpminadmin %%WWWDIR%%
+   Alias /adminer %%WWWDIR%%
    AcceptPathInfo On
    <Directory %%WWWDIR%%>
       AllowOverride None
@@ -14,7 +14,7 @@ and restart the server:
       Allow from all
    </Directory>
 
-Then you can visit your phpminadmin site with a browser
-(i.e. http://your.server.com/phpminadmin/)
+Then you can visit your Adminer site with a browser
+(i.e. http://your.server.com/adminer/)
 
 =====================================
diff --git a/databases/adminer/pkg-plist b/databases/adminer/pkg-plist
index 41564c283d8c..31fc81aa8cbd 100644
--- a/databases/adminer/pkg-plist
+++ b/databases/adminer/pkg-plist
@@ -1,32 +1,34 @@
-%%WWWDIR%%/SciTE.properties
 %%WWWDIR%%/SciTEAbbrev.properties
-%%WWWDIR%%/_compile.php
-%%WWWDIR%%/_coverage.php
-%%WWWDIR%%/_lang.php
-%%WWWDIR%%/abstraction.inc.php
+%%WWWDIR%%/SciTEDirectory.properties
 %%WWWDIR%%/arrow.gif
-%%WWWDIR%%/auth.inc.php
 %%WWWDIR%%/call.inc.php
-%%WWWDIR%%/changes.txt
-%%WWWDIR%%/connect.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%%/design.inc.php
 %%WWWDIR%%/down.gif
 %%WWWDIR%%/download.inc.php
 %%WWWDIR%%/dump.inc.php
 %%WWWDIR%%/edit.inc.php
-%%WWWDIR%%/editing.inc.php
 %%WWWDIR%%/event.inc.php
-%%WWWDIR%%/export.inc.php
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/foreign.inc.php
-%%WWWDIR%%/functions.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.inc.php
 %%WWWDIR%%/lang/cs.inc.php
 %%WWWDIR%%/lang/de.inc.php
 %%WWWDIR%%/lang/en.inc.php
@@ -38,7 +40,6 @@
 %%WWWDIR%%/lang/ru.inc.php
 %%WWWDIR%%/lang/sk.inc.php
 %%WWWDIR%%/lang/zh.inc.php
-%%WWWDIR%%/minus.gif
 %%WWWDIR%%/plus.gif
 %%WWWDIR%%/privileges.inc.php
 %%WWWDIR%%/procedure.inc.php
@@ -47,34 +48,11 @@
 %%WWWDIR%%/select.inc.php
 %%WWWDIR%%/sql.inc.php
 %%WWWDIR%%/table.inc.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/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/logout.html
-%%WWWDIR%%/tests/selenium.html
-%%WWWDIR%%/todo.txt
 %%WWWDIR%%/trigger.inc.php
 %%WWWDIR%%/up.gif
 %%WWWDIR%%/user.inc.php
+%%WWWDIR%%/variables.inc.php
 %%WWWDIR%%/view.inc.php
-@dirrm %%WWWDIR%%/tests
+@dirrm %%WWWDIR%%/include
 @dirrm %%WWWDIR%%/lang
 @dirrm %%WWWDIR%%
diff --git a/databases/phpminadmin/Makefile b/databases/phpminadmin/Makefile
deleted file mode 100644
index 9d214f8495e8..000000000000
--- a/databases/phpminadmin/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:   phpMinAdmin
-# Date created:			28 August 2008
-# Whom:				Wen Heping <wenheping@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	phpminadmin
-PORTVERSION=	1.10.0
-CATEGORIES=	databases www
-MASTER_SITES=	SF
-DISTNAME=	phpMinAdmin-${PORTVERSION}
-
-MAINTAINER=	wenheping@gmail.com
-COMMENT=	A MySQL Management Tool Written in PHP
-
-USE_ZIP=	yes
-NO_BUILD=	yes
-USE_PHP=	mysql session
-SUB_FILES=	pkg-message
-
-do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} 755 -R ${WWWDIR}' \
-		>> ${TMPPLIST}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/databases/phpminadmin/distinfo b/databases/phpminadmin/distinfo
deleted file mode 100644
index 2e9f040469c8..000000000000
--- a/databases/phpminadmin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (phpMinAdmin-1.10.0.zip) = 66359cedeaa5cb394e91cb3c1881fc1d
-SHA256 (phpMinAdmin-1.10.0.zip) = 6207094ec889e2dfc369ad14fe3d179e3bba268dfef867187ef4e99b468bde52
-SIZE (phpMinAdmin-1.10.0.zip) = 114214
diff --git a/databases/phpminadmin/files/pkg-message.in b/databases/phpminadmin/files/pkg-message.in
deleted file mode 100644
index d6d9712a7e5c..000000000000
--- a/databases/phpminadmin/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-
-POST-INSTALL CONFIGURATION FOR phpminadmin
-=====================================
-
-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 /phpminadmin %%WWWDIR%%
-   AcceptPathInfo On
-   <Directory %%WWWDIR%%>
-      AllowOverride None
-      Order Allow,Deny
-      Allow from all
-   </Directory>
-
-Then you can visit your phpminadmin site with a browser
-(i.e. http://your.server.com/phpminadmin/)
-
-=====================================
diff --git a/databases/phpminadmin/pkg-descr b/databases/phpminadmin/pkg-descr
deleted file mode 100644
index 529132c6b4a9..000000000000
--- a/databases/phpminadmin/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-phpMinAdmin is a MySQL management tool written in PHP.
-Currently it can create database, create/drop/alter
-tables, create/drop/alter stored procedures, functions
-and triggers, delete/edit/add fields, execute any SQL
-statement, and manage keys on fields. The main difference
-between phpMinAdmin and phpMyAdmin is that phpMinAdmin
-is light-weight.
-
-WWW: http://phpminadmin.sourceforge.net
diff --git a/databases/phpminadmin/pkg-plist b/databases/phpminadmin/pkg-plist
deleted file mode 100644
index 41564c283d8c..000000000000
--- a/databases/phpminadmin/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-%%WWWDIR%%/SciTE.properties
-%%WWWDIR%%/SciTEAbbrev.properties
-%%WWWDIR%%/_compile.php
-%%WWWDIR%%/_coverage.php
-%%WWWDIR%%/_lang.php
-%%WWWDIR%%/abstraction.inc.php
-%%WWWDIR%%/arrow.gif
-%%WWWDIR%%/auth.inc.php
-%%WWWDIR%%/call.inc.php
-%%WWWDIR%%/changes.txt
-%%WWWDIR%%/connect.inc.php
-%%WWWDIR%%/create.inc.php
-%%WWWDIR%%/createv.inc.php
-%%WWWDIR%%/database.inc.php
-%%WWWDIR%%/default.css
-%%WWWDIR%%/design.inc.php
-%%WWWDIR%%/down.gif
-%%WWWDIR%%/download.inc.php
-%%WWWDIR%%/dump.inc.php
-%%WWWDIR%%/edit.inc.php
-%%WWWDIR%%/editing.inc.php
-%%WWWDIR%%/event.inc.php
-%%WWWDIR%%/export.inc.php
-%%WWWDIR%%/favicon.ico
-%%WWWDIR%%/foreign.inc.php
-%%WWWDIR%%/functions.inc.php
-%%WWWDIR%%/index.php
-%%WWWDIR%%/indexes.inc.php
-%%WWWDIR%%/lang.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%%/minus.gif
-%%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%%/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/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/logout.html
-%%WWWDIR%%/tests/selenium.html
-%%WWWDIR%%/todo.txt
-%%WWWDIR%%/trigger.inc.php
-%%WWWDIR%%/up.gif
-%%WWWDIR%%/user.inc.php
-%%WWWDIR%%/view.inc.php
-@dirrm %%WWWDIR%%/tests
-@dirrm %%WWWDIR%%/lang
-@dirrm %%WWWDIR%%