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

1 files changed, 32 insertions, 21 deletions

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"