Say hello to postgresql-8.0. Some of the highlights of the new version

are savepoints (within transactions), point-in-time recovery and tablespaces. Check out the release notes and the shiny new PostgreSQL.org website at: http://www.PostgreSQL.org/docs/8.0/static/release.html#RELEASE-8-0 The port uses the new postgresql ports' layout and is split into a server and a client part. The following knobs can be used by ports depending on PostgreSQL: # USE_PGSQL - Add PostgreSQL client dependency. # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if # necessary (PostgreSQL-7.4 = 74). # DEFAULT_PGSQL_VER # - PostgreSQL default version. Can be overridden within a port. # Default: 74. # WANT_PGSQL_VER # - Maintainer can set an arbitrary version of PostgreSQL by # using it. # BROKEN_WITH_PGSQL # - This variable can be defined if the ports doesn't support # one or more versions of PostgreSQL. PR: 75344 Approved by: portmgr@ (kris), ade & sean (mentors)
svn path=/head/; revision=127738
2025-01-15 07:56:36 +00:00 · 2005-01-31 00:36:16 +00:00 · 2005-01-31 00:36:16 +00:00 · dde08c696b · 2021-03-31 03:12:20 +00:00
commit dde08c696b
parent 34fa6c853e
207 changed files with 11511 additions and 6246 deletions
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@ -7,28 +7,25 @@

 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	8.0.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]*$//:C/rc/beta/}
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-# XXX: this will eventually go away
-.if !defined(PGSQL_WORK_IN_PROGRESS)
-BROKEN= pending ports/75344, the 8.0 release can be used via the postgresql-devel port
-.endif
-
-CONFLICTS?=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.*
+CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*

 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql

+NO_LATEST_LINK=	beta version
+
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
@ -38,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif

-CONFIGURE_ARGS?=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"

 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}

-BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}

@ -58,18 +56,32 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}

 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
-OPTIONS+=	SSL "Build with SSL" on
+.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.
+#
+# If you *don't* want SSL, set WITHOUT_SSL=YES when making
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
 .endif

 .include <bsd.port.pre.mk>

+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+BROKEN=		"Coredump during build on alpha 4.x"
+.endif
+
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
-.  if ${OSVERSION} < 500041
-OPTIONS+=	GNUGETOPT "Depend on GNU getopt" on
+.  if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 .  if defined(SERVER_ONLY)
 OPTIONS+=	PAM "Build with PAM support" off
+OPTIONS+=	RENDEZVOUZ "Add support for Apple's Rendez-Vouz" off
 .  endif
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal's kerberos support" off
@ -81,11 +93,15 @@ OPTIONS+=	TESTS "Allows the use of a \"check\" target" off
 .  endif
 OPTIONS+=	DEBUG "Builds with debugging symbols" off

+.if defined(SERVER_ONLY) && defined(WITH_RENDEZVOUS)
+CONFIGURE_ARGS+=	--with-rendezvous
+.endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .  endif

-. if !defined(WITHOUT_GNUGETOPT)
+. if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif

@ -109,97 +125,88 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif

-.  if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
-.  endif
-
 .  if defined(WITH_MIT_KRB5)
+WITH_KRB5=	yes
+KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-WITH_KRB5=	yes
 .  endif

 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
 .    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
 .    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
 .    else
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
 .    endif
 .  endif

 .  if defined(WITH_KRB5)
-CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+CONFIGURE_ARGS+=	--with-krb5
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-text-regress-pgregress-sh
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .  endif
-
-.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
-.  endif
-.  if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.  endif
-.  if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world."
-	@exit 1
-.  endif
-
 .endif # !SLAVE_ONLY

 .if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
-		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
-		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
-		pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
-		postmaster.1 psql.1 vacuumdb.1
+MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
+		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
+		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
+		postgres.1 postmaster.1 psql.1 vacuumdb.1

-MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 \
-		alter_database.7 alter_domain.7 alter_function.7 \
-		alter_group.7 alter_language.7 alter_operator_class.7 \
-		alter_schema.7 alter_sequence.7 alter_table.7 \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
-		close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
-		create_cast.7 create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 \
-		create_sequence.7 create_table.7 create_table_as.7 \
-		create_trigger.7 create_type.7 create_user.7 create_view.7 \
-		deallocate.7 declare.7 delete.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_rule.7 drop_schema.7 \
-		drop_sequence.7 \
-		drop_table.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 reindex.7 \
-		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
-		set.7 set_constraints.7 set_transaction.7 show.7 \
-		set_session_authorization.7 start_transaction.7 \
-		truncate.7 unlisten.7 update.7 vacuum.7
+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_schema.7 alter_sequence.7 alter_table.7		      \
+		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
+		copy.7 create_aggregate.7 create_cast.7			      \
+		create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 create_sequence.7		      \
+		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_type.7 create_user.7 create_view.7 delete.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_schema.7 drop_sequence.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 reindex.7 reset.7	      \
+		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
+		set_constraints.7 set_transaction.7 show.7		      \
+		set_session_authorization.7 start_transaction.7		      \
+		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
+		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
+		spi_execp.7 spi_execute.7 spi_execute_plan.7		      \
+		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
+		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
+		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
+		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
+		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
+		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
+		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
+		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		alter_operator.7 alter_tablespace.7 alter_type.7	      \
+		create_tablespace.7 drop_tablespace.7			      \
+		release_savepoint.7 rollback_to_savepoint.7		      \
+		savepoint.7
 .endif

 .if defined(SERVER_ONLY)
@ -208,6 +215,14 @@ pre-everything::
 .endif

 .if !defined(NO_BUILD)
+
+pre-configure:
+.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.  endif
+
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
@ -235,10 +250,9 @@ do-install:
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-	${MKDIR} ${PREFIX}/share/postgresql
 .  if defined(SERVER_ONLY)
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} install-all-headers
-.  for i in profile cshrc
+	@ ${MKDIR} ${PREFIX}/share/postgresql
+.    for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
@ -246,7 +260,7 @@ do-install:
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-.  endfor
+.    endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${RCSCRIPT} ;\
@ -258,7 +272,8 @@ do-install:
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
-		${INSTALL_DATA} ${PKGMESSAGE} ${PREFIX}/share/postgresql/README${PKGNAMESUFFIX} ;\
+		${MKDIR} ${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-8.0.0.tar.bz2) = 57984b8b016501ee920e95af6edc7145
+SIZE (postgresql/postgresql-base-8.0.0.tar.bz2) = 7795453
+MD5 (postgresql/postgresql-docs-8.0.0.tar.bz2) = 9deb6ac959e367cabe882d77287a6b31
+SIZE (postgresql/postgresql-docs-8.0.0.tar.bz2) = 2195941
+MD5 (postgresql/postgresql-opt-8.0.0.tar.bz2) = 11f91f2bf1697d7c8f340151208e0c3e
+SIZE (postgresql/postgresql-opt-8.0.0.tar.bz2) = 133317
+MD5 (postgresql/postgresql-test-8.0.0.tar.bz2) = 0281020c9a1a3c342edaf2d9586ec07e
+SIZE (postgresql/postgresql-test-8.0.0.tar.bz2) = 961649
--- a/databases/postgresql-devel-server/files/502.pgsql
+++ b/databases/postgresql-devel-server/files/502.pgsql
@ -18,7 +18,7 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum

-daily_pgsql_vaccum_enable="NO"
+daily_pgsql_vacuum_enable="YES"
 daily_pgsql_backup_enable="NO"

 daily_pgsql_vacuum_args="-z"
--- a/databases/postgresql-devel-server/files/patch-configure
+++ b/databases/postgresql-devel-server/files/patch-configure
@ -1,59 +0,0 @@
--- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
--- a/databases/postgresql-devel-server/files/patch-plpython-Makefile
+++ b/databases/postgresql-devel-server/files/patch-plpython-Makefile
@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
+@@ -9,7 +9,7 @@
+ # shared library.  Since there is no official way to determine this
+ # (at least not in pre-2.3 Python), we see if there is a file that is
+ # named like a shared library.
+-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+ endif
+ 
--- a/databases/postgresql-devel-server/files/patch-src-interfaces-jdbc-build-xml
+++ b/databases/postgresql-devel-server/files/patch-src-interfaces-jdbc-build-xml
@ -1,14 +0,0 @@
--- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
--- a/databases/postgresql-devel-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ b/databases/postgresql-devel-server/files/patch-src-interfaces-libpgtcl-Makefile
@ -1,11 +0,0 @@
--- src/interfaces/libpgtcl/Makefile.orig	Tue Feb 10 08:26:48 2004
-+++ src/interfaces/libpgtcl/Makefile	Thu Mar 11 21:12:25 2004
-@@ -21,7 +21,7 @@
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
- SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
-	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
-+	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
- 
- all: submake-libpq all-lib
- 
--- a/databases/postgresql-devel-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql-devel-server/files/patch-src-makefiles-Makefile.freebsd
@ -1,15 +1,15 @@
--- src/makefiles/Makefile.freebsd.orig	Wed Aug 29 21:14:40 2001
-+++ src/makefiles/Makefile.freebsd	Sat Jan 31 17:51:25 2004
-@@ -7,7 +7,7 @@
- endif
- 
- DLSUFFIX = .so
+--- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
+@@ -11,7 +11,7 @@
+ ifeq ($(findstring sparc,$(host_cpu)), sparc)
+ CFLAGS_SL = -fPIC -DPIC
+ else
 -CFLAGS_SL = -fpic -DPIC
 +CFLAGS_SL = -fPIC -DPIC
+ endif
 
- %.so: %.o
- ifdef ELF_SYSTEM
-@@ -23,3 +23,5 @@
+ 
+@@ -29,3 +29,5 @@
 endif
 
 sqlmansect = 7
--- a/databases/postgresql-devel-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql-devel-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@ -1,24 +1,18 @@
--- src/backend/utils/misc/postgresql.conf.sample~	Wed Oct  8 05:49:38 2003
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov 18 05:08:08 2003
-@@ -136,9 +136,9 @@
+--- src/backend/utils/misc/postgresql.conf.sample~	Fri Nov  5 20:16:16 2004
+++ src/backend/utils/misc/postgresql.conf.sample	Tue Dec 21 02:06:45 2004
+@@ -172,6 +172,7 @@
 
- # - Syslog -
+ # - Where to Log -
 
-#syslog = 0			# range 0-2; 0=stdout; 1=both; 2=syslog
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-+syslog = 2			# range 0-2; 0=stdout; 1=both; 2=syslog
-+syslog_facility = 'LOCAL0'
-+syslog_ident = 'postgres'
+log_destination = 'syslog'
+ #log_destination = 'stderr'	# Valid values are combinations of stderr,
+                                 # syslog and eventlog, depending on
+                                 # platform.
+@@ -219,6 +220,7 @@
+ 				 
+ #log_min_duration_statement = -1 # -1 is disabled, in milliseconds.
 
- # - When to Log -
- 
-@@ -162,7 +162,7 @@
- 				 # milliseconds.  Zero prints all queries.
- 				 # Minus-one disables.
- 
-#silent_mode = false		 # DO NOT USE without Syslog!
-+silent_mode = true		 # DO NOT USE without Syslog!
+silent_mode = true
+ #silent_mode = false		 # DO NOT USE without syslog or redirect_stderr
 
 # - What to Log -
- 
--- a/databases/postgresql-devel-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql-devel-server/files/pgsql.sh.tmpl
@ -2,50 +2,57 @@

 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postgresql.conf
+# PROVIDE: postgresql
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
 #
-# Note that PGDATA is set in ~pgsql/.profile, don't try to manipulate it here!
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="%%PREFIX%%/pgsql/data"
+#  postgresql_flags="-w -s -m fast"
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf

-PREFIX=%%PREFIX%%
-PGBIN=${PREFIX}/bin
+prefix=%%PREFIX%%

-case $1 in
-start)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c \
-	    "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
-    }
-    ;;
+. %%RC_SUBR%%

-stop)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
-    }
-    ;;

-restart)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
-    }
-    ;;
+# set defaults
+postgresql_enable=${postgresql_enable:-"NO"}
+postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
+postgresql_user=pgsql
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}

-reload)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
-    }
-    ;;
+name=postgresql
+rcvar=`set_rcvar`
+command=${prefix}/bin/pg_ctl
+command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+extra_commands="reload initdb"

-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status"
-    }
-    ;;
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"

-*)
-    echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
-    exit 64
-    ;;
-esac
+initdb_cmd="postgresql_initdb"
+
+postgresql_command()
+{
+    su -m ${postgresql_user} -c "exec ${command} ${command_args}"
+}
+    
+postgresql_initdb()
+{
+    su -l ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+}
+
+load_rc_config postgresql
+run_rc_command "$1"
--- a/databases/postgresql-devel-server/files/regresspatch-src-test-regress-pgregress-sh
+++ b/databases/postgresql-devel-server/files/regresspatch-src-test-regress-pgregress-sh
@ -0,0 +1,12 @@
+--- src/test/regress/pg_regress.sh~	Sun Dec 12 16:34:15 2004
+++ src/test/regress/pg_regress.sh	Sat Jan  8 05:12:46 2005
+@@ -410,6 +410,9 @@
+         (exit 2); exit
+     fi
+ 
+    # make rest of this script happy
+    echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf
+    echo "silent_mode = false"        >> $PGDATA/postgresql.conf
+ 
+     # ----------
+     # Start postmaster
--- a/databases/postgresql-devel-server/pkg-message-jdbc
+++ b/databases/postgresql-devel-server/pkg-message-jdbc
@ -1,8 +0,0 @@
-PostgreSQL JDBC support installed!
-
-postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
-Add this to your CLASSPATH!
-
-java examples reside in
-/usr/local/share/examples/postgresql
--- a/databases/postgresql-devel-server/pkg-message-plpython
+++ b/databases/postgresql-devel-server/pkg-message-plpython
@ -0,0 +1,3 @@
+PL/Python has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Python by using "createlang plpythonu" (it
+exists as an untrusted language only).
--- a/databases/postgresql-devel-server/pkg-message-server
+++ b/databases/postgresql-devel-server/pkg-message-server
@ -1,36 +1,14 @@
-
-Specific for updating 7.4.1->7.4.x:
-
-   A dump/restore is *not* required for those running 7.4, BUT:
-
-   If you want to install the fixes in the information schema you will
-   need to reload it into the database. This is either accomplished by
-   initializing a new cluster by running "initdb", or by running the
-   following sequence of SQL commands in each database (ideally including
-   template1) as a superuser in psql, after installing the new release:
-
-DROP SCHEMA information_schema CASCADE;
-\i /usr/local/pgsql/share/information_schema.sql
-
-   Fixes to the information schema (from HISTORY):
-     * Fix information schema for bit data types (Peter)
-     * Fix information schema view constraint_column_usage for foreign
-       keys (Peter)
-
-=====================================================================
-
 For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.

 If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.

 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
-find useful. See the script for instructions.
+periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
+may find useful. Per default, it perfoms vacuum on all databases
+nightly. See the script for instructions.

 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
--- a/databases/postgresql-devel-server/pkg-message-tcltk
+++ b/databases/postgresql-devel-server/pkg-message-tcltk
@ -1 +0,0 @@
-Now, you should install pgaccess to get a nice GUI for PostgreSQL!
--- a/databases/postgresql-devel-server/pkg-plist-client
+++ b/databases/postgresql-devel-server/pkg-plist-client
@ -7,25 +7,378 @@ bin/droplang
 bin/dropuser
 bin/ecpg
 bin/initdb
-bin/initlocation
 bin/ipcclean
 bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
-bin/pg_id
 bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/vacuumdb
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/ibit.h
+include/postgresql/server/access/iqual.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rtree.h
+include/postgresql/server/access/rtscan.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlog_internal.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catname.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_control.h
+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_group.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+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_proc.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_shadow.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_type.h
+include/postgresql/server/catalog/pg_version.h
+include/postgresql/server/commands/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/comment.h
+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/explain.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/version.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdefs.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+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/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/lib/dllist.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/ip.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+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/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/beos.h
+include/postgresql/server/port/bsdi.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/dgux.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/irix.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/nextstep.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/osf.h
+include/postgresql/server/port/qnx4.h
+include/postgresql/server/port/sco.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/sunos4.h
+include/postgresql/server/port/svr4.h
+include/postgresql/server/port/ultrix4.h
+include/postgresql/server/port/univel.h
+include/postgresql/server/port/unixware.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+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/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+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/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itempos.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/strdup.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+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/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/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+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/portal.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/varbit.h
+@dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tcop
+@dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/port/win32/sys
+@dirrm include/postgresql/server/port/win32/netinet
+@dirrm include/postgresql/server/port/win32/arpa
+@dirrm include/postgresql/server/port/win32
+@dirrm include/postgresql/server/port
+@dirrm include/postgresql/server/parser
+@dirrm include/postgresql/server/optimizer
+@dirrm include/postgresql/server/nodes
+@dirrm include/postgresql/server/mb
+@dirrm include/postgresql/server/libpq
+@dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/executor
+@dirrm include/postgresql/server/commands
+@dirrm include/postgresql/server/catalog
+@dirrm include/postgresql/server/bootstrap
+@dirrm include/postgresql/server/access
+@dirrm include/postgresql/server
 include/libpq/libpq-fs.h
@dirrm include/libpq
 include/postgresql/internal/libpq/pqcomm.h
@dirrm include/postgresql/internal/libpq
-include/postgresql/internal/lib/dllist.h
-@dirrm include/postgresql/internal/lib
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqlda.h
@ -38,6 +391,7 @@ include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+@dirrm include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -66,83 +420,170 @@ lib/libpq.so.3
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/libpgtypes.so.1
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-share/postgresql/README-client
+%%DOCSDIR%%/README-client
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample
+share/postgresql/psqlrc.sample
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.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_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm include/postgresql
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-contrib
+++ b/databases/postgresql-devel-server/pkg-plist-contrib
@ -1,24 +1,15 @@
-bin/ApplySnapshot
-bin/CleanLog
-bin/GetSyncID
-bin/InitRservTest
-bin/MasterAddTable
-bin/MasterInit
-bin/MasterSync
-bin/PrepareSnapshot
-bin/Replicate
-bin/RservTest
-bin/SlaveAddTable
-bin/SlaveInit
+bin/DBMirror.pl
+bin/clean_pending.pl
 bin/dbf2pg
 bin/findoidjoins
 bin/fti.pl
 bin/ipc_check
 bin/make_oidjoins_check
+bin/my2pg.pl
+bin/mysql2pgsql
 bin/oid2name
 bin/pg_autovacuum
 bin/pg_dumplo
-bin/pg_logger
 bin/pgbench
 bin/reindexdb
 bin/vacuumlo
@ -41,10 +32,10 @@ lib/postgresql/misc_utils.so
 lib/postgresql/moddatetime.so
 lib/postgresql/noup.so
 lib/postgresql/pending.so
+lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgstattuple.so
 lib/postgresql/refint.so
-lib/postgresql/rserv.so
 lib/postgresql/rtree_gist.so
 lib/postgresql/seg.so
 lib/postgresql/string_io.so
@ -53,6 +44,7 @@ lib/postgresql/timetravel.so
 lib/postgresql/tsearch.so
 lib/postgresql/tsearch2.so
 lib/postgresql/user_locks.so
+%%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/README.apachelog
 %%DOCSDIR%%/contrib/README.btree_gist
@ -73,18 +65,18 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
 %%DOCSDIR%%/contrib/README.misc_utils
+%%DOCSDIR%%/contrib/README.mysql
 %%DOCSDIR%%/contrib/README.noup
 %%DOCSDIR%%/contrib/README.oid2name
 %%DOCSDIR%%/contrib/README.pg_autovacuum
 %%DOCSDIR%%/contrib/README.pg_dumplo
-%%DOCSDIR%%/contrib/README.pg_logger
+%%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
 %%DOCSDIR%%/contrib/README.pgcrypto
 %%DOCSDIR%%/contrib/README.pgstattuple
 %%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
 %%DOCSDIR%%/contrib/README.reindexdb
-%%DOCSDIR%%/contrib/README.rserv
 %%DOCSDIR%%/contrib/README.rtree_gist
 %%DOCSDIR%%/contrib/README.seg
 %%DOCSDIR%%/contrib/README.soundex
@ -100,7 +92,8 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/moddatetime.example
 %%DOCSDIR%%/contrib/refint.example
 %%DOCSDIR%%/contrib/timetravel.example
-share/postgresql/contrib/RServ.pm
+share/postgresql/contrib/AddTrigger.sql
+share/postgresql/contrib/MirrorSetup.sql
 share/postgresql/contrib/_int.sql
 share/postgresql/contrib/autoinc.sql
 share/postgresql/contrib/btree_gist.sql
@ -119,17 +112,17 @@ share/postgresql/contrib/lo.sql
 share/postgresql/contrib/lo_drop.sql
 share/postgresql/contrib/lo_test.sql
 share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/master.sql
 share/postgresql/contrib/misc_utils.sql
 share/postgresql/contrib/moddatetime.sql
 share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/rtree_gist.sql
 share/postgresql/contrib/russian.stop
 share/postgresql/contrib/seg.sql
-share/postgresql/contrib/slave.sql
+share/postgresql/contrib/slaveDatabase.conf
 share/postgresql/contrib/string_io.sql
 share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
@ -137,7 +130,6 @@ share/postgresql/contrib/tsearch.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
-share/postgresql/README-contrib
@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-jdbc
+++ b/databases/postgresql-devel-server/pkg-plist-jdbc
@ -1,27 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-share/postgresql/README-jdbc
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-plperl
+++ b/databases/postgresql-devel-server/pkg-plist-plperl
@ -1,2 +1,4 @@
+%%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-plpython
+++ b/databases/postgresql-devel-server/pkg-plist-plpython
@ -0,0 +1,4 @@
+%%DOCSDIR%%/README-plpython
+lib/postgresql/plpython.so
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-pltcl
+++ b/databases/postgresql-devel-server/pkg-plist-pltcl
@ -1,8 +1,9 @@
+%%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/README-pltcl
 share/postgresql/unknown.pltcl
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-server
+++ b/databases/postgresql-devel-server/pkg-plist-server
@ -1,6 +1,7 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
+etc/rc.d/postgresql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
@ -28,7 +29,8 @@ lib/postgresql/utf8_and_win1250.so
 lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
-share/postgresql/README-server
+%%DOCSDIR%%/README-server
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@ -36,7 +38,10 @@ share/postgresql/pg_ident.conf.sample
 share/postgresql/postgres.bki
 share/postgresql/postgres.description
 share/postgresql/postgresql.conf.sample
+share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
+share/postgresql/system_views.sql
+%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
@ -44,13 +49,606 @@ share/postgresql/sql_features.txt
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/Bangui
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lubumbashi
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Abidjan
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Cairo
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Addis_Ababa
+share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Banjul
+share/postgresql/timezone/Africa/Accra
+share/postgresql/timezone/Africa/Conakry
+share/postgresql/timezone/Africa/Bissau
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Blantyre
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Casablanca
+share/postgresql/timezone/Africa/El_Aaiun
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Freetown
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Khartoum
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Lome
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Lusaka
+share/postgresql/timezone/Africa/Harare
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Antarctica/Casey
+share/postgresql/timezone/Antarctica/Davis
+share/postgresql/timezone/Antarctica/Mawson
+share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Antarctica/Rothera
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/South_Pole
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bahrain
+share/postgresql/timezone/Asia/Dhaka
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Brunei
+share/postgresql/timezone/Asia/Rangoon
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Chongqing
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Dili
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Jakarta
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Makassar
+share/postgresql/timezone/Asia/Jayapura
+share/postgresql/timezone/Asia/Tehran
+share/postgresql/timezone/Asia/Baghdad
+share/postgresql/timezone/Asia/Jerusalem
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Bishkek
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Pyongyang
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kuala_Lumpur
+share/postgresql/timezone/Asia/Kuching
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Ulaanbaatar
+share/postgresql/timezone/Asia/Choibalsan
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Riyadh
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Krasnoyarsk
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Riyadh87
+share/postgresql/timezone/Asia/Riyadh88
+share/postgresql/timezone/Asia/Riyadh89
+share/postgresql/timezone/Asia/Istanbul
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Tel_Aviv
+share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Perth
+share/postgresql/timezone/Australia/Brisbane
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Adelaide
+share/postgresql/timezone/Australia/Hobart
+share/postgresql/timezone/Australia/Melbourne
+share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Broken_Hill
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/ACT
+share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/NSW
+share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Queensland
+share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Tasmania
+share/postgresql/timezone/Australia/Victoria
+share/postgresql/timezone/Australia/West
+share/postgresql/timezone/Australia/Yancowinna
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Yap
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/WET
+share/postgresql/timezone/CET
+share/postgresql/timezone/MET
+share/postgresql/timezone/EET
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Yellowknife
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Factory
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/EST5EDT
+share/postgresql/timezone/CST6CDT
+share/postgresql/timezone/MST7MDT
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/EST
+share/postgresql/timezone/MST
+share/postgresql/timezone/HST
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Samoa
+share/postgresql/timezone/GMT
+share/postgresql/timezone/Brazil/Acre
+share/postgresql/timezone/Brazil/DeNoronha
+share/postgresql/timezone/Brazil/East
+share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/Canada/Atlantic
+share/postgresql/timezone/Canada/Central
+share/postgresql/timezone/Canada/East-Saskatchewan
+share/postgresql/timezone/Canada/Eastern
+share/postgresql/timezone/Canada/Mountain
+share/postgresql/timezone/Canada/Newfoundland
+share/postgresql/timezone/Canada/Pacific
+share/postgresql/timezone/Canada/Saskatchewan
+share/postgresql/timezone/Canada/Yukon
+share/postgresql/timezone/Chile/Continental
+share/postgresql/timezone/Chile/EasterIsland
+share/postgresql/timezone/Cuba
+share/postgresql/timezone/Egypt
+share/postgresql/timezone/Eire
+share/postgresql/timezone/GB
+share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT+0
+share/postgresql/timezone/GMT-0
+share/postgresql/timezone/GMT0
+share/postgresql/timezone/Greenwich
+share/postgresql/timezone/Hongkong
+share/postgresql/timezone/Iceland
+share/postgresql/timezone/Iran
+share/postgresql/timezone/Israel
+share/postgresql/timezone/Jamaica
+share/postgresql/timezone/Japan
+share/postgresql/timezone/Kwajalein
+share/postgresql/timezone/Libya
+share/postgresql/timezone/Mexico/BajaNorte
+share/postgresql/timezone/Mexico/BajaSur
+share/postgresql/timezone/Mexico/General
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/NZ
+share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Poland
+share/postgresql/timezone/Portugal
+share/postgresql/timezone/PRC
+share/postgresql/timezone/ROC
+share/postgresql/timezone/ROK
+share/postgresql/timezone/Singapore
+share/postgresql/timezone/Turkey
+share/postgresql/timezone/UCT
+share/postgresql/timezone/UTC
+share/postgresql/timezone/Universal
+share/postgresql/timezone/W-SU
+share/postgresql/timezone/Zulu
+share/postgresql/timezone/SystemV/AST4ADT
+share/postgresql/timezone/SystemV/EST5EDT
+share/postgresql/timezone/SystemV/CST6CDT
+share/postgresql/timezone/SystemV/MST7MDT
+share/postgresql/timezone/SystemV/PST8PDT
+share/postgresql/timezone/SystemV/YST9YDT
+share/postgresql/timezone/SystemV/AST4
+share/postgresql/timezone/SystemV/EST5
+share/postgresql/timezone/SystemV/CST6
+share/postgresql/timezone/SystemV/MST7
+share/postgresql/timezone/SystemV/PST8
+share/postgresql/timezone/SystemV/YST9
+share/postgresql/timezone/SystemV/HST10
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
+@dirrm share/postgresql/timezone/Africa
+@dirrm share/postgresql/timezone/America/Argentina
+@dirrm share/postgresql/timezone/America/Indiana
+@dirrm share/postgresql/timezone/America/Kentucky
+@dirrm share/postgresql/timezone/America/North_Dakota
+@dirrm share/postgresql/timezone/America
+@dirrm share/postgresql/timezone/Antarctica
+@dirrm share/postgresql/timezone/Arctic
+@dirrm share/postgresql/timezone/Asia
+@dirrm share/postgresql/timezone/Atlantic
+@dirrm share/postgresql/timezone/Australia
+@dirrm share/postgresql/timezone/Brazil
+@dirrm share/postgresql/timezone/Canada
+@dirrm share/postgresql/timezone/Chile
+@dirrm share/postgresql/timezone/Etc
+@dirrm share/postgresql/timezone/Europe
+@dirrm share/postgresql/timezone/Indian
+@dirrm share/postgresql/timezone/Mexico
+@dirrm share/postgresql/timezone/Mideast
+@dirrm share/postgresql/timezone/Pacific
+@dirrm share/postgresql/timezone/SystemV
+@dirrm share/postgresql/timezone/US
+@dirrm share/postgresql/timezone
@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
@ -61,351 +659,9 @@ share/postgresql/dot.cshrc.dist
@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 rmdir ~pgsql 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
@unexec rmdir %D/share/postgresql 2>/dev/null || true
@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-etc/rc.d/postgresql.sh
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/ibit.h
-include/postgresql/server/access/iqual.h
-include/postgresql/server/access/istrat.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rtree.h
-include/postgresql/server/access/rtscan.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/strat.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catname.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-include/postgresql/server/catalog/namespace.h
-include/postgresql/server/catalog/pg_aggregate.h
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_control.h
-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_group.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-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_proc.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shadow.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_version.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/comment.h
-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/explain.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/version.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdefs.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/lib/dllist.h
-include/postgresql/server/lib/lispsort.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ip.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.h
-include/postgresql/server/nodes/pg_list.h
-include/postgresql/server/nodes/plannodes.h
-include/postgresql/server/nodes/primnodes.h
-include/postgresql/server/nodes/print.h
-include/postgresql/server/nodes/readfuncs.h
-include/postgresql/server/nodes/relation.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-include/postgresql/server/optimizer/geqo_random.h
-include/postgresql/server/optimizer/geqo_recombination.h
-include/postgresql/server/optimizer/geqo_selection.h
-include/postgresql/server/optimizer/joininfo.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/plancat.h
-include/postgresql/server/optimizer/planmain.h
-include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/prep.h
-include/postgresql/server/optimizer/restrictinfo.h
-include/postgresql/server/optimizer/subselect.h
-include/postgresql/server/optimizer/tlist.h
-include/postgresql/server/optimizer/var.h
-include/postgresql/server/parser/analyze.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/parse.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-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/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/beos.h
-include/postgresql/server/port/bsdi.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/dgux.h
-include/postgresql/server/port/freebsd.h
-include/postgresql/server/port/hpux.h
-include/postgresql/server/port/irix5.h
-include/postgresql/server/port/linux.h
-include/postgresql/server/port/netbsd.h
-include/postgresql/server/port/nextstep.h
-include/postgresql/server/port/openbsd.h
-include/postgresql/server/port/osf.h
-include/postgresql/server/port/qnx4.h
-include/postgresql/server/port/sco.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/sunos4.h
-include/postgresql/server/port/svr4.h
-include/postgresql/server/port/ultrix4.h
-include/postgresql/server/port/univel.h
-include/postgresql/server/port/unixware.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itempos.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/lmgr.h
-include/postgresql/server/storage/lock.h
-include/postgresql/server/storage/lwlock.h
-include/postgresql/server/storage/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/pos.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-include/postgresql/server/storage/smgr.h
-include/postgresql/server/storage/spin.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-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/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/date.h
-include/postgresql/server/utils/datetime.h
-include/postgresql/server/utils/datum.h
-include/postgresql/server/utils/dynahash.h
-include/postgresql/server/utils/dynamic_loader.h
-include/postgresql/server/utils/elog.h
-include/postgresql/server/utils/errcodes.h
-include/postgresql/server/utils/fmgroids.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-include/postgresql/server/utils/inval.h
-include/postgresql/server/utils/logtape.h
-include/postgresql/server/utils/lsyscache.h
-include/postgresql/server/utils/memutils.h
-include/postgresql/server/utils/nabstime.h
-include/postgresql/server/utils/numeric.h
-include/postgresql/server/utils/palloc.h
-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/portal.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/sets.h
-include/postgresql/server/utils/syscache.h
-include/postgresql/server/utils/timestamp.h
-include/postgresql/server/utils/tqual.h
-include/postgresql/server/utils/tuplesort.h
-include/postgresql/server/utils/tuplestore.h
-include/postgresql/server/utils/typcache.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/c.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/port.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/strdup.h
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server
+@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/pgsql 2>/dev/null || true
--- a/databases/postgresql-devel-server/pkg-plist-tcltk
+++ b/databases/postgresql-devel-server/pkg-plist-tcltk
@ -1,11 +0,0 @@
-bin/pgtclsh
-include/libpgtcl.h
-lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
-@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true
-lib/libpgtcl.a
-lib/libpgtcl.so
-lib/libpgtcl.so.2
-%%TK%%bin/pgtksh
-share/postgresql/README-tcltk
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@ -7,28 +7,25 @@

 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	8.0.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]*$//:C/rc/beta/}
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-# XXX: this will eventually go away
-.if !defined(PGSQL_WORK_IN_PROGRESS)
-BROKEN= pending ports/75344, the 8.0 release can be used via the postgresql-devel port
-.endif
-
-CONFLICTS?=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.*
+CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*

 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql

+NO_LATEST_LINK=	beta version
+
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
@ -38,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif

-CONFIGURE_ARGS?=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"

 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}

-BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}

@ -58,18 +56,32 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}

 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
-OPTIONS+=	SSL "Build with SSL" on
+.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.
+#
+# If you *don't* want SSL, set WITHOUT_SSL=YES when making
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
 .endif

 .include <bsd.port.pre.mk>

+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+BROKEN=		"Coredump during build on alpha 4.x"
+.endif
+
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
-.  if ${OSVERSION} < 500041
-OPTIONS+=	GNUGETOPT "Depend on GNU getopt" on
+.  if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 .  if defined(SERVER_ONLY)
 OPTIONS+=	PAM "Build with PAM support" off
+OPTIONS+=	RENDEZVOUZ "Add support for Apple's Rendez-Vouz" off
 .  endif
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal's kerberos support" off
@ -81,11 +93,15 @@ OPTIONS+=	TESTS "Allows the use of a \"check\" target" off
 .  endif
 OPTIONS+=	DEBUG "Builds with debugging symbols" off

+.if defined(SERVER_ONLY) && defined(WITH_RENDEZVOUS)
+CONFIGURE_ARGS+=	--with-rendezvous
+.endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .  endif

-. if !defined(WITHOUT_GNUGETOPT)
+. if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif

@ -109,97 +125,88 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif

-.  if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
-.  endif
-
 .  if defined(WITH_MIT_KRB5)
+WITH_KRB5=	yes
+KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-WITH_KRB5=	yes
 .  endif

 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
 .    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
 .    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
 .    else
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
 .    endif
 .  endif

 .  if defined(WITH_KRB5)
-CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+CONFIGURE_ARGS+=	--with-krb5
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-text-regress-pgregress-sh
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .  endif
-
-.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
-.  endif
-.  if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.  endif
-.  if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world."
-	@exit 1
-.  endif
-
 .endif # !SLAVE_ONLY

 .if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
-		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
-		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
-		pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
-		postmaster.1 psql.1 vacuumdb.1
+MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
+		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
+		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
+		postgres.1 postmaster.1 psql.1 vacuumdb.1

-MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 \
-		alter_database.7 alter_domain.7 alter_function.7 \
-		alter_group.7 alter_language.7 alter_operator_class.7 \
-		alter_schema.7 alter_sequence.7 alter_table.7 \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
-		close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
-		create_cast.7 create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 \
-		create_sequence.7 create_table.7 create_table_as.7 \
-		create_trigger.7 create_type.7 create_user.7 create_view.7 \
-		deallocate.7 declare.7 delete.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_rule.7 drop_schema.7 \
-		drop_sequence.7 \
-		drop_table.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 reindex.7 \
-		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
-		set.7 set_constraints.7 set_transaction.7 show.7 \
-		set_session_authorization.7 start_transaction.7 \
-		truncate.7 unlisten.7 update.7 vacuum.7
+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_schema.7 alter_sequence.7 alter_table.7		      \
+		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
+		copy.7 create_aggregate.7 create_cast.7			      \
+		create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 create_sequence.7		      \
+		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_type.7 create_user.7 create_view.7 delete.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_schema.7 drop_sequence.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 reindex.7 reset.7	      \
+		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
+		set_constraints.7 set_transaction.7 show.7		      \
+		set_session_authorization.7 start_transaction.7		      \
+		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
+		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
+		spi_execp.7 spi_execute.7 spi_execute_plan.7		      \
+		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
+		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
+		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
+		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
+		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
+		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
+		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
+		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		alter_operator.7 alter_tablespace.7 alter_type.7	      \
+		create_tablespace.7 drop_tablespace.7			      \
+		release_savepoint.7 rollback_to_savepoint.7		      \
+		savepoint.7
 .endif

 .if defined(SERVER_ONLY)
@ -208,6 +215,14 @@ pre-everything::
 .endif

 .if !defined(NO_BUILD)
+
+pre-configure:
+.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.  endif
+
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
@ -235,10 +250,9 @@ do-install:
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-	${MKDIR} ${PREFIX}/share/postgresql
 .  if defined(SERVER_ONLY)
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} install-all-headers
-.  for i in profile cshrc
+	@ ${MKDIR} ${PREFIX}/share/postgresql
+.    for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
@ -246,7 +260,7 @@ do-install:
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-.  endfor
+.    endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${RCSCRIPT} ;\
@ -258,7 +272,8 @@ do-install:
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
-		${INSTALL_DATA} ${PKGMESSAGE} ${PREFIX}/share/postgresql/README${PKGNAMESUFFIX} ;\
+		${MKDIR} ${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-8.0.0.tar.bz2) = 57984b8b016501ee920e95af6edc7145
+SIZE (postgresql/postgresql-base-8.0.0.tar.bz2) = 7795453
+MD5 (postgresql/postgresql-docs-8.0.0.tar.bz2) = 9deb6ac959e367cabe882d77287a6b31
+SIZE (postgresql/postgresql-docs-8.0.0.tar.bz2) = 2195941
+MD5 (postgresql/postgresql-opt-8.0.0.tar.bz2) = 11f91f2bf1697d7c8f340151208e0c3e
+SIZE (postgresql/postgresql-opt-8.0.0.tar.bz2) = 133317
+MD5 (postgresql/postgresql-test-8.0.0.tar.bz2) = 0281020c9a1a3c342edaf2d9586ec07e
+SIZE (postgresql/postgresql-test-8.0.0.tar.bz2) = 961649
--- a/databases/postgresql80-server/files/502.pgsql
+++ b/databases/postgresql80-server/files/502.pgsql
@ -18,7 +18,7 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum

-daily_pgsql_vaccum_enable="NO"
+daily_pgsql_vacuum_enable="YES"
 daily_pgsql_backup_enable="NO"

 daily_pgsql_vacuum_args="-z"
--- a/databases/postgresql80-server/files/patch-configure
+++ b/databases/postgresql80-server/files/patch-configure
@ -1,59 +0,0 @@
--- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
--- a/databases/postgresql80-server/files/patch-plpython-Makefile
+++ b/databases/postgresql80-server/files/patch-plpython-Makefile
@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
+@@ -9,7 +9,7 @@
+ # shared library.  Since there is no official way to determine this
+ # (at least not in pre-2.3 Python), we see if there is a file that is
+ # named like a shared library.
+-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+ endif
+ 
--- a/databases/postgresql80-server/files/patch-src-interfaces-jdbc-build-xml
+++ b/databases/postgresql80-server/files/patch-src-interfaces-jdbc-build-xml
@ -1,14 +0,0 @@
--- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
--- a/databases/postgresql80-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ b/databases/postgresql80-server/files/patch-src-interfaces-libpgtcl-Makefile
@ -1,11 +0,0 @@
--- src/interfaces/libpgtcl/Makefile.orig	Tue Feb 10 08:26:48 2004
-+++ src/interfaces/libpgtcl/Makefile	Thu Mar 11 21:12:25 2004
-@@ -21,7 +21,7 @@
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
- SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
-	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
-+	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
- 
- all: submake-libpq all-lib
- 
--- a/databases/postgresql80-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql80-server/files/patch-src-makefiles-Makefile.freebsd
@ -1,15 +1,15 @@
--- src/makefiles/Makefile.freebsd.orig	Wed Aug 29 21:14:40 2001
-+++ src/makefiles/Makefile.freebsd	Sat Jan 31 17:51:25 2004
-@@ -7,7 +7,7 @@
- endif
- 
- DLSUFFIX = .so
+--- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
+@@ -11,7 +11,7 @@
+ ifeq ($(findstring sparc,$(host_cpu)), sparc)
+ CFLAGS_SL = -fPIC -DPIC
+ else
 -CFLAGS_SL = -fpic -DPIC
 +CFLAGS_SL = -fPIC -DPIC
+ endif
 
- %.so: %.o
- ifdef ELF_SYSTEM
-@@ -23,3 +23,5 @@
+ 
+@@ -29,3 +29,5 @@
 endif
 
 sqlmansect = 7
--- a/databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@ -1,24 +1,18 @@
--- src/backend/utils/misc/postgresql.conf.sample~	Wed Oct  8 05:49:38 2003
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov 18 05:08:08 2003
-@@ -136,9 +136,9 @@
+--- src/backend/utils/misc/postgresql.conf.sample~	Fri Nov  5 20:16:16 2004
+++ src/backend/utils/misc/postgresql.conf.sample	Tue Dec 21 02:06:45 2004
+@@ -172,6 +172,7 @@
 
- # - Syslog -
+ # - Where to Log -
 
-#syslog = 0			# range 0-2; 0=stdout; 1=both; 2=syslog
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-+syslog = 2			# range 0-2; 0=stdout; 1=both; 2=syslog
-+syslog_facility = 'LOCAL0'
-+syslog_ident = 'postgres'
+log_destination = 'syslog'
+ #log_destination = 'stderr'	# Valid values are combinations of stderr,
+                                 # syslog and eventlog, depending on
+                                 # platform.
+@@ -219,6 +220,7 @@
+ 				 
+ #log_min_duration_statement = -1 # -1 is disabled, in milliseconds.
 
- # - When to Log -
- 
-@@ -162,7 +162,7 @@
- 				 # milliseconds.  Zero prints all queries.
- 				 # Minus-one disables.
- 
-#silent_mode = false		 # DO NOT USE without Syslog!
-+silent_mode = true		 # DO NOT USE without Syslog!
+silent_mode = true
+ #silent_mode = false		 # DO NOT USE without syslog or redirect_stderr
 
 # - What to Log -
- 
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/pgsql.sh.tmpl
@ -2,50 +2,57 @@

 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postgresql.conf
+# PROVIDE: postgresql
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
 #
-# Note that PGDATA is set in ~pgsql/.profile, don't try to manipulate it here!
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="%%PREFIX%%/pgsql/data"
+#  postgresql_flags="-w -s -m fast"
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf

-PREFIX=%%PREFIX%%
-PGBIN=${PREFIX}/bin
+prefix=%%PREFIX%%

-case $1 in
-start)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c \
-	    "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
-    }
-    ;;
+. %%RC_SUBR%%

-stop)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
-    }
-    ;;

-restart)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
-    }
-    ;;
+# set defaults
+postgresql_enable=${postgresql_enable:-"NO"}
+postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
+postgresql_user=pgsql
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}

-reload)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
-    }
-    ;;
+name=postgresql
+rcvar=`set_rcvar`
+command=${prefix}/bin/pg_ctl
+command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+extra_commands="reload initdb"

-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status"
-    }
-    ;;
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"

-*)
-    echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
-    exit 64
-    ;;
-esac
+initdb_cmd="postgresql_initdb"
+
+postgresql_command()
+{
+    su -m ${postgresql_user} -c "exec ${command} ${command_args}"
+}
+    
+postgresql_initdb()
+{
+    su -l ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+}
+
+load_rc_config postgresql
+run_rc_command "$1"
--- a/databases/postgresql80-server/files/regresspatch-src-test-regress-pgregress-sh
+++ b/databases/postgresql80-server/files/regresspatch-src-test-regress-pgregress-sh
@ -0,0 +1,12 @@
+--- src/test/regress/pg_regress.sh~	Sun Dec 12 16:34:15 2004
+++ src/test/regress/pg_regress.sh	Sat Jan  8 05:12:46 2005
+@@ -410,6 +410,9 @@
+         (exit 2); exit
+     fi
+ 
+    # make rest of this script happy
+    echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf
+    echo "silent_mode = false"        >> $PGDATA/postgresql.conf
+ 
+     # ----------
+     # Start postmaster
--- a/databases/postgresql80-server/pkg-message-jdbc
+++ b/databases/postgresql80-server/pkg-message-jdbc
@ -1,8 +0,0 @@
-PostgreSQL JDBC support installed!
-
-postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
-Add this to your CLASSPATH!
-
-java examples reside in
-/usr/local/share/examples/postgresql
--- a/databases/postgresql80-server/pkg-message-plpython
+++ b/databases/postgresql80-server/pkg-message-plpython
@ -0,0 +1,3 @@
+PL/Python has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Python by using "createlang plpythonu" (it
+exists as an untrusted language only).
--- a/databases/postgresql80-server/pkg-message-server
+++ b/databases/postgresql80-server/pkg-message-server
@ -1,36 +1,14 @@
-
-Specific for updating 7.4.1->7.4.x:
-
-   A dump/restore is *not* required for those running 7.4, BUT:
-
-   If you want to install the fixes in the information schema you will
-   need to reload it into the database. This is either accomplished by
-   initializing a new cluster by running "initdb", or by running the
-   following sequence of SQL commands in each database (ideally including
-   template1) as a superuser in psql, after installing the new release:
-
-DROP SCHEMA information_schema CASCADE;
-\i /usr/local/pgsql/share/information_schema.sql
-
-   Fixes to the information schema (from HISTORY):
-     * Fix information schema for bit data types (Peter)
-     * Fix information schema view constraint_column_usage for foreign
-       keys (Peter)
-
-=====================================================================
-
 For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.

 If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.

 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
-find useful. See the script for instructions.
+periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
+may find useful. Per default, it perfoms vacuum on all databases
+nightly. See the script for instructions.

 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
--- a/databases/postgresql80-server/pkg-message-tcltk
+++ b/databases/postgresql80-server/pkg-message-tcltk
@ -1 +0,0 @@
-Now, you should install pgaccess to get a nice GUI for PostgreSQL!
--- a/databases/postgresql80-server/pkg-plist-client
+++ b/databases/postgresql80-server/pkg-plist-client
@ -7,25 +7,378 @@ bin/droplang
 bin/dropuser
 bin/ecpg
 bin/initdb
-bin/initlocation
 bin/ipcclean
 bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
-bin/pg_id
 bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/vacuumdb
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/ibit.h
+include/postgresql/server/access/iqual.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rtree.h
+include/postgresql/server/access/rtscan.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlog_internal.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catname.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_control.h
+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_group.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+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_proc.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_shadow.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_type.h
+include/postgresql/server/catalog/pg_version.h
+include/postgresql/server/commands/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/comment.h
+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/explain.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/version.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdefs.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+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/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/lib/dllist.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/ip.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+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/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/beos.h
+include/postgresql/server/port/bsdi.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/dgux.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/irix.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/nextstep.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/osf.h
+include/postgresql/server/port/qnx4.h
+include/postgresql/server/port/sco.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/sunos4.h
+include/postgresql/server/port/svr4.h
+include/postgresql/server/port/ultrix4.h
+include/postgresql/server/port/univel.h
+include/postgresql/server/port/unixware.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+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/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+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/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itempos.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/strdup.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+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/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/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+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/portal.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/varbit.h
+@dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tcop
+@dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/port/win32/sys
+@dirrm include/postgresql/server/port/win32/netinet
+@dirrm include/postgresql/server/port/win32/arpa
+@dirrm include/postgresql/server/port/win32
+@dirrm include/postgresql/server/port
+@dirrm include/postgresql/server/parser
+@dirrm include/postgresql/server/optimizer
+@dirrm include/postgresql/server/nodes
+@dirrm include/postgresql/server/mb
+@dirrm include/postgresql/server/libpq
+@dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/executor
+@dirrm include/postgresql/server/commands
+@dirrm include/postgresql/server/catalog
+@dirrm include/postgresql/server/bootstrap
+@dirrm include/postgresql/server/access
+@dirrm include/postgresql/server
 include/libpq/libpq-fs.h
@dirrm include/libpq
 include/postgresql/internal/libpq/pqcomm.h
@dirrm include/postgresql/internal/libpq
-include/postgresql/internal/lib/dllist.h
-@dirrm include/postgresql/internal/lib
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqlda.h
@ -38,6 +391,7 @@ include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+@dirrm include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -66,83 +420,170 @@ lib/libpq.so.3
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/libpgtypes.so.1
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-share/postgresql/README-client
+%%DOCSDIR%%/README-client
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample
+share/postgresql/psqlrc.sample
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.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_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm include/postgresql
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-contrib
+++ b/databases/postgresql80-server/pkg-plist-contrib
@ -1,24 +1,15 @@
-bin/ApplySnapshot
-bin/CleanLog
-bin/GetSyncID
-bin/InitRservTest
-bin/MasterAddTable
-bin/MasterInit
-bin/MasterSync
-bin/PrepareSnapshot
-bin/Replicate
-bin/RservTest
-bin/SlaveAddTable
-bin/SlaveInit
+bin/DBMirror.pl
+bin/clean_pending.pl
 bin/dbf2pg
 bin/findoidjoins
 bin/fti.pl
 bin/ipc_check
 bin/make_oidjoins_check
+bin/my2pg.pl
+bin/mysql2pgsql
 bin/oid2name
 bin/pg_autovacuum
 bin/pg_dumplo
-bin/pg_logger
 bin/pgbench
 bin/reindexdb
 bin/vacuumlo
@ -41,10 +32,10 @@ lib/postgresql/misc_utils.so
 lib/postgresql/moddatetime.so
 lib/postgresql/noup.so
 lib/postgresql/pending.so
+lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgstattuple.so
 lib/postgresql/refint.so
-lib/postgresql/rserv.so
 lib/postgresql/rtree_gist.so
 lib/postgresql/seg.so
 lib/postgresql/string_io.so
@ -53,6 +44,7 @@ lib/postgresql/timetravel.so
 lib/postgresql/tsearch.so
 lib/postgresql/tsearch2.so
 lib/postgresql/user_locks.so
+%%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/README.apachelog
 %%DOCSDIR%%/contrib/README.btree_gist
@ -73,18 +65,18 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
 %%DOCSDIR%%/contrib/README.misc_utils
+%%DOCSDIR%%/contrib/README.mysql
 %%DOCSDIR%%/contrib/README.noup
 %%DOCSDIR%%/contrib/README.oid2name
 %%DOCSDIR%%/contrib/README.pg_autovacuum
 %%DOCSDIR%%/contrib/README.pg_dumplo
-%%DOCSDIR%%/contrib/README.pg_logger
+%%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
 %%DOCSDIR%%/contrib/README.pgcrypto
 %%DOCSDIR%%/contrib/README.pgstattuple
 %%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
 %%DOCSDIR%%/contrib/README.reindexdb
-%%DOCSDIR%%/contrib/README.rserv
 %%DOCSDIR%%/contrib/README.rtree_gist
 %%DOCSDIR%%/contrib/README.seg
 %%DOCSDIR%%/contrib/README.soundex
@ -100,7 +92,8 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/moddatetime.example
 %%DOCSDIR%%/contrib/refint.example
 %%DOCSDIR%%/contrib/timetravel.example
-share/postgresql/contrib/RServ.pm
+share/postgresql/contrib/AddTrigger.sql
+share/postgresql/contrib/MirrorSetup.sql
 share/postgresql/contrib/_int.sql
 share/postgresql/contrib/autoinc.sql
 share/postgresql/contrib/btree_gist.sql
@ -119,17 +112,17 @@ share/postgresql/contrib/lo.sql
 share/postgresql/contrib/lo_drop.sql
 share/postgresql/contrib/lo_test.sql
 share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/master.sql
 share/postgresql/contrib/misc_utils.sql
 share/postgresql/contrib/moddatetime.sql
 share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/rtree_gist.sql
 share/postgresql/contrib/russian.stop
 share/postgresql/contrib/seg.sql
-share/postgresql/contrib/slave.sql
+share/postgresql/contrib/slaveDatabase.conf
 share/postgresql/contrib/string_io.sql
 share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
@ -137,7 +130,6 @@ share/postgresql/contrib/tsearch.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
-share/postgresql/README-contrib
@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
--- a/databases/postgresql80-server/pkg-plist-jdbc
+++ b/databases/postgresql80-server/pkg-plist-jdbc
@ -1,27 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-share/postgresql/README-jdbc
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-plperl
+++ b/databases/postgresql80-server/pkg-plist-plperl
@ -1,2 +1,4 @@
+%%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-plpython
+++ b/databases/postgresql80-server/pkg-plist-plpython
@ -0,0 +1,4 @@
+%%DOCSDIR%%/README-plpython
+lib/postgresql/plpython.so
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-pltcl
+++ b/databases/postgresql80-server/pkg-plist-pltcl
@ -1,8 +1,9 @@
+%%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/README-pltcl
 share/postgresql/unknown.pltcl
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@ -1,6 +1,7 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
+etc/rc.d/postgresql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
@ -28,7 +29,8 @@ lib/postgresql/utf8_and_win1250.so
 lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
