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.

8 files changed, 34 insertions, 29 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 940794cd1e76..1d2cd21217ad 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
+DISTVERSION?=	9.1.1
 DISTVERSION?=	9.1.0
-PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -27,6 +27,7 @@ DIST_SUBDIR=	postgresql
 UNIQUENAME?=	${PORTNAME}91
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
+PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
@@ -61,7 +62,7 @@ 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
@@ -190,7 +191,7 @@ LDFLAGS+=	-lgssapi
 
 .  if defined(WITH_MIT_KRB5)
 .    if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)
-BROKEN=		You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
+BROKEN=		You must remove /usr/bin/krb5-config and /usr/lib/libkrb5.so* (from system heimdal), and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
 .    endif
 # Allow defining a home built MIT Kerberos by setting KRB5_HOME
 .    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
@@ -306,7 +307,7 @@ MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
 
 .if defined(SERVER_ONLY)
 pre-everything::
-	@${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING
+	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
 .if !defined(NO_BUILD)
@@ -330,11 +331,10 @@ PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .  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}
-PKGINSTALL=	${WRKDIR}/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
 
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 8b557f276097..8db08ba8410b 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.1.0.tar.bz2) = ec011c55194a0ac43687c0388c6567ffb534a8d0458e38b843bcd18aba027fca
-SIZE (postgresql/postgresql-9.1.0.tar.bz2) = 14788869
+SHA256 (postgresql/postgresql-9.1.1.tar.bz2) = c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
+SIZE (postgresql/postgresql-9.1.1.tar.bz2) = 14884071
 SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149
 SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373
diff --git a/databases/postgresql92-server/files/502.pgsql.in b/databases/postgresql92-server/files/502.pgsql.in
index 4ab9cb449ee7..e92f01f992cd 100644
--- a/databases/postgresql92-server/files/502.pgsql.in
+++ b/databases/postgresql92-server/files/502.pgsql.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/502.pgsql.in,v 1.3 2011-06-11 23:14:30 girgen Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/502.pgsql.in,v 1.4 2011-10-18 09:03:32 girgen Exp $
 #
 # Maintenance shell script to vacuum and backup database
 # Put this in /usr/local/etc/periodic/daily, and it will be run 
@@ -58,7 +58,7 @@ pgsql_backup() {
 	now=`date "+%Y-%m-%dT%H:%M:%S"`
 	file=${daily_pgsql_backupdir}/pgglobals_${now}
 	su -l ${daily_pgsql_user} -c \
-		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals__args} | gzip -9 > ${file}.gz"
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
 
 	db=$1
 	while shift; do
diff --git a/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile
index 12c43172fb35..ee9a537b1ecc 100644
--- a/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile
+++ b/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile
@@ -1,11 +1,5 @@
-Manual pages are already present in the PostgreSQL tarball, so we avoid
-messing with timestamp: it depends on postgres.xml that, in turn,
-depends on almost all SGML files, most notably, version.sgml.  And the
-latter depends on the configure in the top-level directory, so when
-we patch it, build system wants to regenerate manual pages.
-
---- doc/src/sgml/Makefile.orig	2011-09-13 23:42:58.508672251 +0400
-+++ doc/src/sgml/Makefile	2011-09-13 23:43:01.676668807 +0400
+--- doc/src/sgml/Makefile.orig	2011-10-13 16:53:51.000000000 +0200
++++ doc/src/sgml/Makefile	2011-10-13 17:05:08.000000000 +0200
 @@ -75,8 +75,6 @@
  ## Man pages
  ##
@@ -15,3 +9,12 @@ we patch it, build system wants to regenerate manual pages.
  man-stamp: stylesheet-man.xsl postgres.xml
  	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
  	touch $@
+@@ -303,7 +301,7 @@
+ endif
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ uninstall:
+ 	rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
diff --git a/databases/postgresql92-server/files/pkg-install-server.in b/databases/postgresql92-server/pkg-install-server
index b40ee0032cdf..6f41226305d7 100644
--- a/databases/postgresql92-server/files/pkg-install-server.in
+++ b/databases/postgresql92-server/pkg-install-server
@@ -1,10 +1,11 @@
 #! /bin/sh
 
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/Attic/pkg-install-server.in,v 1.2 2011-06-11 23:14:30 girgen Exp $
+# $FreeBSD$
 
 PATH=/bin:/usr/bin:/usr/sbin
 
-backupwarning() { echo "
+backupwarning() {
+cat <<EOF
 
   =========== BACKUP YOUR DATA! =============
   As always, backup your data before
@@ -15,12 +16,12 @@ backupwarning() { echo "
 
   Press ctrl-C *now* if you need to pg_dump.
   ===========================================
-"
+EOF
 	sleep 5
 }
 
 case $2 in
-BACKUPWARNING)
+PRE-INSTALL)
 	backupwarning
 	;;
 esac
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index 4536bc100c90..6262d830db14 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -682,6 +682,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.1.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.1.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.1.mo
-@dirrm share/doc/postgresql/html
-@dirrm share/doc/postgresql
-
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 20a4952033d6..b616652ad171 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -43,6 +43,7 @@ lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
 lib/postgresql/unaccent.so
+lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/extension/README
 bin/pg_test_fsync
@@ -163,6 +164,9 @@ share/postgresql/extension/tsearch2.control
 share/postgresql/extension/unaccent--1.0.sql
 share/postgresql/extension/unaccent--unpackaged--1.0.sql
 share/postgresql/extension/unaccent.control
+share/postgresql/extension/uuid-ossp--1.0.sql
+share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+share/postgresql/extension/uuid-ossp.control
 share/postgresql/extension/xml2--1.0.sql
 share/postgresql/extension/xml2--unpackaged--1.0.sql
 share/postgresql/extension/xml2.control
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 0e64df5c521a..6284d5756572 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -92,6 +92,7 @@ share/postgresql/extension/plpgsql.control
 %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.1.mo
 %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.1.mo
 %%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.1.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.1.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.1.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.1.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.1.mo
@@ -768,4 +769,3 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
 @dirrmtry lib/postgresql
-@dirrmtry %%PG_USER%%