5 files changed, 47 insertions, 185 deletions

diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 4825ec4d2984..87b62c38f9f4 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.1
-PORTREVISION?=	3
+PORTVERSION?=	8.0.2
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -89,10 +89,39 @@ OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
+# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
+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
+
+# 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)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier801054
+PATCHFILES+=	hier-Pg8.0.1-0.5.4.diff.gz:hier801054
+.  endif
+
+.  if defined(SERVER_ONLY) && defined(WITH_ICU)
+USE_AUTOCONF_VER=253
+CONFIGURE_ARGS+=--with-icu
+LIB_DEPENDS=	icudata.32:${PORTSDIR}/devel/icu
+PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+PATCHFILES+=	pg-802-icu-2005-03-26.diff.gz:icu
+.  endif
+
+PATCH_DIST_STRIP=-p1
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
 
+.  if defined(WITH_INTDATE)
+CONFIGURE_ARGS+=--enable-integer-datetimes
+.  endif
+
 . if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 8c1ca90907ab..0e5132e7cf53 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,8 +1,12 @@
-MD5 (postgresql/postgresql-base-8.0.1.tar.bz2) = b8f8edce5b29bcf785251693c6225885
-SIZE (postgresql/postgresql-base-8.0.1.tar.bz2) = 7798118
-MD5 (postgresql/postgresql-docs-8.0.1.tar.bz2) = f51624e70b9fca4ebd6bb56ba8587b97
-SIZE (postgresql/postgresql-docs-8.0.1.tar.bz2) = 2198650
-MD5 (postgresql/postgresql-opt-8.0.1.tar.bz2) = 130474770b88fd059c2dff457fb06b0a
-SIZE (postgresql/postgresql-opt-8.0.1.tar.bz2) = 133466
-MD5 (postgresql/postgresql-test-8.0.1.tar.bz2) = ad7baaaf9cf417b9ddd1512f1dd7fb10
-SIZE (postgresql/postgresql-test-8.0.1.tar.bz2) = 961001
+MD5 (postgresql/postgresql-base-8.0.2.tar.bz2) = 39ef5bfca3d573b356c755b5429aea8b
+SIZE (postgresql/postgresql-base-8.0.2.tar.bz2) = 7806083
+MD5 (postgresql/postgresql-docs-8.0.2.tar.bz2) = 9840cc8892ac52e7ae0ac5a357b5b610
+SIZE (postgresql/postgresql-docs-8.0.2.tar.bz2) = 2202096
+MD5 (postgresql/postgresql-opt-8.0.2.tar.bz2) = ed57846ed0b4a0044fe545437fcf6f6f
+SIZE (postgresql/postgresql-opt-8.0.2.tar.bz2) = 133708
+MD5 (postgresql/postgresql-test-8.0.2.tar.bz2) = 3942e1c0119cabc6de124a54ba1d2d38
+SIZE (postgresql/postgresql-test-8.0.2.tar.bz2) = 959433
+MD5 (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 1d410cfb38253675fee36c8f9ee655e2
+SIZE (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 30662
+MD5 (postgresql/pg-802-icu-2005-03-26.diff.gz) = 727474757c1c3ed503a069db7a640afa
+SIZE (postgresql/pg-802-icu-2005-03-26.diff.gz) = 4324
diff --git a/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-gram-y b/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-gram-y
deleted file mode 100644
index 672745ce2760..000000000000
--- a/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-gram-y
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/pl/plpgsql/src/gram.y	2005/01/21 00:17:02	1.64.4.1 REL8_0_1
-+++ src/pl/plpgsql/src/gram.y	2005/02/08 18:21:59	1.64.4.3 REL8_0_STABLE
-@@ -4,7 +4,7 @@
-  *						  procedural language
-  *
-  * IDENTIFICATION
-- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
-+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
-  *
-  *	  This software is copyrighted by Jan Wieck - Hamburg.
-  *
-@@ -1766,8 +1766,19 @@ read_sql_construct(int until,
- 						 errmsg("missing \"%s\" at end of SQL statement",
- 								expected)));
- 		}
-+
- 		if (plpgsql_SpaceScanned)
- 			plpgsql_dstring_append(&ds, " ");
-+
-+		/* Check for array overflow */
-+		if (nparams >= 1024)
-+		{
-+			plpgsql_error_lineno = lno;
-+			ereport(ERROR,
-+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+					 errmsg("too many variables specified in SQL statement")));
-+		}
-+
- 		switch (tok)
- 		{
- 			case T_SCALAR:
-@@ -1940,6 +1951,15 @@ make_select_stmt(void)
- 
- 					while ((tok = yylex()) == ',')
- 					{
-+						/* Check for array overflow */
-+						if (nfields >= 1024)
-+						{
-+							plpgsql_error_lineno = plpgsql_scanner_lineno();
-+							ereport(ERROR,
-+									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+									 errmsg("too many INTO variables specified")));
-+						}
-+
- 						tok = yylex();
- 						switch(tok)
- 						{
-@@ -1990,6 +2010,16 @@ make_select_stmt(void)
- 
- 		if (plpgsql_SpaceScanned)
- 			plpgsql_dstring_append(&ds, " ");
-+
-+		/* Check for array overflow */
-+		if (nparams >= 1024)
-+		{
-+			plpgsql_error_lineno = plpgsql_scanner_lineno();
-+			ereport(ERROR,
-+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+					 errmsg("too many variables specified in SQL statement")));
-+		}
-+
- 		switch (tok)
- 		{
- 			case T_SCALAR:
-@@ -2085,6 +2115,15 @@ make_fetch_stmt(void)
- 
- 				while ((tok = yylex()) == ',')
- 				{
-+					/* Check for array overflow */
-+					if (nfields >= 1024)
-+					{
-+						plpgsql_error_lineno = plpgsql_scanner_lineno();
-+						ereport(ERROR,
-+								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+								 errmsg("too many INTO variables specified")));
-+					}
-+
- 					tok = yylex();
- 					switch(tok)
- 					{
diff --git a/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c
deleted file mode 100644
index e4cb940fda72..000000000000
--- a/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c
+++ /dev/null
@@ -1,91 +0,0 @@
---- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
-+++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
-@@ -191,7 +191,7 @@
-  *						  procedural language
-  *
-  * IDENTIFICATION
-- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
-+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
-  *
-  *	  This software is copyrighted by Jan Wieck - Hamburg.
-  *
-@@ -3426,8 +3412,19 @@
- 						 errmsg("missing \"%s\" at end of SQL statement",
- 								expected)));
- 		}
-+
- 		if (plpgsql_SpaceScanned)
- 			plpgsql_dstring_append(&ds, " ");
-+
-+		/* Check for array overflow */
-+		if (nparams >= 1024)
-+		{
-+			plpgsql_error_lineno = lno;
-+			ereport(ERROR,
-+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+					 errmsg("too many variables specified in SQL statement")));
-+		}
-+
- 		switch (tok)
- 		{
- 			case T_SCALAR:
-@@ -3600,6 +3597,15 @@
- 
- 					while ((tok = plpgsql_yylex()) == ',')
- 					{
-+						/* Check for array overflow */
-+						if (nfields >= 1024)
-+						{
-+							plpgsql_error_lineno = plpgsql_scanner_lineno();
-+							ereport(ERROR,
-+									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+									 errmsg("too many INTO variables specified")));
-+						}
-+
- 						tok = plpgsql_yylex();
- 						switch(tok)
- 						{
-@@ -3650,6 +3656,16 @@
- 
- 		if (plpgsql_SpaceScanned)
- 			plpgsql_dstring_append(&ds, " ");
-+
-+		/* Check for array overflow */
-+		if (nparams >= 1024)
-+		{
-+			plpgsql_error_lineno = plpgsql_scanner_lineno();
-+			ereport(ERROR,
-+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+					 errmsg("too many variables specified in SQL statement")));
-+		}
-+
- 		switch (tok)
- 		{
- 			case T_SCALAR:
-@@ -3745,6 +3761,15 @@
- 
- 				while ((tok = plpgsql_yylex()) == ',')
- 				{
-+					/* Check for array overflow */
-+					if (nfields >= 1024)
-+					{
-+						plpgsql_error_lineno = plpgsql_scanner_lineno();
-+						ereport(ERROR,
-+								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-+								 errmsg("too many INTO variables specified")));
-+					}
-+
- 					tok = plpgsql_yylex();
- 					switch(tok)
- 					{
---- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
-+++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
-@@ -209,7 +209,7 @@
- 		PLpgSQL_exceptions		*exceptions;
- 		PLpgSQL_nsitem			*nsitem;
- } PLPGSQL_YYSTYPE;
--/* Line 1248 of yacc.c.  */
-+/* Line 1238 of yacc.c.  */
- #line 213 "y.tab.h"
- # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
- # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client
index cde44ae6df19..ec7bde8ab088 100644
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@@ -410,16 +410,16 @@ include/sql3types.h
 include/sqlca.h
 lib/libecpg.a
 lib/libecpg.so
-lib/libecpg.so.4
+lib/libecpg.so.5
 lib/libecpg_compat.a
 lib/libecpg_compat.so
-lib/libecpg_compat.so.1
+lib/libecpg_compat.so.2
 lib/libpq.a
 lib/libpq.so
-lib/libpq.so.3
+lib/libpq.so.4
 lib/libpgtypes.a
 lib/libpgtypes.so
-lib/libpgtypes.so.1
+lib/libpgtypes.so.2
 %%DOCSDIR%%/README-client
 @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample