4 files changed, 20 insertions, 9 deletions

diff --git a/databases/postgresql80-server/files/dot.profile.in b/databases/postgresql80-server/files/dot.profile.in
index bd7ec45043be..3d8ca9ac4641 100644
--- a/databases/postgresql80-server/files/dot.profile.in
+++ b/databases/postgresql80-server/files/dot.profile.in
@@ -1,14 +1,14 @@
 PATH=${PATH}:%%PREFIX%%/pgsql/bin
 PGLIB=%%PREFIX%%/pgsql/lib
 
-# note: PGDATA overwrites the -D startup option
+# note: PGDATA can be overridden by the -D startup option
 PGDATA=%%PREFIX%%/pgsql/data
 
 export PATH MANPATH PGLIB PGDATA
 
 #You might want to set some locale stuff here
 #PGDATESTYLE=ISO
-#LC_ALL=sv_SE.ISO_88591-1
+#LC_ALL=sv_SE.ISO_8859-1
 #export PGDATESTYLE LC_ALL
 
 # if you want to make regression tests use this TZ
diff --git a/databases/postgresql80-server/pkg-deinstall b/databases/postgresql80-server/pkg-deinstall
new file mode 100644
index 000000000000..9e1fa3121dc0
--- /dev/null
+++ b/databases/postgresql80-server/pkg-deinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# remove postgresql users
+
+case $2 in 
+
+POST-DEINSTALL)
+	pw groupdel pgsql
+	pw userdel pgsql
+	;;
+
+esac
diff --git a/databases/postgresql80-server/pkg-install b/databases/postgresql80-server/pkg-install
index c55c0ebb161f..edd4f36830d5 100644
--- a/databases/postgresql80-server/pkg-install
+++ b/databases/postgresql80-server/pkg-install
@@ -4,15 +4,13 @@
 
 PATH=/bin:/usr/sbin
 
-if [ -z "${DB_DIR}" ]; then
-	DB_DIR=${PKG_PREFIX}/pgsql/data
-fi
+DB_DIR=${PKG_PREFIX}/pgsql
 
 case $2 in
-POST-INSTALL)
+PRE-INSTALL)
 	USER=pgsql
 	GROUP=${USER}
-	UID=89
+	UID=70
 	GID=${UID}
 
 	if pw group show "${GROUP}" 2>/dev/null; then
@@ -39,6 +37,6 @@ POST-INSTALL)
 		fi
 	fi
 
-	chown -R ${USER}.${GROUP} ${DB_DIR}
 	;;
+
 esac
diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist
index fd2bd41937f1..4cf31ebc5bc6 100644
--- a/databases/postgresql80-server/pkg-plist
+++ b/databases/postgresql80-server/pkg-plist
@@ -55,7 +55,6 @@ pgsql/include/utils/elog.h
 pgsql/include/utils/geo_decls.h
 pgsql/include/utils/mcxt.h
 pgsql/include/utils/palloc.h
-@exec chown root:wheel %D/pgsql/lib
 pgsql/lib/global1.bki.source
 pgsql/lib/global1.description
 pgsql/lib/libecpg.a
@@ -78,6 +77,7 @@ pgsql/lib/pg_ident.conf.sample
 pgsql/lib/pg_options.sample
 pgsql/lib/plpgsql.so
 pgsql/lib/postmaster.opts.default.sample
+@exec chown -R root:wheel %D/pgsql/lib
 pgsql/post-install-notes
 @dirrm pgsql/bin
 @dirrm pgsql/include/access
@@ -92,4 +92,5 @@ pgsql/post-install-notes
 @dirrm pgsql/man/man1
 @dirrm pgsql/man/manl
 @dirrm pgsql/man
+@unexec rmdir %D/pgsql/data 2>/dev/null || true
 @unexec rmdir %D/pgsql 2>/dev/null || true