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.

9 files changed, 98 insertions, 120 deletions

diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index e3f181ce9914..ccea4b175bcd 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.0.4
-PORTREVISION?=	3
+DISTVERSION?=	9.0.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,7 +17,9 @@ MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-[78]* \
-		${PORTNAME}${PKGNAMESUFFIX}-[78]*
+		${PORTNAME}${PKGNAMESUFFIX}-[78]* \
+		${PORTNAME}-client-9.[1-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-9.[1-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
@@ -25,6 +27,7 @@ DIST_SUBDIR=	postgresql
 UNIQUENAME?=	${PORTNAME}90
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
+PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
@@ -34,7 +37,7 @@ GNU_CONFIGURE=	YES
 .endif
 
 PG_USER?=	pgsql
-PG_GROUP?=	pgsql
+PG_GROUP?=	${PG_USER}
 PG_UID?=	70
 
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -59,7 +62,13 @@ 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
 
@@ -296,7 +305,7 @@ MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.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)
@@ -320,19 +329,14 @@ 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}
+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}
 .  endif
 .endif
 
-.if defined(SERVER_ONLY)
-pre-su-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
 .if !defined(NO_BUILD)
 post-patch:
 	@${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in
@@ -342,6 +346,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} && \
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index fab2290611db..365f37d9b247 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.0.4.tar.bz2) = 30572706e3176228415991895e63a8b77343a5abad11407961cfd08790be9e84
-SIZE (postgresql/postgresql-9.0.4.tar.bz2) = 14040871
+SHA256 (postgresql/postgresql-9.0.5.tar.bz2) = 56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504
+SIZE (postgresql/postgresql-9.0.5.tar.bz2) = 14344752
 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
 SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
diff --git a/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile
index 12c43172fb35..986ef77157fb 100644
--- a/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile
+++ b/databases/postgresql90-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 15:05:32.000000000 +0200
++++ doc/src/sgml/Makefile	2011-10-13 15:41:10.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 $@
+@@ -292,7 +290,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/postgresql90-server/files/patch-src-plperl-plperl b/databases/postgresql90-server/files/patch-src-plperl-plperl
deleted file mode 100644
index 6f84a60e950d..000000000000
--- a/databases/postgresql90-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
-@@ -874,7 +874,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
-@@ -42,6 +42,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
-+
- /* declare routines from plperl.c for access by .xs files */
- HV		   *plperl_spi_exec(char *, int);
- void		plperl_return_next(SV *);
diff --git a/databases/postgresql90-server/files/pkg-install-server.in b/databases/postgresql90-server/files/pkg-install-server.in
deleted file mode 100644
index da85c73b7e4c..000000000000
--- a/databases/postgresql90-server/files/pkg-install-server.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-PG_USER=%%PG_USER%%
-PG_GROUP=%%PG_GROUP%%
-PG_UID=%%PG_UID%%
-
-backupwarning() { echo "
-
-  =========== BACKUP YOUR DATA! =============
-  As always, backup your data before
-  upgrading. If the upgrade leads to a higher
-  minor revision (e.g. 7.3.x -> 7.4), a dump
-  and restore of all databases is
-  required. This is *NOT* done by the port!
-
-  Press ctrl-C *now* if you need to pg_dump.
-  ===========================================
-"
-	sleep 5
-}
-
-case $2 in
-PRE-INSTALL)
-	backupwarning
-	DB_DIR=${PKG_PREFIX}/${PG_USER}
-
-	if pw group show "${PG_GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${PG_GROUP}\", so I will use it."
-	else
-		if pw groupadd ${PG_GROUP} -g ${PG_UID}; then
-			echo "Added group \"${PG_GROUP}\"."
-		else
-			echo "Adding group \"${PG_GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${PG_USER}" 2>/dev/null; then
-		echo "You already have a user \"${PG_USER}\", so I will use it."
-	else
-		if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \
-			-d ${DB_DIR} -c "PostgreSQL Daemon"
-		then
-			echo "Added user \"${PG_USER}\"."
-		else
-			echo "Adding user \"${PG_USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~${PG_USER} ] ; then 
-		install -m 755 -o ${PG_USER} -g ${PG_GROUP} -d ${DB_DIR}
-	fi
-	;;
-
-BACKUPWARNING)
-	backupwarning
-	;;
-esac
diff --git a/databases/postgresql90-server/pkg-install-server b/databases/postgresql90-server/pkg-install-server
new file mode 100644
index 000000000000..6f41226305d7
--- /dev/null
+++ b/databases/postgresql90-server/pkg-install-server
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+backupwarning() {
+cat <<EOF
+
+  =========== BACKUP YOUR DATA! =============
+  As always, backup your data before
+  upgrading. If the upgrade leads to a higher
+  minor revision (e.g. 7.3.x -> 7.4), a dump
+  and restore of all databases is
+  required. This is *NOT* done by the port!
+
+  Press ctrl-C *now* if you need to pg_dump.
+  ===========================================
+EOF
+	sleep 5
+}
+
+case $2 in
+PRE-INSTALL)
+	backupwarning
+	;;
+esac
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index dac1a5f8c8f3..233c612dae9a 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -569,7 +569,11 @@ lib/postgresql/pgxs/src/nls-global.mk
 share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
 @dirrmtry share/postgresql
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.0.mo
@@ -607,11 +611,20 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.0.mo
@@ -646,9 +659,9 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
-@dirrm share/doc/postgresql/html
-@dirrm share/doc/postgresql
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.0.mo
diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib
index 3471716032c0..06f6e95af4b8 100644
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-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%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -87,6 +88,8 @@ share/postgresql/contrib/test_parser.sql
 share/postgresql/contrib/timetravel.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/unaccent.sql
+share/postgresql/contrib/uninstall_uuid-ossp.sql
+share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/contrib/uninstall__int.sql
 share/postgresql/contrib/uninstall_adminpack.sql
 share/postgresql/contrib/uninstall_btree_gin.sql
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index ffd6dfc752d2..c99292212c63 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -47,6 +47,10 @@ share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/plpgsql-9.0.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-9.0.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo
@@ -81,6 +85,13 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo
@@ -92,6 +103,7 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata-9.0.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-9.0.mo
@@ -148,6 +160,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Gaborone
 %%TZDATA%%share/postgresql/timezone/Africa/Harare
 %%TZDATA%%share/postgresql/timezone/Africa/Johannesburg
+%%TZDATA%%share/postgresql/timezone/Africa/Juba
 %%TZDATA%%share/postgresql/timezone/Africa/Kampala
 %%TZDATA%%share/postgresql/timezone/Africa/Khartoum
 %%TZDATA%%share/postgresql/timezone/Africa/Kigali
@@ -262,10 +275,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
@@ -756,9 +771,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 %%PG_USER%%