-share/postgresql/README-server
+%%DOCSDIR%%/README-server
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@ -36,7 +38,10 @@ share/postgresql/pg_ident.conf.sample
 share/postgresql/postgres.bki
 share/postgresql/postgres.description
 share/postgresql/postgresql.conf.sample
+share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
+share/postgresql/system_views.sql
+%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
@ -44,13 +49,606 @@ share/postgresql/sql_features.txt
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/Bangui
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lubumbashi
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Abidjan
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Cairo
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Addis_Ababa
+share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Banjul
+share/postgresql/timezone/Africa/Accra
+share/postgresql/timezone/Africa/Conakry
+share/postgresql/timezone/Africa/Bissau
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Blantyre
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Casablanca
+share/postgresql/timezone/Africa/El_Aaiun
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Freetown
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Khartoum
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Lome
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Lusaka
+share/postgresql/timezone/Africa/Harare
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Antarctica/Casey
+share/postgresql/timezone/Antarctica/Davis
+share/postgresql/timezone/Antarctica/Mawson
+share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Antarctica/Rothera
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/South_Pole
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bahrain
+share/postgresql/timezone/Asia/Dhaka
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Brunei
+share/postgresql/timezone/Asia/Rangoon
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Chongqing
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Dili
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Jakarta
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Makassar
+share/postgresql/timezone/Asia/Jayapura
+share/postgresql/timezone/Asia/Tehran
+share/postgresql/timezone/Asia/Baghdad
+share/postgresql/timezone/Asia/Jerusalem
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Bishkek
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Pyongyang
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kuala_Lumpur
+share/postgresql/timezone/Asia/Kuching
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Ulaanbaatar
+share/postgresql/timezone/Asia/Choibalsan
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Riyadh
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Krasnoyarsk
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Riyadh87
+share/postgresql/timezone/Asia/Riyadh88
+share/postgresql/timezone/Asia/Riyadh89
+share/postgresql/timezone/Asia/Istanbul
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Tel_Aviv
+share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Perth
+share/postgresql/timezone/Australia/Brisbane
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Adelaide
+share/postgresql/timezone/Australia/Hobart
+share/postgresql/timezone/Australia/Melbourne
+share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Broken_Hill
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/ACT
+share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/NSW
+share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Queensland
+share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Tasmania
+share/postgresql/timezone/Australia/Victoria
+share/postgresql/timezone/Australia/West
+share/postgresql/timezone/Australia/Yancowinna
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Yap
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/WET
+share/postgresql/timezone/CET
+share/postgresql/timezone/MET
+share/postgresql/timezone/EET
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Yellowknife
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Factory
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/EST5EDT
+share/postgresql/timezone/CST6CDT
+share/postgresql/timezone/MST7MDT
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/EST
+share/postgresql/timezone/MST
+share/postgresql/timezone/HST
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Samoa
+share/postgresql/timezone/GMT
+share/postgresql/timezone/Brazil/Acre
+share/postgresql/timezone/Brazil/DeNoronha
+share/postgresql/timezone/Brazil/East
+share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/Canada/Atlantic
+share/postgresql/timezone/Canada/Central
+share/postgresql/timezone/Canada/East-Saskatchewan
+share/postgresql/timezone/Canada/Eastern
+share/postgresql/timezone/Canada/Mountain
+share/postgresql/timezone/Canada/Newfoundland
+share/postgresql/timezone/Canada/Pacific
+share/postgresql/timezone/Canada/Saskatchewan
+share/postgresql/timezone/Canada/Yukon
+share/postgresql/timezone/Chile/Continental
+share/postgresql/timezone/Chile/EasterIsland
+share/postgresql/timezone/Cuba
+share/postgresql/timezone/Egypt
+share/postgresql/timezone/Eire
+share/postgresql/timezone/GB
+share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT+0
+share/postgresql/timezone/GMT-0
+share/postgresql/timezone/GMT0
+share/postgresql/timezone/Greenwich
+share/postgresql/timezone/Hongkong
+share/postgresql/timezone/Iceland
+share/postgresql/timezone/Iran
+share/postgresql/timezone/Israel
+share/postgresql/timezone/Jamaica
+share/postgresql/timezone/Japan
+share/postgresql/timezone/Kwajalein
+share/postgresql/timezone/Libya
+share/postgresql/timezone/Mexico/BajaNorte
+share/postgresql/timezone/Mexico/BajaSur
+share/postgresql/timezone/Mexico/General
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/NZ
+share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Poland
+share/postgresql/timezone/Portugal
+share/postgresql/timezone/PRC
+share/postgresql/timezone/ROC
+share/postgresql/timezone/ROK
+share/postgresql/timezone/Singapore
+share/postgresql/timezone/Turkey
+share/postgresql/timezone/UCT
+share/postgresql/timezone/UTC
+share/postgresql/timezone/Universal
+share/postgresql/timezone/W-SU
+share/postgresql/timezone/Zulu
+share/postgresql/timezone/SystemV/AST4ADT
+share/postgresql/timezone/SystemV/EST5EDT
+share/postgresql/timezone/SystemV/CST6CDT
+share/postgresql/timezone/SystemV/MST7MDT
+share/postgresql/timezone/SystemV/PST8PDT
+share/postgresql/timezone/SystemV/YST9YDT
+share/postgresql/timezone/SystemV/AST4
+share/postgresql/timezone/SystemV/EST5
+share/postgresql/timezone/SystemV/CST6
+share/postgresql/timezone/SystemV/MST7
+share/postgresql/timezone/SystemV/PST8
+share/postgresql/timezone/SystemV/YST9
+share/postgresql/timezone/SystemV/HST10
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
+@dirrm share/postgresql/timezone/Africa
+@dirrm share/postgresql/timezone/America/Argentina
+@dirrm share/postgresql/timezone/America/Indiana
+@dirrm share/postgresql/timezone/America/Kentucky
+@dirrm share/postgresql/timezone/America/North_Dakota
+@dirrm share/postgresql/timezone/America
+@dirrm share/postgresql/timezone/Antarctica
+@dirrm share/postgresql/timezone/Arctic
+@dirrm share/postgresql/timezone/Asia
+@dirrm share/postgresql/timezone/Atlantic
+@dirrm share/postgresql/timezone/Australia
+@dirrm share/postgresql/timezone/Brazil
+@dirrm share/postgresql/timezone/Canada
+@dirrm share/postgresql/timezone/Chile
+@dirrm share/postgresql/timezone/Etc
+@dirrm share/postgresql/timezone/Europe
+@dirrm share/postgresql/timezone/Indian
+@dirrm share/postgresql/timezone/Mexico
+@dirrm share/postgresql/timezone/Mideast
+@dirrm share/postgresql/timezone/Pacific
+@dirrm share/postgresql/timezone/SystemV
+@dirrm share/postgresql/timezone/US
+@dirrm share/postgresql/timezone
@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
@ -61,351 +659,9 @@ share/postgresql/dot.cshrc.dist
@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 rmdir ~pgsql 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
@unexec rmdir %D/share/postgresql 2>/dev/null || true
@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-etc/rc.d/postgresql.sh
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/ibit.h
-include/postgresql/server/access/iqual.h
-include/postgresql/server/access/istrat.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rtree.h
-include/postgresql/server/access/rtscan.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/strat.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catname.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-include/postgresql/server/catalog/namespace.h
-include/postgresql/server/catalog/pg_aggregate.h
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_control.h
-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_group.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-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_proc.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shadow.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_version.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/comment.h
-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/explain.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/version.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdefs.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/lib/dllist.h
-include/postgresql/server/lib/lispsort.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ip.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.h
-include/postgresql/server/nodes/pg_list.h
-include/postgresql/server/nodes/plannodes.h
-include/postgresql/server/nodes/primnodes.h
-include/postgresql/server/nodes/print.h
-include/postgresql/server/nodes/readfuncs.h
-include/postgresql/server/nodes/relation.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-include/postgresql/server/optimizer/geqo_random.h
-include/postgresql/server/optimizer/geqo_recombination.h
-include/postgresql/server/optimizer/geqo_selection.h
-include/postgresql/server/optimizer/joininfo.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/plancat.h
-include/postgresql/server/optimizer/planmain.h
-include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/prep.h
-include/postgresql/server/optimizer/restrictinfo.h
-include/postgresql/server/optimizer/subselect.h
-include/postgresql/server/optimizer/tlist.h
-include/postgresql/server/optimizer/var.h
-include/postgresql/server/parser/analyze.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/parse.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-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/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/beos.h
-include/postgresql/server/port/bsdi.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/dgux.h
-include/postgresql/server/port/freebsd.h
-include/postgresql/server/port/hpux.h
-include/postgresql/server/port/irix5.h
-include/postgresql/server/port/linux.h
-include/postgresql/server/port/netbsd.h
-include/postgresql/server/port/nextstep.h
-include/postgresql/server/port/openbsd.h
-include/postgresql/server/port/osf.h
-include/postgresql/server/port/qnx4.h
-include/postgresql/server/port/sco.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/sunos4.h
-include/postgresql/server/port/svr4.h
-include/postgresql/server/port/ultrix4.h
-include/postgresql/server/port/univel.h
-include/postgresql/server/port/unixware.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itempos.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/lmgr.h
-include/postgresql/server/storage/lock.h
-include/postgresql/server/storage/lwlock.h
-include/postgresql/server/storage/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/pos.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-include/postgresql/server/storage/smgr.h
-include/postgresql/server/storage/spin.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-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/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/date.h
-include/postgresql/server/utils/datetime.h
-include/postgresql/server/utils/datum.h
-include/postgresql/server/utils/dynahash.h
-include/postgresql/server/utils/dynamic_loader.h
-include/postgresql/server/utils/elog.h
-include/postgresql/server/utils/errcodes.h
-include/postgresql/server/utils/fmgroids.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-include/postgresql/server/utils/inval.h
-include/postgresql/server/utils/logtape.h
-include/postgresql/server/utils/lsyscache.h
-include/postgresql/server/utils/memutils.h
-include/postgresql/server/utils/nabstime.h
-include/postgresql/server/utils/numeric.h
-include/postgresql/server/utils/palloc.h
-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/portal.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/sets.h
-include/postgresql/server/utils/syscache.h
-include/postgresql/server/utils/timestamp.h
-include/postgresql/server/utils/tqual.h
-include/postgresql/server/utils/tuplesort.h
-include/postgresql/server/utils/tuplestore.h
-include/postgresql/server/utils/typcache.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/c.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/port.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/strdup.h
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server
+@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/pgsql 2>/dev/null || true
--- a/databases/postgresql80-server/pkg-plist-tcltk
+++ b/databases/postgresql80-server/pkg-plist-tcltk
@ -1,11 +0,0 @@
-bin/pgtclsh
-include/libpgtcl.h
-lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
-@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true
-lib/libpgtcl.a
-lib/libpgtcl.so
-lib/libpgtcl.so.2
-%%TK%%bin/pgtksh
-share/postgresql/README-tcltk
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@ -7,28 +7,25 @@

 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	8.0.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]*$//:C/rc/beta/}
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-# XXX: this will eventually go away
-.if !defined(PGSQL_WORK_IN_PROGRESS)
-BROKEN= pending ports/75344, the 8.0 release can be used via the postgresql-devel port
-.endif
-
-CONFLICTS?=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.*
+CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*

 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql

+NO_LATEST_LINK=	beta version
+
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
@ -38,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif

-CONFIGURE_ARGS?=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"

 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}

-BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}

@ -58,18 +56,32 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}

 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
-OPTIONS+=	SSL "Build with SSL" on
+.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.
+#
+# If you *don't* want SSL, set WITHOUT_SSL=YES when making
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
 .endif

 .include <bsd.port.pre.mk>

+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+BROKEN=		"Coredump during build on alpha 4.x"
+.endif
+
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
-.  if ${OSVERSION} < 500041
-OPTIONS+=	GNUGETOPT "Depend on GNU getopt" on
+.  if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 .  if defined(SERVER_ONLY)
 OPTIONS+=	PAM "Build with PAM support" off
+OPTIONS+=	RENDEZVOUZ "Add support for Apple's Rendez-Vouz" off
 .  endif
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal's kerberos support" off
@ -81,11 +93,15 @@ OPTIONS+=	TESTS "Allows the use of a \"check\" target" off
 .  endif
 OPTIONS+=	DEBUG "Builds with debugging symbols" off

+.if defined(SERVER_ONLY) && defined(WITH_RENDEZVOUS)
+CONFIGURE_ARGS+=	--with-rendezvous
+.endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .  endif

-. if !defined(WITHOUT_GNUGETOPT)
+. if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif

@ -109,97 +125,88 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif

-.  if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
-.  endif
-
 .  if defined(WITH_MIT_KRB5)
+WITH_KRB5=	yes
+KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-WITH_KRB5=	yes
 .  endif

 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
 .    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
 .    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
 .    else
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
 .    endif
 .  endif

 .  if defined(WITH_KRB5)
-CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+CONFIGURE_ARGS+=	--with-krb5
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-text-regress-pgregress-sh
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .  endif
-
-.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
-.  endif
-.  if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.  endif
-.  if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world."
-	@exit 1
-.  endif
-
 .endif # !SLAVE_ONLY

 .if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
-		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
-		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
-		pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
-		postmaster.1 psql.1 vacuumdb.1
+MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
+		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
+		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
+		postgres.1 postmaster.1 psql.1 vacuumdb.1

-MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 \
-		alter_database.7 alter_domain.7 alter_function.7 \
-		alter_group.7 alter_language.7 alter_operator_class.7 \
-		alter_schema.7 alter_sequence.7 alter_table.7 \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
-		close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
-		create_cast.7 create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 \
-		create_sequence.7 create_table.7 create_table_as.7 \
-		create_trigger.7 create_type.7 create_user.7 create_view.7 \
-		deallocate.7 declare.7 delete.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_rule.7 drop_schema.7 \
-		drop_sequence.7 \
-		drop_table.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 reindex.7 \
-		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
-		set.7 set_constraints.7 set_transaction.7 show.7 \
-		set_session_authorization.7 start_transaction.7 \
-		truncate.7 unlisten.7 update.7 vacuum.7
+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_schema.7 alter_sequence.7 alter_table.7		      \
+		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
+		copy.7 create_aggregate.7 create_cast.7			      \
+		create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 create_sequence.7		      \
+		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_type.7 create_user.7 create_view.7 delete.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_schema.7 drop_sequence.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 reindex.7 reset.7	      \
+		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
+		set_constraints.7 set_transaction.7 show.7		      \
+		set_session_authorization.7 start_transaction.7		      \
+		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
+		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
+		spi_execp.7 spi_execute.7 spi_execute_plan.7		      \
+		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
+		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
+		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
+		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
+		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
+		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
+		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
+		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		alter_operator.7 alter_tablespace.7 alter_type.7	      \
+		create_tablespace.7 drop_tablespace.7			      \
+		release_savepoint.7 rollback_to_savepoint.7		      \
+		savepoint.7
 .endif

 .if defined(SERVER_ONLY)
@ -208,6 +215,14 @@ pre-everything::
 .endif

 .if !defined(NO_BUILD)
+
+pre-configure:
+.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.  endif
+
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
@ -235,10 +250,9 @@ do-install:
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-	${MKDIR} ${PREFIX}/share/postgresql
 .  if defined(SERVER_ONLY)
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} install-all-headers
-.  for i in profile cshrc
+	@ ${MKDIR} ${PREFIX}/share/postgresql
+.    for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
@ -246,7 +260,7 @@ do-install:
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-.  endfor
+.    endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${RCSCRIPT} ;\
@ -258,7 +272,8 @@ do-install:
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
-		${INSTALL_DATA} ${PKGMESSAGE} ${PREFIX}/share/postgresql/README${PKGNAMESUFFIX} ;\
+		${MKDIR} ${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-8.0.0.tar.bz2) = 57984b8b016501ee920e95af6edc7145
+SIZE (postgresql/postgresql-base-8.0.0.tar.bz2) = 7795453
+MD5 (postgresql/postgresql-docs-8.0.0.tar.bz2) = 9deb6ac959e367cabe882d77287a6b31
+SIZE (postgresql/postgresql-docs-8.0.0.tar.bz2) = 2195941
+MD5 (postgresql/postgresql-opt-8.0.0.tar.bz2) = 11f91f2bf1697d7c8f340151208e0c3e
+SIZE (postgresql/postgresql-opt-8.0.0.tar.bz2) = 133317
+MD5 (postgresql/postgresql-test-8.0.0.tar.bz2) = 0281020c9a1a3c342edaf2d9586ec07e
+SIZE (postgresql/postgresql-test-8.0.0.tar.bz2) = 961649
--- a/databases/postgresql81-server/files/502.pgsql
+++ b/databases/postgresql81-server/files/502.pgsql
@ -18,7 +18,7 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum

-daily_pgsql_vaccum_enable="NO"
+daily_pgsql_vacuum_enable="YES"
 daily_pgsql_backup_enable="NO"

 daily_pgsql_vacuum_args="-z"
