6 files changed, 82 insertions, 45 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 2d1aca9420af..ee4877fe1d7b 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.5
-PORTREVISION?=	1
+PORTVERSION?=	8.3beta1
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -16,17 +16,17 @@ DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
-COMMENT?=	The most advanced open-source database available anywhere
+COMMENT?=	BETA VERSION of the PostgreSQL server, only for testing
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-13-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]*
+		${PORTNAME}-client-8.[0-24-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}82
+UNIQUENAME?=	${PORTNAME}83
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -38,8 +38,6 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif
 
-IGNORE=		"Please ignore, work in progress"
-
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
@@ -99,17 +97,17 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 #OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
-PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
-PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
-USE_BISON=	yes
-.  endif
+# .  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+# PATCH_SITES+=	http://gppl.moonbone.ru/:hier820055
+# PATCHFILES+=	hier-v0.5.5-Pg8.2.0.diff.gz:hier820055
+# USE_BISON=	yes
+# .  endif
 
 # .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 # USE_AUTOTOOLS=	autoconf:261
@@ -212,9 +210,14 @@ MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		alter_domain.7 alter_function.7 alter_group.7		      \
 		alter_index.7 alter_language.7 alter_operator_class.7	      \
+		alter_operator_family.7 				      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		alter_text_search_configuration.7			      \
+		alter_text_search_dictionary.7				      \
+		alter_text_search_parser.7				      \
+		alter_text_search_template.7				      \
+		alter_trigger.7 alter_user.7 alter_view.7 analyze.7 begin.7   \
 		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
@@ -222,17 +225,25 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		create_database.7 create_domain.7 create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
-		create_role.7						      \
+		create_operator_family.7 create_role.7			      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
-		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_table.7 create_table_as.7			      \
+		create_text_search_configuration.7			      \
+		create_text_search_dictionary.7				      \
+		create_text_search_parser.7				      \
+		create_text_search_template.7 create_trigger.7		      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
-		declare.7 delete.7					      \
+		declare.7 delete.7 discard.7				      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
-		drop_operator.7 drop_operator_class.7 drop_owned.7	      \
-		drop_role.7 drop_rule.7					      \
-		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
+		drop_operator.7 drop_operator_class.7 drop_operator_family.7  \
+		drop_owned.7 drop_role.7 drop_rule.7			      \
+		drop_schema.7 drop_sequence.7 drop_table.7		      \
+		drop_text_search_configuration.7			      \
+		drop_text_search_dictionary.7				      \
+		drop_text_search_parser.7				      \
+		drop_text_search_template.7 drop_trigger.7		      \
 		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 2dbebd41916b..e436dd6f234a 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,12 +1,9 @@
-MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd
-SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
-SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348
-MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7
-SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
-SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549
-MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900
-SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
-SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777
-MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb
-SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
-SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137
+MD5 (postgresql/postgresql-base-8.3beta1.tar.bz2) = e142031cdc181aab8f97c7957cb12715
+SHA256 (postgresql/postgresql-base-8.3beta1.tar.bz2) = fd2777dadfb6699df83cbdc26388f2d7e9a95680a0a4db3f7d35ea96d7244d2c
+SIZE (postgresql/postgresql-base-8.3beta1.tar.bz2) = 9496130
+MD5 (postgresql/postgresql-opt-8.3beta1.tar.bz2) = 0fe6fc6ea38a5bec8593b9017934fdd7
+SHA256 (postgresql/postgresql-opt-8.3beta1.tar.bz2) = 35f808b7d058ceedc26f297ec312f01354a062224324815ae8c082f7e98995a0
+SIZE (postgresql/postgresql-opt-8.3beta1.tar.bz2) = 178035
+MD5 (postgresql/postgresql-docs-8.3beta1.tar.bz2) = 4b80ba90097538e247d1314001e2ab47
+SHA256 (postgresql/postgresql-docs-8.3beta1.tar.bz2) = 63fc84430a63f419738941333dcd101425a080a50df44d5995c0ed2087b34c18
+SIZE (postgresql/postgresql-docs-8.3beta1.tar.bz2) = 2996936
diff --git a/databases/postgresql92-server/pkg-install-server b/databases/postgresql92-server/pkg-install-server
index c3db75540ffa..fcdb889a6f51 100644
--- a/databases/postgresql92-server/pkg-install-server
+++ b/databases/postgresql92-server/pkg-install-server
@@ -8,6 +8,8 @@ DB_DIR=${PKG_PREFIX}/${PGUSER}
 
 backupwarning() { echo "
 
+  == BETA QUALITY, DON'T FOR PRODUCTION USE ==
+
   =========== BACKUP YOUR DATA! =============
   As always, backup your data before
   upgrading. If the upgrade leads to a higher
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index b11019cc0bfb..e0f7101bc2ef 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -31,6 +31,7 @@ include/postgresql/server/access/nbtree.h
 include/postgresql/server/access/printtup.h
 include/postgresql/server/access/reloptions.h
 include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rewriteheap.h
 include/postgresql/server/access/rmgr.h
 include/postgresql/server/access/sdir.h
 include/postgresql/server/access/skey.h
@@ -74,6 +75,7 @@ include/postgresql/server/catalog/pg_conversion.h
 include/postgresql/server/catalog/pg_database.h
 include/postgresql/server/catalog/pg_depend.h
 include/postgresql/server/catalog/pg_description.h
+include/postgresql/server/catalog/pg_enum.h
 include/postgresql/server/catalog/pg_index.h
 include/postgresql/server/catalog/pg_inherits.h
 include/postgresql/server/catalog/pg_language.h
@@ -82,6 +84,7 @@ include/postgresql/server/catalog/pg_listener.h
 include/postgresql/server/catalog/pg_namespace.h
 include/postgresql/server/catalog/pg_opclass.h
 include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_opfamily.h
 include/postgresql/server/catalog/pg_pltemplate.h
 include/postgresql/server/catalog/pg_proc.h
 include/postgresql/server/catalog/pg_rewrite.h
@@ -90,6 +93,11 @@ include/postgresql/server/catalog/pg_shdescription.h
 include/postgresql/server/catalog/pg_statistic.h
 include/postgresql/server/catalog/pg_tablespace.h
 include/postgresql/server/catalog/pg_trigger.h
+include/postgresql/server/catalog/pg_ts_config.h
+include/postgresql/server/catalog/pg_ts_config_map.h
+include/postgresql/server/catalog/pg_ts_dict.h
+include/postgresql/server/catalog/pg_ts_parser.h
+include/postgresql/server/catalog/pg_ts_template.h
 include/postgresql/server/catalog/pg_type.h
 include/postgresql/server/catalog/toasting.h
 include/postgresql/server/commands/alter.h
@@ -100,6 +108,7 @@ include/postgresql/server/commands/conversioncmds.h
 include/postgresql/server/commands/copy.h
 include/postgresql/server/commands/dbcommands.h
 include/postgresql/server/commands/defrem.h
+include/postgresql/server/commands/discard.h
 include/postgresql/server/commands/explain.h
 include/postgresql/server/commands/lockcmds.h
 include/postgresql/server/commands/portalcmds.h
@@ -225,6 +234,7 @@ include/postgresql/server/parser/parse_oper.h
 include/postgresql/server/parser/parse_relation.h
 include/postgresql/server/parser/parse_target.h
 include/postgresql/server/parser/parse_type.h
+include/postgresql/server/parser/parse_utilcmd.h
 include/postgresql/server/parser/parser.h
 include/postgresql/server/parser/parsetree.h
 include/postgresql/server/parser/scansup.h
@@ -316,12 +326,18 @@ include/postgresql/server/tcop/pquery.h
 include/postgresql/server/tcop/tcopdebug.h
 include/postgresql/server/tcop/tcopprot.h
 include/postgresql/server/tcop/utility.h
+include/postgresql/server/tsearch/ts_cache.h
+include/postgresql/server/tsearch/ts_locale.h
+include/postgresql/server/tsearch/ts_public.h
+include/postgresql/server/tsearch/ts_type.h
+include/postgresql/server/tsearch/ts_utils.h
 include/postgresql/server/utils/acl.h
 include/postgresql/server/utils/array.h
 include/postgresql/server/utils/ascii.h
 include/postgresql/server/utils/builtins.h
 include/postgresql/server/utils/cash.h
 include/postgresql/server/utils/catcache.h
+include/postgresql/server/utils/combocid.h
 include/postgresql/server/utils/date.h
 include/postgresql/server/utils/datetime.h
 include/postgresql/server/utils/datum.h
@@ -351,6 +367,7 @@ include/postgresql/server/utils/pg_crc.h
 include/postgresql/server/utils/pg_locale.h
 include/postgresql/server/utils/pg_lzcompress.h
 include/postgresql/server/utils/pg_rusage.h
+include/postgresql/server/utils/plancache.h
 include/postgresql/server/utils/portal.h
 include/postgresql/server/utils/ps_status.h
 include/postgresql/server/utils/rel.h
@@ -364,8 +381,11 @@ include/postgresql/server/utils/tuplesort.h
 include/postgresql/server/utils/tuplestore.h
 include/postgresql/server/utils/typcache.h
 include/postgresql/server/utils/tzparser.h
+include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
+include/postgresql/server/utils/xml.h
 @dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tsearch
 @dirrm include/postgresql/server/tcop
 @dirrm include/postgresql/server/storage
 @dirrm include/postgresql/server/rewrite
@@ -422,16 +442,16 @@ include/sql3types.h
 include/sqlca.h
 lib/libecpg.a
 lib/libecpg.so
-lib/libecpg.so.5
+lib/libecpg.so.6
 lib/libecpg_compat.a
 lib/libecpg_compat.so
-lib/libecpg_compat.so.2
+lib/libecpg_compat.so.3
+lib/libpgtypes.so.3
 lib/libpq.a
 lib/libpq.so
 lib/libpq.so.5
 lib/libpgtypes.a
 lib/libpgtypes.so
-lib/libpgtypes.so.2
 lib/postgresql/pgxs/config/install-sh
 lib/postgresql/pgxs/config/mkinstalldirs
 lib/postgresql/pgxs/src/makefiles/pgxs.mk
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 6aac8614c6bd..7517de8c92a6 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -1,4 +1,5 @@
 bin/oid2name
+bin/pg_standby
 bin/pgbench
 bin/vacuumlo
 lib/postgresql/_int.so
@@ -17,6 +18,7 @@ lib/postgresql/isn.so
 lib/postgresql/lo.so
 lib/postgresql/ltree.so
 lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
 lib/postgresql/pg_buffercache.so
 lib/postgresql/pg_freespacemap.so
 lib/postgresql/pg_trgm.so
@@ -28,7 +30,6 @@ lib/postgresql/seg.so
 lib/postgresql/sslinfo.so
 lib/postgresql/tablefunc.so
 lib/postgresql/timetravel.so
-lib/postgresql/tsearch2.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/README.adminpack
@@ -45,8 +46,10 @@ lib/postgresql/tsearch2.so
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
 %%DOCSDIR%%/contrib/README.oid2name
+%%DOCSDIR%%/contrib/README.pageinspect
 %%DOCSDIR%%/contrib/README.pg_buffercache
 %%DOCSDIR%%/contrib/README.pg_freespacemap
+%%DOCSDIR%%/contrib/README.pg_standby
 %%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
@@ -60,7 +63,6 @@ lib/postgresql/tsearch2.so
 %%DOCSDIR%%/contrib/README.spi
 %%DOCSDIR%%/contrib/README.sslinfo
 %%DOCSDIR%%/contrib/README.tablefunc
-%%DOCSDIR%%/contrib/README.tsearch2
 %%DOCSDIR%%/contrib/README.vacuumlo
 %%DOCSDIR%%/contrib/autoinc.example
 %%DOCSDIR%%/contrib/insert_username.example
@@ -75,7 +77,6 @@ share/postgresql/contrib/chkpass.sql
 share/postgresql/contrib/cube.sql
 share/postgresql/contrib/dblink.sql
 share/postgresql/contrib/earthdistance.sql
-share/postgresql/contrib/english.stop
 share/postgresql/contrib/fuzzystrmatch.sql
 share/postgresql/contrib/hstore.sql
 share/postgresql/contrib/insert_username.sql
@@ -84,6 +85,7 @@ share/postgresql/contrib/isn.sql
 share/postgresql/contrib/lo.sql
 share/postgresql/contrib/ltree.sql
 share/postgresql/contrib/moddatetime.sql
+share/postgresql/contrib/pageinspect.sql
 share/postgresql/contrib/pg_buffercache.sql
 share/postgresql/contrib/pg_freespacemap.sql
 share/postgresql/contrib/pg_trgm.sql
@@ -91,14 +93,10 @@ share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgrowlocks.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
-share/postgresql/contrib/russian.stop
-share/postgresql/contrib/russian.stop.utf8
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/sslinfo.sql
 share/postgresql/contrib/tablefunc.sql
-share/postgresql/contrib/thesaurus
 share/postgresql/contrib/timetravel.sql
-share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/uninstall__int.sql
 share/postgresql/contrib/uninstall_adminpack.sql
 share/postgresql/contrib/uninstall_btree_gist.sql
@@ -112,6 +110,7 @@ share/postgresql/contrib/uninstall_int_aggregate.sql
 share/postgresql/contrib/uninstall_isn.sql
 share/postgresql/contrib/uninstall_lo.sql
 share/postgresql/contrib/uninstall_ltree.sql
+share/postgresql/contrib/uninstall_pageinspect.sql
 share/postgresql/contrib/uninstall_pg_buffercache.sql
 share/postgresql/contrib/uninstall_pg_freespacemap.sql
 share/postgresql/contrib/uninstall_pg_trgm.sql
@@ -121,7 +120,6 @@ share/postgresql/contrib/uninstall_pgstattuple.sql
 share/postgresql/contrib/uninstall_seg.sql
 share/postgresql/contrib/uninstall_sslinfo.sql
 share/postgresql/contrib/uninstall_tablefunc.sql
-share/postgresql/contrib/uninstall_tsearch2.sql
 @dirrmtry share/postgresql/contrib >&2
 @dirrmtry share/postgresql >&2
 @dirrmtry %%DOCSDIR%%/contrib >&2
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 8096163f4b88..4ec20227bd8c 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -10,15 +10,18 @@ lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
+lib/postgresql/euc_jis_2004_and_shift_jis_2004.so
 lib/postgresql/euc_jp_and_sjis.so
 lib/postgresql/euc_kr_and_mic.so
 lib/postgresql/euc_tw_and_big5.so
 lib/postgresql/latin2_and_win1250.so
 lib/postgresql/latin_and_mic.so
+lib/postgresql/plpgsql.so
 lib/postgresql/utf8_and_ascii.so
 lib/postgresql/utf8_and_big5.so
 lib/postgresql/utf8_and_cyrillic.so
 lib/postgresql/utf8_and_euc_cn.so
+lib/postgresql/utf8_and_euc_jis_2004.so
 lib/postgresql/utf8_and_euc_jp.so
 lib/postgresql/utf8_and_euc_kr.so
 lib/postgresql/utf8_and_euc_tw.so
@@ -27,10 +30,10 @@ lib/postgresql/utf8_and_gbk.so
 lib/postgresql/utf8_and_iso8859.so
 lib/postgresql/utf8_and_iso8859_1.so
 lib/postgresql/utf8_and_johab.so
+lib/postgresql/utf8_and_shift_jis_2004.so
 lib/postgresql/utf8_and_sjis.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
-lib/postgresql/plpgsql.so
 %%DOCSDIR%%/README-server
 @dirrmtry %%DOCSDIR%%
 share/postgresql/conversion_create.sql
@@ -724,6 +727,12 @@ share/postgresql/timezonesets/Pacific.txt
 @dirrm share/postgresql/timezone/US
 @dirrm share/postgresql/timezone
 @dirrm share/postgresql/timezonesets
+share/postgresql/tsearch_data/hunspell_sample.affix
+share/postgresql/tsearch_data/ispell_sample.affix
+share/postgresql/tsearch_data/ispell_sample.dict
+share/postgresql/tsearch_data/synonym_sample.syn
+share/postgresql/tsearch_data/thesaurus_sample.ths
+@dirrm share/postgresql/tsearch_data
 @unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 @unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 @unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist