Update to phpPgAdmin-3.4.1, based on patches submitted in PR pkg/26539

by Sergio Jimenez.

The full change list since 2.4 is not available, and even the changes in 3.x
line are too numberous to list. See package file HISTORY for details.

Highlights include much more complete support for various PostgreSQL features,
full support for version up to and including 8.0 beta1, localization
to many languages.

6 files changed, 307 insertions, 119 deletions

diff --git a/databases/phppgadmin/DESCR b/databases/phppgadmin/DESCR
index 8f0a9d67186..fcb2628969e 100644
--- a/databases/phppgadmin/DESCR
+++ b/databases/phppgadmin/DESCR
@@ -1,15 +1,25 @@
-phpPgAdmin is phpMyAdmin (for MySQL) ported to PostgreSQL.  phpPgAdmin
-is a fully functional PostgreSQL administration utility.  You can use
-it to create an maintain multiple databases and even multiple servers.
+phpPgAdmin is a web-based administration tool for PostgreSQL. It is perfect
+for PostgreSQL DBAs, newbies and hosting services.
 
 Features include:
-
-- create and drop databases
-- create, copy, drop and alter table/view/sequence/function/indicie/trigger
-- edit and add fields (to the extent Postgres allows)
-- execute any SQL-statement, even batch-queries
-- manage primary and unique keys
-- create and read dumps of tables
-- administer one single database
-- administer multiple servers
-- administer postgres users and groups
+- Administer multiple servers
+- Support for PostgreSQL 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x and 8.0.0beta1
+- Manage all aspects of:
+  * Users & groups
+  * Databases
+  * Schemas
+  * Tables, indexes, constraints, triggers, rules & privileges,
+  * Views, sequences & functions
+  * Advanced objects
+  * Reports
+- Easy data manipulation:
+  * Browse tables, views & reports
+  * Execute arbitrary SQL
+  * Select, insert, update and delete
+- Dump table data in a variety of formats: SQL, COPY, XML, XHTML, CSV, Tabbed,
+  pg_dump
+- Import SQL scripts, COPY data, XML, CSV and Tabbed
+- Excellent language support: 
+  * Available in 18 languages
+  * No encoding conflicts. Edit Russian data using a Japanese interface!
+- Easy to install and configure
diff --git a/databases/phppgadmin/MESSAGE b/databases/phppgadmin/MESSAGE
index f1d18fef9a4..0ded3f6d591 100644
--- a/databases/phppgadmin/MESSAGE
+++ b/databases/phppgadmin/MESSAGE
@@ -1,16 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/06 17:40:46 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2004/10/09 16:23:43 jdolecek Exp $
 
-Copy required files from ${PREFIX}/share/phppgadmin to your web
-space. Do not edit "config.inc.php-dist", copy it to "config.inc.php" and
-configure it for your needs. Remember that PHP should be configured to
-have "magic_quotes=on".
+In order to use ${PKGNAME} under Apache/PHP, include following in your
+server configuration:
 
-You may want to set the following variables in config.inc.php:
+Include ${EGDIR}/apache.conf
 
-	$cfgDefaultDB                       = "mydb";
-	$cfgSuperUser                       = "pgsql";
-	$cfgServers[1]['host']              = 'localhost';
-	$cfgServers[1]['user']              = 'pgsql'
+This makes ${PKGNAME} available on your server as:
+
+	http://www.yourdomain.com/phppgadmin/
+
+Your Apache server must also be configured to support PHP, and PHP
+must be configured to support PostgreSQL by including this in php.ini:
+
+extension=pgsql.so 
 
 ===========================================================================
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 01635d87b56..54a57b3123f 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,35 +1,73 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 01:14:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/09 16:23:43 jdolecek Exp $
 
