3 files changed, 182 insertions, 80 deletions

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index f7dfc91262c3..b1bf91eac85c 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	phppgadmin
-PORTVERSION=	2.4.2
+PORTVERSION=	3.0
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	phpPgAdmin_${PORTVERSION:S/./-/g}
+DISTNAME=	phpPgAdmin-${PORTVERSION}
 
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
-.if !defined(WITH_PHP3)
 .if defined(WITH_APACHE2)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
 .else
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 .endif
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
-.endif
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
+USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/phpPgAdmin
 NO_BUILD=	YES
 
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index a4cc375a36d0..1e49485a7607 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1 +1 @@
-MD5 (phpPgAdmin_2-4-2.tar.gz) = 66ed3296d7d4b2dcc71df24092b82ba8
+MD5 (phpPgAdmin-3.0.tar.bz2) = c0e04a526c2d9e88f865f3a740f02b60
diff --git a/databases/phppgadmin/pkg-plist b/databases/phppgadmin/pkg-plist
index fd702f9921e9..15c556da18c5 100644
--- a/databases/phppgadmin/pkg-plist
+++ b/databases/phppgadmin/pkg-plist
@@ -1,85 +1,190 @@
 www/data.default/phpPgAdmin/BUGS
-www/data.default/phpPgAdmin/ChangeLog
+www/data.default/phpPgAdmin/CREDITS
 www/data.default/phpPgAdmin/DEVELOPERS
-www/data.default/phpPgAdmin/Documentation.html
+www/data.default/phpPgAdmin/FAQ
+www/data.default/phpPgAdmin/HISTORY
 www/data.default/phpPgAdmin/INSTALL
-www/data.default/phpPgAdmin/README
+www/data.default/phpPgAdmin/LICENSE
 www/data.default/phpPgAdmin/TODO
+www/data.default/phpPgAdmin/TRANSLATORS
 www/data.default/phpPgAdmin/all_db.php
-www/data.default/phpPgAdmin/basque.inc.php
-www/data.default/phpPgAdmin/castellano.inc.php
-www/data.default/phpPgAdmin/catalan.inc.php
-www/data.default/phpPgAdmin/chinese_big5.inc.php
-www/data.default/phpPgAdmin/chinese_gb.inc.php
-www/data.default/phpPgAdmin/config.inc.php-dist
-www/data.default/phpPgAdmin/danish.inc.php
-www/data.default/phpPgAdmin/dutch.inc.php
-www/data.default/phpPgAdmin/db_create.php
-www/data.default/phpPgAdmin/db_details.php
-www/data.default/phpPgAdmin/db_dump.php
-www/data.default/phpPgAdmin/db_privilege.php
-www/data.default/phpPgAdmin/db_readdump.php
-www/data.default/phpPgAdmin/dutch.inc.php
-www/data.default/phpPgAdmin/english.inc.php
-www/data.default/phpPgAdmin/extchg.sh
-www/data.default/phpPgAdmin/file_sql.php
-www/data.default/phpPgAdmin/footer.inc.php
-www/data.default/phpPgAdmin/french.inc.php
-www/data.default/phpPgAdmin/func_edit.php
-www/data.default/phpPgAdmin/func_properties.php
-www/data.default/phpPgAdmin/german.inc.php
-www/data.default/phpPgAdmin/grp_admin.php
-www/data.default/phpPgAdmin/header.inc.php
-www/data.default/phpPgAdmin/hung.inc.php
-www/data.default/phpPgAdmin/images/.cvsignore
-www/data.default/phpPgAdmin/images/bkg.gif
-www/data.default/phpPgAdmin/images/browse.gif
-www/data.default/phpPgAdmin/images/minus.gif
-www/data.default/phpPgAdmin/images/plus.gif
-www/data.default/phpPgAdmin/images/spacer.gif
+www/data.default/phpPgAdmin/bottombar.php
+www/data.default/phpPgAdmin/browser.php
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/TreeMenu.js
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/TreeMenu.php
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/branch.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/branchbottom.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/branchtop.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/folder-expanded.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/folder.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/line.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/linebottom.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/minus.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/minusbottom.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/minustop.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/plus.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/plusbottom.gif
+www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images/plustop.gif
+www/data.default/phpPgAdmin/classes/Misc.php
+www/data.default/phpPgAdmin/classes/Reports.php
+www/data.default/phpPgAdmin/classes/class.select.php
+www/data.default/phpPgAdmin/classes/database/ADODB_base.php
+www/data.default/phpPgAdmin/classes/database/BaseDB.php
+www/data.default/phpPgAdmin/classes/database/MySQL.php
+www/data.default/phpPgAdmin/classes/database/Postgres.php
+www/data.default/phpPgAdmin/classes/database/Postgres71.php
+www/data.default/phpPgAdmin/classes/database/Postgres72.php
+www/data.default/phpPgAdmin/classes/database/Postgres73.php
+www/data.default/phpPgAdmin/classes/database/Postgres74.php
+www/data.default/phpPgAdmin/conf/.cvsignore
+@unexec if cmp -s %D/www/data.default/phpPgAdmin3/conf/config.inc.php %D/www/data.default/phpPgAdmin3/conf/config.inc.php-dist; then rm -f %D/www/data.default/phpPgAdmin3/conf/config.inc.php; fi
+www/data.default/phpPgAdmin3/conf/config.inc.php-dist
+@exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php
+www/data.default/phpPgAdmin/constraints.php
+www/data.default/phpPgAdmin/database.php
+www/data.default/phpPgAdmin/databases.php
+www/data.default/phpPgAdmin/display.php
+www/data.default/phpPgAdmin/functions.php
+www/data.default/phpPgAdmin/groups.php
+www/data.default/phpPgAdmin/images/themes/default/database.gif
+www/data.default/phpPgAdmin/images/themes/default/functions.gif
+www/data.default/phpPgAdmin/images/themes/default/operators.gif
+www/data.default/phpPgAdmin/images/themes/default/sequences.gif
+www/data.default/phpPgAdmin/images/themes/default/tables.gif
+www/data.default/phpPgAdmin/images/themes/default/title.gif
+www/data.default/phpPgAdmin/images/themes/default/triggers.gif
+www/data.default/phpPgAdmin/images/themes/default/types.gif
+www/data.default/phpPgAdmin/images/themes/default/views.gif
 www/data.default/phpPgAdmin/index.php
-www/data.default/phpPgAdmin/italian.inc.php
-www/data.default/phpPgAdmin/ldi_check.php
-www/data.default/phpPgAdmin/ldi_table.php
-www/data.default/phpPgAdmin/left.js
-www/data.default/phpPgAdmin/left.php
-www/data.default/phpPgAdmin/lib.inc.php
-www/data.default/phpPgAdmin/login.inc.php
-www/data.default/phpPgAdmin/main.php
-www/data.default/phpPgAdmin/norwegian.inc.php
-www/data.default/phpPgAdmin/oper_create.php
-www/data.default/phpPgAdmin/oper_properties.php
-www/data.default/phpPgAdmin/polish.inc.php
-www/data.default/phpPgAdmin/portuguese.inc.php
-www/data.default/phpPgAdmin/rep_create.php
-www/data.default/phpPgAdmin/rep_properties.php
+www/data.default/phpPgAdmin/indexes.js
+www/data.default/phpPgAdmin/indexes.php
+www/data.default/phpPgAdmin/intro.php
+www/data.default/phpPgAdmin/lang/Makefile
+www/data.default/phpPgAdmin/lang/chinese-sim.php
+www/data.default/phpPgAdmin/lang/chinese-tr.php
+www/data.default/phpPgAdmin/lang/czech.php
+www/data.default/phpPgAdmin/lang/dutch.php
+www/data.default/phpPgAdmin/lang/english.php
+www/data.default/phpPgAdmin/lang/french.php
+www/data.default/phpPgAdmin/lang/german.php
+www/data.default/phpPgAdmin/lang/italian.php
+www/data.default/phpPgAdmin/lang/japanese.php
+www/data.default/phpPgAdmin/lang/langcheck
+www/data.default/phpPgAdmin/lang/polish.php
+www/data.default/phpPgAdmin/lang/portuguese-br.php
+www/data.default/phpPgAdmin/lang/recoded/README
+www/data.default/phpPgAdmin/lang/recoded/chinese-sim.php
+www/data.default/phpPgAdmin/lang/recoded/chinese-tr.php
+www/data.default/phpPgAdmin/lang/recoded/czech.php
+www/data.default/phpPgAdmin/lang/recoded/dutch.php
+www/data.default/phpPgAdmin/lang/recoded/english.php
+www/data.default/phpPgAdmin/lang/recoded/french.php
+www/data.default/phpPgAdmin/lang/recoded/german.php
+www/data.default/phpPgAdmin/lang/recoded/italian.php
+www/data.default/phpPgAdmin/lang/recoded/japanese.php
+www/data.default/phpPgAdmin/lang/recoded/polish.php
+www/data.default/phpPgAdmin/lang/recoded/portuguese-br.php
+www/data.default/phpPgAdmin/lang/recoded/russian.php
+www/data.default/phpPgAdmin/lang/recoded/slovak.php
+www/data.default/phpPgAdmin/lang/recoded/spanish.php
+www/data.default/phpPgAdmin/lang/recoded/turkish.php
+www/data.default/phpPgAdmin/lang/russian.php
+www/data.default/phpPgAdmin/lang/slovak.php
+www/data.default/phpPgAdmin/lang/spanish.php
+www/data.default/phpPgAdmin/lang/synch
+www/data.default/phpPgAdmin/lang/turkish.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-connection.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-cryptsession.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-csvlib.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-datadict.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-errorhandler.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-errorpear.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-lib.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-pager.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-pear.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-recordset.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-session.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb-time.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/adodb.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/crypt.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/datadict/datadict-mssql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/datadict/datadict-mysql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/datadict/datadict-oci8.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/datadict/datadict-postgres.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-access.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-ado.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-ado_access.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-ado_mssql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-borland_ibase.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-csv.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-db2.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-fbsql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-firebird.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-ibase.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-informix.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-informix72.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-mssql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-mssqlpo.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-mysql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-mysqlt.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-oci8.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-oci805.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-oci8po.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-odbc.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-oracle.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-postgres.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-postgres64.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-postgres7.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-proxy.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-sybase.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/drivers/adodb-vfp.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/license.txt
+www/data.default/phpPgAdmin/libraries/adodb/pivottable.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/readme.txt
+www/data.default/phpPgAdmin/libraries/adodb/rsfilter.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/server.php
+www/data.default/phpPgAdmin/libraries/adodb/toexport.inc.php
+www/data.default/phpPgAdmin/libraries/adodb/tohtml.inc.php
+www/data.default/phpPgAdmin/libraries/errorhandler.inc.php
+www/data.default/phpPgAdmin/libraries/lib.inc.php
+www/data.default/phpPgAdmin/login.php
+www/data.default/phpPgAdmin/logout.php
+www/data.default/phpPgAdmin/privileges.php
 www/data.default/phpPgAdmin/reports.php