--- a/databases/postgresql81-server/files/patch-configure
+++ b/databases/postgresql81-server/files/patch-configure
@ -1,59 +0,0 @@
--- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
--- a/databases/postgresql81-server/files/patch-plpython-Makefile
+++ b/databases/postgresql81-server/files/patch-plpython-Makefile
@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
+@@ -9,7 +9,7 @@
+ # shared library.  Since there is no official way to determine this
+ # (at least not in pre-2.3 Python), we see if there is a file that is
+ # named like a shared library.
+-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+ endif
+ 
--- a/databases/postgresql81-server/files/patch-src-interfaces-jdbc-build-xml
+++ b/databases/postgresql81-server/files/patch-src-interfaces-jdbc-build-xml
@ -1,14 +0,0 @@
--- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
--- a/databases/postgresql81-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ b/databases/postgresql81-server/files/patch-src-interfaces-libpgtcl-Makefile
@ -1,11 +0,0 @@
--- src/interfaces/libpgtcl/Makefile.orig	Tue Feb 10 08:26:48 2004
-+++ src/interfaces/libpgtcl/Makefile	Thu Mar 11 21:12:25 2004
-@@ -21,7 +21,7 @@
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
- SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
-	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
-+	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
- 
- all: submake-libpq all-lib
- 
--- a/databases/postgresql81-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql81-server/files/patch-src-makefiles-Makefile.freebsd
@ -1,15 +1,15 @@
--- src/makefiles/Makefile.freebsd.orig	Wed Aug 29 21:14:40 2001
-+++ src/makefiles/Makefile.freebsd	Sat Jan 31 17:51:25 2004
-@@ -7,7 +7,7 @@
- endif
- 
- DLSUFFIX = .so
+--- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
+@@ -11,7 +11,7 @@
+ ifeq ($(findstring sparc,$(host_cpu)), sparc)
+ CFLAGS_SL = -fPIC -DPIC
+ else
 -CFLAGS_SL = -fpic -DPIC
 +CFLAGS_SL = -fPIC -DPIC
+ endif
 
- %.so: %.o
- ifdef ELF_SYSTEM
-@@ -23,3 +23,5 @@
+ 
+@@ -29,3 +29,5 @@
 endif
 
 sqlmansect = 7
--- a/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@ -1,24 +1,18 @@
--- src/backend/utils/misc/postgresql.conf.sample~	Wed Oct  8 05:49:38 2003
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov 18 05:08:08 2003
-@@ -136,9 +136,9 @@
+--- src/backend/utils/misc/postgresql.conf.sample~	Fri Nov  5 20:16:16 2004
+++ src/backend/utils/misc/postgresql.conf.sample	Tue Dec 21 02:06:45 2004
+@@ -172,6 +172,7 @@
 
- # - Syslog -
+ # - Where to Log -
 
-#syslog = 0			# range 0-2; 0=stdout; 1=both; 2=syslog
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-+syslog = 2			# range 0-2; 0=stdout; 1=both; 2=syslog
-+syslog_facility = 'LOCAL0'
-+syslog_ident = 'postgres'
+log_destination = 'syslog'
+ #log_destination = 'stderr'	# Valid values are combinations of stderr,
+                                 # syslog and eventlog, depending on
+                                 # platform.
+@@ -219,6 +220,7 @@
+ 				 
+ #log_min_duration_statement = -1 # -1 is disabled, in milliseconds.
 
- # - When to Log -
- 
-@@ -162,7 +162,7 @@
- 				 # milliseconds.  Zero prints all queries.
- 				 # Minus-one disables.
- 
-#silent_mode = false		 # DO NOT USE without Syslog!
-+silent_mode = true		 # DO NOT USE without Syslog!
+silent_mode = true
+ #silent_mode = false		 # DO NOT USE without syslog or redirect_stderr
 
 # - What to Log -
- 
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/pgsql.sh.tmpl
@ -2,50 +2,57 @@

 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postgresql.conf
+# PROVIDE: postgresql
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
 #
-# Note that PGDATA is set in ~pgsql/.profile, don't try to manipulate it here!
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="%%PREFIX%%/pgsql/data"
+#  postgresql_flags="-w -s -m fast"
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf

-PREFIX=%%PREFIX%%
-PGBIN=${PREFIX}/bin
+prefix=%%PREFIX%%

-case $1 in
-start)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c \
-	    "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
-    }
-    ;;
+. %%RC_SUBR%%

-stop)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
-    }
-    ;;

-restart)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
-    }
-    ;;
+# set defaults
+postgresql_enable=${postgresql_enable:-"NO"}
+postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
+postgresql_user=pgsql
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}

-reload)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
-    }
-    ;;
+name=postgresql
+rcvar=`set_rcvar`
+command=${prefix}/bin/pg_ctl
+command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+extra_commands="reload initdb"

-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status"
-    }
-    ;;
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"

-*)
-    echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
-    exit 64
-    ;;
-esac
+initdb_cmd="postgresql_initdb"
+
+postgresql_command()
+{
+    su -m ${postgresql_user} -c "exec ${command} ${command_args}"
+}
+    
+postgresql_initdb()
+{
+    su -l ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+}
+
+load_rc_config postgresql
+run_rc_command "$1"
--- a/databases/postgresql81-server/files/regresspatch-src-test-regress-pgregress-sh
+++ b/databases/postgresql81-server/files/regresspatch-src-test-regress-pgregress-sh
@ -0,0 +1,12 @@
+--- src/test/regress/pg_regress.sh~	Sun Dec 12 16:34:15 2004
+++ src/test/regress/pg_regress.sh	Sat Jan  8 05:12:46 2005
+@@ -410,6 +410,9 @@
+         (exit 2); exit
+     fi
+ 
+    # make rest of this script happy
+    echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf
+    echo "silent_mode = false"        >> $PGDATA/postgresql.conf
+ 
+     # ----------
+     # Start postmaster
--- a/databases/postgresql81-server/pkg-message-jdbc
+++ b/databases/postgresql81-server/pkg-message-jdbc
@ -1,8 +0,0 @@
-PostgreSQL JDBC support installed!
-
-postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
-Add this to your CLASSPATH!
-
-java examples reside in
-/usr/local/share/examples/postgresql
--- a/databases/postgresql81-server/pkg-message-plpython
+++ b/databases/postgresql81-server/pkg-message-plpython
@ -0,0 +1,3 @@
+PL/Python has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Python by using "createlang plpythonu" (it
+exists as an untrusted language only).
--- a/databases/postgresql81-server/pkg-message-server
+++ b/databases/postgresql81-server/pkg-message-server
@ -1,36 +1,14 @@
-
-Specific for updating 7.4.1->7.4.x:
-
-   A dump/restore is *not* required for those running 7.4, BUT:
-
-   If you want to install the fixes in the information schema you will
-   need to reload it into the database. This is either accomplished by
-   initializing a new cluster by running "initdb", or by running the
-   following sequence of SQL commands in each database (ideally including
-   template1) as a superuser in psql, after installing the new release:
-
-DROP SCHEMA information_schema CASCADE;
-\i /usr/local/pgsql/share/information_schema.sql
-
-   Fixes to the information schema (from HISTORY):
-     * Fix information schema for bit data types (Peter)
-     * Fix information schema view constraint_column_usage for foreign
-       keys (Peter)
-
-=====================================================================
-
 For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.

 If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.

 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
-find useful. See the script for instructions.
+periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
+may find useful. Per default, it perfoms vacuum on all databases
+nightly. See the script for instructions.

 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
--- a/databases/postgresql81-server/pkg-message-tcltk
+++ b/databases/postgresql81-server/pkg-message-tcltk
@ -1 +0,0 @@
-Now, you should install pgaccess to get a nice GUI for PostgreSQL!
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@ -7,25 +7,378 @@ bin/droplang
 bin/dropuser
 bin/ecpg
 bin/initdb
-bin/initlocation
 bin/ipcclean
 bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
-bin/pg_id
 bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/vacuumdb
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/ibit.h
+include/postgresql/server/access/iqual.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rtree.h
+include/postgresql/server/access/rtscan.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlog_internal.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catname.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_control.h
+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_group.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+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_proc.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_shadow.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_type.h
+include/postgresql/server/catalog/pg_version.h
+include/postgresql/server/commands/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/comment.h
+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/explain.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/version.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdefs.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+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/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/lib/dllist.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/ip.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+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/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/beos.h
+include/postgresql/server/port/bsdi.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/dgux.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/irix.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/nextstep.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/osf.h
+include/postgresql/server/port/qnx4.h
+include/postgresql/server/port/sco.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/sunos4.h
+include/postgresql/server/port/svr4.h
+include/postgresql/server/port/ultrix4.h
+include/postgresql/server/port/univel.h
+include/postgresql/server/port/unixware.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+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/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+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/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itempos.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/strdup.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+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/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/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+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/portal.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/varbit.h
+@dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tcop
+@dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/port/win32/sys
+@dirrm include/postgresql/server/port/win32/netinet
+@dirrm include/postgresql/server/port/win32/arpa
+@dirrm include/postgresql/server/port/win32
+@dirrm include/postgresql/server/port
+@dirrm include/postgresql/server/parser
+@dirrm include/postgresql/server/optimizer
+@dirrm include/postgresql/server/nodes
+@dirrm include/postgresql/server/mb
+@dirrm include/postgresql/server/libpq
+@dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/executor
+@dirrm include/postgresql/server/commands
+@dirrm include/postgresql/server/catalog
+@dirrm include/postgresql/server/bootstrap
+@dirrm include/postgresql/server/access
+@dirrm include/postgresql/server
 include/libpq/libpq-fs.h
@dirrm include/libpq
 include/postgresql/internal/libpq/pqcomm.h
@dirrm include/postgresql/internal/libpq
-include/postgresql/internal/lib/dllist.h
-@dirrm include/postgresql/internal/lib
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqlda.h
@ -38,6 +391,7 @@ include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+@dirrm include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -66,83 +420,170 @@ lib/libpq.so.3
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/libpgtypes.so.1
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-share/postgresql/README-client
+%%DOCSDIR%%/README-client
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample
+share/postgresql/psqlrc.sample
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.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_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm include/postgresql
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-contrib
+++ b/databases/postgresql81-server/pkg-plist-contrib
@ -1,24 +1,15 @@
-bin/ApplySnapshot
-bin/CleanLog
-bin/GetSyncID
-bin/InitRservTest
-bin/MasterAddTable
-bin/MasterInit
-bin/MasterSync
-bin/PrepareSnapshot
-bin/Replicate
-bin/RservTest
-bin/SlaveAddTable
-bin/SlaveInit
+bin/DBMirror.pl
+bin/clean_pending.pl
 bin/dbf2pg
 bin/findoidjoins
 bin/fti.pl
 bin/ipc_check
 bin/make_oidjoins_check
+bin/my2pg.pl
+bin/mysql2pgsql
 bin/oid2name
 bin/pg_autovacuum
 bin/pg_dumplo
-bin/pg_logger
 bin/pgbench
 bin/reindexdb
 bin/vacuumlo
@ -41,10 +32,10 @@ lib/postgresql/misc_utils.so
 lib/postgresql/moddatetime.so
 lib/postgresql/noup.so
 lib/postgresql/pending.so
+lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgstattuple.so
 lib/postgresql/refint.so
-lib/postgresql/rserv.so
 lib/postgresql/rtree_gist.so
 lib/postgresql/seg.so
 lib/postgresql/string_io.so
@ -53,6 +44,7 @@ lib/postgresql/timetravel.so
 lib/postgresql/tsearch.so
 lib/postgresql/tsearch2.so
 lib/postgresql/user_locks.so
+%%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/README.apachelog
 %%DOCSDIR%%/contrib/README.btree_gist
@ -73,18 +65,18 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
 %%DOCSDIR%%/contrib/README.misc_utils
+%%DOCSDIR%%/contrib/README.mysql
 %%DOCSDIR%%/contrib/README.noup
 %%DOCSDIR%%/contrib/README.oid2name
 %%DOCSDIR%%/contrib/README.pg_autovacuum
 %%DOCSDIR%%/contrib/README.pg_dumplo
-%%DOCSDIR%%/contrib/README.pg_logger
+%%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
 %%DOCSDIR%%/contrib/README.pgcrypto
 %%DOCSDIR%%/contrib/README.pgstattuple
 %%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
 %%DOCSDIR%%/contrib/README.reindexdb
-%%DOCSDIR%%/contrib/README.rserv
 %%DOCSDIR%%/contrib/README.rtree_gist
 %%DOCSDIR%%/contrib/README.seg
 %%DOCSDIR%%/contrib/README.soundex
@ -100,7 +92,8 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/moddatetime.example
 %%DOCSDIR%%/contrib/refint.example
 %%DOCSDIR%%/contrib/timetravel.example
-share/postgresql/contrib/RServ.pm
+share/postgresql/contrib/AddTrigger.sql
+share/postgresql/contrib/MirrorSetup.sql
 share/postgresql/contrib/_int.sql
 share/postgresql/contrib/autoinc.sql
 share/postgresql/contrib/btree_gist.sql
@ -119,17 +112,17 @@ share/postgresql/contrib/lo.sql
 share/postgresql/contrib/lo_drop.sql
 share/postgresql/contrib/lo_test.sql
 share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/master.sql
 share/postgresql/contrib/misc_utils.sql
 share/postgresql/contrib/moddatetime.sql
 share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/rtree_gist.sql
 share/postgresql/contrib/russian.stop
 share/postgresql/contrib/seg.sql
-share/postgresql/contrib/slave.sql
+share/postgresql/contrib/slaveDatabase.conf
 share/postgresql/contrib/string_io.sql
 share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
@ -137,7 +130,6 @@ share/postgresql/contrib/tsearch.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
-share/postgresql/README-contrib
@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
--- a/databases/postgresql81-server/pkg-plist-jdbc
+++ b/databases/postgresql81-server/pkg-plist-jdbc
@ -1,27 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-share/postgresql/README-jdbc
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-plperl
+++ b/databases/postgresql81-server/pkg-plist-plperl
@ -1,2 +1,4 @@
+%%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-plpython
+++ b/databases/postgresql81-server/pkg-plist-plpython
@ -0,0 +1,4 @@
+%%DOCSDIR%%/README-plpython
+lib/postgresql/plpython.so
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-pltcl
+++ b/databases/postgresql81-server/pkg-plist-pltcl
@ -1,8 +1,9 @@
+%%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/README-pltcl
 share/postgresql/unknown.pltcl
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@ -1,6 +1,7 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
+etc/rc.d/postgresql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
@ -28,7 +29,8 @@ lib/postgresql/utf8_and_win1250.so
 lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
-share/postgresql/README-server
+%%DOCSDIR%%/README-server
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@ -36,7 +38,10 @@ share/postgresql/pg_ident.conf.sample
 share/postgresql/postgres.bki
 share/postgresql/postgres.description
 share/postgresql/postgresql.conf.sample
+share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
+share/postgresql/system_views.sql
+%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
@ -44,13 +49,606 @@ share/postgresql/sql_features.txt
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/Bangui
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lubumbashi
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Abidjan
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Cairo
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Addis_Ababa
+share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Banjul
+share/postgresql/timezone/Africa/Accra
+share/postgresql/timezone/Africa/Conakry
+share/postgresql/timezone/Africa/Bissau
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Blantyre
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Casablanca
+share/postgresql/timezone/Africa/El_Aaiun
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Freetown
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Khartoum
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Lome
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Lusaka
+share/postgresql/timezone/Africa/Harare
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Antarctica/Casey
+share/postgresql/timezone/Antarctica/Davis
+share/postgresql/timezone/Antarctica/Mawson
+share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Antarctica/Rothera
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/South_Pole
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bahrain
+share/postgresql/timezone/Asia/Dhaka
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Brunei
+share/postgresql/timezone/Asia/Rangoon
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Chongqing
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Dili
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Jakarta
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Makassar
+share/postgresql/timezone/Asia/Jayapura
+share/postgresql/timezone/Asia/Tehran
+share/postgresql/timezone/Asia/Baghdad
+share/postgresql/timezone/Asia/Jerusalem
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Bishkek
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Pyongyang
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kuala_Lumpur
+share/postgresql/timezone/Asia/Kuching
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Ulaanbaatar
+share/postgresql/timezone/Asia/Choibalsan
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Riyadh
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Krasnoyarsk
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Riyadh87
+share/postgresql/timezone/Asia/Riyadh88
+share/postgresql/timezone/Asia/Riyadh89
+share/postgresql/timezone/Asia/Istanbul
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Tel_Aviv
+share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Perth
+share/postgresql/timezone/Australia/Brisbane
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Adelaide
+share/postgresql/timezone/Australia/Hobart
+share/postgresql/timezone/Australia/Melbourne
+share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Broken_Hill
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/ACT
+share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/NSW
+share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Queensland
+share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Tasmania
+share/postgresql/timezone/Australia/Victoria
+share/postgresql/timezone/Australia/West
+share/postgresql/timezone/Australia/Yancowinna
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Yap
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/WET
+share/postgresql/timezone/CET
+share/postgresql/timezone/MET
+share/postgresql/timezone/EET
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Yellowknife
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Factory
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/EST5EDT
+share/postgresql/timezone/CST6CDT
+share/postgresql/timezone/MST7MDT
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/EST
+share/postgresql/timezone/MST
+share/postgresql/timezone/HST
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Samoa
+share/postgresql/timezone/GMT
+share/postgresql/timezone/Brazil/Acre
+share/postgresql/timezone/Brazil/DeNoronha
+share/postgresql/timezone/Brazil/East
+share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/Canada/Atlantic
+share/postgresql/timezone/Canada/Central
+share/postgresql/timezone/Canada/East-Saskatchewan
+share/postgresql/timezone/Canada/Eastern
+share/postgresql/timezone/Canada/Mountain
+share/postgresql/timezone/Canada/Newfoundland
+share/postgresql/timezone/Canada/Pacific
+share/postgresql/timezone/Canada/Saskatchewan
+share/postgresql/timezone/Canada/Yukon
+share/postgresql/timezone/Chile/Continental
+share/postgresql/timezone/Chile/EasterIsland
+share/postgresql/timezone/Cuba
+share/postgresql/timezone/Egypt
+share/postgresql/timezone/Eire
+share/postgresql/timezone/GB
+share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT+0
+share/postgresql/timezone/GMT-0
+share/postgresql/timezone/GMT0
+share/postgresql/timezone/Greenwich
+share/postgresql/timezone/Hongkong
+share/postgresql/timezone/Iceland
+share/postgresql/timezone/Iran
+share/postgresql/timezone/Israel
+share/postgresql/timezone/Jamaica
+share/postgresql/timezone/Japan
+share/postgresql/timezone/Kwajalein
+share/postgresql/timezone/Libya
+share/postgresql/timezone/Mexico/BajaNorte
+share/postgresql/timezone/Mexico/BajaSur
+share/postgresql/timezone/Mexico/General
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/NZ
+share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Poland
+share/postgresql/timezone/Portugal
+share/postgresql/timezone/PRC
+share/postgresql/timezone/ROC
+share/postgresql/timezone/ROK
+share/postgresql/timezone/Singapore
+share/postgresql/timezone/Turkey
+share/postgresql/timezone/UCT
+share/postgresql/timezone/UTC
+share/postgresql/timezone/Universal
+share/postgresql/timezone/W-SU
+share/postgresql/timezone/Zulu
+share/postgresql/timezone/SystemV/AST4ADT
+share/postgresql/timezone/SystemV/EST5EDT
+share/postgresql/timezone/SystemV/CST6CDT
+share/postgresql/timezone/SystemV/MST7MDT
+share/postgresql/timezone/SystemV/PST8PDT
+share/postgresql/timezone/SystemV/YST9YDT
+share/postgresql/timezone/SystemV/AST4
+share/postgresql/timezone/SystemV/EST5
+share/postgresql/timezone/SystemV/CST6
+share/postgresql/timezone/SystemV/MST7
+share/postgresql/timezone/SystemV/PST8
+share/postgresql/timezone/SystemV/YST9
+share/postgresql/timezone/SystemV/HST10
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
+@dirrm share/postgresql/timezone/Africa
+@dirrm share/postgresql/timezone/America/Argentina
+@dirrm share/postgresql/timezone/America/Indiana
+@dirrm share/postgresql/timezone/America/Kentucky
+@dirrm share/postgresql/timezone/America/North_Dakota
+@dirrm share/postgresql/timezone/America
+@dirrm share/postgresql/timezone/Antarctica
+@dirrm share/postgresql/timezone/Arctic
+@dirrm share/postgresql/timezone/Asia
+@dirrm share/postgresql/timezone/Atlantic
+@dirrm share/postgresql/timezone/Australia
+@dirrm share/postgresql/timezone/Brazil
+@dirrm share/postgresql/timezone/Canada
+@dirrm share/postgresql/timezone/Chile
+@dirrm share/postgresql/timezone/Etc
+@dirrm share/postgresql/timezone/Europe
+@dirrm share/postgresql/timezone/Indian
+@dirrm share/postgresql/timezone/Mexico
+@dirrm share/postgresql/timezone/Mideast
+@dirrm share/postgresql/timezone/Pacific
+@dirrm share/postgresql/timezone/SystemV
+@dirrm share/postgresql/timezone/US
+@dirrm share/postgresql/timezone
@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
@ -61,351 +659,9 @@ share/postgresql/dot.cshrc.dist
@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 rmdir ~pgsql 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
@unexec rmdir %D/share/postgresql 2>/dev/null || true
@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-etc/rc.d/postgresql.sh
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/ibit.h
-include/postgresql/server/access/iqual.h
-include/postgresql/server/access/istrat.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rtree.h
-include/postgresql/server/access/rtscan.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/strat.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catname.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-include/postgresql/server/catalog/namespace.h
-include/postgresql/server/catalog/pg_aggregate.h
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_control.h
-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_group.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-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_proc.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shadow.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_version.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/comment.h
-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/explain.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/version.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdefs.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/lib/dllist.h
-include/postgresql/server/lib/lispsort.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ip.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.h
-include/postgresql/server/nodes/pg_list.h
-include/postgresql/server/nodes/plannodes.h
-include/postgresql/server/nodes/primnodes.h
-include/postgresql/server/nodes/print.h
-include/postgresql/server/nodes/readfuncs.h
-include/postgresql/server/nodes/relation.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-include/postgresql/server/optimizer/geqo_random.h
-include/postgresql/server/optimizer/geqo_recombination.h
-include/postgresql/server/optimizer/geqo_selection.h
-include/postgresql/server/optimizer/joininfo.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/plancat.h
-include/postgresql/server/optimizer/planmain.h
-include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/prep.h
-include/postgresql/server/optimizer/restrictinfo.h
-include/postgresql/server/optimizer/subselect.h
-include/postgresql/server/optimizer/tlist.h
-include/postgresql/server/optimizer/var.h
-include/postgresql/server/parser/analyze.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/parse.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-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/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/beos.h
-include/postgresql/server/port/bsdi.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/dgux.h
-include/postgresql/server/port/freebsd.h
-include/postgresql/server/port/hpux.h
-include/postgresql/server/port/irix5.h
-include/postgresql/server/port/linux.h
-include/postgresql/server/port/netbsd.h
-include/postgresql/server/port/nextstep.h
-include/postgresql/server/port/openbsd.h
-include/postgresql/server/port/osf.h
-include/postgresql/server/port/qnx4.h
-include/postgresql/server/port/sco.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/sunos4.h
-include/postgresql/server/port/svr4.h
-include/postgresql/server/port/ultrix4.h
-include/postgresql/server/port/univel.h
-include/postgresql/server/port/unixware.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itempos.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/lmgr.h
-include/postgresql/server/storage/lock.h
-include/postgresql/server/storage/lwlock.h
-include/postgresql/server/storage/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/pos.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-include/postgresql/server/storage/smgr.h
-include/postgresql/server/storage/spin.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-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/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/date.h
-include/postgresql/server/utils/datetime.h
-include/postgresql/server/utils/datum.h
-include/postgresql/server/utils/dynahash.h
-include/postgresql/server/utils/dynamic_loader.h
-include/postgresql/server/utils/elog.h
-include/postgresql/server/utils/errcodes.h
-include/postgresql/server/utils/fmgroids.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-include/postgresql/server/utils/inval.h
-include/postgresql/server/utils/logtape.h
-include/postgresql/server/utils/lsyscache.h
-include/postgresql/server/utils/memutils.h
-include/postgresql/server/utils/nabstime.h
-include/postgresql/server/utils/numeric.h
-include/postgresql/server/utils/palloc.h
-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/portal.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/sets.h
-include/postgresql/server/utils/syscache.h
-include/postgresql/server/utils/timestamp.h
-include/postgresql/server/utils/tqual.h
-include/postgresql/server/utils/tuplesort.h
-include/postgresql/server/utils/tuplestore.h
-include/postgresql/server/utils/typcache.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/c.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/port.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/strdup.h
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server
+@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/pgsql 2>/dev/null || true
--- a/databases/postgresql81-server/pkg-plist-tcltk
+++ b/databases/postgresql81-server/pkg-plist-tcltk
@ -1,11 +0,0 @@
-bin/pgtclsh
-include/libpgtcl.h
-lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
-@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true
-lib/libpgtcl.a
-lib/libpgtcl.so
-lib/libpgtcl.so.2
-%%TK%%bin/pgtksh
-share/postgresql/README-tcltk
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@ -7,28 +7,25 @@

 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	8.0.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]*$//:C/rc/beta/}
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-# XXX: this will eventually go away
-.if !defined(PGSQL_WORK_IN_PROGRESS)
-BROKEN= pending ports/75344, the 8.0 release can be used via the postgresql-devel port
-.endif
-
-CONFLICTS?=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.*
+CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*

 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql

+NO_LATEST_LINK=	beta version
+
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
@ -38,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif

-CONFIGURE_ARGS?=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"

 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}

-BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}

@ -58,18 +56,32 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}

 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
-OPTIONS+=	SSL "Build with SSL" on
+.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.
+#
+# If you *don't* want SSL, set WITHOUT_SSL=YES when making
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
 .endif

 .include <bsd.port.pre.mk>

+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+BROKEN=		"Coredump during build on alpha 4.x"
+.endif
+
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
-.  if ${OSVERSION} < 500041
-OPTIONS+=	GNUGETOPT "Depend on GNU getopt" on
+.  if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 .  if defined(SERVER_ONLY)
 OPTIONS+=	PAM "Build with PAM support" off
+OPTIONS+=	RENDEZVOUZ "Add support for Apple's Rendez-Vouz" off
 .  endif
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal's kerberos support" off
@ -81,11 +93,15 @@ OPTIONS+=	TESTS "Allows the use of a \"check\" target" off
 .  endif
 OPTIONS+=	DEBUG "Builds with debugging symbols" off

+.if defined(SERVER_ONLY) && defined(WITH_RENDEZVOUS)
+CONFIGURE_ARGS+=	--with-rendezvous
+.endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .  endif

-. if !defined(WITHOUT_GNUGETOPT)
+. if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif

@ -109,97 +125,88 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif

-.  if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
-.  endif
-
 .  if defined(WITH_MIT_KRB5)
+WITH_KRB5=	yes
+KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-WITH_KRB5=	yes
 .  endif

 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
 .    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
 .    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
 .    else
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
 .    endif
 .  endif

 .  if defined(WITH_KRB5)
-CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+CONFIGURE_ARGS+=	--with-krb5
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-text-regress-pgregress-sh
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .  endif
-
-.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
-.  endif
-.  if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.  endif
-.  if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world."
-	@exit 1
-.  endif
-
 .endif # !SLAVE_ONLY

 .if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
-		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
-		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
-		pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
-		postmaster.1 psql.1 vacuumdb.1
+MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
+		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
+		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
+		postgres.1 postmaster.1 psql.1 vacuumdb.1

-MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 \
-		alter_database.7 alter_domain.7 alter_function.7 \
-		alter_group.7 alter_language.7 alter_operator_class.7 \
-		alter_schema.7 alter_sequence.7 alter_table.7 \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
-		close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
-		create_cast.7 create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 \
-		create_sequence.7 create_table.7 create_table_as.7 \
-		create_trigger.7 create_type.7 create_user.7 create_view.7 \
-		deallocate.7 declare.7 delete.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_rule.7 drop_schema.7 \
-		drop_sequence.7 \
-		drop_table.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 reindex.7 \
-		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
-		set.7 set_constraints.7 set_transaction.7 show.7 \
-		set_session_authorization.7 start_transaction.7 \
-		truncate.7 unlisten.7 update.7 vacuum.7
+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_schema.7 alter_sequence.7 alter_table.7		      \
+		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
+		copy.7 create_aggregate.7 create_cast.7			      \
+		create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 create_sequence.7		      \
+		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_type.7 create_user.7 create_view.7 delete.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_schema.7 drop_sequence.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 reindex.7 reset.7	      \
+		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
+		set_constraints.7 set_transaction.7 show.7		      \
+		set_session_authorization.7 start_transaction.7		      \
+		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
+		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
+		spi_execp.7 spi_execute.7 spi_execute_plan.7		      \
+		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
+		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
+		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
+		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
+		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
+		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
+		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
+		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		alter_operator.7 alter_tablespace.7 alter_type.7	      \
+		create_tablespace.7 drop_tablespace.7			      \
+		release_savepoint.7 rollback_to_savepoint.7		      \
+		savepoint.7
 .endif

 .if defined(SERVER_ONLY)
@ -208,6 +215,14 @@ pre-everything::
 .endif

 .if !defined(NO_BUILD)
+
+pre-configure:
+.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.  endif
+
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
@ -235,10 +250,9 @@ do-install:
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-	${MKDIR} ${PREFIX}/share/postgresql
 .  if defined(SERVER_ONLY)
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} install-all-headers
-.  for i in profile cshrc
+	@ ${MKDIR} ${PREFIX}/share/postgresql
+.    for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
@ -246,7 +260,7 @@ do-install:
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-.  endfor
+.    endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${RCSCRIPT} ;\
@ -258,7 +272,8 @@ do-install:
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
-		${INSTALL_DATA} ${PKGMESSAGE} ${PREFIX}/share/postgresql/README${PKGNAMESUFFIX} ;\
+		${MKDIR} ${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-8.0.0.tar.bz2) = 57984b8b016501ee920e95af6edc7145
+SIZE (postgresql/postgresql-base-8.0.0.tar.bz2) = 7795453
+MD5 (postgresql/postgresql-docs-8.0.0.tar.bz2) = 9deb6ac959e367cabe882d77287a6b31
+SIZE (postgresql/postgresql-docs-8.0.0.tar.bz2) = 2195941
+MD5 (postgresql/postgresql-opt-8.0.0.tar.bz2) = 11f91f2bf1697d7c8f340151208e0c3e
+SIZE (postgresql/postgresql-opt-8.0.0.tar.bz2) = 133317
+MD5 (postgresql/postgresql-test-8.0.0.tar.bz2) = 0281020c9a1a3c342edaf2d9586ec07e
+SIZE (postgresql/postgresql-test-8.0.0.tar.bz2) = 961649
--- a/databases/postgresql82-server/files/502.pgsql
+++ b/databases/postgresql82-server/files/502.pgsql
@ -18,7 +18,7 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum

-daily_pgsql_vaccum_enable="NO"
+daily_pgsql_vacuum_enable="YES"
 daily_pgsql_backup_enable="NO"

 daily_pgsql_vacuum_args="-z"
--- a/databases/postgresql82-server/files/patch-configure
+++ b/databases/postgresql82-server/files/patch-configure
@ -1,59 +0,0 @@
--- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
--- a/databases/postgresql82-server/files/patch-plpython-Makefile
+++ b/databases/postgresql82-server/files/patch-plpython-Makefile
@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
+@@ -9,7 +9,7 @@
+ # shared library.  Since there is no official way to determine this
+ # (at least not in pre-2.3 Python), we see if there is a file that is
+ # named like a shared library.
+-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+ endif
+ 
--- a/databases/postgresql82-server/files/patch-src-interfaces-jdbc-build-xml
+++ b/databases/postgresql82-server/files/patch-src-interfaces-jdbc-build-xml
@ -1,14 +0,0 @@
--- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
--- a/databases/postgresql82-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ b/databases/postgresql82-server/files/patch-src-interfaces-libpgtcl-Makefile
@ -1,11 +0,0 @@
--- src/interfaces/libpgtcl/Makefile.orig	Tue Feb 10 08:26:48 2004
-+++ src/interfaces/libpgtcl/Makefile	Thu Mar 11 21:12:25 2004
-@@ -21,7 +21,7 @@
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
- SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
-	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
-+	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
- 
- all: submake-libpq all-lib
- 
--- a/databases/postgresql82-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql82-server/files/patch-src-makefiles-Makefile.freebsd
@ -1,15 +1,15 @@
--- src/makefiles/Makefile.freebsd.orig	Wed Aug 29 21:14:40 2001
-+++ src/makefiles/Makefile.freebsd	Sat Jan 31 17:51:25 2004
-@@ -7,7 +7,7 @@
- endif
- 
- DLSUFFIX = .so
+--- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
+@@ -11,7 +11,7 @@
+ ifeq ($(findstring sparc,$(host_cpu)), sparc)
+ CFLAGS_SL = -fPIC -DPIC
+ else
 -CFLAGS_SL = -fpic -DPIC
 +CFLAGS_SL = -fPIC -DPIC
+ endif
 
- %.so: %.o
- ifdef ELF_SYSTEM
-@@ -23,3 +23,5 @@
+ 
+@@ -29,3 +29,5 @@
 endif
 
 sqlmansect = 7
--- a/databases/postgresql82-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql82-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@ -1,24 +1,18 @@
--- src/backend/utils/misc/postgresql.conf.sample~	Wed Oct  8 05:49:38 2003
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov 18 05:08:08 2003
-@@ -136,9 +136,9 @@
+--- src/backend/utils/misc/postgresql.conf.sample~	Fri Nov  5 20:16:16 2004
+++ src/backend/utils/misc/postgresql.conf.sample	Tue Dec 21 02:06:45 2004
+@@ -172,6 +172,7 @@
 
- # - Syslog -
+ # - Where to Log -
 
-#syslog = 0			# range 0-2; 0=stdout; 1=both; 2=syslog
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-+syslog = 2			# range 0-2; 0=stdout; 1=both; 2=syslog
-+syslog_facility = 'LOCAL0'
-+syslog_ident = 'postgres'
+log_destination = 'syslog'
+ #log_destination = 'stderr'	# Valid values are combinations of stderr,
+                                 # syslog and eventlog, depending on
+                                 # platform.
+@@ -219,6 +220,7 @@
+ 				 
+ #log_min_duration_statement = -1 # -1 is disabled, in milliseconds.
 
- # - When to Log -
- 
-@@ -162,7 +162,7 @@
- 				 # milliseconds.  Zero prints all queries.
- 				 # Minus-one disables.
- 
-#silent_mode = false		 # DO NOT USE without Syslog!
-+silent_mode = true		 # DO NOT USE without Syslog!
+silent_mode = true
+ #silent_mode = false		 # DO NOT USE without syslog or redirect_stderr
 
 # - What to Log -
- 
--- a/databases/postgresql82-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql82-server/files/pgsql.sh.tmpl
@ -2,50 +2,57 @@

 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postgresql.conf
+# PROVIDE: postgresql
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
 #
-# Note that PGDATA is set in ~pgsql/.profile, don't try to manipulate it here!
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="%%PREFIX%%/pgsql/data"
+#  postgresql_flags="-w -s -m fast"
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf

-PREFIX=%%PREFIX%%
-PGBIN=${PREFIX}/bin
+prefix=%%PREFIX%%

-case $1 in
-start)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c \
-	    "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
-    }
-    ;;
+. %%RC_SUBR%%

-stop)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	echo -n ' pgsql'
-	su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
-    }
-    ;;

