9 files changed, 124 insertions, 16 deletions

diff --git a/databases/postgresql92-server/files/dot.profile.in b/databases/postgresql92-server/files/dot.profile.in
new file mode 100644
index 000000000000..bd7ec45043be
--- /dev/null
+++ b/databases/postgresql92-server/files/dot.profile.in
@@ -0,0 +1,16 @@
+PATH=${PATH}:%%PREFIX%%/pgsql/bin
+PGLIB=%%PREFIX%%/pgsql/lib
+
+# note: PGDATA overwrites the -D startup option
+PGDATA=%%PREFIX%%/pgsql/data
+
+export PATH MANPATH PGLIB PGDATA
+
+#You might want to set some locale stuff here
+#PGDATESTYLE=ISO
+#LC_ALL=sv_SE.ISO_88591-1
+#export PGDATESTYLE LC_ALL
+
+# if you want to make regression tests use this TZ
+#TZ=PST8PDT
+#export TZ
diff --git a/databases/postgresql92-server/files/patch-au b/databases/postgresql92-server/files/patch-au
new file mode 100644
index 000000000000..340521b49482
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-au
@@ -0,0 +1,58 @@
+--- configure.in.orig	Sun Nov  5 05:03:47 2000
++++ configure.in	Mon Dec  4 02:36:15 2000
+@@ -299,13 +299,28 @@
+    [  --with-tcl              build Tcl interfaces and pgtclsh ],
+    [
+ 	case "$withval" in
+-	y | ye | yes)		USE_TCL=true; USE_TK=true; AC_MSG_RESULT(enabled) ;;
++	y | ye | yes)		USE_TCL=true; AC_MSG_RESULT(enabled) ;;
+ 	*)			USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ;;
+ 	esac
+    ],
+    [ USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ]
+ )
+ 
++dnl We include tk support with tcl unless user says --without-tk
++if test USE_TCL = true
++then
++AC_MSG_CHECKING(setting USE_TK)
++AC_ARG_WITH(
++   tk,
++   [  --without-tk              build Tcl *without* Tk ],
++   [
++	case "$withval" in
++	y | ye | yes)		USE_TK=true; USE_TK=true; AC_MSG_RESULT(enabled) ;;
++	*)			USE_TK=n; AC_MSG_RESULT(disabled) ;;
++	esac
++   ]
++)
++fi
+ export USE_TCL
+ export USE_TK
+ 
+@@ -482,7 +497,7 @@
+ #endif
+ ],
+ 	ELF_SYS=true,
+-[if test "X$elf" = "Xyes"
++[if test "X$PORTOBJFORMAT" = "Xyes"
+ then
+ 	ELF_SYS=true
+ else
+@@ -1248,10 +1263,15 @@
+ 	else
+ 		AC_MSG_RESULT($TCL_CONFIG_SH)
+ 		AC_SUBST(TCL_CONFIG_SH)
++		. ${TCL_CONFIG_SH}
++		AC_SUBST(TCL_LIB_SPEC)
+ 	fi
+ fi
+ 
+-USE_TK=$USE_TCL		# If TCL is disabled, disable TK
++USE_TK=${USE_TK:=$USE_TCL}	# If TCL is disabled, disable TK
++				# otherwise -- enable unless explicitly
++				# disabled
++
+ 
+ dnl Check for Tk configuration script tkConfig.sh
+ if test "$USE_TK" = true
diff --git a/databases/postgresql92-server/files/patch-av b/databases/postgresql92-server/files/patch-av
new file mode 100644
index 000000000000..49b35f9e8dc1
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-av
@@ -0,0 +1,17 @@
+--- interfaces/libpq/fe-connect.c	Sun May 21 17:19:53 2000
++++ interfaces/libpq/fe-connect.c	Fri Sep 15 13:53:52 2000
+@@ -801 +801 @@
+-			sprintf(conn->errorMessage,
++			printfPQExpBuffer(&conn->errorMessage,
+@@ -809 +809 @@
+-			sprintf(conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
++			printfPQExpBuffer(&conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
+@@ -822 +822 @@
+-					sprintf(conn->errorMessage,
++					printfPQExpBuffer(&conn->errorMessage,
+@@ -832 +832 @@
+-				sprintf(conn->errorMessage,
++				printfPQExpBuffer(&conn->errorMessage,
+@@ -850 +850 @@
+-			strcpy(conn->errorMessage,
++			printfPQExpBuffer(&conn->errorMessage,
diff --git a/databases/postgresql92-server/files/patch-ba b/databases/postgresql92-server/files/patch-ba
index a3b679b882c5..586d725c536a 100644
--- a/databases/postgresql92-server/files/patch-ba
+++ b/databases/postgresql92-server/files/patch-ba
@@ -1,5 +1,5 @@
---- interfaces/jdbc/Makefile.orig	Tue Mar 14 16:55:17 2000
-+++ interfaces/jdbc/Makefile	Sun Apr 16 21:16:43 2000
+--- interfaces/jdbc/Makefile.orig	Sun Nov  5 05:03:53 2000
++++ interfaces/jdbc/Makefile	Fri Dec  8 03:16:17 2000
 @@ -10,10 +10,10 @@
  
  FIND		= find
@@ -15,11 +15,3 @@
  RM		= rm -f
  TOUCH		= touch
  
-@@ -40,6 +40,7 @@
- 	@echo To compile, type:
- 	@echo "  $(MAKE) jdbc2"
- 	@echo ------------------------------------------------------------
-+	$(MAKE) jdbc1
- 
- msg:	
- 	@echo ------------------------------------------------------------
diff --git a/databases/postgresql92-server/files/patch-be b/databases/postgresql92-server/files/patch-be
new file mode 100644
index 000000000000..2f8c3c55566f
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-be
@@ -0,0 +1,9 @@
+This patches let you disable Tk even if you have it installed and
+makes sure the TCL-library is added as a dependency for libpgtcl.
+--- interfaces/libpgtcl/Makefile.in	Tue Mar  7 20:58:36 2000
++++ interfaces/libpgtcl/Makefile.in	Wed Sep 20 08:57:28 2000
+@@ -29,3 +29,3 @@
+ 
+-SHLIB_LINK+= $(LIBPQ)
++SHLIB_LINK+= $(LIBPQ) @TCL_LIB_SPEC@
+ 
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index e1673b4850c2..753e0b8aaf80 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -17,13 +17,13 @@ start)
 
 stop)
     [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop'
+	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop'
     }
     ;;
 
 status)
     [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status'
+	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status'
     }
     ;;
 
diff --git a/databases/postgresql92-server/files/pkgIndex.tcl.in b/databases/postgresql92-server/files/pkgIndex.tcl.in
new file mode 100644
index 000000000000..bd8329b15c69
--- /dev/null
+++ b/databases/postgresql92-server/files/pkgIndex.tcl.in
@@ -0,0 +1,4 @@
+# Package-index file for Pgtcl-package. Enables you to load PostgreSQL
+# interface functions right into you TCL-interpreter as simply as
+#	package require Pgtcl
+package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so"
diff --git a/databases/postgresql92-server/files/post-install-notes b/databases/postgresql92-server/files/post-install-notes
index 289a7651109a..4c69908b2676 100644
--- a/databases/postgresql92-server/files/post-install-notes
+++ b/databases/postgresql92-server/files/post-install-notes
@@ -8,9 +8,12 @@ You may wish to subscribe to the PostgreSQL user-support mailing list.
 Send an e-mail to pgsql-questions-request@postgresql.org with the
 text "subscribe" in the message body.
 
-If you built PostgreSQL with TCL support, you can install the port
-"pgaccess" to get a TCL/TK based database frontend for database
-operations.
+If you built PostgreSQL with TCL/TK support, you can use the pgaccess
+utility to get a TCL/TK based database frontend for database
+operations. You do NOT need to install the pgaccess port separately.
+
+If you built in the TCL support, you can load the Pg package into your
+TCL scripts as easily as ``package require Pgtcl''.
 
 To start PostgreSQL, run the startup script:
-$PREFIX/etc/rc.d/pgsql.sh start
+%%PREFIX%%/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql92-server/files/pre-install-notes b/databases/postgresql92-server/files/pre-install-notes
new file mode 100644
index 000000000000..72388933bd6d
--- /dev/null
+++ b/databases/postgresql92-server/files/pre-install-notes
@@ -0,0 +1,9 @@
+# ----------------------------------------------------------------
+# UPGRADE NOTE! Depending on which version you are upgrading from,
+# you may have to dump/restore existing databases
+# as part of the update.
+# This is *NOT* done by this port!
+# For detailed instructions, see
+# %%WRKDIR%%/%%DISTNAME%%/INSTALL
+# after extraction.
+# --------------------------------------------------------------