The PostgreSQL Global Development Group today released minor version updates

for all active branches of the PostgreSQL object-relational database system,
including versions 9.1.1, 9.0.5, 8.4.9, 8.3.16 and 8.2.22.

All users are strongly urged to update their installations at the next
scheduled downtime.

URL:	http://www.postgresql.org/about/news.1355

Cleanup ports. Better handling of the knob PG_USER.
Also add uuid to 9.0 and 9.1 contrib ports.

6 files changed, 55 insertions, 98 deletions

diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index a51c0932ebdf..c6aaf33e7d86 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.15
+DISTVERSION?=	8.3.16
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -35,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif
 
-PGUSER=		pgsql
-PGGROUP=	pgsql
+PG_USER?=	pgsql
+PG_GROUP?=	${PG_USER}
+PG_UID?=	70
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 INCLUDES+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
-		--with-includes=${PREFIX}/lib \
+		--with-includes=${PREFIX}/include \
 		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
@@ -60,7 +61,14 @@ INSTALL_DIRS?=	${BUILD_DIRS}
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
-WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+WANT_PGSQL_VER=	${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USERS?=		${PG_USER}
+.if (${USERS} != "pgsql")
+UID_FILES+=	${WRKDIR}/pguid
+GID_FILES+=	${WRKDIR}/pggid
+.endif
+GROUPS?=	${PG_GROUP}
+SUB_FILES+=	502.pgsql
 .endif
 
 .if !defined(SLAVE_ONLY)
@@ -82,8 +90,6 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if !defined(SLAVE_ONLY)
 OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	LDAP "Build with LDAP authentication support" off
@@ -100,7 +106,11 @@ OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
+.endif # !SLAVE_ONLY
 
+.include <bsd.port.pre.mk>
+
+.if !defined(SLAVE_ONLY)
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=--with-icu
@@ -112,7 +122,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
 
 PATCH_DIST_STRIP=-p1
 
-.  if  defined(WITH_PAM)
+.  if defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
@@ -248,7 +258,7 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 
 .if defined(SERVER_ONLY)
 pre-everything::
-	@${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING
+	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
@@ -271,12 +281,13 @@ do-build:
 SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
-.endif
-
-.if defined(SERVER_ONLY)
-pre-su-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \
-		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+.  if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
+SUB_FILES+=     pkg-install${PKGNAMESUFFIX}
+SUB_LIST=	PG_GROUP=$(PG_GROUP) \
+		PG_USER=$(PG_USER) \
+		PG_UID=$(PG_UID)
+PLIST_SUB+=	PG_USER=$(PG_USER)
+.  endif
 .endif
 
 .if !defined(NO_BUILD)
@@ -288,6 +299,12 @@ post-patch:
 		${WRKSRC}/configure.in
 .  endif
 
+.  if defined(SERVER_ONLY) && (${PG_USER} != "pgsql")
+pre-install:
+	@${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid
+	@${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid
+.  endif
+
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
@@ -296,7 +313,7 @@ do-install:
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
+	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index c064be0cd87a..7cf17c1fc910 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-8.3.15.tar.bz2) = 433bfad5c9ccca38029be193d3c4ff47d394f4c678be41ef709063255c97cf16
-SIZE (postgresql/postgresql-8.3.15.tar.bz2) = 14344586
+SHA256 (postgresql/postgresql-8.3.16.tar.bz2) = 000590e2bdd1a00c8f2d2fa30c1f244826a61ad038a53b63179e902f876a2744
+SIZE (postgresql/postgresql-8.3.16.tar.bz2) = 14348568
 SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a
 SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064
diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql.in
index 281189a59c46..0a80253cffc3 100644
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-server/files/502.pgsql.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/databases/postgresql83-server/files/502.pgsql.in,v 1.1 2011-10-18 09:03:31 girgen Exp $
 #
 # Maintenance shell script to vacuum and backup database
 # Put this in /usr/local/etc/periodic/daily, and it will be run 
@@ -19,10 +19,12 @@
 # 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_args="-z"
-daily_pgsql_pgdump_args="-b -F c"
+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="~pgsql/backups"
+daily_pgsql_backupdir="~${daily_pgsql_user}/backups"
 daily_pgsql_savedays="7"
 
 # If there is a global system configuration file, suck it in.
@@ -39,12 +41,12 @@ eval backupdir=${daily_pgsql_backupdir}
 rc=0
 
 pgsql_backup() {
-	# daily_pgsql_backupdir must be writeable by user pgsql
-	# ~pgsql is just that under normal circumstances,
+	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
+	# ~%%PG_USER%% is just that under normal circumstances,
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
 	fi
 
 	echo
@@ -55,13 +57,14 @@ pgsql_backup() {
 	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"
+	su -l ${daily_pgsql_user} -c \
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
 
 	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}"
+	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
 	    [ $? -gt 0 ] && rc=3
 		db=$1
 	done
@@ -79,7 +82,7 @@ pgsql_backup() {
 
 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\'"`
+	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\'"`
 	pgsql_backup $dbnames
 	;;
 
@@ -99,7 +102,7 @@ case "$daily_pgsql_vacuum_enable" in
 
 	echo
 	echo "PostgreSQL vacuum"
-	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
+	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
 	    echo
diff --git a/databases/postgresql83-server/files/patch-src-plperl-plperl b/databases/postgresql83-server/files/patch-src-plperl-plperl
deleted file mode 100644
index fc67e6e82be5..000000000000
--- a/databases/postgresql83-server/files/patch-src-plperl-plperl
+++ /dev/null
@@ -1,28 +0,0 @@
-Obtained from:	http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php
-Reference:	http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues
-
---- src/pl/plperl/plperl.c.orig	2011-04-15 11:15:53.000000000 +0800
-+++ src/pl/plperl/plperl.c	2011-05-19 20:39:34.126713700 +0800
-@@ -685,7 +685,7 @@
- 		if (!isGV_with_GP(sv) || !GvCV(sv))
- 			continue;
- 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
--		GvCV(sv) = NULL;		/* prevent call via GV */
-+		GvCV_set(sv, NULL);		/* prevent call via GV */
- 	}
- 	hv_clear(stash);
- 
---- src/pl/plperl/plperl.h.orig	2011-04-15 11:15:53.000000000 +0800
-+++ src/pl/plperl/plperl.h	2011-05-19 20:39:34.127713548 +0800
-@@ -43,6 +43,11 @@
- #undef bool
- #endif
- 
-+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
-+#ifndef GvCV_set
-+#define GvCV_set(gv, cv)		(GvCV(gv) = cv)
-+#endif
-+
- /* routines from spi_internal.c */
- int			spi_DEBUG(void);
- int			spi_LOG(void);
diff --git a/databases/postgresql83-server/pkg-install-server b/databases/postgresql83-server/pkg-install-server
index 6dc3b6fdbd67..6f41226305d7 100644
--- a/databases/postgresql83-server/pkg-install-server
+++ b/databases/postgresql83-server/pkg-install-server
@@ -4,7 +4,8 @@
 
 PATH=/bin:/usr/bin:/usr/sbin
 
-backupwarning() { echo "
+backupwarning() {
+cat <<EOF
 
   =========== BACKUP YOUR DATA! =============
   As always, backup your data before
@@ -15,49 +16,12 @@ backupwarning() { echo "
 
   Press ctrl-C *now* if you need to pg_dump.
   ===========================================
-"
+EOF
 	sleep 5
 }
 
 case $2 in
 PRE-INSTALL)
 	backupwarning
-	PGUSER=${PGUSER:-pgsql}
-	PGGROUP=${PGGROUP:-pgsql}
-	DB_DIR=${PKG_PREFIX}/${PGUSER}
-	UID=70
-	GID=70
-
-	if pw group show "${PGGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${PGGROUP}\", so I will use it."
-	else
-		if pw groupadd ${PGGROUP} -g ${GID}; then
-			echo "Added group \"${PGGROUP}\"."
-		else
-			echo "Adding group \"${PGGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${PGUSER}" 2>/dev/null; then
-		echo "You already have a user \"${PGUSER}\", so I will use it."
-	else
-		if pw useradd ${PGUSER} -u ${UID} -g ${PGGROUP} -h - \
-			-d ${DB_DIR} -c "PostgreSQL Daemon"
-		then
-			echo "Added user \"${PGUSER}\"."
-		else
-			echo "Adding user \"${PGUSER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~${PGUSER} ] ; then 
-		install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR}
-	fi
-	;;
-
-BACKUPWARNING)
-	backupwarning
 	;;
 esac
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 8abc4498a995..55a368398351 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -187,6 +187,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Niamey
 %%TZDATA%%share/postgresql/timezone/Africa/Nouakchott
 %%TZDATA%%share/postgresql/timezone/Africa/Ouagadougou
+%%TZDATA%%share/postgresql/timezone/Africa/Juba
 %%TZDATA%%share/postgresql/timezone/Africa/Porto-Novo
 %%TZDATA%%share/postgresql/timezone/Africa/Sao_Tome
 %%TZDATA%%share/postgresql/timezone/Africa/Timbuktu
@@ -280,10 +281,12 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville
 %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello
 %%TZDATA%%share/postgresql/timezone/America/Knox_IN
+%%TZDATA%%share/postgresql/timezone/America/Kralendijk
 %%TZDATA%%share/postgresql/timezone/America/La_Paz
 %%TZDATA%%share/postgresql/timezone/America/Lima
 %%TZDATA%%share/postgresql/timezone/America/Los_Angeles
 %%TZDATA%%share/postgresql/timezone/America/Louisville
+%%TZDATA%%share/postgresql/timezone/America/Lower_Princes
 %%TZDATA%%share/postgresql/timezone/America/Maceio
 %%TZDATA%%share/postgresql/timezone/America/Managua
 %%TZDATA%%share/postgresql/timezone/America/Manaus
@@ -774,9 +777,7 @@ share/postgresql/tsearch_data/ispell_sample.dict
 share/postgresql/tsearch_data/synonym_sample.syn
 share/postgresql/tsearch_data/thesaurus_sample.ths
 @dirrmtry share/postgresql/tsearch_data
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
 @dirrmtry share/postgresql
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
 @dirrmtry lib/postgresql
-@dirrmtry pgsql