Update from 6.0 to 6.1

Enabled locale support, please tell me, if this ok or causes trouble.
Thanks.

4 files changed, 192 insertions, 169 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index d75977ce0a5c..163b68506fb0 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -1,61 +1,75 @@
 # New ports collection makefile for:	PostgreSQL
-# Version required:			6.0 
-# Date created:				April 2, 1997
-# Whom:	      				Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Version required:	6.1 
+# Date created:		April 2, 1997
+# Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-#   $Id: Makefile,v 1.2 1997/04/02 18:17:50 jfitz Exp $
+# $Id$
 
-DISTNAME=	postgresql-v6.0
-PKGNAME=	postgresql-6.0
+DISTNAME=	postgresql-v6.1
+PKGNAME=	postgresql-6.1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.PostgreSQL.org/pub/ \
 		ftp://ftp.luga.or.at/pub/postgres95/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ 
 		
-MAINTAINER=	scrappy@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Requires pgsql uid"
-WRKSRC=		${WRKDIR}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+		--enable-locale \
+		--with-template=`uname -s | tr '[A-Z]' '[a-z]'`
 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
+MAN1=		cleardbdir.1 createdb.1 createuser.1 destroydb.1 \
+		destroyuser.1 initdb.1 ipcclean.1 monitor.1 pg_dump.1 \
+		pg_dumpall.1 postgres.1 postmaster.1 psql.1 unix.1
+MAN3=		built-in.3 catalogs.3 large_objects.3 libpq.3 oracle_compat.3
+MAN5=		bki.5 page.5 pg_hba.conf.5 
+MANL=		abort.l alter_table.l begin.l close.l cluster.l \
+		commit.l copy.l create_aggregate.l create_database.l \
+		create_function.l create_index.l create_operator.l \
+		create_rule.l create_sequence.l create_table.l \
+		create_type.l create_version.l create_view.l delete.l \
+		drop.l drop_aggregate.l drop_database.l drop_function.l \
+		drop_index.l drop_operator.l drop_rule.l drop_sequence.l \
+		drop_type.l drop_view.l end.l explain.l fetch.l grant.l \
+		insert.l listen.l load.l notify.l purge.l rename.l \
+		reset.l revoke.l rollback.l select.l set.l show.l \
+		sql.l update.l vacuum.l
 MANPREFIX=	${PREFIX}/pgsql
 
 pre-install:
-		@ ${MKDIR} ${PREFIX}/pgsql
-		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+	@ ${MKDIR} ${PREFIX}/pgsql
+	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
 
 post-install:
-		@ 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}/pgsql
+	@ chown -R pgsql:pgsql ${PREFIX}/pgsql
+	@ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \
+		echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \
+			> ${PREFIX}/pgsql/.profile; \
+		echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \
+			>> ${PREFIX}/pgsql/.profile; \
+		echo "PGLIB=${PREFIX}/pgsql/bin" \
+			>> ${PREFIX}/pgsql/.profile; \
+		echo "PGDATA=${PREFIX}/pgsql/bin" \
+			>> ${PREFIX}/pgsql/.profile; \
+		echo "export PATH MANPATH PGLIB PGDATA" \
+			>> ${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}/pgsql
 .if !defined(BATCH)
-		@ more -e ${FILESDIR}/post-install-notes
+	@ more -e ${FILESDIR}/post-install-notes
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo
index 6e38772d6134..355b5db38ad8 100644
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@@ -1 +1 @@
-MD5 (postgresql-v6.0.tar.gz) = f58a0cd9beec65a473b76a19409bdedd
+MD5 (postgresql-v6.1.tar.gz) = 497a1d3499a0640375b50a22594874da
diff --git a/databases/postgresql-devel-server/pkg-descr b/databases/postgresql-devel-server/pkg-descr
index 789621204a8a..680bf5c7f2ba 100644
--- a/databases/postgresql-devel-server/pkg-descr
+++ b/databases/postgresql-devel-server/pkg-descr
@@ -1,5 +1,4 @@
 
-
 PostgreSQL is a robust, next-generation, Object-Relational DBMS (ORDBMS), 
 derived from the Berkeley Postgres database management system.  While 
 PostgreSQL retains the powerful object-relational data model, rich data types 
diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist
index e3c2513f015f..162d85812ab6 100644
--- a/databases/postgresql-devel-server/pkg-plist
+++ b/databases/postgresql-devel-server/pkg-plist
@@ -1,162 +1,172 @@
 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/.profile
 pgsql/bin/cleardbdir
 pgsql/bin/createdb
 pgsql/bin/createuser
 pgsql/bin/destroydb
 pgsql/bin/destroyuser
 pgsql/bin/initdb
+pgsql/bin/pg_dump
+pgsql/bin/pg_dumpall
+pgsql/bin/pg_id
+pgsql/bin/pg_version
+pgsql/bin/postgres
+pgsql/bin/postmaster
+pgsql/bin/psql
+pgsql/data/PG_VERSION
+pgsql/data/base/template1/PG_VERSION
+pgsql/data/base/template1/pg_aggregate
+pgsql/data/base/template1/pg_am
+pgsql/data/base/template1/pg_amop
+pgsql/data/base/template1/pg_amproc
+pgsql/data/base/template1/pg_attnameind
+pgsql/data/base/template1/pg_attnumind
+pgsql/data/base/template1/pg_attrelidind
+pgsql/data/base/template1/pg_attribute
+pgsql/data/base/template1/pg_class
+pgsql/data/base/template1/pg_classnameind
+pgsql/data/base/template1/pg_classoidind
+pgsql/data/base/template1/pg_index
+pgsql/data/base/template1/pg_inheritproc
+pgsql/data/base/template1/pg_inherits
+pgsql/data/base/template1/pg_internal.init
+pgsql/data/base/template1/pg_ipl
+pgsql/data/base/template1/pg_language
+pgsql/data/base/template1/pg_listener
+pgsql/data/base/template1/pg_opclass
+pgsql/data/base/template1/pg_operator
+pgsql/data/base/template1/pg_parg
+pgsql/data/base/template1/pg_proc
+pgsql/data/base/template1/pg_procidind
+pgsql/data/base/template1/pg_procnameind
+pgsql/data/base/template1/pg_procsrcind
+pgsql/data/base/template1/pg_rewrite
+pgsql/data/base/template1/pg_statistic
+pgsql/data/base/template1/pg_type
+pgsql/data/base/template1/pg_typeidind
+pgsql/data/base/template1/pg_typenameind
+pgsql/data/base/template1/pg_version
+pgsql/data/pg_database
+pgsql/data/pg_defaults
+pgsql/data/pg_demon
+pgsql/data/pg_geqo.sample
+pgsql/data/pg_group
+pgsql/data/pg_hba.conf
+pgsql/data/pg_hosts
+pgsql/data/pg_log
+pgsql/data/pg_magic
+pgsql/data/pg_server
+pgsql/data/pg_time
+pgsql/data/pg_user
+pgsql/data/pg_variable
+pgsql/include/access/attnum.h
+pgsql/include/c.h
+pgsql/include/config.h
 pgsql/include/fmgr.h
 pgsql/include/lib/dllist.h
-pgsql/include/libpq/pqcomm.h
+pgsql/include/libpq-fe.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/libpq/pqcomm.h
+pgsql/include/os.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/include/utils/elog.h
+pgsql/include/utils/geo_decls.h
+pgsql/include/utils/palloc.h
+pgsql/lib/global1.bki.source
+pgsql/lib/libpq.a
+pgsql/lib/libpq.so
+pgsql/lib/libpq.so.1.0
+pgsql/lib/local1_template1.bki.source
+pgsql/lib/pg_geqo.sample
+pgsql/lib/pg_hba.conf.sample
 pgsql/man/man1/cleardbdir.1.gz
+pgsql/man/man1/createdb.1.gz
 pgsql/man/man1/createuser.1.gz
+pgsql/man/man1/destroydb.1.gz
 pgsql/man/man1/destroyuser.1.gz
+pgsql/man/man1/initdb.1.gz
+pgsql/man/man1/ipcclean.1.gz
+pgsql/man/man1/monitor.1.gz
 pgsql/man/man1/pg_dump.1.gz
+pgsql/man/man1/pg_dumpall.1.gz
+pgsql/man/man1/postgres.1.gz
 pgsql/man/man1/postmaster.1.gz
-pgsql/man/man3/libpq.3.gz
-pgsql/man/man3/large_objects.3.gz
+pgsql/man/man1/psql.1.gz
+pgsql/man/man1/unix.1.gz
 pgsql/man/man3/built-in.3.gz
 pgsql/man/man3/catalogs.3.gz
-pgsql/man/man5/pg_hba.conf.5.gz
+pgsql/man/man3/large_objects.3.gz
+pgsql/man/man3/libpq.3.gz
+pgsql/man/man3/oracle_compat.3.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/man5/pg_hba.conf.5.gz
 pgsql/man/manl/abort.l.gz
 pgsql/man/manl/alter_table.l.gz
+pgsql/man/manl/begin.l.gz
 pgsql/man/manl/close.l.gz
+pgsql/man/manl/cluster.l.gz
+pgsql/man/manl/commit.l.gz
+pgsql/man/manl/copy.l.gz
+pgsql/man/manl/create_aggregate.l.gz
+pgsql/man/manl/create_database.l.gz
+pgsql/man/manl/create_function.l.gz
+pgsql/man/manl/create_index.l.gz
 pgsql/man/manl/create_operator.l.gz
+pgsql/man/manl/create_rule.l.gz
+pgsql/man/manl/create_sequence.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/create_view.l.gz
+pgsql/man/manl/delete.l.gz
+pgsql/man/manl/drop.l.gz
 pgsql/man/manl/drop_aggregate.l.gz
+pgsql/man/manl/drop_database.l.gz
+pgsql/man/manl/drop_function.l.gz
+pgsql/man/manl/drop_index.l.gz
 pgsql/man/manl/drop_operator.l.gz
+pgsql/man/manl/drop_rule.l.gz
+pgsql/man/manl/drop_sequence.l.gz
+pgsql/man/manl/drop_type.l.gz
+pgsql/man/manl/drop_view.l.gz
+pgsql/man/manl/end.l.gz
 pgsql/man/manl/explain.l.gz
+pgsql/man/manl/fetch.l.gz
+pgsql/man/manl/grant.l.gz
+pgsql/man/manl/insert.l.gz
+pgsql/man/manl/listen.l.gz
+pgsql/man/manl/load.l.gz
 pgsql/man/manl/notify.l.gz
-pgsql/man/manl/remove_view.l.gz
+pgsql/man/manl/purge.l.gz
+pgsql/man/manl/rename.l.gz
+pgsql/man/manl/reset.l.gz
+pgsql/man/manl/revoke.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/man/manl/select.l.gz
+pgsql/man/manl/set.l.gz
+pgsql/man/manl/show.l.gz
+pgsql/man/manl/sql.l.gz
+pgsql/man/manl/update.l.gz
+pgsql/man/manl/vacuum.l.gz
 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/
+@dirrm pgsql/lib
+@dirrm pgsql/bin
+@dirrm pgsql/include/port/BSD44_derived
+@dirrm pgsql/include/port
+@dirrm pgsql/include/include
+@dirrm pgsql/include/lib
+@dirrm pgsql/include/libpq
+@dirrm pgsql/include/utils
+@dirrm pgsql/include/access
+@dirrm pgsql/include
+@dirrm pgsql/man/man1
+@dirrm pgsql/man/man3
+@dirrm pgsql/man/man5
+@dirrm pgsql/man/manl
+@dirrm pgsql/man
+@dirrm pgsql/data/base/template1
+@dirrm pgsql/data/base
+@dirrm pgsql/data
+@dirrm pgsql