- Update to 3.3.1

- better defaults
- preserve config.inc.php
- superseeds ports/63459

3 files changed, 19 insertions, 3 deletions

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 4c9a263cfbd1..44c485b9d020 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phppgadmin
-PORTVERSION=	3.2.1
+PORTVERSION=	3.3.1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,6 +15,7 @@ DISTNAME=	phpPgAdmin-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_PHP=	yes
 WRKSRC=		${WRKDIR}/phpPgAdmin
@@ -24,8 +25,17 @@ PHP_PORT?=	www/mod_php4-twig
 PGADMDIR?=      www/data/phpPgAdmin
 PLIST_SUB+=     PGADMDIR=${PGADMDIR}
 
+do-configure:
+	${REINPLACE_CMD} -e "s|/usr/bin/pg|${LOCALBASE}/bin/pg|" \
+		${WRKSRC}/conf/config.inc.php-dist 
+	rm -f ${WRKSRC}/conf/config.inc.php \
+		${WRKSRC}/conf/config.inc.php-dist.bak
+
 do-install:
 	${MKDIR} ${PREFIX}/${PGADMDIR}
 	${CP} -R ${WRKSRC}/* ${PREFIX}/${PGADMDIR}
+	@[ -f ${PREFIX}/${PGADMDIR}/conf/config.inc.php ] || \
+		cp ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \
+		${PREFIX}/${PGADMDIR}/conf/config.inc.php
 
 .include <bsd.port.mk>
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index 6bb962092c68..3292c950b0f3 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1,2 +1,2 @@
-MD5 (phpPgAdmin-3.2.1.tar.bz2) = d4ff4fd3be278fb06a37097f7be4baa4
-SIZE (phpPgAdmin-3.2.1.tar.bz2) = 332780
+MD5 (phpPgAdmin-3.3.1.tar.bz2) = 3fb8880c9f0ca165b691b5e8944ac577
+SIZE (phpPgAdmin-3.3.1.tar.bz2) = 344259
diff --git a/databases/phppgadmin/pkg-plist b/databases/phppgadmin/pkg-plist
index 99c94647e183..d6ce727f4dc2 100644
--- a/databases/phppgadmin/pkg-plist
+++ b/databases/phppgadmin/pkg-plist
@@ -7,6 +7,7 @@
 %%PGADMDIR%%/LICENSE
 %%PGADMDIR%%/TODO
 %%PGADMDIR%%/TRANSLATORS
+%%PGADMDIR%%/aggregates.php
 %%PGADMDIR%%/all_db.php
 %%PGADMDIR%%/bottombar.php
 %%PGADMDIR%%/browser.php
@@ -31,6 +32,7 @@
 %%PGADMDIR%%/classes/class.select.php
 %%PGADMDIR%%/classes/database/ADODB_base.php
 %%PGADMDIR%%/classes/database/BaseDB.php
+%%PGADMDIR%%/classes/database/Connection.php
 %%PGADMDIR%%/classes/database/Postgres.php
 %%PGADMDIR%%/classes/database/Postgres71.php
 %%PGADMDIR%%/classes/database/Postgres72.php
@@ -46,6 +48,7 @@
 %%PGADMDIR%%/database.php
 %%PGADMDIR%%/databases.php
 %%PGADMDIR%%/dataexport.php
+%%PGADMDIR%%/dbexport.php
 %%PGADMDIR%%/display.php
 %%PGADMDIR%%/domains.php
 %%PGADMDIR%%/functions.php
@@ -69,6 +72,7 @@
 %%PGADMDIR%%/lang/afrikaans.php
 %%PGADMDIR%%/lang/chinese-sim.php
 %%PGADMDIR%%/lang/chinese-tr.php
+%%PGADMDIR%%/lang/convert.awk
 %%PGADMDIR%%/lang/czech.php
 %%PGADMDIR%%/lang/dutch.php
 %%PGADMDIR%%/lang/english.php
@@ -163,8 +167,10 @@
 %%PGADMDIR%%/libraries/adodb/tohtml.inc.php
 %%PGADMDIR%%/libraries/errorhandler.inc.php
 %%PGADMDIR%%/libraries/lib.inc.php
+%%PGADMDIR%%/links.js
 %%PGADMDIR%%/login.php
 %%PGADMDIR%%/logout.php
+%%PGADMDIR%%/opclasses.php
 %%PGADMDIR%%/operators.php
 %%PGADMDIR%%/privileges.php
 %%PGADMDIR%%/reports.php