-restart)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
-    }
-    ;;
+# set defaults
+postgresql_enable=${postgresql_enable:-"NO"}
+postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
+postgresql_user=pgsql
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}

-reload)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
-    }
-    ;;
+name=postgresql
+rcvar=`set_rcvar`
+command=${prefix}/bin/pg_ctl
+command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+extra_commands="reload initdb"

-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status"
-    }
-    ;;
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"

-*)
-    echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
-    exit 64
-    ;;
-esac
+initdb_cmd="postgresql_initdb"
+
+postgresql_command()
+{
+    su -m ${postgresql_user} -c "exec ${command} ${command_args}"
+}
+    
+postgresql_initdb()
+{
+    su -l ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+}
+
+load_rc_config postgresql
+run_rc_command "$1"
--- a/databases/postgresql82-server/files/regresspatch-src-test-regress-pgregress-sh
+++ b/databases/postgresql82-server/files/regresspatch-src-test-regress-pgregress-sh
@ -0,0 +1,12 @@
+--- src/test/regress/pg_regress.sh~	Sun Dec 12 16:34:15 2004
+++ src/test/regress/pg_regress.sh	Sat Jan  8 05:12:46 2005
+@@ -410,6 +410,9 @@
+         (exit 2); exit
+     fi
+ 
+    # make rest of this script happy
+    echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf
+    echo "silent_mode = false"        >> $PGDATA/postgresql.conf
+ 
+     # ----------
+     # Start postmaster
--- a/databases/postgresql82-server/pkg-message-jdbc
+++ b/databases/postgresql82-server/pkg-message-jdbc
@ -1,8 +0,0 @@
-PostgreSQL JDBC support installed!
-
-postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
-Add this to your CLASSPATH!
-
-java examples reside in
-/usr/local/share/examples/postgresql
--- a/databases/postgresql82-server/pkg-message-plpython
+++ b/databases/postgresql82-server/pkg-message-plpython
@ -0,0 +1,3 @@
+PL/Python has been installed. Check the createlang(l) manpage for more
+info. You can install PL/Python by using "createlang plpythonu" (it
+exists as an untrusted language only).
--- a/databases/postgresql82-server/pkg-message-server
+++ b/databases/postgresql82-server/pkg-message-server
@ -1,36 +1,14 @@
-
-Specific for updating 7.4.1->7.4.x:
-
-   A dump/restore is *not* required for those running 7.4, BUT:
-
-   If you want to install the fixes in the information schema you will
-   need to reload it into the database. This is either accomplished by
-   initializing a new cluster by running "initdb", or by running the
-   following sequence of SQL commands in each database (ideally including
-   template1) as a superuser in psql, after installing the new release:
-
-DROP SCHEMA information_schema CASCADE;
-\i /usr/local/pgsql/share/information_schema.sql
-
-   Fixes to the information schema (from HISTORY):
-     * Fix information schema for bit data types (Peter)
-     * Fix information schema view constraint_column_usage for foreign
-       keys (Peter)
-
-=====================================================================
-
 For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server. For example,
-the "elog" method disappeared in postgresql-7.4, so postgresql-contrib
-must be updated along with the server.
+you might have to update them when updating the server.

 If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.

 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
-find useful. See the script for instructions.
+periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
+may find useful. Per default, it perfoms vacuum on all databases
+nightly. See the script for instructions.

 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
--- a/databases/postgresql82-server/pkg-message-tcltk
+++ b/databases/postgresql82-server/pkg-message-tcltk
@ -1 +0,0 @@
-Now, you should install pgaccess to get a nice GUI for PostgreSQL!
--- a/databases/postgresql82-server/pkg-plist-client
+++ b/databases/postgresql82-server/pkg-plist-client
@ -7,25 +7,378 @@ bin/droplang
 bin/dropuser
 bin/ecpg
 bin/initdb
-bin/initlocation
 bin/ipcclean
 bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_encoding
-bin/pg_id
 bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/vacuumdb
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/ibit.h
+include/postgresql/server/access/iqual.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relscan.h
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rtree.h
+include/postgresql/server/access/rtscan.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/transam.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/tuptoaster.h
+include/postgresql/server/access/valid.h
+include/postgresql/server/access/xact.h
+include/postgresql/server/access/xlog.h
+include/postgresql/server/access/xlog_internal.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catname.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_control.h
+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_group.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_largeobject.h
+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_proc.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_shadow.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_type.h
+include/postgresql/server/catalog/pg_version.h
+include/postgresql/server/commands/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/comment.h
+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/explain.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/version.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/dynloader.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdefs.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIndexscan.h
+include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeMaterial.h
+include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+include/postgresql/server/executor/nodeSubplan.h
+include/postgresql/server/executor/nodeSubqueryscan.h
+include/postgresql/server/executor/nodeTidscan.h
+include/postgresql/server/executor/nodeUnique.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+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/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/lib/dllist.h
+include/postgresql/server/lib/stringinfo.h
+include/postgresql/server/libpq/auth.h
+include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/crypt.h
+include/postgresql/server/libpq/hba.h
+include/postgresql/server/libpq/ip.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/params.h
+include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pg_list.h
+include/postgresql/server/nodes/plannodes.h
+include/postgresql/server/nodes/primnodes.h
+include/postgresql/server/nodes/print.h
+include/postgresql/server/nodes/readfuncs.h
+include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/geqo_recombination.h
+include/postgresql/server/optimizer/geqo_selection.h
+include/postgresql/server/optimizer/joininfo.h
+include/postgresql/server/optimizer/pathnode.h
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/prep.h
+include/postgresql/server/optimizer/restrictinfo.h
+include/postgresql/server/optimizer/subselect.h
+include/postgresql/server/optimizer/tlist.h
+include/postgresql/server/optimizer/var.h
+include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_node.h
+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/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scansup.h
+include/postgresql/server/pg_config.h
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/beos.h
+include/postgresql/server/port/bsdi.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/dgux.h
+include/postgresql/server/port/freebsd.h
+include/postgresql/server/port/hpux.h
+include/postgresql/server/port/irix.h
+include/postgresql/server/port/linux.h
+include/postgresql/server/port/netbsd.h
+include/postgresql/server/port/nextstep.h
+include/postgresql/server/port/openbsd.h
+include/postgresql/server/port/osf.h
+include/postgresql/server/port/qnx4.h
+include/postgresql/server/port/sco.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/sunos4.h
+include/postgresql/server/port/svr4.h
+include/postgresql/server/port/ultrix4.h
+include/postgresql/server/port/univel.h
+include/postgresql/server/port/unixware.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+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/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+include/postgresql/server/rewrite/rewriteHandler.h
+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/storage/backendid.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itempos.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/lmgr.h
+include/postgresql/server/storage/lock.h
+include/postgresql/server/storage/lwlock.h
+include/postgresql/server/storage/off.h
+include/postgresql/server/storage/pg_sema.h
+include/postgresql/server/storage/pg_shmem.h
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+include/postgresql/server/storage/smgr.h
+include/postgresql/server/storage/spin.h
+include/postgresql/server/strdup.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+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/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/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dynahash.h
+include/postgresql/server/utils/dynamic_loader.h
+include/postgresql/server/utils/elog.h
+include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/fmgroids.h
+include/postgresql/server/utils/fmgrtab.h
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/int8.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/logtape.h
+include/postgresql/server/utils/lsyscache.h
+include/postgresql/server/utils/memutils.h
+include/postgresql/server/utils/nabstime.h
+include/postgresql/server/utils/numeric.h
+include/postgresql/server/utils/palloc.h
+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/portal.h
+include/postgresql/server/utils/ps_status.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tqual.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/varbit.h
+@dirrm include/postgresql/server/utils
+@dirrm include/postgresql/server/tcop
+@dirrm include/postgresql/server/storage
+@dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/regex
+@dirrm include/postgresql/server/port/win32/sys
+@dirrm include/postgresql/server/port/win32/netinet
+@dirrm include/postgresql/server/port/win32/arpa
+@dirrm include/postgresql/server/port/win32
+@dirrm include/postgresql/server/port
+@dirrm include/postgresql/server/parser
+@dirrm include/postgresql/server/optimizer
+@dirrm include/postgresql/server/nodes
+@dirrm include/postgresql/server/mb
+@dirrm include/postgresql/server/libpq
+@dirrm include/postgresql/server/lib
+@dirrm include/postgresql/server/executor
+@dirrm include/postgresql/server/commands
+@dirrm include/postgresql/server/catalog
+@dirrm include/postgresql/server/bootstrap
+@dirrm include/postgresql/server/access
+@dirrm include/postgresql/server
 include/libpq/libpq-fs.h
@dirrm include/libpq
 include/postgresql/internal/libpq/pqcomm.h
@dirrm include/postgresql/internal/libpq
-include/postgresql/internal/lib/dllist.h
-@dirrm include/postgresql/internal/lib
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqlda.h
@ -38,6 +391,7 @@ include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+@dirrm include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -66,83 +420,170 @@ lib/libpq.so.3
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/libpgtypes.so.1
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-share/postgresql/README-client
+%%DOCSDIR%%/README-client
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample
+share/postgresql/psqlrc.sample
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.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_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm include/postgresql
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-contrib
+++ b/databases/postgresql82-server/pkg-plist-contrib
@ -1,24 +1,15 @@
-bin/ApplySnapshot
-bin/CleanLog
-bin/GetSyncID
-bin/InitRservTest
-bin/MasterAddTable
-bin/MasterInit
-bin/MasterSync
-bin/PrepareSnapshot
-bin/Replicate
-bin/RservTest
-bin/SlaveAddTable
-bin/SlaveInit
+bin/DBMirror.pl
+bin/clean_pending.pl
 bin/dbf2pg
 bin/findoidjoins
 bin/fti.pl
 bin/ipc_check
 bin/make_oidjoins_check
+bin/my2pg.pl
+bin/mysql2pgsql
 bin/oid2name
 bin/pg_autovacuum
 bin/pg_dumplo
-bin/pg_logger
 bin/pgbench
 bin/reindexdb
 bin/vacuumlo
@ -41,10 +32,10 @@ lib/postgresql/misc_utils.so
 lib/postgresql/moddatetime.so
 lib/postgresql/noup.so
 lib/postgresql/pending.so
+lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgstattuple.so
 lib/postgresql/refint.so
-lib/postgresql/rserv.so
 lib/postgresql/rtree_gist.so
 lib/postgresql/seg.so
 lib/postgresql/string_io.so
@ -53,6 +44,7 @@ lib/postgresql/timetravel.so
 lib/postgresql/tsearch.so
 lib/postgresql/tsearch2.so
 lib/postgresql/user_locks.so
+%%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/README.apachelog
 %%DOCSDIR%%/contrib/README.btree_gist
@ -73,18 +65,18 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
 %%DOCSDIR%%/contrib/README.misc_utils
+%%DOCSDIR%%/contrib/README.mysql
 %%DOCSDIR%%/contrib/README.noup
 %%DOCSDIR%%/contrib/README.oid2name
 %%DOCSDIR%%/contrib/README.pg_autovacuum
 %%DOCSDIR%%/contrib/README.pg_dumplo
-%%DOCSDIR%%/contrib/README.pg_logger
+%%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
 %%DOCSDIR%%/contrib/README.pgcrypto
 %%DOCSDIR%%/contrib/README.pgstattuple
 %%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
 %%DOCSDIR%%/contrib/README.reindexdb
-%%DOCSDIR%%/contrib/README.rserv
 %%DOCSDIR%%/contrib/README.rtree_gist
 %%DOCSDIR%%/contrib/README.seg
 %%DOCSDIR%%/contrib/README.soundex
@ -100,7 +92,8 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/moddatetime.example
 %%DOCSDIR%%/contrib/refint.example
 %%DOCSDIR%%/contrib/timetravel.example
-share/postgresql/contrib/RServ.pm
+share/postgresql/contrib/AddTrigger.sql
+share/postgresql/contrib/MirrorSetup.sql
 share/postgresql/contrib/_int.sql
 share/postgresql/contrib/autoinc.sql
 share/postgresql/contrib/btree_gist.sql
@ -119,17 +112,17 @@ share/postgresql/contrib/lo.sql
 share/postgresql/contrib/lo_drop.sql
 share/postgresql/contrib/lo_test.sql
 share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/master.sql
 share/postgresql/contrib/misc_utils.sql
 share/postgresql/contrib/moddatetime.sql
 share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/rtree_gist.sql
 share/postgresql/contrib/russian.stop
 share/postgresql/contrib/seg.sql
-share/postgresql/contrib/slave.sql
+share/postgresql/contrib/slaveDatabase.conf
 share/postgresql/contrib/string_io.sql
 share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
@ -137,7 +130,6 @@ share/postgresql/contrib/tsearch.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
-share/postgresql/README-contrib
@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
--- a/databases/postgresql82-server/pkg-plist-jdbc
+++ b/databases/postgresql82-server/pkg-plist-jdbc
@ -1,27 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-share/postgresql/README-jdbc
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-plperl
+++ b/databases/postgresql82-server/pkg-plist-plperl
@ -1,2 +1,4 @@
+%%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-plpython
+++ b/databases/postgresql82-server/pkg-plist-plpython
@ -0,0 +1,4 @@
+%%DOCSDIR%%/README-plpython
+lib/postgresql/plpython.so
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-pltcl
+++ b/databases/postgresql82-server/pkg-plist-pltcl
@ -1,8 +1,9 @@
+%%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/README-pltcl
 share/postgresql/unknown.pltcl
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@ -1,6 +1,7 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
+etc/rc.d/postgresql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
@ -28,7 +29,8 @@ lib/postgresql/utf8_and_win1250.so
 lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
-share/postgresql/README-server
+%%DOCSDIR%%/README-server
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@ -36,7 +38,10 @@ share/postgresql/pg_ident.conf.sample
 share/postgresql/postgres.bki
 share/postgresql/postgres.description
 share/postgresql/postgresql.conf.sample
