5 files changed, 34 insertions, 21 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 6d3f94cf8ffa..804014893fed 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.0
+DISTVERSION?=	8.4.1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -57,7 +57,6 @@ BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_p
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
-PORTREVISION=	1
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
@@ -100,7 +99,7 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" 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
+OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" on
 
 #.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 #USE_AUTOTOOLS=	autoconf:262
@@ -133,8 +132,8 @@ CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo
 PLIST_SUB+=	TZDATA="@comment "
 .  endif
 
-.  if defined(WITH_INTDATE)
-CONFIGURE_ARGS+=--enable-integer-datetimes
+.  if defined(WITHOUT_INTDATE)
+CONFIGURE_ARGS+=--disable-integer-datetimes
 .  endif
 
 .  if !(defined(WITHOUT_GETTEXT) || defined(WITHOUT_NLS))
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 8ced8f4d765e..21d719a5f263 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.4.0.tar.bz2) = 1f172d5f60326e972837f58fa5acd130
-SHA256 (postgresql/postgresql-8.4.0.tar.bz2) = 84bf53b4a45db4fdf875bb03bf247f29dcb97f8bda42839b00b73671df05e007
-SIZE (postgresql/postgresql-8.4.0.tar.bz2) = 13839282
+MD5 (postgresql/postgresql-8.4.1.tar.bz2) = f2015af17bacbbfe140daf0d1067f9c9
+SHA256 (postgresql/postgresql-8.4.1.tar.bz2) = 85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
+SIZE (postgresql/postgresql-8.4.1.tar.bz2) = 13579302
diff --git a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index fade23fba5cf..4c32ae4a26bb 100644
--- a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@@ -1,6 +1,6 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	2008-01-30 19:35:55.000000000 +0100
-+++ src/backend/utils/misc/postgresql.conf.sample	2008-02-18 13:49:42.000000000 +0100
-@@ -231,6 +231,7 @@
+--- ./src/backend/utils/misc/postgresql.conf.sample.orig	2009-08-24 22:08:40.000000000 +0200
++++ ./src/backend/utils/misc/postgresql.conf.sample	2009-10-04 19:21:09.000000000 +0200
+@@ -230,6 +230,7 @@
  
  # - Where to Log -
  
@@ -8,20 +8,21 @@
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog and eventlog,
  					# depending on platform.  csvlog
-@@ -313,6 +314,7 @@
- 					# and their durations, > 0 logs only
- 					# statements running at least this time.
+@@ -264,6 +265,7 @@
+ #syslog_facility = 'LOCAL0'
+ #syslog_ident = 'postgres'
  
 +silent_mode = on
- #silent_mode = off			# DO NOT USE without syslog or
+ #silent_mode = off			# Run server silently.
+ 					# DO NOT USE without syslog or
  					# logging_collector
- 					# (change requires restart)
-@@ -365,6 +367,8 @@
+@@ -367,6 +369,9 @@
  #track_counts = on
- #update_process_title = on
- 
+ #track_functions = none			# none, pl, all
+ #track_activity_query_size = 1024
++
 +# On FreeBSD, this is a performance hog, so keep it off if you need speed
 +update_process_title = off
- 
- # - Statistics Monitoring -
+ #update_process_title = on
+ #stats_temp_directory = 'pg_stat_tmp'
  
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index de7496ef73e2..31a1fd4b22f4 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -178,6 +178,7 @@ include/postgresql/server/executor/tstoreReceiver.h
 include/postgresql/server/executor/tuptable.h
 include/postgresql/server/fmgr.h
 include/postgresql/server/funcapi.h
+include/postgresql/server/foreign/foreign.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
 include/postgresql/server/lib/dllist.h
@@ -481,6 +482,7 @@ include/postgresql/server/windowapi.h
 @dirrm include/postgresql/server/mb
 @dirrm include/postgresql/server/libpq
 @dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/foreign
 @dirrm include/postgresql/server/executor
 @dirrm include/postgresql/server/commands
 @dirrm include/postgresql/server/catalog
@@ -573,6 +575,12 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-8.4.mo
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 9a848fff4b84..c1080770cd40 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -65,6 +65,11 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo