5 files changed, 90 insertions, 14 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index ee4877fe1d7b..ed82314325e4 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.3beta1
+PORTVERSION?=	8.3beta2
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]$//}
 PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
@@ -48,8 +48,8 @@ CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
-		src/bin/pg_resetxlog src/pl
+		src/backend/snowball src/bin/initdb src/bin/ipcclean src/bin/pg_ctl \
+		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
 
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index e436dd6f234a..df410758a749 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,9 +1,12 @@
-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
+MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78
+SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
+SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997
+MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6
+SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725
+SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552
+MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999
+SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8
+SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921
+MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d
+SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15
+SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384
diff --git a/databases/postgresql84-server/pkg-install-server b/databases/postgresql84-server/pkg-install-server
index fcdb889a6f51..212b1d241d96 100644
--- a/databases/postgresql84-server/pkg-install-server
+++ b/databases/postgresql84-server/pkg-install-server
@@ -8,7 +8,7 @@ DB_DIR=${PKG_PREFIX}/${PGUSER}
 
 backupwarning() { echo "
 
-  == BETA QUALITY, DON'T FOR PRODUCTION USE ==
+  == BETA QUALITY, NOT FOR PRODUCTION USE! ==
 
   =========== BACKUP YOUR DATA! =============
   As always, backup your data before
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index e0f7101bc2ef..0ed69caca9de 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -274,9 +274,22 @@ include/postgresql/server/port/win32/netinet/in.h
 include/postgresql/server/port/win32/pwd.h
 include/postgresql/server/port/win32/sys/socket.h
 include/postgresql/server/port/win32/sys/wait.h
+include/postgresql/server/port/win32_msvc/dirent.h
+include/postgresql/server/port/win32_msvc/sys/file.h
+include/postgresql/server/port/win32_msvc/sys/param.h
+include/postgresql/server/port/win32_msvc/sys/time.h
+include/postgresql/server/port/win32_msvc/unistd.h
+include/postgresql/server/port/win32_msvc/utime.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
+include/postgresql/server/postmaster/autovacuum.h
+include/postgresql/server/postmaster/bgwriter.h
+include/postgresql/server/postmaster/fork_process.h
+include/postgresql/server/postmaster/pgarch.h
+include/postgresql/server/postmaster/postmaster.h
+include/postgresql/server/postmaster/syslogger.h
+include/postgresql/server/postmaster/walwriter.h
 include/postgresql/server/regex/regcustom.h
 include/postgresql/server/regex/regerrs.h
 include/postgresql/server/regex/regex.h
@@ -288,6 +301,40 @@ include/postgresql/server/rewrite/rewriteManip.h
 include/postgresql/server/rewrite/rewriteRemove.h
 include/postgresql/server/rewrite/rewriteSupport.h
 include/postgresql/server/rusagestub.h
+include/postgresql/server/snowball/header.h
+include/postgresql/server/snowball/libstemmer/api.h
+include/postgresql/server/snowball/libstemmer/header.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_danish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_dutch.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_english.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_spanish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_swedish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_romanian.h
+include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_danish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_dutch.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_english.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_french.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_german.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_hungarian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_italian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_norwegian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_porter.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_portuguese.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_romanian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_russian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_spanish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
 include/postgresql/server/storage/backendid.h
 include/postgresql/server/storage/block.h
 include/postgresql/server/storage/buf.h
@@ -326,6 +373,8 @@ 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/dicts/regis.h
+include/postgresql/server/tsearch/dicts/spell.h
 include/postgresql/server/tsearch/ts_cache.h
 include/postgresql/server/tsearch/ts_locale.h
 include/postgresql/server/tsearch/ts_public.h
@@ -385,11 +434,17 @@ 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/dicts
 @dirrm include/postgresql/server/tsearch
 @dirrm include/postgresql/server/tcop
 @dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/snowball/libstemmer
+@dirrm include/postgresql/server/snowball
 @dirrm include/postgresql/server/rewrite
 @dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/postmaster
+@dirrm include/postgresql/server/port/win32_msvc/sys
+@dirrm include/postgresql/server/port/win32_msvc
 @dirrm include/postgresql/server/port/win32/sys
 @dirrm include/postgresql/server/port/win32/netinet
 @dirrm include/postgresql/server/port/win32/arpa
@@ -536,6 +591,7 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 4ec20227bd8c..45221503553f 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -9,6 +9,7 @@ etc/periodic/daily/502.pgsql
 lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
+lib/postgresql/dict_snowball.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
@@ -116,6 +117,7 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
@@ -132,6 +134,7 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
 share/postgresql/postgres.shdescription
+share/postgresql/snowball_create.sql
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
 share/postgresql/timezone/Africa/Addis_Ababa
@@ -727,6 +730,20 @@ share/postgresql/timezonesets/Pacific.txt
 @dirrm share/postgresql/timezone/US
 @dirrm share/postgresql/timezone
 @dirrm share/postgresql/timezonesets
+share/postgresql/tsearch_data/danish.stop
+share/postgresql/tsearch_data/dutch.stop
+share/postgresql/tsearch_data/english.stop
+share/postgresql/tsearch_data/finnish.stop
+share/postgresql/tsearch_data/french.stop
+share/postgresql/tsearch_data/german.stop
+share/postgresql/tsearch_data/hungarian.stop
+share/postgresql/tsearch_data/italian.stop
+share/postgresql/tsearch_data/norwegian.stop
+share/postgresql/tsearch_data/portuguese.stop
+share/postgresql/tsearch_data/russian.stop
+share/postgresql/tsearch_data/spanish.stop
+share/postgresql/tsearch_data/swedish.stop
+share/postgresql/tsearch_data/turkish.stop
 share/postgresql/tsearch_data/hunspell_sample.affix
 share/postgresql/tsearch_data/ispell_sample.affix
 share/postgresql/tsearch_data/ispell_sample.dict