4 files changed, 37 insertions, 17 deletions

diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 73ef4e392882..ee1a4e03087d 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.15
-PORTREVISION?=	1
+PORTVERSION?=	8.2.17
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -41,6 +40,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
+LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 417a1b7b94c5..f7eb9464c379 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.2.15.tar.bz2) = e6f2274613ad42fe82f4267183ff174a
-SHA256 (postgresql/postgresql-8.2.15.tar.bz2) = 6932dd3970bd6948f3d0fe7e22ef36021b6a5cf219952b7392ca38947ad09e65
-SIZE (postgresql/postgresql-8.2.15.tar.bz2) = 12653038
+MD5 (postgresql/postgresql-8.2.17.tar.bz2) = 583c21c036357480a85dd3710e40a261
+SHA256 (postgresql/postgresql-8.2.17.tar.bz2) = 3eaebfd2ba8256a168a32b0950b5129f999ae06115e482b1f5a2bdf66aa91985
+SIZE (postgresql/postgresql-8.2.17.tar.bz2) = 12714721
diff --git a/databases/postgresql82-server/files/502.pgsql b/databases/postgresql82-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql82-server/files/502.pgsql
+++ b/databases/postgresql82-server/files/502.pgsql
@@ -15,12 +15,10 @@
 # Define these variables in either /etc/periodic.conf or
 # /etc/periodic.conf.local to override the default values.
 #
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# 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_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ eval backupdir=${daily_pgsql_backupdir}
 
 rc=0
 
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-
+pgsql_backup() {
 	# daily_pgsql_backupdir must be writeable by user pgsql
 	# ~pgsql is just that under normal circumstances,
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
-	dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
 	rc=$?
 	now=`date "+%Y-%m-%dT%H:%M:%S"`
 	file=${daily_pgsql_backupdir}/pgglobals_${now}
 	su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
-	for db in ${dbnames}; do
+
+	db=$1
+	while shift; do
 	    echo -n " $db"
 	    file=${backupdir}/pgdump_${db}_${now}
 	    su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
 	    [ $? -gt 0 ] && rc=3
+		db=$1
 	done
 
 	if [ $rc -gt 0 ]; then
@@ -76,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
 	# cleaning up old data
 	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
+	echo
+}
+
+case "$daily_pgsql_backup_enable" in
+    [Yy][Ee][Ss])
+	dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	pgsql_backup $dbnames
+	;;
+
+	[Nn][Oo])
+	;;
+
+	"")
+	;;
+
+	*)
+	pgsql_backup $daily_pgsql_backup_enable
 	;;
 esac
 
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index 5652e146f0e8..363e731bcb88 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -205,6 +205,7 @@ share/postgresql/timezone/America/Asuncion
 share/postgresql/timezone/America/Atikokan
 share/postgresql/timezone/America/Atka
 share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
 share/postgresql/timezone/America/Barbados
 share/postgresql/timezone/America/Belem
 share/postgresql/timezone/America/Belize
@@ -277,6 +278,7 @@ share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
 share/postgresql/timezone/America/Marigot
 share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
 share/postgresql/timezone/America/Mazatlan
 share/postgresql/timezone/America/Mendoza
 share/postgresql/timezone/America/Menominee
@@ -295,6 +297,7 @@ share/postgresql/timezone/America/Nome
 share/postgresql/timezone/America/Noronha
 share/postgresql/timezone/America/North_Dakota/Center
 share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
 share/postgresql/timezone/America/Panama
 share/postgresql/timezone/America/Pangnirtung
 share/postgresql/timezone/America/Paramaribo
@@ -311,6 +314,7 @@ share/postgresql/timezone/America/Regina
 share/postgresql/timezone/America/Resolute
 share/postgresql/timezone/America/Rio_Branco
 share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
 share/postgresql/timezone/America/Santarem
 share/postgresql/timezone/America/Santiago
 share/postgresql/timezone/America/Santo_Domingo
@@ -339,6 +343,7 @@ share/postgresql/timezone/America/Yellowknife
 share/postgresql/timezone/Antarctica/Casey
 share/postgresql/timezone/Antarctica/Davis
 share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
 share/postgresql/timezone/Antarctica/Mawson
 share/postgresql/timezone/Antarctica/McMurdo
 share/postgresql/timezone/Antarctica/Palmer