Update to 3.5.4

From the HISTORY:

> Version 3.5.4
> -------------
>
> Bugs
> * Fix security hole in include() of language file:
>    http://secunia.com/advisories/15941/
>   Check now requires that the language filename be in the list
>   of known allowed filenames.
> * Fix that functions returning cstring were not being listed
> * Make parsing of PostgreSQL 1-dimensional arrays correct.  Makes
>   named function parameter use more reliable.
> * Fix downloading of the results of multiline queries.
>
>
> Version 3.5.3
> -------------
>
> Bugs
> * Fix using schema enabled dump on non-schema enabled backend
> * Don't try setting no timeout when in safe mode
> * Reload browser after executing arbitrary SQL
> * Fix browser in RTL languages
> * Fix inability to drop database using the drop link
> * Fix last internal oid for PostgreSQL 8.0
> * Fix (again) dumping on v8 for windows, exclude dumping some objects.
>
> Translations
> * Portuguese from Francisco
>
>
> Version 3.5.2
> -------------
>
> Bugs
> * Fix export to work with release candidates and beta releases as well as finals
>  (Russell Smith)
> * Fix port selection for local connections (Russell Smith)
> * Fix timeouts on long running operations (Adrian Nida)
> * Allow Multiline character and character varying editing and inserting
> * Do browser language detection for all languages
>
> Translations
> * Japanese from Tadashi
> * Danish from Arne

4 files changed, 43 insertions, 28 deletions

diff --git a/databases/phppgadmin/MESSAGE b/databases/phppgadmin/MESSAGE
index 0ded3f6d591..4c7ce95debd 100644
--- a/databases/phppgadmin/MESSAGE
+++ b/databases/phppgadmin/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/10/09 16:23:43 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.6 2005/08/06 21:36:56 adrianp Exp $
 
 In order to use ${PKGNAME} under Apache/PHP, include following in your
 server configuration:
@@ -13,6 +13,6 @@ This makes ${PKGNAME} available on your server as:
 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 
+extension=pgsql.so
 
 ===========================================================================
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 0035e8476ed..f49e85a9025 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/06 21:36:56 adrianp Exp $
 
-DISTNAME=	phpPgAdmin-3.5.1
+DISTNAME=	phpPgAdmin-3.5.4
 PKGREVISION=	# empty
 PKGNAME=	${DISTNAME:S/PgAdmin/pgadmin/}
 CATEGORIES=	databases www
@@ -20,8 +20,8 @@ NO_BUILD=	YES
 USE_PKGINSTALL=	YES
 
 PHPPGBASE=	${PREFIX}/share/phppgadmin
-PHPPGHIER=	classes/HTML_TreeMenu/images images/themes/default	\
-		libraries/adodb/datadict libraries/adodb/drivers 	\
+PHPPGHIER=	classes/HTML_TreeMenu/images images/themes/default \
+		libraries/adodb/datadict libraries/adodb/drivers \
 		classes/database lang/recoded themes/default sql conf
 
 PKG_SYSCONFDIR.phppgadmin=	${PREFIX}/share/phppgadmin/conf
@@ -32,41 +32,52 @@ 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 \
+	@${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} ${PHPPGBASE}
 	${INSTALL_DATA_DIR} ${EGDIR}
 
-	for d in ${PHPPGHIER}; do                                       \
-	        ${INSTALL_DATA_DIR} ${PHPPGBASE}/$$d;                   \
+	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}/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_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_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};                      \
+	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 7254b361501..6b44bf022de 100644
--- a/databases/phppgadmin/PLIST
+++ b/databases/phppgadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/02/07 15:02:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/08/06 21:36:56 adrianp Exp $
 share/doc/phppgadmin/CREDITS
 share/doc/phppgadmin/DEVELOPERS
 share/doc/phppgadmin/FAQ
@@ -75,6 +75,7 @@ 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/danish.php
 share/phppgadmin/lang/dutch.php
 share/phppgadmin/lang/english.php
 share/phppgadmin/lang/french.php
@@ -84,11 +85,13 @@ share/phppgadmin/lang/italian.php
 share/phppgadmin/lang/japanese.php
 share/phppgadmin/lang/polish.php
 share/phppgadmin/lang/portuguese-br.php
+share/phppgadmin/lang/portuguese-pt.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/danish.php
 share/phppgadmin/lang/recoded/dutch.php
 share/phppgadmin/lang/recoded/english.php
 share/phppgadmin/lang/recoded/french.php
@@ -100,6 +103,7 @@ share/phppgadmin/lang/recoded/japanese.php
 share/phppgadmin/lang/recoded/mongol.php
 share/phppgadmin/lang/recoded/polish.php
 share/phppgadmin/lang/recoded/portuguese-br.php
+share/phppgadmin/lang/recoded/portuguese-pt.php
 share/phppgadmin/lang/recoded/romanian.php
 share/phppgadmin/lang/recoded/russian.php
 share/phppgadmin/lang/recoded/slovak.php
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index 61ae09ae047..f5388eb67ae 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 16:33:08 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/08/06 21:36:56 adrianp Exp $
 
-SHA1 (phpPgAdmin-3.5.1.tar.bz2) = 0d53daeaa30b334ad2281aa7a9fbef5f580d331f
-RMD160 (phpPgAdmin-3.5.1.tar.bz2) = cf8ca473f88b37d73994238c2ae1642a0d7c62e9
-Size (phpPgAdmin-3.5.1.tar.bz2) = 446953 bytes
+SHA1 (phpPgAdmin-3.5.4.tar.bz2) = d36da637a5e23455402a8ac12b7694bd81df685e
+RMD160 (phpPgAdmin-3.5.4.tar.bz2) = 939cc713d6a5b96c07558039427bc985768ec1ef
+Size (phpPgAdmin-3.5.4.tar.bz2) = 457648 bytes