8 files changed, 61 insertions, 106 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 900aaec42ba4..021b1eb93752 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.3beta2
+PORTVERSION?=	8.3RC1
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]$//}
 PKGNAMESUFFIX?=	-server
-DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES?=	postgresql-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	BETA VERSION of the PostgreSQL server, only for testing
 
-BROKEN=		Unfetchable
-
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[0-24-9]* \
@@ -40,6 +37,9 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif
 
+PGUSER=		pgsql
+PGGROUP=	pgsql
+
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--with-docdir=${DOCSDIR}
@@ -58,7 +58,6 @@ INSTALL_DIRS?=	${BUILD_DIRS}
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
-SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -67,6 +66,11 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 OPTIONS=	NLS "Use internationalized messages" on
 .endif
 
+.if !defined(CLIENT_ONLY)
+MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
+CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
+.endif
+
 # Cannot check this with standard OPTION due to a catch-22.
 # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
 # what OPTIONS are set.
@@ -121,10 +125,6 @@ OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
 PATCH_DIST_STRIP=-p1
 
-.  ifmake makesum
-DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
-.  endif
-
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.23:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
-.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum)
-DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
-.  endif
-
 .  if defined(WITH_THREADSAFE)
 CONFIGURE_ARGS+=--enable-thread-safety
 .  endif
@@ -290,7 +286,7 @@ PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 
 .if defined(SERVER_ONLY)
 pre-su-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+	@ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
@@ -301,15 +297,7 @@ do-install:
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
-	@ ${MKDIR} ${PREFIX}/share/postgresql
-.    for i in profile cshrc
-	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
-	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
-	fi
-.    endfor
-	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index df410758a749..b845800f2d85 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,12 +1,3 @@
-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
+MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe
+SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4
+SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207
diff --git a/databases/postgresql84-server/files/patch-doc-Makefile b/databases/postgresql84-server/files/patch-doc-Makefile
new file mode 100644
index 000000000000..805b541b438a
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-doc-Makefile
@@ -0,0 +1,20 @@
+--- doc/Makefile.orig	2007-02-09 16:55:57.000000000 +0100
++++ doc/Makefile	2008-01-02 11:38:43.000000000 +0100
+@@ -25,11 +25,12 @@
+ 
+ .NOTPARALLEL:
+ 
+-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
+-ifneq (,$(docdir))
+-found_html = yes
+-endif
+-endif
++# FreeBSD has a separate port for installing the documentation
++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
++#ifneq (,$(docdir))
++#found_html = yes
++#endif
++#endif
+ 
+ ifneq ($(wildcard $(srcdir)/man.tar.gz),)
+ # SCO OpenServer's man system is sufficiently different to not bother.
diff --git a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index 7c2831c41be0..58e776c20465 100644
--- a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@@ -1,27 +1,18 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	Sun May 21 22:11:02 2006
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  7 17:23:50 2006
-@@ -206,6 +206,7 @@
+--- src/backend/utils/misc/postgresql.conf.sample.orig	2007-12-07 17:44:56.000000000 +0100
++++ src/backend/utils/misc/postgresql.conf.sample	2008-01-04 14:00:09.000000000 +0100
+@@ -231,6 +231,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
- #log_destination = 'stderr'		# Valid values are combinations of 
- 					# stderr, syslog and eventlog, 
- 					# depending on platform.
-@@ -283,6 +284,7 @@
- #log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
- 					# and their durations, in milliseconds.
+ #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.
  
 +silent_mode = on
- #silent_mode = off			# DO NOT USE without syslog or 
- 					# redirect_stderr
- 
-@@ -339,6 +341,8 @@
- #---------------------------------------------------------------------------
- # AUTOVACUUM PARAMETERS
- #---------------------------------------------------------------------------
-+
-+autovacuum = on
- 
- #autovacuum = off			# enable autovacuum subprocess?
- #autovacuum_naptime = 60		# time between autovacuum runs, in secs
+ #silent_mode = off			# DO NOT USE without syslog or
+ 					# logging_collector
+ 					# (change requires restart)
diff --git a/databases/postgresql84-server/pkg-install-server b/databases/postgresql84-server/pkg-install-server
index 212b1d241d96..5abfa7862f64 100644
--- a/databases/postgresql84-server/pkg-install-server
+++ b/databases/postgresql84-server/pkg-install-server
@@ -2,8 +2,7 @@
 
 # $FreeBSD$
 
