Update postgresql port from v1.09 to v6.0 using files from PostgreSQL

port, which is going to be removed

6 files changed, 231 insertions, 229 deletions

diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 8fe4bc783e44..d75977ce0a5c 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,66 +1,61 @@
-# New ports collection makefile for:	postgres95
-# Version required:			1.08
-# Date created:				Oct 9 1996
-# Whom:	      				Matthew Stein <matt@bdd.net>
+# New ports collection makefile for:	PostgreSQL
+# Version required:			6.0 
+# Date created:				April 2, 1997
+# Whom:	      				Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.7 1997/04/02 09:15:26 scrappy Exp $
+#   $Id: Makefile,v 1.2 1997/04/02 18:17:50 jfitz Exp $
 
-PKGNAME=	postgres95-1.08
+DISTNAME=	postgresql-v6.0
+PKGNAME=	postgresql-6.0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.PostgreSQL.org/pub/oldstuff/ \
-		ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/oldstuff/ \
-		ftp://postgres95.vnet.net:/pub/postgres95/oldstuff/ \
-		ftp://ftp.itm.tu-clausthal.de/pub/mirrors/postgres95/oldstuff/ \
-		ftp://rocker.sch.bme.hu/pub/mirrors/postgreSQL/oldstuff/ \
-		ftp://ftp.luga.or.at/pub/postgres95/ 
-
-DISTFILES=	postgres95-1.08.tar.gz \
-		flex-2.5.2.tgz
+MASTER_SITES=	ftp://ftp.PostgreSQL.org/pub/ \
+		ftp://ftp.luga.or.at/pub/postgres95/ \
+		ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ 
 		
-MAINTAINER=	matt@bdd.net
-
-NO_PACKAGE=	"Requires postgres uid"
-WRKSRC=		${WRKDIR}/postgres95/src/
-MAKE_ENV+=	WRKSRC=${WRKSRC} WRKDIR=${WRKDIR}
-USE_GMAKE=	yes
-
-pre-fetch:
-.if exists(/usr/lib/libc.so.3.0)
-		@ ${CAT} ${FILESDIR}/md5.libc30 ${FILESDIR}/md5.all > ${FILESDIR}/md5
-MASTER_SITES+=	ftp://eddie.cis.uoguelph.ca/pub/flex/ \
-		ftp://ftp.teamos2.org/pub/flex/ \
-		ftp://ftp.bdd.net/pub/flex/
-.else
-		@ ${CAT} ${FILESDIR}/md5.libc22 ${FILESDIR}/md5.all > ${FILESDIR}/md5
-MASTER_SITES+=	ftp://ftp.freebsd.org/pub/FreeBSD/packages-2.1.5/All/
-.endif
+MAINTAINER=	scrappy@FreeBSD.ORG
+
+NO_PACKAGE=	"Requires pgsql uid"
+WRKSRC=		${WRKDIR}/src
+USE_GMAKE=	YES
+MAKEFILE=	GNUmakefile
+
+MAN1=		createdb.1 psql.1 unix.1 postgres.1 pg_dumpall.1 monitor.1 \
+		initdb.1 ipcclean.1 destroydb.1 cleardbdir.1 createuser.1 \
+		destroyuser.1 pg_dump.1 postmaster.1
+MAN3=		libpq.3 large_objects.3 built-in.3 catalogs.3
+MAN5=		pg_hba.conf.5 bki.5 page.5
+MANL=		vacuum.l sql.l select.l update.l revoke.l rename.l purge.l \
+		load.l listen.l insert.l fetch.l end.l grant.l drop_rule.l \
+		drop_type.l drop_function.l create_aggregate.l drop.l \
+		delete.l destroydb.l create_view.l create_rule.l \
+		create_index.l copy.l cluster.l create_database.l \
+		create_function.l begin.l abort.l alter_table.l close.l \
+		create_operator.l create_table.l create_type.l \
+		create_version.l drop_aggregate.l drop_operator.l explain.l \
+		notify.l remove_view.l rollback.l commit.l drop_index.l
+MANPREFIX=	${PREFIX}/pgsql
 
 pre-install:
-		@ ${MKDIR} ${PREFIX}/postgres95
+		@ ${MKDIR} ${PREFIX}/pgsql
 		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
 
 post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in ${PREFIX}/postgres95/man/man[135l]/*; do \
-			gzip -9nf $$file ; \
-		done
-.endif
-		@ chown -R postgres:postgres ${PREFIX}/postgres95
-		@ echo 'Initializing Postgres95 Databases - this may take a few minutes...'
-		@ su -l postgres -c ${PREFIX}/postgres95/bin/initdb
-		@ ${MKDIR} ${PREFIX}/etc/rc.d
-		@ if [ ! -f ${PREFIX}/etc/rc.d/postgres95.sh ]; then \
-			echo "Installing ${PREFIX}/etc/rc.d/postgres95.sh startup file."; \
-			echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgres95.sh; \
-			echo "[ -x ${PREFIX}/postgres95/bin/postmaster ] && su -l postgres -c ${PREFIX}/postgres95/bin/postmaster & && echo -n ' postgres95'" >> ${PREFIX}/etc/rc.d/postgres95.sh; \
-			chmod 751 ${PREFIX}/etc/rc.d/postgres95.sh; \
+		@ chown -R pgsql:pgsql ${PREFIX}/pgsql
+		@ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \
+			echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" > ${PREFIX}/pgsql/.profile; \
+			echo "export PATH" >> ${PREFIX}/pgsql/.profile; \
+		fi
+		@ echo 'Initializing PostgreSQL Databases - this may take a few minutes...'
+		@ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+		@ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \
+			echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \
+			echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \
+			echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \
+			chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \
 		fi
-		@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/postgres95
-.ifndef(BATCH)
+		@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if !defined(BATCH)
 		@ more -e ${FILESDIR}/post-install-notes
 .endif
 
-pre-clean:
-		@ ${RM} -f ${FILESDIR}/md5
-
 .include <bsd.port.mk>
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
new file mode 100644
index 000000000000..6e38772d6134
--- /dev/null
+++ b/databases/postgresql80-server/distinfo
@@ -0,0 +1 @@
+MD5 (postgresql-v6.0.tar.gz) = f58a0cd9beec65a473b76a19409bdedd
diff --git a/databases/postgresql80-server/files/post-install-notes b/databases/postgresql80-server/files/post-install-notes
index 6d26c8799339..1956d17766c9 100644
--- a/databases/postgresql80-server/files/post-install-notes
+++ b/databases/postgresql80-server/files/post-install-notes
@@ -1,8 +1,6 @@
 
-Now that postgres95 is installed, you should read the documentation and
-implementation guides.  These can be found at
+Now that PostgreSQL is installed, you should read the documentation and
+implementation guides.  These can be found at:
 
-http://www.PostgreSQL.org/docs/
+		http://www.PostgreSQL.org/docs
 
---
-mat.
diff --git a/databases/postgresql80-server/pkg-descr b/databases/postgresql80-server/pkg-descr
index 2743afb25835..9cefa466a8c0 100644
--- a/databases/postgresql80-server/pkg-descr
+++ b/databases/postgresql80-server/pkg-descr
@@ -1,20 +1,20 @@
-Postgres95 is an enhancement of the POSTGRES database management system, a
-next-generation DBMS research prototype.  While Postgres95 retains the
+PostgreSQL is an enhancement of the POSTGRES database management system, a
+next-generation DBMS research prototype.  While PostgreSQL retains the
 powerful data model and rich data types of POSTGRES, it replaces the
-PostQuel query language with an extended subset of SQL.  Postgres95 is free
+PostQuel query language with an extended subset of SQL.  PostgreSQL is free
 and the complete source is available.
 
-Postgres95 development is being performed by a team of Internet developers
-who all subscribe to the Postgres95 development mailing list.  The current
-coordinator is Marc G. Fournier (scrappy@ki.net).  This team is now
-responsible for all current and future development of Postgres95.
+PostgreSQL development is being performed by a team of Internet developers
+who all subscribe to the PostgreSQL development mailing list.  The current
+coordinator is Marc G. Fournier (scrappy@postgresql.org).  This team is now
+responsible for all current and future development of PostgreSQL.
 
 The authors of Postgres95 1.01 were Andrew Yu and Jolly Chen. Many others
 have contributed to the porting, testing, debugging and enhancement of the
-code.  The original Postgres code, from which Postgres95 is derived, was the
+code.  The original Postgres code, from which PostgreSQL is derived, was the
 effort of many graduate students, undergraduate students, and staff
 programmers working under the direction of Professor Michael Stonebraker at
 the University of California, Berkeley.
 
-More information and documentation can be found at the postgres95 website,
-at http://www.ki.net/postgres95/
+More information and documentation can be found at the PostgreSQL website,
+at http://www.PostgreSQL.org
diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist
index 43a0ebb2e780..e3c2513f015f 100644
--- a/databases/postgresql80-server/pkg-plist
+++ b/databases/postgresql80-server/pkg-plist
@@ -1,154 +1,162 @@
-etc/rc.d/postgres95.sh
-postgres95/lib/libpq.a
-postgres95/bin/postgres
-postgres95/bin/postmaster
-postgres95/bin/pg_id
-postgres95/bin/pg_version
-postgres95/bin/psql
-postgres95/bin/pg_dump
-postgres95/bin/cleardbdir
-postgres95/bin/createdb
-postgres95/bin/createuser
-postgres95/bin/destroydb
-postgres95/bin/destroyuser
-postgres95/bin/initdb
-postgres95/data/files/global1.bki
-postgres95/data/files/global1.bki.source
-postgres95/data/files/local1_template1.bki
-postgres95/data/files/local1_template1.bki.source
-postgres95/data/pg_hba
-postgres95/data/base/template1/pg_proc
-postgres95/data/base/template1/pg_type
-postgres95/data/base/template1/pg_attribute
-postgres95/data/base/template1/pg_class
-postgres95/data/base/template1/pg_inherits
-postgres95/data/base/template1/pg_index
-postgres95/data/base/template1/pg_version
-postgres95/data/base/template1/pg_statistic
-postgres95/data/base/template1/pg_operator
-postgres95/data/base/template1/pg_opclass
-postgres95/data/base/template1/pg_am
-postgres95/data/base/template1/pg_amop
-postgres95/data/base/template1/pg_amproc
-postgres95/data/base/template1/pg_language
-postgres95/data/base/template1/pg_parg
-postgres95/data/base/template1/pg_aggregate
-postgres95/data/base/template1/pg_ipl
-postgres95/data/base/template1/pg_inheritproc
-postgres95/data/base/template1/pg_rewrite
-postgres95/data/base/template1/pg_listener
-postgres95/data/base/template1/pg_attnameind
-postgres95/data/base/template1/pg_attnumind
-postgres95/data/base/template1/pg_attrelidind
-postgres95/data/base/template1/pg_procidind
-postgres95/data/base/template1/pg_procnameind
-postgres95/data/base/template1/pg_procsrcind
-postgres95/data/base/template1/pg_typeidind
-postgres95/data/base/template1/pg_typenameind
-postgres95/data/base/template1/pg_classnameind
-postgres95/data/base/template1/pg_classoidind
-postgres95/data/base/template1/PG_VERSION
-postgres95/data/base/template1/pg_internal.init
-postgres95/data/pg_variable
-postgres95/data/pg_database
-postgres95/data/pg_demon
-postgres95/data/pg_magic
-postgres95/data/pg_defaults
-postgres95/data/pg_server
-postgres95/data/pg_user
-postgres95/data/pg_hosts
-postgres95/data/pg_group
-postgres95/data/pg_log
-postgres95/data/pg_time
-postgres95/data/PG_VERSION
-postgres95/include/fmgr.h
-postgres95/include/lib/dllist.h
-postgres95/include/libpq/pqcomm.h
-postgres95/include/libpq/libpq-fs.h
-postgres95/include/utils/geo-decls.h
-postgres95/include/libpq-fe.h
-postgres95/include/postgres.h
-postgres95/include/c.h
-postgres95/man/man1/cleardbdir.1.gz
-postgres95/man/man1/psql.1.gz
-postgres95/man/man1/postmaster.1.gz
-postgres95/man/man1/postgres.1.gz
-postgres95/man/man1/pg_dump.1.gz
-postgres95/man/man1/monitor.1.gz
-postgres95/man/man1/ipcclean.1.gz
-postgres95/man/man1/initdb.1.gz
-postgres95/man/man1/destroyuser.1.gz
-postgres95/man/man1/destroydb.1.gz
-postgres95/man/man1/createuser.1.gz
-postgres95/man/man1/createdb.1.gz
-postgres95/man/man1/unix.1.gz
-postgres95/man/man3/libpq.3.gz
-postgres95/man/man3/large_objects.3.gz
-postgres95/man/man3/catalogs.3.gz
-postgres95/man/man3/built-in.3.gz
-postgres95/man/man5/template.5.gz
-postgres95/man/man5/pg_hba.5.gz
-postgres95/man/man5/page.5.gz
-postgres95/man/man5/files.5.gz
-postgres95/man/man5/bki.5.gz
-postgres95/man/manl/abort.l.gz
-postgres95/man/manl/update.l.gz
-postgres95/man/manl/sql.l.gz
-postgres95/man/manl/select.l.gz
-postgres95/man/manl/rollback.l.gz
-postgres95/man/manl/revoke.l.gz
-postgres95/man/manl/rename.l.gz
-postgres95/man/manl/remove_view.l.gz
-postgres95/man/manl/purge.l.gz
-postgres95/man/manl/notify.l.gz
-postgres95/man/manl/load.l.gz
-postgres95/man/manl/listen.l.gz
-postgres95/man/manl/insert.l.gz
-postgres95/man/manl/grant.l.gz
-postgres95/man/manl/fetch.l.gz
-postgres95/man/manl/end.l.gz
-postgres95/man/manl/drop_type.l.gz
-postgres95/man/manl/drop_rule.l.gz
-postgres95/man/manl/drop_operator.l.gz
-postgres95/man/manl/drop_index.l.gz
-postgres95/man/manl/drop_function.l.gz
-postgres95/man/manl/drop_aggregate.l.gz
-postgres95/man/manl/drop.l.gz
-postgres95/man/manl/destroydb.l.gz
-postgres95/man/manl/copy.l.gz
-postgres95/man/manl/delete.l.gz
-postgres95/man/manl/create_database.l.gz
-postgres95/man/manl/create_view.l.gz
-postgres95/man/manl/create_version.l.gz
-postgres95/man/manl/create_type.l.gz
-postgres95/man/manl/create_table.l.gz
-postgres95/man/manl/create_rule.l.gz
-postgres95/man/manl/create_operator.l.gz
-postgres95/man/manl/create_index.l.gz
-postgres95/man/manl/create_function.l.gz
-postgres95/man/manl/create_aggregate.l.gz
-postgres95/man/manl/commit.l.gz
-postgres95/man/manl/cluster.l.gz
-postgres95/man/manl/close.l.gz
-postgres95/man/manl/begin.l.gz
-postgres95/man/manl/alter_table.l.gz
-postgres95/man/manl/vacuum.l.gz
-postgres95/post-install-notes
-@dirrm postgres95/man/man1/
-@dirrm postgres95/man/man3/
-@dirrm postgres95/man/man5/
-@dirrm postgres95/man/manl/
-@dirrm postgres95/man/
-@dirrm postgres95/lib/
-@dirrm postgres95/include/utils/
-@dirrm postgres95/include/port/BSD44_derived/
-@dirrm postgres95/include/port/
-@dirrm postgres95/include/libpq/
-@dirrm postgres95/include/lib/
-@dirrm postgres95/include/
-@dirrm postgres95/data/files/
-@dirrm postgres95/data/base/template1/
-@dirrm postgres95/data/base/
-@dirrm postgres95/data/
-@dirrm postgres95/bin/
-@dirrm postgres95/
+etc/rc.d/postgresql.sh
+pgsql/lib/global1.bki.source
+pgsql/lib/local1_template1.bki.source
+pgsql/lib/pg_hba.conf.sample
+pgsql/lib/libpq.a
+pgsql/bin/postgres
+pgsql/bin/postmaster
+pgsql/bin/pg_id
+pgsql/bin/pg_version
+pgsql/bin/psql
+pgsql/bin/pg_dump
+pgsql/bin/pg_dumpall
+pgsql/bin/cleardbdir
+pgsql/bin/createdb
+pgsql/bin/createuser
+pgsql/bin/destroydb
+pgsql/bin/destroyuser
+pgsql/bin/initdb
+pgsql/include/fmgr.h
+pgsql/include/lib/dllist.h
+pgsql/include/libpq/pqcomm.h
+pgsql/include/libpq/libpq-fs.h
+pgsql/include/utils/geo-decls.h
+pgsql/include/utils/elog.h
+pgsql/include/utils/palloc.h
+pgsql/include/access/attnum.h
+pgsql/include/config.h
+pgsql/include/postgres.h
+pgsql/include/postgres_ext.h
+pgsql/include/libpq-fe.h
+pgsql/include/c.h
+pgsql/man/man1/createdb.1.gz
+pgsql/man/man1/psql.1.gz
+pgsql/man/man1/unix.1.gz
+pgsql/man/man1/postgres.1.gz
+pgsql/man/man1/pg_dumpall.1.gz
+pgsql/man/man1/monitor.1.gz
+pgsql/man/man1/initdb.1.gz
+pgsql/man/man1/ipcclean.1.gz
+pgsql/man/man1/destroydb.1.gz
+pgsql/man/man1/cleardbdir.1.gz
+pgsql/man/man1/createuser.1.gz
+pgsql/man/man1/destroyuser.1.gz
+pgsql/man/man1/pg_dump.1.gz
+pgsql/man/man1/postmaster.1.gz
+pgsql/man/man3/libpq.3.gz
+pgsql/man/man3/large_objects.3.gz
+pgsql/man/man3/built-in.3.gz
+pgsql/man/man3/catalogs.3.gz
+pgsql/man/man5/pg_hba.conf.5.gz
+pgsql/man/man5/bki.5.gz
+pgsql/man/man5/page.5.gz
+pgsql/man/manl/vacuum.l.gz
+pgsql/man/manl/sql.l.gz
+pgsql/man/manl/select.l.gz
+pgsql/man/manl/update.l.gz
+pgsql/man/manl/revoke.l.gz
+pgsql/man/manl/rename.l.gz
+pgsql/man/manl/purge.l.gz
+pgsql/man/manl/load.l.gz
+pgsql/man/manl/listen.l.gz
+pgsql/man/manl/insert.l.gz
+pgsql/man/manl/fetch.l.gz
+pgsql/man/manl/end.l.gz
+pgsql/man/manl/grant.l.gz
+pgsql/man/manl/drop_rule.l.gz
+pgsql/man/manl/drop_type.l.gz
+pgsql/man/manl/drop_index.l.gz
+pgsql/man/manl/drop_function.l.gz
+pgsql/man/manl/create_aggregate.l.gz
+pgsql/man/manl/drop.l.gz
+pgsql/man/manl/delete.l.gz
+pgsql/man/manl/destroydb.l.gz
+pgsql/man/manl/create_view.l.gz
+pgsql/man/manl/create_rule.l.gz
+pgsql/man/manl/create_index.l.gz
+pgsql/man/manl/copy.l.gz
+pgsql/man/manl/commit.l.gz
+pgsql/man/manl/cluster.l.gz
+pgsql/man/manl/create_database.l.gz
+pgsql/man/manl/create_function.l.gz
+pgsql/man/manl/begin.l.gz
+pgsql/man/manl/abort.l.gz
+pgsql/man/manl/alter_table.l.gz
+pgsql/man/manl/close.l.gz
+pgsql/man/manl/create_operator.l.gz
+pgsql/man/manl/create_table.l.gz
+pgsql/man/manl/create_type.l.gz
+pgsql/man/manl/create_version.l.gz
+pgsql/man/manl/drop_aggregate.l.gz
+pgsql/man/manl/drop_operator.l.gz
+pgsql/man/manl/explain.l.gz
+pgsql/man/manl/notify.l.gz
+pgsql/man/manl/remove_view.l.gz
+pgsql/man/manl/rollback.l.gz
+pgsql/.profile
+pgsql/data/base/template1/pg_proc
+pgsql/data/base/template1/pg_type
+pgsql/data/base/template1/pg_attribute
+pgsql/data/base/template1/pg_class
+pgsql/data/base/template1/pg_inherits
+pgsql/data/base/template1/pg_index
+pgsql/data/base/template1/pg_version
+pgsql/data/base/template1/pg_statistic
+pgsql/data/base/template1/pg_operator
+pgsql/data/base/template1/pg_opclass
+pgsql/data/base/template1/pg_am
+pgsql/data/base/template1/pg_amop
+pgsql/data/base/template1/pg_amproc
+pgsql/data/base/template1/pg_language
+pgsql/data/base/template1/pg_parg
+pgsql/data/base/template1/pg_aggregate
+pgsql/data/base/template1/pg_ipl
+pgsql/data/base/template1/pg_inheritproc
+pgsql/data/base/template1/pg_rewrite
+pgsql/data/base/template1/pg_listener
+pgsql/data/base/template1/pg_attnameind
+pgsql/data/base/template1/pg_attnumind
+pgsql/data/base/template1/pg_attrelidind
+pgsql/data/base/template1/pg_procidind
+pgsql/data/base/template1/pg_procnameind
+pgsql/data/base/template1/pg_procsrcind
+pgsql/data/base/template1/pg_typeidind
+pgsql/data/base/template1/pg_typenameind
+pgsql/data/base/template1/pg_classnameind
+pgsql/data/base/template1/pg_classoidind
+pgsql/data/base/template1/PG_VERSION
+pgsql/data/base/template1/pg_internal.init
+pgsql/data/pg_variable
+pgsql/data/pg_database
+pgsql/data/pg_demon
+pgsql/data/pg_magic
+pgsql/data/pg_defaults
+pgsql/data/pg_server
+pgsql/data/pg_user
+pgsql/data/pg_hosts
+pgsql/data/pg_group
+pgsql/data/pg_log
+pgsql/data/pg_time
+pgsql/data/PG_VERSION
+pgsql/data/pg_hba.conf
+pgsql/errlog
+pgsql/post-install-notes
+@dirrm pgsql/man/man1/
+@dirrm pgsql/man/man3/
+@dirrm pgsql/man/man5/
+@dirrm pgsql/man/manl/
+@dirrm pgsql/man/
+@dirrm pgsql/lib/
+@dirrm pgsql/include/utils/
+@dirrm pgsql/include/port/BSD44_derived/
+@dirrm pgsql/include/port/
+@dirrm pgsql/include/libpq/
+@dirrm pgsql/include/lib/
+@dirrm pgsql/include/include/
+@dirrm pgsql/include/access/
+@dirrm pgsql/include/
+@dirrm pgsql/data/base/template1/
+@dirrm pgsql/data/base/
+@dirrm pgsql/data/
+@dirrm pgsql/bin/
+@dirrm pgsql/
diff --git a/databases/postgresql80-server/scripts/createuser b/databases/postgresql80-server/scripts/createuser
index 4c24a164fbd6..ceb99626e648 100644
--- a/databases/postgresql80-server/scripts/createuser
+++ b/databases/postgresql80-server/scripts/createuser
@@ -10,8 +10,8 @@ if( $> ) {
 	exit 1;
 } 
 
-if( getpwnam( "postgres" ) ) {
-	( $null, $null, $pgUID ) = getpwnam( "postgres" );
+if( getpwnam( "pgsql" ) ) {
+	( $null, $null, $pgUID ) = getpwnam( "pgsql" );
 } else {
 	$pgUID = 70;
 	while( getpwuid( $pgUID ) ) {
@@ -19,20 +19,20 @@ if( getpwnam( "postgres" ) ) {
 	}
 }
 
-if( getgrnam( "postgres" ) ) {
-	( $null, $null, $pgGID ) = getgrnam( "postgres" );
+if( getgrnam( "pgsql" ) ) {
+	( $null, $null, $pgGID ) = getgrnam( "pgsql" );
 } else {
 	$pgGID = 70;
 	while( getgrgid( $pgGID ) ) {
 		$pgGID++;
 	}
-	&append_file( "/etc/group", "postgres:*:$pgGID:" );
+	&append_file( "/etc/group", "pgsql:*:$pgGID:" );
 }
 
-print "postgres user using uid $pgUID\n";
-print "postgres user using gid $pgGID\n";
+print "pgsql user using uid $pgUID\n";
+print "pgsql user using gid $pgGID\n";
 
-system( "/usr/bin/chpass -a \"postgres:*:$pgUID:$pgGID::0:0:Postgres95 pseudo-user:$ENV{'PREFIX'}/postgres95:/bin/sh\"" );
+system( "/usr/bin/chpass -a \"pgsql:*:$pgUID:$pgGID::0:0:PostgreSQL pseudo-user:$ENV{'PREFIX'}/pgsql:/bin/sh\"" );
 
 sub append_file {
 	local($file,@list) = @_;