-DISTNAME=	phpPgAdmin_2-4-2
-PKGNAME=	phppgadmin-2.4.2
-PKGREVISION=	1
+DISTNAME=	phpPgAdmin-3.4.1
+PKGREVISION=	# empty
+PKGNAME=	${DISTNAME:S/PgAdmin/pgadmin/}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phppgadmin/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	sjr@hispabsd.org
+MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://phppgadmin.sourceforge.net/
 COMMENT=	Set of PHP-scripts to administer PostgreSQL over the WWW
 
-DEPENDS+=	php-pgsql>=4.1.2:../../databases/php4-pgsql
+DEPENDS+=	php-pgsql>=4.2.0:../../databases/php4-pgsql
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_2-4-2//}
+MESSAGE_SUBST+=	EGDIR=${EGDIR}
+
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
 NO_BUILD=	YES
 NO_BUILDLINK=	YES
+USE_PKGINSTALL=	YES
+
+PHPPGBASE=	${PREFIX}/share/phppgadmin
+PHPPGHIER=	classes/HTML_TreeMenu/images images/themes/default	\
+		libraries/adodb/datadict libraries/adodb/drivers 	\
+		classes/database lang/recoded themes/default sql conf
 
-DOC_FILES=	BUGS ChangeLog Documentation.html \
-		INSTALL README TODO
+PKG_SYSCONFDIR.phppgadmin=	${PREFIX}/share/phppgadmin/conf
+EGDIR=		${PREFIX}/share/examples/phppgadmin
+DOCDIR=		${PREFIX}/share/doc/phpgadmin
+CONF_FILES=	${EGDIR}/config.inc.php-dist ${PKG_SYSCONFDIR}/config.inc.php
+DOC_FILES=	CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO \
+		TRANSLATORS
+
+do-configure:
+	${SED} -e "s#/usr/bin/pg#${PREFIX}/bin/pg#" \
+		${WRKSRC}/conf/config.inc.php-dist > ${WRKSRC}/conf/config.inc.php-dist.tmp
+	${MV} ${WRKSRC}/conf/config.inc.php-dist.tmp ${WRKSRC}/conf/config.inc.php-dist
+	${SED} -e "s#@PHPPGBASE@#${PHPPGBASE}#g" ${FILESDIR}/apache.conf-dist \
+		> ${WRKDIR}/apache.conf
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phppgadmin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/phppgadmin/images
-	${INSTALL_SCRIPT} ${WRKSRC}/*.js ${PREFIX}/share/phppgadmin
-	${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/phppgadmin
-	${INSTALL_SCRIPT} ${WRKSRC}/config.inc.php-dist ${PREFIX}/share/phppgadmin
-	${INSTALL_DATA} ${WRKSRC}/images/*.* ${PREFIX}/share/phppgadmin/images
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phppgadmin
-	for f in ${DOC_FILES}; do					\
-	  ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/phppgadmin;	\
+	${INSTALL_DATA_DIR} ${PHPPGBASE}
+	${INSTALL_DATA_DIR} ${EGDIR}
+
+	for d in ${PHPPGHIER}; do                                       \
+	        ${INSTALL_DATA_DIR} ${PHPPGBASE}/$$d;                   \
+	done
+
+	${INSTALL_SCRIPT} ${WRKSRC}/*.* ${PHPPGBASE}
+	${INSTALL_SCRIPT} ${WRKSRC}/classes/*.* ${PHPPGBASE}/classes
+	${INSTALL_SCRIPT} ${WRKSRC}/classes/HTML_TreeMenu/*.* ${PHPPGBASE}/classes/HTML_TreeMenu
+	${INSTALL_DATA} ${WRKSRC}/classes/HTML_TreeMenu/images/* ${PHPPGBASE}/classes/HTML_TreeMenu/images
+	${INSTALL_SCRIPT} ${WRKSRC}/classes/database/* ${PHPPGBASE}/classes/database
+	${INSTALL_SCRIPT} ${WRKSRC}/sql/* ${PHPPGBASE}/sql
+	${INSTALL_DATA} ${WRKSRC}/images/themes/default/*.png ${PHPPGBASE}/images/themes/default
+	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.* ${PHPPGBASE}/lang
+	${INSTALL_SCRIPT} ${WRKSRC}/lang/recoded/*.* ${PHPPGBASE}/lang/recoded
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/*.php ${PHPPGBASE}/libraries
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/adodb/*.php ${PHPPGBASE}/libraries/adodb
+	${INSTALL_DATA} ${WRKSRC}/libraries/adodb/*.txt ${PHPPGBASE}/libraries/adodb
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/adodb/datadict/* ${PHPPGBASE}/libraries/adodb/datadict
+	${INSTALL_SCRIPT} ${WRKSRC}/libraries/adodb/drivers/* ${PHPPGBASE}/libraries/adodb/drivers
+	${INSTALL_DATA} ${WRKSRC}/themes/default/global.css ${PHPPGBASE}/themes/default
+	${INSTALL_DATA} ${WRKSRC}/conf/config.inc.php-dist ${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/apache.conf ${EGDIR}
+
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	for f in ${DOC_FILES}; do                                       \
+	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCDIR};                      \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/phppgadmin/PLIST b/databases/phppgadmin/PLIST
index 642378d9fcc..6f24a5ac4e5 100644
--- a/databases/phppgadmin/PLIST
+++ b/databases/phppgadmin/PLIST
@@ -1,81 +1,209 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/23 12:13:35 agc Exp $
-share/doc/phppgadmin/BUGS
-share/doc/phppgadmin/ChangeLog
-share/doc/phppgadmin/Documentation.html
-share/doc/phppgadmin/INSTALL
-share/doc/phppgadmin/README
-share/doc/phppgadmin/TODO
+@comment $NetBSD: PLIST,v 1.2 2004/10/09 16:23:43 jdolecek Exp $
+share/doc/phpgadmin/CREDITS
+share/doc/phpgadmin/DEVELOPERS
+share/doc/phpgadmin/FAQ
+share/doc/phpgadmin/HISTORY
+share/doc/phpgadmin/INSTALL
+share/doc/phpgadmin/LICENSE
+share/doc/phpgadmin/TODO
+share/doc/phpgadmin/TRANSLATORS
+share/examples/phppgadmin/config.inc.php-dist
+share/examples/phppgadmin/apache.conf
+share/phppgadmin/aggregates.php
 share/phppgadmin/all_db.php
-share/phppgadmin/basque.inc.php
-share/phppgadmin/castellano.inc.php
-share/phppgadmin/catalan.inc.php
-share/phppgadmin/chinese_big5.inc.php
-share/phppgadmin/chinese_gb.inc.php
-share/phppgadmin/config.inc.php-dist
-share/phppgadmin/danish.inc.php
-share/phppgadmin/db_create.php
-share/phppgadmin/db_details.php
-share/phppgadmin/db_dump.php
-share/phppgadmin/db_privilege.php
-share/phppgadmin/db_readdump.php
-share/phppgadmin/dutch.inc.php
-share/phppgadmin/english.inc.php
-share/phppgadmin/file_sql.php
-share/phppgadmin/footer.inc.php
-share/phppgadmin/french.inc.php
-share/phppgadmin/func_edit.php
-share/phppgadmin/func_properties.php
-share/phppgadmin/german.inc.php
-share/phppgadmin/grp_admin.php
-share/phppgadmin/header.inc.php
-share/phppgadmin/hung.inc.php
-share/phppgadmin/images/bkg.gif
-share/phppgadmin/images/browse.gif
-share/phppgadmin/images/minus.gif
-share/phppgadmin/images/plus.gif
-share/phppgadmin/images/spacer.gif
+share/phppgadmin/bottombar.php
+share/phppgadmin/browser.php
+share/phppgadmin/casts.php
+share/phppgadmin/classes/Gui.php
+share/phppgadmin/classes/HTML_TreeMenu/TreeMenu.js
+share/phppgadmin/classes/HTML_TreeMenu/TreeMenu.php
+share/phppgadmin/classes/HTML_TreeMenu/images/branch.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/branchbottom.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/branchtop.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/folder-expanded.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/folder.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/line.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/linebottom.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/minus.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/minusbottom.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/minustop.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/plus.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/plusbottom.gif
+share/phppgadmin/classes/HTML_TreeMenu/images/plustop.gif
+share/phppgadmin/classes/Misc.php
+share/phppgadmin/classes/Reports.php
+share/phppgadmin/classes/class.select.php
+share/phppgadmin/classes/database/ADODB_base.php
+share/phppgadmin/classes/database/BaseDB.php
+share/phppgadmin/classes/database/Connection.php
+share/phppgadmin/classes/database/Postgres.php
+share/phppgadmin/classes/database/Postgres71.php
+share/phppgadmin/classes/database/Postgres72.php
+share/phppgadmin/classes/database/Postgres73.php
+share/phppgadmin/classes/database/Postgres74.php
+share/phppgadmin/classes/database/Postgres75.php
+share/phppgadmin/conf/.pkgsrc
+share/phppgadmin/constraints.php
+share/phppgadmin/conversions.php
+share/phppgadmin/database.php
+share/phppgadmin/dataexport.php
+share/phppgadmin/dataimport.php
+share/phppgadmin/dbexport.php
+share/phppgadmin/display.php
+share/phppgadmin/domains.php
+share/phppgadmin/functions.php
+share/phppgadmin/groups.php
+share/phppgadmin/images/themes/default/database.png
+share/phppgadmin/images/themes/default/domains.png
+share/phppgadmin/images/themes/default/functions.png
+share/phppgadmin/images/themes/default/operators.png
+share/phppgadmin/images/themes/default/sequences.png
+share/phppgadmin/images/themes/default/tables.png
+share/phppgadmin/images/themes/default/title.png
+share/phppgadmin/images/themes/default/triggers.png
+share/phppgadmin/images/themes/default/types.png
+share/phppgadmin/images/themes/default/views.png
 share/phppgadmin/index.php
-share/phppgadmin/italian.inc.php
-share/phppgadmin/ldi_check.php
-share/phppgadmin/ldi_table.php
-share/phppgadmin/left.js
-share/phppgadmin/left.php
-share/phppgadmin/lib.inc.php
-share/phppgadmin/login.inc.php
-share/phppgadmin/main.php
-share/phppgadmin/norwegian.inc.php
-share/phppgadmin/oper_create.php
-share/phppgadmin/oper_properties.php
-share/phppgadmin/polish.inc.php
-share/phppgadmin/portuguese.inc.php
-share/phppgadmin/rep_create.php
-share/phppgadmin/rep_properties.php
+share/phppgadmin/indexes.js
+share/phppgadmin/indexes.php
+share/phppgadmin/info.php
+share/phppgadmin/intro.php
+share/phppgadmin/lang/afrikaans.php
+share/phppgadmin/lang/arabic.php
+share/phppgadmin/lang/chinese-sim.php
+share/phppgadmin/lang/chinese-tr.php
+share/phppgadmin/lang/convert.awk
+share/phppgadmin/lang/czech.php
+share/phppgadmin/lang/dutch.php
+share/phppgadmin/lang/english.php
+share/phppgadmin/lang/french.php
+share/phppgadmin/lang/german.php
+share/phppgadmin/lang/hungarian.php
+share/phppgadmin/lang/italian.php
+share/phppgadmin/lang/japanese.php
+share/phppgadmin/lang/polish.php
+share/phppgadmin/lang/portuguese-br.php
+share/phppgadmin/lang/recoded/afrikaans.php
+share/phppgadmin/lang/recoded/arabic.php
+share/phppgadmin/lang/recoded/chinese-sim.php
+share/phppgadmin/lang/recoded/chinese-tr.php
+share/phppgadmin/lang/recoded/czech.php
+share/phppgadmin/lang/recoded/dutch.php
+share/phppgadmin/lang/recoded/english.php
+share/phppgadmin/lang/recoded/french.php
+share/phppgadmin/lang/recoded/german.php
+share/phppgadmin/lang/recoded/hungarian.php
+share/phppgadmin/lang/recoded/italian.php
+share/phppgadmin/lang/recoded/japanese.php
+share/phppgadmin/lang/recoded/polish.php
+share/phppgadmin/lang/recoded/portuguese-br.php
+share/phppgadmin/lang/recoded/russian.php
+share/phppgadmin/lang/recoded/slovak.php
+share/phppgadmin/lang/recoded/spanish.php
+share/phppgadmin/lang/recoded/swedish.php
+share/phppgadmin/lang/recoded/turkish.php
+share/phppgadmin/lang/russian.php
+share/phppgadmin/lang/slovak.php
+share/phppgadmin/lang/spanish.php
+share/phppgadmin/lang/swedish.php
+share/phppgadmin/lang/turkish.php
+share/phppgadmin/languages.php
+share/phppgadmin/libraries/adodb/adodb-connection.inc.php
+share/phppgadmin/libraries/adodb/adodb-cryptsession.php
+share/phppgadmin/libraries/adodb/adodb-csvlib.inc.php
+share/phppgadmin/libraries/adodb/adodb-datadict.inc.php
+share/phppgadmin/libraries/adodb/adodb-errorhandler.inc.php
+share/phppgadmin/libraries/adodb/adodb-errorpear.inc.php
+share/phppgadmin/libraries/adodb/adodb-lib.inc.php
+share/phppgadmin/libraries/adodb/adodb-pager.inc.php
+share/phppgadmin/libraries/adodb/adodb-pear.inc.php
+share/phppgadmin/libraries/adodb/adodb-recordset.inc.php
+share/phppgadmin/libraries/adodb/adodb-session.php
+share/phppgadmin/libraries/adodb/adodb-time.inc.php
+share/phppgadmin/libraries/adodb/adodb.inc.php
+share/phppgadmin/libraries/adodb/crypt.inc.php
+share/phppgadmin/libraries/adodb/datadict/datadict-mssql.inc.php
+share/phppgadmin/libraries/adodb/datadict/datadict-mysql.inc.php
+share/phppgadmin/libraries/adodb/datadict/datadict-oci8.inc.php
+share/phppgadmin/libraries/adodb/datadict/datadict-postgres.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-access.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-ado.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-ado_access.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-ado_mssql.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-borland_ibase.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-csv.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-db2.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-fbsql.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-firebird.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-ibase.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-informix.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-informix72.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-mssql.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-mssqlpo.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-mysql.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-mysqlt.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-oci8.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-oci805.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-oci8po.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-odbc.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-oracle.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-postgres.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-postgres64.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-postgres7.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-proxy.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-sybase.inc.php
+share/phppgadmin/libraries/adodb/drivers/adodb-vfp.inc.php
+share/phppgadmin/libraries/adodb/license.txt
+share/phppgadmin/libraries/adodb/pivottable.inc.php
+share/phppgadmin/libraries/adodb/readme.txt
+share/phppgadmin/libraries/adodb/rsfilter.inc.php
+share/phppgadmin/libraries/adodb/server.php
+share/phppgadmin/libraries/adodb/toexport.inc.php
+share/phppgadmin/libraries/adodb/tohtml.inc.php
+share/phppgadmin/libraries/errorhandler.inc.php
+share/phppgadmin/libraries/lib.inc.php
+share/phppgadmin/links.js
+share/phppgadmin/login.php
+share/phppgadmin/logout.php
+share/phppgadmin/opclasses.php
+share/phppgadmin/operators.php
+share/phppgadmin/privileges.php
 share/phppgadmin/reports.php
-share/phppgadmin/russian-koi8.inc.php
-share/phppgadmin/russian-win1251.inc.php
-share/phppgadmin/seq_create.php
-share/phppgadmin/spanish.inc.php
+share/phppgadmin/robots.txt
+share/phppgadmin/rules.php
+share/phppgadmin/schema.php
+share/phppgadmin/sequences.php
 share/phppgadmin/sql.php
-share/phppgadmin/tbl_addfield.php
-share/phppgadmin/tbl_alter.php
-share/phppgadmin/tbl_alter_drop.php
-share/phppgadmin/tbl_change.php
-share/phppgadmin/tbl_copy.php
-share/phppgadmin/tbl_create.php
-share/phppgadmin/tbl_dump.php
-share/phppgadmin/tbl_form.inc.php
-share/phppgadmin/tbl_privilege.php
-share/phppgadmin/tbl_properties.inc.php
-share/phppgadmin/tbl_properties.php
-share/phppgadmin/tbl_qbe.php
-share/phppgadmin/tbl_rename.php
-share/phppgadmin/tbl_replace.php
-share/phppgadmin/tbl_select.php
-share/phppgadmin/trig_create.php
-share/phppgadmin/trig_properties.php
-share/phppgadmin/turkish.inc.php
-share/phppgadmin/user_admin.php
-share/phppgadmin/view_create.php
+share/phppgadmin/sql/reports-pgsql.sql
+share/phppgadmin/sqledit.php
+share/phppgadmin/tables.php
+share/phppgadmin/tblproperties.php
+share/phppgadmin/themes/default/global.css
+share/phppgadmin/topbar.php
+share/phppgadmin/triggers.php
+share/phppgadmin/types.php
+share/phppgadmin/users.php
+share/phppgadmin/viewproperties.php
+share/phppgadmin/views.php
+@dirrm share/phppgadmin/themes/default
+@dirrm share/phppgadmin/themes
+@dirrm share/phppgadmin/sql
+@dirrm share/phppgadmin/libraries/adodb/drivers
+@dirrm share/phppgadmin/libraries/adodb/datadict
+@dirrm share/phppgadmin/libraries/adodb
+@dirrm share/phppgadmin/libraries
+@dirrm share/phppgadmin/lang/recoded
+@dirrm share/phppgadmin/lang
+@dirrm share/phppgadmin/images/themes/default
+@dirrm share/phppgadmin/images/themes
 @dirrm share/phppgadmin/images
+@dirrm share/phppgadmin/conf
+@dirrm share/phppgadmin/classes/database
+@dirrm share/phppgadmin/classes/HTML_TreeMenu/images
+@dirrm share/phppgadmin/classes/HTML_TreeMenu
+@dirrm share/phppgadmin/classes
 @dirrm share/phppgadmin
-@dirrm share/doc/phppgadmin
+@dirrm share/examples/phppgadmin
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index bb1070d1561..b62493f9dcf 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/23 12:13:34 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/10/09 16:23:43 jdolecek Exp $
 
-SHA1 (phpPgAdmin_2-4-2.tar.bz2) = 0115ace79a6c60f27a3f9916e0002556bebc7ab7
-Size (phpPgAdmin_2-4-2.tar.bz2) = 93769 bytes
+SHA1 (phpPgAdmin-3.4.1.tar.bz2) = c3b160c4171ba4d393e31eae5dd8f177747fc9d0
+Size (phpPgAdmin-3.4.1.tar.bz2) = 359408 bytes
diff --git a/databases/phppgadmin/files/apache.conf-dist b/databases/phppgadmin/files/apache.conf-dist
new file mode 100644
index 00000000000..311e8a00252
--- /dev/null
+++ b/databases/phppgadmin/files/apache.conf-dist
@@ -0,0 +1,10 @@
+<IfModule mod_alias.c>
+    Alias /phppgadmin/ "@PHPPGBASE@/"
+</IfModule>
+
+<Directory "@PHPPGBASE@">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>