Close PR

Postgresql port now can be packaged.
User and group will be created automatically

PR:		17744
Submitted by:	Adrian Filipi-Martin <adrian@ubergeeks.com>

42 files changed, 2422 insertions, 28 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql-devel-server/pkg-install b/databases/postgresql-devel-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql-devel-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql-devel-server/pkg-plist
+++ b/databases/postgresql-devel-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql-devel/pkg-install b/databases/postgresql-devel/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql-devel/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql-devel/pkg-plist
+++ b/databases/postgresql-devel/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql7/pkg-install b/databases/postgresql7/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql7/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql7/pkg-plist
+++ b/databases/postgresql7/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql73-server/pkg-install b/databases/postgresql73-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql73-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql73-server/pkg-plist
+++ b/databases/postgresql73-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql73/pkg-install b/databases/postgresql73/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql73/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql73/pkg-plist
+++ b/databases/postgresql73/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql74-server/pkg-install b/databases/postgresql74-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql74-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql80-server/pkg-install b/databases/postgresql80-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql80-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql80-server/pkg-plist
+++ b/databases/postgresql80-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql81-server/pkg-install b/databases/postgresql81-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql81-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql81-server/pkg-plist
+++ b/databases/postgresql81-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql82-server/pkg-install b/databases/postgresql82-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql82-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql82-server/pkg-plist
+++ b/databases/postgresql82-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql83-server/pkg-install b/databases/postgresql83-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql83-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql83-server/pkg-plist
+++ b/databases/postgresql83-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql84-server/pkg-install b/databases/postgresql84-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql84-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql84-server/pkg-plist
+++ b/databases/postgresql84-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql90-server/pkg-install b/databases/postgresql90-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql90-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql90-server/pkg-plist
+++ b/databases/postgresql90-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql91-server/pkg-install b/databases/postgresql91-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql91-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql91-server/pkg-plist
+++ b/databases/postgresql91-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index e9c9e510515d..748948761f9a 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -42,7 +42,6 @@ BUILD_DEPENDS=	${JAVA_HOME}/bin/javac:${PORTSDIR}/java/jdk
 SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 .endif
 
-NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	YES
diff --git a/databases/postgresql92-server/pkg-install b/databases/postgresql92-server/pkg-install
new file mode 100644
index 000000000000..012699f1d6fe
--- /dev/null
+++ b/databases/postgresql92-server/pkg-install
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+if [ -z "${DB_DIR}" ]; then
+	DB_DIR=/usr/local/pgsql/data
+fi
+
+case $2 in
+POST-INSTALL)
+	USER=pgsql
+	GROUP=${USER}
+	UID=89
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d ${DB_DIR} -s /sbin/nologin -c "PostgreSQL Daemon"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	chown -R ${USER}.${GROUP} ${DB_DIR}
+	;;
+esac
diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist
index d58a27f31eb5..e5b4226c1643 100644
--- a/databases/postgresql92-server/pkg-plist
+++ b/databases/postgresql92-server/pkg-plist
@@ -11,6 +11,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgaccess
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
@@ -116,6 +117,128 @@ pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
 pgsql/lib/pg_hba.conf.sample
 pgsql/lib/plpgsql.so
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/post-install-notes
@@ -922,6 +1045,7 @@ share/doc/pgsql/user/y2k.htm
 @dirrm share/doc/pgsql/tutorial
 @dirrm share/doc/pgsql/user
 @dirrm share/doc/pgsql
+@dirrm pgsql/bin
 @dirrm pgsql/man/manl
 @dirrm pgsql/man/man5
 @dirrm pgsql/man/man3
@@ -941,5 +1065,9 @@ share/doc/pgsql/user/y2k.htm
 @dirrm pgsql/data/base/template1
 @dirrm pgsql/data/base
 @dirrm pgsql/data
-@dirrm pgsql/bin
+@dirrm pgsql/pgaccess/lib/help
+@dirrm pgsql/pgaccess/lib/languages
+@dirrm pgsql/pgaccess/lib
+@dirrm pgsql/pgaccess/images
+@dirrm pgsql/pgaccess
 @dirrm pgsql