-www/data.default/phpPgAdmin/russian-koi8.inc.php
-www/data.default/phpPgAdmin/russian-win1251.inc.php
-www/data.default/phpPgAdmin/seq_create.php
-www/data.default/phpPgAdmin/spanish.inc.php
+www/data.default/phpPgAdmin/rules.php
+www/data.default/phpPgAdmin/schema.php
+www/data.default/phpPgAdmin/sequences.php
 www/data.default/phpPgAdmin/sql.php
-www/data.default/phpPgAdmin/tbl_addfield.php
-www/data.default/phpPgAdmin/tbl_alter.php
-www/data.default/phpPgAdmin/tbl_alter_drop.php
-www/data.default/phpPgAdmin/tbl_change.php
-www/data.default/phpPgAdmin/tbl_copy.php
-www/data.default/phpPgAdmin/tbl_create.php
-www/data.default/phpPgAdmin/tbl_dump.php
-www/data.default/phpPgAdmin/tbl_form.inc.php
-www/data.default/phpPgAdmin/tbl_privilege.php
-www/data.default/phpPgAdmin/tbl_properties.inc.php
-www/data.default/phpPgAdmin/tbl_properties.php
-www/data.default/phpPgAdmin/tbl_qbe.php
-www/data.default/phpPgAdmin/tbl_rename.php
-www/data.default/phpPgAdmin/tbl_replace.php
-www/data.default/phpPgAdmin/tbl_select.php
-www/data.default/phpPgAdmin/trig_create.php
-www/data.default/phpPgAdmin/trig_properties.php
-www/data.default/phpPgAdmin/turkish.inc.php
-www/data.default/phpPgAdmin/user_admin.php
-www/data.default/phpPgAdmin/view_create.php
+www/data.default/phpPgAdmin/sql/reports-pgsql.sql
+www/data.default/phpPgAdmin/tables.php
+www/data.default/phpPgAdmin/tblexport.php
+www/data.default/phpPgAdmin/tblproperties.php
+www/data.default/phpPgAdmin/themes/default/global.css
+www/data.default/phpPgAdmin/topbar.php
+www/data.default/phpPgAdmin/triggers.php
+www/data.default/phpPgAdmin/types.php
+www/data.default/phpPgAdmin/users.php
+www/data.default/phpPgAdmin/views.php
+@dirrm www/data.default/phpPgAdmin/themes/default
+@dirrm www/data.default/phpPgAdmin/themes
+@dirrm www/data.default/phpPgAdmin/sql
+@dirrm www/data.default/phpPgAdmin/libraries/adodb/drivers
+@dirrm www/data.default/phpPgAdmin/libraries/adodb/datadict
+@dirrm www/data.default/phpPgAdmin/libraries/adodb
+@dirrm www/data.default/phpPgAdmin/libraries
+@dirrm www/data.default/phpPgAdmin/lang/recoded
+@dirrm www/data.default/phpPgAdmin/lang
+@dirrm www/data.default/phpPgAdmin/images/themes/default
+@dirrm www/data.default/phpPgAdmin/images/themes
 @dirrm www/data.default/phpPgAdmin/images
+@dirrm www/data.default/phpPgAdmin/conf
+@dirrm www/data.default/phpPgAdmin/classes/database
+@dirrm www/data.default/phpPgAdmin/classes/HTML_TreeMenu/images
+@dirrm www/data.default/phpPgAdmin/classes/HTML_TreeMenu
+@dirrm www/data.default/phpPgAdmin/classes
 @dirrm www/data.default/phpPgAdmin
 @unexec if [ -L %D/www/data.default ]; then rm -f %D/www/data.default; fi
 @unexec if [ -L %D/www ]; then rm -f %D/www; fi