9 files changed, 97 insertions, 157 deletions

diff --git a/databases/postgresql90-server/files/502.pgsql b/databases/postgresql90-server/files/502.pgsql
index a1cf9ba4f2ee..09591559c317 100644
--- a/databases/postgresql90-server/files/502.pgsql
+++ b/databases/postgresql90-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"
diff --git a/databases/postgresql90-server/files/patch-configure b/databases/postgresql90-server/files/patch-configure
deleted file mode 100644
index efeca517d300..000000000000
--- a/databases/postgresql90-server/files/patch-configure
+++ /dev/null
@@ -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
diff --git a/databases/postgresql90-server/files/patch-plpython-Makefile b/databases/postgresql90-server/files/patch-plpython-Makefile
new file mode 100644
index 000000000000..3357b699da8a
--- /dev/null
+++ b/databases/postgresql90-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
+ 
diff --git a/databases/postgresql90-server/files/patch-src-interfaces-jdbc-build-xml b/databases/postgresql90-server/files/patch-src-interfaces-jdbc-build-xml
deleted file mode 100644
index 89806a159665..000000000000
--- a/databases/postgresql90-server/files/patch-src-interfaces-jdbc-build-xml
+++ /dev/null
@@ -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/**" />
diff --git a/databases/postgresql90-server/files/patch-src-interfaces-libpgtcl-Makefile b/databases/postgresql90-server/files/patch-src-interfaces-libpgtcl-Makefile
deleted file mode 100644
index 44c60a29157e..000000000000
--- a/databases/postgresql90-server/files/patch-src-interfaces-libpgtcl-Makefile
+++ /dev/null
@@ -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
- 
diff --git a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
index 9b4571d5dc30..89aaa9a2c0cc 100644
--- a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql90-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
diff --git a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index b9842b0c94f6..07363e882113 100644
--- a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql90-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 -
- 
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index 3f8706d6af0c..b3e33352de07 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-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%%
+
+. %%RC_SUBR%%
+
+
+# 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"}
+
+name=postgresql
+rcvar=`set_rcvar`
+command=${prefix}/bin/pg_ctl
+command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+extra_commands="reload initdb"
+
+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"
+
+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}"
+}
 
-PREFIX=%%PREFIX%%
-PGBIN=${PREFIX}/bin
-
-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"
-    }
-    ;;
-
-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"
-    }
-    ;;
-
-reload)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
-    }
-    ;;
-
-status)
-    [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status"
-    }
-    ;;
-
-*)
-    echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
-    exit 64
-    ;;
-esac
+load_rc_config postgresql
+run_rc_command "$1"
diff --git a/databases/postgresql90-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql90-server/files/regresspatch-src-test-regress-pgregress-sh
new file mode 100644
index 000000000000..f2ebbf5cb96e
--- /dev/null
+++ b/databases/postgresql90-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