- Update to 3.2.1

- change default dependency to mod_php4 with postgresql
  which resolves some conflicts
- take maintanership
PR:		62956

3 files changed, 31 insertions, 18 deletions

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index c96e9ff929ec..4c9a263cfbd1 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	phppgadmin
-PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	phpPgAdmin-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-
 USE_BZIP2=	yes
 USE_PHP=	yes
 WRKSRC=		${WRKDIR}/phpPgAdmin
 NO_BUILD=	YES
 
+PHP_PORT?=	www/mod_php4-twig
 PGADMDIR?=      www/data/phpPgAdmin
 PLIST_SUB+=     PGADMDIR=${PGADMDIR}
 
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index 7026f1238793..6bb962092c68 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1 +1,2 @@
-MD5 (phpPgAdmin-3.0.1.tar.bz2) = 0a7ef2d4675e8800b3e02807cf1e3ac5
+MD5 (phpPgAdmin-3.2.1.tar.bz2) = d4ff4fd3be278fb06a37097f7be4baa4
+SIZE (phpPgAdmin-3.2.1.tar.bz2) = 332780
diff --git a/databases/phppgadmin/pkg-plist b/databases/phppgadmin/pkg-plist
index d3b4c1ea8b1f..99c94647e183 100644
--- a/databases/phppgadmin/pkg-plist
+++ b/databases/phppgadmin/pkg-plist
@@ -10,6 +10,7 @@
 %%PGADMDIR%%/all_db.php
 %%PGADMDIR%%/bottombar.php
 %%PGADMDIR%%/browser.php
+%%PGADMDIR%%/casts.php
 %%PGADMDIR%%/classes/HTML_TreeMenu/TreeMenu.js
 %%PGADMDIR%%/classes/HTML_TreeMenu/TreeMenu.php
 %%PGADMDIR%%/classes/HTML_TreeMenu/images/branch.gif
@@ -30,36 +31,42 @@
 %%PGADMDIR%%/classes/class.select.php
 %%PGADMDIR%%/classes/database/ADODB_base.php
 %%PGADMDIR%%/classes/database/BaseDB.php
-%%PGADMDIR%%/classes/database/MySQL.php
 %%PGADMDIR%%/classes/database/Postgres.php
 %%PGADMDIR%%/classes/database/Postgres71.php
 %%PGADMDIR%%/classes/database/Postgres72.php
 %%PGADMDIR%%/classes/database/Postgres73.php
 %%PGADMDIR%%/classes/database/Postgres74.php
+%%PGADMDIR%%/classes/database/Postgres75.php
 %%PGADMDIR%%/conf/.cvsignore
 @unexec if cmp -s %D/%%PGADMDIR%%/conf/config.inc.php %D/%%PGADMDIR%%/conf/config.inc.php-dist; then rm -f %D/%%PGADMDIR%%/conf/config.inc.php; fi
 %%PGADMDIR%%/conf/config.inc.php-dist
 @exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php
 %%PGADMDIR%%/constraints.php
+%%PGADMDIR%%/conversions.php
 %%PGADMDIR%%/database.php
 %%PGADMDIR%%/databases.php
+%%PGADMDIR%%/dataexport.php
 %%PGADMDIR%%/display.php
+%%PGADMDIR%%/domains.php
 %%PGADMDIR%%/functions.php
 %%PGADMDIR%%/groups.php
-%%PGADMDIR%%/images/themes/default/database.gif
-%%PGADMDIR%%/images/themes/default/functions.gif
-%%PGADMDIR%%/images/themes/default/operators.gif
-%%PGADMDIR%%/images/themes/default/sequences.gif
-%%PGADMDIR%%/images/themes/default/tables.gif
-%%PGADMDIR%%/images/themes/default/title.gif
-%%PGADMDIR%%/images/themes/default/triggers.gif
-%%PGADMDIR%%/images/themes/default/types.gif
-%%PGADMDIR%%/images/themes/default/views.gif
+%%PGADMDIR%%/images/themes/default/database.png
+%%PGADMDIR%%/images/themes/default/domains.png
+%%PGADMDIR%%/images/themes/default/functions.png
+%%PGADMDIR%%/images/themes/default/operators.png
+%%PGADMDIR%%/images/themes/default/sequences.png
+%%PGADMDIR%%/images/themes/default/tables.png
+%%PGADMDIR%%/images/themes/default/title.png
+%%PGADMDIR%%/images/themes/default/triggers.png
+%%PGADMDIR%%/images/themes/default/types.png
+%%PGADMDIR%%/images/themes/default/views.png
 %%PGADMDIR%%/index.php
 %%PGADMDIR%%/indexes.js
 %%PGADMDIR%%/indexes.php
+%%PGADMDIR%%/info.php
 %%PGADMDIR%%/intro.php
 %%PGADMDIR%%/lang/Makefile
+%%PGADMDIR%%/lang/afrikaans.php
 %%PGADMDIR%%/lang/chinese-sim.php
 %%PGADMDIR%%/lang/chinese-tr.php
 %%PGADMDIR%%/lang/czech.php
@@ -67,12 +74,14 @@
 %%PGADMDIR%%/lang/english.php
 %%PGADMDIR%%/lang/french.php
 %%PGADMDIR%%/lang/german.php
+%%PGADMDIR%%/lang/hungarian.php
 %%PGADMDIR%%/lang/italian.php
 %%PGADMDIR%%/lang/japanese.php
 %%PGADMDIR%%/lang/langcheck
 %%PGADMDIR%%/lang/polish.php
 %%PGADMDIR%%/lang/portuguese-br.php
 %%PGADMDIR%%/lang/recoded/README
+%%PGADMDIR%%/lang/recoded/afrikaans.php
 %%PGADMDIR%%/lang/recoded/chinese-sim.php
 %%PGADMDIR%%/lang/recoded/chinese-tr.php
 %%PGADMDIR%%/lang/recoded/czech.php
@@ -80,6 +89,7 @@
 %%PGADMDIR%%/lang/recoded/english.php
 %%PGADMDIR%%/lang/recoded/french.php
 %%PGADMDIR%%/lang/recoded/german.php
+%%PGADMDIR%%/lang/recoded/hungarian.php
 %%PGADMDIR%%/lang/recoded/italian.php
 %%PGADMDIR%%/lang/recoded/japanese.php
 %%PGADMDIR%%/lang/recoded/polish.php
@@ -87,12 +97,15 @@
 %%PGADMDIR%%/lang/recoded/russian.php
 %%PGADMDIR%%/lang/recoded/slovak.php
 %%PGADMDIR%%/lang/recoded/spanish.php
+%%PGADMDIR%%/lang/recoded/swedish.php
 %%PGADMDIR%%/lang/recoded/turkish.php
 %%PGADMDIR%%/lang/russian.php
 %%PGADMDIR%%/lang/slovak.php
 %%PGADMDIR%%/lang/spanish.php
+%%PGADMDIR%%/lang/swedish.php
 %%PGADMDIR%%/lang/synch
 %%PGADMDIR%%/lang/turkish.php
+%%PGADMDIR%%/languages.php
 %%PGADMDIR%%/libraries/adodb/adodb-connection.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-cryptsession.php
 %%PGADMDIR%%/libraries/adodb/adodb-csvlib.inc.php
@@ -152,15 +165,17 @@
 %%PGADMDIR%%/libraries/lib.inc.php
 %%PGADMDIR%%/login.php
 %%PGADMDIR%%/logout.php
+%%PGADMDIR%%/operators.php
 %%PGADMDIR%%/privileges.php
 %%PGADMDIR%%/reports.php
+%%PGADMDIR%%/robots.txt
 %%PGADMDIR%%/rules.php
 %%PGADMDIR%%/schema.php
 %%PGADMDIR%%/sequences.php
 %%PGADMDIR%%/sql.php
 %%PGADMDIR%%/sql/reports-pgsql.sql
+%%PGADMDIR%%/sqledit.php
 %%PGADMDIR%%/tables.php
-%%PGADMDIR%%/tblexport.php
 %%PGADMDIR%%/tblproperties.php
 %%PGADMDIR%%/themes/default/global.css
 %%PGADMDIR%%/topbar.php