-PATH=/bin:/usr/sbin
-PGUSER=pgsql
+PATH=/bin:/usr/bin:/usr/sbin
 DB_DIR=${PKG_PREFIX}/${PGUSER}
 
 backupwarning() { echo "
@@ -27,9 +26,9 @@ case $2 in
 PRE-INSTALL)
 	backupwarning
 	USER=${PGUSER}
-	GROUP=${USER}
+	GROUP=${PGGROUP}
 	UID=70
-	GID=${UID}
+	GID=70
 
 	if pw group show "${GROUP}" 2>/dev/null; then
 		echo "You already have a group \"${GROUP}\", so I will use it."
@@ -56,8 +55,7 @@ PRE-INSTALL)
 	fi
 
 	if ! [ -x ~${PGUSER} ] ; then 
-		mkdir -p ${DB_DIR}
-		chown pgsql:pgsql ${DB_DIR}
+		install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR}
 	fi
 	;;
 
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index 0ed69caca9de..c219ef4dff82 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample
 %%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/ta/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.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-contrib b/databases/postgresql84-server/pkg-plist-contrib
index 7517de8c92a6..46ed0e10e37c 100644
--- a/databases/postgresql84-server/pkg-plist-contrib
+++ b/databases/postgresql84-server/pkg-plist-contrib
@@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so
 lib/postgresql/timetravel.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
-%%DOCSDIR%%/contrib/README.adminpack
-%%DOCSDIR%%/contrib/README.btree_gist
-%%DOCSDIR%%/contrib/README.chkpass
-%%DOCSDIR%%/contrib/README.cube
-%%DOCSDIR%%/contrib/README.dblink
-%%DOCSDIR%%/contrib/README.earthdistance
-%%DOCSDIR%%/contrib/README.fuzzystrmatch
-%%DOCSDIR%%/contrib/README.hstore
-%%DOCSDIR%%/contrib/README.int_aggregate
-%%DOCSDIR%%/contrib/README.intarray
-%%DOCSDIR%%/contrib/README.isn
-%%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
-%%DOCSDIR%%/contrib/README.pgcrypto
-%%DOCSDIR%%/contrib/README.pgrowlocks
-%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp
-%%DOCSDIR%%/contrib/README.pgstattuple
-%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
-%%DOCSDIR%%/contrib/README.seg
-%%DOCSDIR%%/contrib/README.soundex
-%%DOCSDIR%%/contrib/README.spi
-%%DOCSDIR%%/contrib/README.sslinfo
-%%DOCSDIR%%/contrib/README.tablefunc
-%%DOCSDIR%%/contrib/README.vacuumlo
 %%DOCSDIR%%/contrib/autoinc.example
 %%DOCSDIR%%/contrib/insert_username.example
 %%DOCSDIR%%/contrib/moddatetime.example
@@ -120,6 +88,8 @@ 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/tsearch_data/xsyn_sample.rules
+@dirrmtry share/postgresql/tsearch_data >&2
 @dirrmtry share/postgresql/contrib >&2
 @dirrmtry share/postgresql >&2
 @dirrmtry %%DOCSDIR%%/contrib >&2
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 45221503553f..863ea206ec65 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -118,6 +118,9 @@ share/postgresql/system_views.sql
 %%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/ta/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.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
@@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville
 share/postgresql/timezone/America/Maceio
 share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Marigot
 share/postgresql/timezone/America/Martinique
 share/postgresql/timezone/America/Mazatlan
 share/postgresql/timezone/America/Mendoza
@@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo
 share/postgresql/timezone/America/Sao_Paulo
 share/postgresql/timezone/America/Scoresbysund
 share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/St_Barthelemy
 share/postgresql/timezone/America/St_Johns
 share/postgresql/timezone/America/St_Kitts
 share/postgresql/timezone/America/St_Lucia
@@ -750,16 +755,6 @@ 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
-@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist
-share/postgresql/dot.profile.dist
-share/postgresql/dot.cshrc.dist
-@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/.
-@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.
-@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
-@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
 @unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
 @dirrmtry share/postgresql
 @dirrmtry etc/periodic/daily