4 files changed, 20 insertions, 10 deletions

diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 91c62d479055..482f2f6c8094 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 DISTVERSION?=	9.5.0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -10,7 +11,9 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
-		src/bin/pg_basebackup
+		src/bin/pg_basebackup src/bin/pg_archivecleanup \
+		src/bin/pg_test_fsync src/bin/pg_test_timing \
+		src/bin/pg_xlogdump src/bin/pg_upgrade
 
 ICU_PATCHFILE=	sorry-icu-patch-is-not-quite-ready-for-95-yet
 
diff --git a/databases/postgresql95-server/files/502.pgsql.in b/databases/postgresql95-server/files/502.pgsql.in
index e92f01f992cd..2945928da400 100644
--- a/databases/postgresql95-server/files/502.pgsql.in
+++ b/databases/postgresql95-server/files/502.pgsql.in
@@ -19,14 +19,6 @@
 # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_user=%%PG_USER%%
-daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz"
-daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c"
-daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}"
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-daily_pgsql_backupdir="~${daily_pgsql_user}/backups"
-daily_pgsql_savedays="7"
-
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
@@ -35,6 +27,15 @@ then
     source_periodic_confs
 fi
 
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
 # allow '~´ in dir name
 eval backupdir=${daily_pgsql_backupdir}
 
@@ -82,7 +83,7 @@ pgsql_backup() {
 
 case "$daily_pgsql_backup_enable" in
     [Yy][Ee][Ss])
-	dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
 	pgsql_backup $dbnames
 	;;
 
diff --git a/databases/postgresql95-server/pkg-plist-client b/databases/postgresql95-server/pkg-plist-client
index 7f4284131e93..4722e9563c90 100644
--- a/databases/postgresql95-server/pkg-plist-client
+++ b/databases/postgresql95-server/pkg-plist-client
@@ -11,6 +11,7 @@ bin/pg_dump
 bin/pg_dumpall
 bin/pg_isready
 bin/pg_restore
+bin/pgbench
 bin/psql
 bin/reindexdb
 bin/vacuumdb
diff --git a/databases/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server
index 46134274bcd2..d2b94fe8b3d1 100644
--- a/databases/postgresql95-server/pkg-plist-server
+++ b/databases/postgresql95-server/pkg-plist-server
@@ -5,6 +5,11 @@ bin/pg_ctl
 bin/pg_receivexlog
 bin/pg_resetxlog
 bin/pg_recvlogical
+bin/pg_archivecleanup
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_xlogdump
+bin/pg_upgrade
 bin/postgres
 bin/postmaster
 etc/periodic/daily/502.pgsql