+share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
+share/postgresql/system_views.sql
+%%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
@ -44,13 +49,606 @@ share/postgresql/sql_features.txt
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/Bangui
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lubumbashi
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Abidjan
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Cairo
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Addis_Ababa
+share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Banjul
+share/postgresql/timezone/Africa/Accra
+share/postgresql/timezone/Africa/Conakry
+share/postgresql/timezone/Africa/Bissau
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Blantyre
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Casablanca
+share/postgresql/timezone/Africa/El_Aaiun
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Freetown
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Khartoum
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Lome
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Lusaka
+share/postgresql/timezone/Africa/Harare
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Antarctica/Casey
+share/postgresql/timezone/Antarctica/Davis
+share/postgresql/timezone/Antarctica/Mawson
+share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Antarctica/Rothera
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/South_Pole
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bahrain
+share/postgresql/timezone/Asia/Dhaka
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Brunei
+share/postgresql/timezone/Asia/Rangoon
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Chongqing
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Dili
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Jakarta
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Makassar
+share/postgresql/timezone/Asia/Jayapura
+share/postgresql/timezone/Asia/Tehran
+share/postgresql/timezone/Asia/Baghdad
+share/postgresql/timezone/Asia/Jerusalem
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Bishkek
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Pyongyang
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kuala_Lumpur
+share/postgresql/timezone/Asia/Kuching
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Ulaanbaatar
+share/postgresql/timezone/Asia/Choibalsan
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Riyadh
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Krasnoyarsk
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Riyadh87
+share/postgresql/timezone/Asia/Riyadh88
+share/postgresql/timezone/Asia/Riyadh89
+share/postgresql/timezone/Asia/Istanbul
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Tel_Aviv
+share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Perth
+share/postgresql/timezone/Australia/Brisbane
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Adelaide
+share/postgresql/timezone/Australia/Hobart
+share/postgresql/timezone/Australia/Melbourne
+share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Broken_Hill
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/ACT
+share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/NSW
+share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Queensland
+share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Tasmania
+share/postgresql/timezone/Australia/Victoria
+share/postgresql/timezone/Australia/West
+share/postgresql/timezone/Australia/Yancowinna
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Yap
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/WET
+share/postgresql/timezone/CET
+share/postgresql/timezone/MET
+share/postgresql/timezone/EET
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Yellowknife
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Factory
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/EST5EDT
+share/postgresql/timezone/CST6CDT
+share/postgresql/timezone/MST7MDT
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/EST
+share/postgresql/timezone/MST
+share/postgresql/timezone/HST
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Samoa
+share/postgresql/timezone/GMT
+share/postgresql/timezone/Brazil/Acre
+share/postgresql/timezone/Brazil/DeNoronha
+share/postgresql/timezone/Brazil/East
+share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/Canada/Atlantic
+share/postgresql/timezone/Canada/Central
+share/postgresql/timezone/Canada/East-Saskatchewan
+share/postgresql/timezone/Canada/Eastern
+share/postgresql/timezone/Canada/Mountain
+share/postgresql/timezone/Canada/Newfoundland
+share/postgresql/timezone/Canada/Pacific
+share/postgresql/timezone/Canada/Saskatchewan
+share/postgresql/timezone/Canada/Yukon
+share/postgresql/timezone/Chile/Continental
+share/postgresql/timezone/Chile/EasterIsland
+share/postgresql/timezone/Cuba
+share/postgresql/timezone/Egypt
+share/postgresql/timezone/Eire
+share/postgresql/timezone/GB
+share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT+0
+share/postgresql/timezone/GMT-0
+share/postgresql/timezone/GMT0
+share/postgresql/timezone/Greenwich
+share/postgresql/timezone/Hongkong
+share/postgresql/timezone/Iceland
+share/postgresql/timezone/Iran
+share/postgresql/timezone/Israel
+share/postgresql/timezone/Jamaica
+share/postgresql/timezone/Japan
+share/postgresql/timezone/Kwajalein
+share/postgresql/timezone/Libya
+share/postgresql/timezone/Mexico/BajaNorte
+share/postgresql/timezone/Mexico/BajaSur
+share/postgresql/timezone/Mexico/General
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/NZ
+share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Poland
+share/postgresql/timezone/Portugal
+share/postgresql/timezone/PRC
+share/postgresql/timezone/ROC
+share/postgresql/timezone/ROK
+share/postgresql/timezone/Singapore
+share/postgresql/timezone/Turkey
+share/postgresql/timezone/UCT
+share/postgresql/timezone/UTC
+share/postgresql/timezone/Universal
+share/postgresql/timezone/W-SU
+share/postgresql/timezone/Zulu
+share/postgresql/timezone/SystemV/AST4ADT
+share/postgresql/timezone/SystemV/EST5EDT
+share/postgresql/timezone/SystemV/CST6CDT
+share/postgresql/timezone/SystemV/MST7MDT
+share/postgresql/timezone/SystemV/PST8PDT
+share/postgresql/timezone/SystemV/YST9YDT
+share/postgresql/timezone/SystemV/AST4
+share/postgresql/timezone/SystemV/EST5
+share/postgresql/timezone/SystemV/CST6
+share/postgresql/timezone/SystemV/MST7
+share/postgresql/timezone/SystemV/PST8
+share/postgresql/timezone/SystemV/YST9
+share/postgresql/timezone/SystemV/HST10
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
+@dirrm share/postgresql/timezone/Africa
+@dirrm share/postgresql/timezone/America/Argentina
+@dirrm share/postgresql/timezone/America/Indiana
+@dirrm share/postgresql/timezone/America/Kentucky
+@dirrm share/postgresql/timezone/America/North_Dakota
+@dirrm share/postgresql/timezone/America
+@dirrm share/postgresql/timezone/Antarctica
+@dirrm share/postgresql/timezone/Arctic
+@dirrm share/postgresql/timezone/Asia
+@dirrm share/postgresql/timezone/Atlantic
+@dirrm share/postgresql/timezone/Australia
+@dirrm share/postgresql/timezone/Brazil
+@dirrm share/postgresql/timezone/Canada
+@dirrm share/postgresql/timezone/Chile
+@dirrm share/postgresql/timezone/Etc
+@dirrm share/postgresql/timezone/Europe
+@dirrm share/postgresql/timezone/Indian
+@dirrm share/postgresql/timezone/Mexico
+@dirrm share/postgresql/timezone/Mideast
+@dirrm share/postgresql/timezone/Pacific
+@dirrm share/postgresql/timezone/SystemV
+@dirrm share/postgresql/timezone/US
+@dirrm share/postgresql/timezone
@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
@ -61,351 +659,9 @@ share/postgresql/dot.cshrc.dist
@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 rmdir ~pgsql 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
@unexec rmdir %D/share/postgresql 2>/dev/null || true
@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-etc/rc.d/postgresql.sh
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/ibit.h
-include/postgresql/server/access/iqual.h
-include/postgresql/server/access/istrat.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rtree.h
-include/postgresql/server/access/rtscan.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/strat.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catname.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-include/postgresql/server/catalog/namespace.h
-include/postgresql/server/catalog/pg_aggregate.h
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_control.h
-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_group.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-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_proc.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shadow.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_version.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/comment.h
-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/explain.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/version.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdefs.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/lib/dllist.h
-include/postgresql/server/lib/lispsort.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ip.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.h
-include/postgresql/server/nodes/pg_list.h
-include/postgresql/server/nodes/plannodes.h
-include/postgresql/server/nodes/primnodes.h
-include/postgresql/server/nodes/print.h
-include/postgresql/server/nodes/readfuncs.h
-include/postgresql/server/nodes/relation.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-include/postgresql/server/optimizer/geqo_random.h
-include/postgresql/server/optimizer/geqo_recombination.h
-include/postgresql/server/optimizer/geqo_selection.h
-include/postgresql/server/optimizer/joininfo.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/plancat.h
-include/postgresql/server/optimizer/planmain.h
-include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/prep.h
-include/postgresql/server/optimizer/restrictinfo.h
-include/postgresql/server/optimizer/subselect.h
-include/postgresql/server/optimizer/tlist.h
-include/postgresql/server/optimizer/var.h
-include/postgresql/server/parser/analyze.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/parse.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-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/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/beos.h
-include/postgresql/server/port/bsdi.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/dgux.h
-include/postgresql/server/port/freebsd.h
-include/postgresql/server/port/hpux.h
-include/postgresql/server/port/irix5.h
-include/postgresql/server/port/linux.h
-include/postgresql/server/port/netbsd.h
-include/postgresql/server/port/nextstep.h
-include/postgresql/server/port/openbsd.h
-include/postgresql/server/port/osf.h
-include/postgresql/server/port/qnx4.h
-include/postgresql/server/port/sco.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/sunos4.h
-include/postgresql/server/port/svr4.h
-include/postgresql/server/port/ultrix4.h
-include/postgresql/server/port/univel.h
-include/postgresql/server/port/unixware.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itempos.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/lmgr.h
-include/postgresql/server/storage/lock.h
-include/postgresql/server/storage/lwlock.h
-include/postgresql/server/storage/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/pos.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-include/postgresql/server/storage/smgr.h
-include/postgresql/server/storage/spin.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-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/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/date.h
-include/postgresql/server/utils/datetime.h
-include/postgresql/server/utils/datum.h
-include/postgresql/server/utils/dynahash.h
-include/postgresql/server/utils/dynamic_loader.h
-include/postgresql/server/utils/elog.h
-include/postgresql/server/utils/errcodes.h
-include/postgresql/server/utils/fmgroids.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-include/postgresql/server/utils/inval.h
-include/postgresql/server/utils/logtape.h
-include/postgresql/server/utils/lsyscache.h
-include/postgresql/server/utils/memutils.h
-include/postgresql/server/utils/nabstime.h
-include/postgresql/server/utils/numeric.h
-include/postgresql/server/utils/palloc.h
-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/portal.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/sets.h
-include/postgresql/server/utils/syscache.h
-include/postgresql/server/utils/timestamp.h
-include/postgresql/server/utils/tqual.h
-include/postgresql/server/utils/tuplesort.h
-include/postgresql/server/utils/tuplestore.h
-include/postgresql/server/utils/typcache.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/c.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/port.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/strdup.h
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server
+@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@unexec rmdir %D/pgsql 2>/dev/null || true
--- a/databases/postgresql82-server/pkg-plist-tcltk
+++ b/databases/postgresql82-server/pkg-plist-tcltk
@ -1,11 +0,0 @@
-bin/pgtclsh
-include/libpgtcl.h
-lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
-@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true
-lib/libpgtcl.a
-lib/libpgtcl.so
-lib/libpgtcl.so.2
-%%TK%%bin/pgtksh
-share/postgresql/README-tcltk
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@ -7,28 +7,25 @@

 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	8.0.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	source/v${PORTVERSION:C/[0-9]*$//:C/rc/beta/}
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-# XXX: this will eventually go away
-.if !defined(PGSQL_WORK_IN_PROGRESS)
-BROKEN= pending ports/75344, the 8.0 release can be used via the postgresql-devel port
-.endif
-
-CONFLICTS?=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.*
+CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*

 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql

+NO_LATEST_LINK=	beta version
+
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	YES
 USE_GMAKE=	YES
@ -38,13 +35,14 @@ GNU_CONFIGURE=	YES
 .undef GNU_CONFIGURE
 .endif

-CONFIGURE_ARGS?=--with-libraries=${LOCALBASE}/lib \
-		--with-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"

 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}

-BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}

@ -58,18 +56,32 @@ WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}

 .if !defined(SLAVE_ONLY)
 OPTIONS=	NLS "Use internationalized messages" on
-OPTIONS+=	SSL "Build with SSL" on
+.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.
+#
+# If you *don't* want SSL, set WITHOUT_SSL=YES when making
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
 .endif

 .include <bsd.port.pre.mk>

+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+BROKEN=		"Coredump during build on alpha 4.x"
+.endif
+
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
-.  if ${OSVERSION} < 500041
-OPTIONS+=	GNUGETOPT "Depend on GNU getopt" on
+.  if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+OPTIONS+=	GNUGETOPT "Use GNU getopt" on
 .  endif
 .  if defined(SERVER_ONLY)
 OPTIONS+=	PAM "Build with PAM support" off
+OPTIONS+=	RENDEZVOUZ "Add support for Apple's Rendez-Vouz" off
 .  endif
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal's kerberos support" off
@ -81,11 +93,15 @@ OPTIONS+=	TESTS "Allows the use of a \"check\" target" off
 .  endif
 OPTIONS+=	DEBUG "Builds with debugging symbols" off

+.if defined(SERVER_ONLY) && defined(WITH_RENDEZVOUS)
+CONFIGURE_ARGS+=	--with-rendezvous
+.endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .  endif

-. if !defined(WITHOUT_GNUGETOPT)
+. if !defined(WITHOUT_GNUGETOPT) || exists(${LOCALBASE}/include/getopt.h)
 USE_GETOPT_LONG=yes
 .  endif

@ -109,97 +125,88 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif

-.  if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	"--with-openssl=${OPENSSLBASE}"
-.  endif
-
 .  if defined(WITH_MIT_KRB5)
+WITH_KRB5=	yes
+KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
-WITH_KRB5=	yes
 .  endif

 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
 .    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME}
 KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
 .    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-krb5=${DESTDIR}/usr
 KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
 .    else
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
 .    endif
 .  endif

 .  if defined(WITH_KRB5)
-CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+CONFIGURE_ARGS+=	--with-krb5
 LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-text-regress-pgregress-sh
 .  endif

 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .  endif
-
-.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
-.  endif
-.  if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.  endif
-.  if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world."
-	@exit 1
-.  endif
-
 .endif # !SLAVE_ONLY

 .if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
-		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
-		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
-		pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
-		postmaster.1 psql.1 vacuumdb.1
+MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
+		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
+		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
+		postgres.1 postmaster.1 psql.1 vacuumdb.1

-MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 \
-		alter_database.7 alter_domain.7 alter_function.7 \
-		alter_group.7 alter_language.7 alter_operator_class.7 \
-		alter_schema.7 alter_sequence.7 alter_table.7 \
-		alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
-		close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
-		create_cast.7 create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 \
-		create_sequence.7 create_table.7 create_table_as.7 \
-		create_trigger.7 create_type.7 create_user.7 create_view.7 \
-		deallocate.7 declare.7 delete.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_rule.7 drop_schema.7 \
-		drop_sequence.7 \
-		drop_table.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 reindex.7 \
-		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
-		set.7 set_constraints.7 set_transaction.7 show.7 \
-		set_session_authorization.7 start_transaction.7 \
-		truncate.7 unlisten.7 update.7 vacuum.7
+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_schema.7 alter_sequence.7 alter_table.7		      \
+		alter_trigger.7 alter_user.7 analyze.7 begin.7		      \
+		checkpoint.7 close.7 cluster.7 comment.7 commit.7	      \
+		copy.7 create_aggregate.7 create_cast.7			      \
+		create_constraint_trigger.7 create_conversion.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_rule.7 create_schema.7 create_sequence.7		      \
+		create_table.7 create_table_as.7 create_trigger.7	      \
+		create_type.7 create_user.7 create_view.7 delete.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_schema.7 drop_sequence.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 reindex.7 reset.7	      \
+		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
+		set_constraints.7 set_transaction.7 show.7		      \
+		set_session_authorization.7 start_transaction.7		      \
+		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
+		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
+		spi_execp.7 spi_execute.7 spi_execute_plan.7		      \
+		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
+		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
+		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
+		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
+		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
+		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
+		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
+		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		alter_operator.7 alter_tablespace.7 alter_type.7	      \
+		create_tablespace.7 drop_tablespace.7			      \
+		release_savepoint.7 rollback_to_savepoint.7		      \
+		savepoint.7
 .endif

 .if defined(SERVER_ONLY)
@ -208,6 +215,14 @@ pre-everything::
 .endif

 .if !defined(NO_BUILD)
+
+pre-configure:
+.  if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "MIT's and Heimdal Kerberos are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.  endif
+
 do-build:
 	@ cd ${WRKSRC}/src/backend ;\
 	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
@ -235,10 +250,9 @@ do-install:
 	    cd ${WRKSRC}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-	${MKDIR} ${PREFIX}/share/postgresql
 .  if defined(SERVER_ONLY)
-	@ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} install-all-headers
-.  for i in profile cshrc
+	@ ${MKDIR} ${PREFIX}/share/postgresql
+.    for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
@ -246,7 +260,7 @@ do-install:
 	if [ ! -f ~pgsql/.$i ]; then \
 		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
 	fi
-.  endfor
+.    endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
 		> ${RCSCRIPT} ;\
@ -258,7 +272,8 @@ do-install:
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
-		${INSTALL_DATA} ${PKGMESSAGE} ${PREFIX}/share/postgresql/README${PKGNAMESUFFIX} ;\
+		${MKDIR} ${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
 		${ECHO} "======================================================================" ;\
 		${CAT} ${PKGMESSAGE} ;\
 		${ECHO} "======================================================================" ;\
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-8.0.0.tar.bz2) = 57984b8b016501ee920e95af6edc7145
+SIZE (postgresql/postgresql-base-8.0.0.tar.bz2) = 7795453
+MD5 (postgresql/postgresql-docs-8.0.0.tar.bz2) = 9deb6ac959e367cabe882d77287a6b31
+SIZE (postgresql/postgresql-docs-8.0.0.tar.bz2) = 2195941
+MD5 (postgresql/postgresql-opt-8.0.0.tar.bz2) = 11f91f2bf1697d7c8f340151208e0c3e
+SIZE (postgresql/postgresql-opt-8.0.0.tar.bz2) = 133317
+MD5 (postgresql/postgresql-test-8.0.0.tar.bz2) = 0281020c9a1a3c342edaf2d9586ec07e
+SIZE (postgresql/postgresql-test-8.0.0.tar.bz2) = 961649
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-server/files/502.pgsql
@ -18,7 +18,7 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum

-daily_pgsql_vaccum_enable="NO"
+daily_pgsql_vacuum_enable="YES"
 daily_pgsql_backup_enable="NO"

 daily_pgsql_vacuum_args="-z"
--- a/databases/postgresql83-server/files/patch-configure
+++ b/databases/postgresql83-server/files/patch-configure
@ -1,59 +0,0 @@
--- configure.orig	Wed Jun 26 21:28:24 2002
-+++ configure	Wed Jun 26 21:35:16 2002
-@@ -2007,11 +2007,13 @@
- EOF
- 
- 
-  if test -d "$krb4_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
-  fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test "$krb4_prefix" != "/usr"; then
-+    if test -d "$krb4_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb4_prefix/include"
-+    fi
-+    if test -d "$krb4_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -2052,11 +2054,13 @@
- EOF
- 
- 
-  if test -d "$krb5_prefix/include"; then
-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
-  fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test "$krb5_prefix" != "/usr"; then
-+    if test -d "$krb5_prefix/include"; then
-+      INCLUDES="$INCLUDES -I$krb5_prefix/include"
-+    fi
-+    if test -d "$krb5_prefix/lib"; then
-+      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+    fi
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -2157,11 +2161,13 @@
- EOF
- 
- 
-  if test -d "${openssl_prefix}/include" ; then
-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-  fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test "${openssl_prefix}" != "/usr"; then
-+    if test -d "${openssl_prefix}/include" ; then
-+      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-+    fi
-+    if test -d "${openssl_prefix}/lib" ; then
-+      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+    fi
-   fi
- 
- fi
--- a/databases/postgresql83-server/files/patch-plpython-Makefile
+++ b/databases/postgresql83-server/files/patch-plpython-Makefile
@ -0,0 +1,11 @@
+--- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
+@@ -9,7 +9,7 @@
+ # shared library.  Since there is no official way to determine this
+ # (at least not in pre-2.3 Python), we see if there is a file that is
+ # named like a shared library.
+-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+ endif
+ 
--- a/databases/postgresql83-server/files/patch-src-interfaces-jdbc-build-xml
+++ b/databases/postgresql83-server/files/patch-src-interfaces-jdbc-build-xml
@ -1,14 +0,0 @@
--- src/interfaces/jdbc/build.xml.orig	Thu Jun 24 11:51:44 2004
-+++ src/interfaces/jdbc/build.xml	Thu Sep  2 01:51:36 2004
-@@ -113,10 +113,7 @@
- 
-   <target name="compile" depends="prepare,check_versions,driver">
- 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all three versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
--- a/databases/postgresql83-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ b/databases/postgresql83-server/files/patch-src-interfaces-libpgtcl-Makefile
@ -1,11 +0,0 @@
--- src/interfaces/libpgtcl/Makefile.orig	Tue Feb 10 08:26:48 2004
-+++ src/interfaces/libpgtcl/Makefile	Thu Mar 11 21:12:25 2004
-@@ -21,7 +21,7 @@
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
- SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
-	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
-+	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
- 
- all: submake-libpq all-lib
- 
--- a/databases/postgresql83-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql83-server/files/patch-src-makefiles-Makefile.freebsd
@ -1,15 +1,15 @@
--- src/makefiles/Makefile.freebsd.orig	Wed Aug 29 21:14:40 2001
-+++ src/makefiles/Makefile.freebsd	Sat Jan 31 17:51:25 2004
-@@ -7,7 +7,7 @@
- endif
- 
- DLSUFFIX = .so
+--- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
+@@ -11,7 +11,7 @@
+ ifeq ($(findstring sparc,$(host_cpu)), sparc)
+ CFLAGS_SL = -fPIC -DPIC
+ else
 -CFLAGS_SL = -fpic -DPIC
 +CFLAGS_SL = -fPIC -DPIC
+ endif
 
- %.so: %.o
- ifdef ELF_SYSTEM
-@@ -23,3 +23,5 @@
+ 
+@@ -29,3 +29,5 @@
 endif
 
 sqlmansect = 7
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Now, you should install pgaccess to get a nice GUI for PostgreSQL!`