Upgrade to 7.1, change to new layout style.

PR:				ports/26741
Submitted by:	maintainer

20 files changed, 211 insertions, 271 deletions

diff --git a/databases/postgresql91-server/files/dot.cshrc.in b/databases/postgresql91-server/files/dot.cshrc.in
new file mode 100644
index 000000000000..a326041bff7b
--- /dev/null
+++ b/databases/postgresql91-server/files/dot.cshrc.in
@@ -0,0 +1,13 @@
+set path = ( %%PREFIX%%/%%PG_PREFIX%%bin $path )
+
+setenv PGLIB %%PREFIX%%/%%PG_PREFIX%%lib
+
+# note: PGDATA can be overridden by the -D startup option
+setenv PGDATA $HOME/data
+
+#You might want to set some locale stuff here
+#setenv PGDATESTYLE ISO
+#setenv LC_ALL sv_SE.ISO_8859-1
+
+# if you want to make regression tests use this TZ
+#setenv TZ PST8PDT
diff --git a/databases/postgresql91-server/files/dot.profile.in b/databases/postgresql91-server/files/dot.profile.in
index 3d8ca9ac4641..4aca6aadd19a 100644
--- a/databases/postgresql91-server/files/dot.profile.in
+++ b/databases/postgresql91-server/files/dot.profile.in
@@ -1,10 +1,12 @@
-PATH=${PATH}:%%PREFIX%%/pgsql/bin
-PGLIB=%%PREFIX%%/pgsql/lib
+# both new and old layout's paths, but new path first...
+PATH=%%PREFIX%%/%%PG_PREFIX%%bin:${PATH}
+
+PGLIB=%%PREFIX%%/%%PG_PREFIX%%lib
 
 # note: PGDATA can be overridden by the -D startup option
-PGDATA=%%PREFIX%%/pgsql/data
+PGDATA=${HOME}/data
 
-export PATH MANPATH PGLIB PGDATA
+export PATH PGLIB PGDATA
 
 #You might want to set some locale stuff here
 #PGDATESTYLE=ISO
diff --git a/databases/postgresql91-server/files/patch-aj b/databases/postgresql91-server/files/patch-aj
index 4231fc94ede9..94c0d6d79991 100644
--- a/databases/postgresql91-server/files/patch-aj
+++ b/databases/postgresql91-server/files/patch-aj
@@ -1,67 +1,118 @@
---- bin/pg_passwd/pg_passwd.c.orig	Mon Apr 17 05:45:18 2000
-+++ bin/pg_passwd/pg_passwd.c	Sat May 20 17:54:59 2000
-@@ -18,11 +18,15 @@
- 
- #endif
+--- src/bin/pg_passwd/pg_passwd.c.orig	Sat Mar 24 01:54:55 2001
++++ src/bin/pg_passwd/pg_passwd.c	Wed Apr 18 04:54:14 2001
+@@ -7,6 +7,12 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <ctype.h>
++
++#if defined(__FreeBSD__)
++#include <pwd.h>  /* defines _PASSWORD_LEN, max # of characters in a password */
++#include <sys/time.h> /* gettimeofday for password salt */
++#endif
++
+ #define issaltchar(c)	(isalnum((unsigned char) (c)) || (c) == '.' || (c) == '/')
  
-+#ifndef _POSIX_SOURCE
-+# define	_PASSWORD_LEN	128	/* max length, not containing NULL */
+ #ifdef HAVE_TERMIOS_H
+@@ -23,18 +29,31 @@
+  * We assume that the output of crypt(3) is always 13 characters,
+  * and that at most 8 characters can usefully be sent to it.
+  *
++ * For FreeBSD, take these values from /usr/include/pwd.h
+  * Postgres usernames are assumed to be less than NAMEDATALEN chars long.
+  */
++#if defined(__FreeBSD__)
++#define CLEAR_PASSWD_LEN   _PASSWORD_LEN
++#define CRYPTED_PASSWD_LEN _PASSWORD_LEN /* max length, not containing NULL */
++#define SALT_LEN 10
++#else
+ #define CLEAR_PASSWD_LEN 8		/* not including null */
+ #define CRYPTED_PASSWD_LEN 13	/* not including null */
++#define SALT_LEN 3
 +#endif
 +
- char	   *comname;
- static void usage(FILE *stream);
++static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
++	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
++
+ 
+ const char *progname;
+ 
+ static void usage(void);
++static void to64(char *s, long v, int n);
  static void read_pwd_file(char *filename);
  static void write_pwd_file(char *filename, char *bkname);
--static void encrypt_pwd(char key[9], char salt[3], char passwd[14]);
-+static void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
+ static void encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
+-			char salt[3],
++			char salt[SALT_LEN],
+ 			char passwd[CRYPTED_PASSWD_LEN + 1]);
  static void prompt_for_username(char *username);
  static void prompt_for_password(char *prompt, char *password);
- 
-@@ -150,7 +154,7 @@
- 
- 		if (q != NULL)
- 			*(q++) = '\0';
--		if (strlen(p) != 13)
-+		if (strlen(p) > _PASSWORD_LEN)
- 		{
- 			fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
- 					filename, npwds + 1);
-@@ -214,7 +218,7 @@
+@@ -47,6 +66,15 @@
+ 	printf("Report bugs to <pgsql-bugs@postgresql.org>.\n");
  }
  
- static void
--encrypt_pwd(char key[9], char salt[3], char passwd[14])
-+encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1])
++static void
++to64(char *s, long v, int n)
++{
++	while (--n >= 0) {
++		*s++ = itoa64[v&0x3f];
++		v >>= 6;
++	}
++}
++
+ typedef struct
  {
- 	int			n;
+ 	char	   *uname;
+@@ -154,7 +182,7 @@
+ 			if (q != NULL)
+ 				*(q++) = '\0';
  
-@@ -246,9 +250,9 @@
+-			if (strlen(p) != CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
++			if (strlen(p) > CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0)
+ 			{
+ 				fprintf(stderr, "%s:%d: warning: invalid password length\n",
+ 						filename, npwds + 1);
+@@ -221,15 +249,25 @@
  
- #ifdef NOT_USED
- static int
--check_pwd(char key[9], char passwd[14])
-+check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
+ static void
+ encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1],
+-			char salt[3],
++			char salt[SALT_LEN],
+ 			char passwd[CRYPTED_PASSWD_LEN + 1])
  {
--	char		shouldbe[14];
-+	char		shouldbe[_PASSWORD_LEN+1];
- 	char		salt[3];
- 
- 	salt[0] = passwd[0];
-@@ -256,7 +260,7 @@
- 	salt[2] = '\0';
- 	encrypt_pwd(key, salt, shouldbe);
- 
--	return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0;
-+	return strncmp(shouldbe, passwd, _PASSWORD_LEN) == 0 ? 1 : 0;
- }
- 
- #endif
-@@ -332,7 +336,7 @@
- 	char		salt[3];
- 	char		key[9],
- 				key2[9];
--	char		e_passwd[14];
-+	char		e_passwd[_PASSWORD_LEN+1];
- 	int			i;
++#if !defined(__FreeBSD__)
+ 	int			n;
+-
++#endif
+ 	/* select a salt, if not already given */
+ 	if (salt[0] == '\0')
+ 	{
++#if defined(__FreeBSD__)
++		struct timeval tv;
++		srandomdev();
++		gettimeofday(&tv,0);
++		to64(&salt[0], random(), 3);
++		to64(&salt[3], tv.tv_usec, 3);
++		to64(&salt[6], tv.tv_sec, 2);
++		salt[8] = '\0';
+ 		srand(time(NULL));
++#else
+ 		do
+ 		{
+ 			n = rand() % 256;
+@@ -241,6 +279,7 @@
+ 		} while (!issaltchar(n));
+ 		salt[1] = n;
+ 		salt[2] = '\0';
++#endif
+ 	}
  
- 	comname = argv[0];
+ 	/* get encrypted password */
+@@ -335,7 +374,7 @@
+ 	char	   *filename;
+ 	char		bkname[MAXPGPATH];
+ 	char		username[NAMEDATALEN];
+-	char		salt[3];
++	char		salt[SALT_LEN];
+ 	char		key[CLEAR_PASSWD_LEN + 1],
+ 				key2[CLEAR_PASSWD_LEN + 1];
+ 	char		e_passwd[CRYPTED_PASSWD_LEN + 1];
diff --git a/databases/postgresql91-server/files/patch-ar b/databases/postgresql91-server/files/patch-ar
deleted file mode 100644
index c5c8096fc141..000000000000
--- a/databases/postgresql91-server/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Oct 10 14:37:07 1999
-+++ configure	Sun Oct 10 14:37:29 1999
-@@ -1429,7 +1429,7 @@
-   ELF_SYS=true
- else
-   rm -rf conftest*
--  if test "X$elf" = "Xyes"
-+  if test "X$PORTOBJFORMAT" = "Xelf"
- then
- 	ELF_SYS=true
- else
diff --git a/databases/postgresql91-server/files/patch-as b/databases/postgresql91-server/files/patch-as
deleted file mode 100644
index 3282168c4aed..000000000000
--- a/databases/postgresql91-server/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.global.in.orig	Sun Dec  6 00:08:56 1998
-+++ Makefile.global.in	Sat Feb 27 04:23:12 1999
-@@ -79,7 +79,7 @@
- POSTMANDIR= $(POSTGRESDIR)/man
- 
- # Where the formatted documents (e.g., the reference manual) get installed.
--POSTDOCDIR= $(POSTGRESDIR)/doc
-+POSTDOCDIR= !!PREFIX!!/share/doc/pgsql
- 
- # Where the header files necessary to build frontend programs get installed.
- HEADERDIR= $(POSTGRESDIR)/include
diff --git a/databases/postgresql91-server/files/patch-at b/databases/postgresql91-server/files/patch-at
deleted file mode 100644
index 93e68a708211..000000000000
--- a/databases/postgresql91-server/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../doc/Makefile.orig	Sun Nov 29 06:30:13 1998
-+++ ../doc/Makefile	Mon Jun 21 17:00:13 1999
-@@ -12,7 +12,7 @@
- #
- #----------------------------------------------------------------------------
- 
--PGDOCS= $(POSTGRESDIR)/doc
-+PGDOCS= $(POSTDOCDIR)
- SRCDIR= ../src
- 
- TAR= tar
diff --git a/databases/postgresql91-server/files/patch-au b/databases/postgresql91-server/files/patch-au
deleted file mode 100644
index 340521b49482..000000000000
--- a/databases/postgresql91-server/files/patch-au
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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/postgresql91-server/files/patch-av b/databases/postgresql91-server/files/patch-av
deleted file mode 100644
index 49b35f9e8dc1..000000000000
--- a/databases/postgresql91-server/files/patch-av
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/postgresql91-server/files/patch-ba b/databases/postgresql91-server/files/patch-ba
deleted file mode 100644
index 586d725c536a..000000000000
--- a/databases/postgresql91-server/files/patch-ba
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
- IDL2JAVA	= idltojava -fno-cpp -fno-tie
--JAR		= jar
--JAVA		= java
--JAVAC		= javac -g
--JAVADOC		= javadoc
-+JAR		= !!JAVA_HOME!!/bin/jar
-+JAVA		= !!JAVA_HOME!!/bin/java
-+JAVAC		= !!JAVA_HOME!!/bin/javac
-+JAVADOC		= !!JAVA_HOME!!/bin/javadoc
- RM		= rm -f
- TOUCH		= touch
- 
diff --git a/databases/postgresql91-server/files/patch-bb b/databases/postgresql91-server/files/patch-bb
deleted file mode 100644
index ea0f1732dcb0..000000000000
--- a/databases/postgresql91-server/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- pl/tcl/Makefile~	Sat Apr 29 19:45:42 2000
-+++ pl/tcl/Makefile	Sat May 20 22:42:22 2000
-@@ -71,7 +71,9 @@
- CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- 
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
--        
-+
-+CFLAGS+= -I$(TCL_INCDIR)
-+
- #
- # Uncomment the following to enable the unknown command lookup
- # on the first of all calls to the call handler. See the doc
diff --git a/databases/postgresql91-server/files/patch-bc b/databases/postgresql91-server/files/patch-bc
deleted file mode 100644
index ff747fb84a2f..000000000000
--- a/databases/postgresql91-server/files/patch-bc
+++ /dev/null
@@ -1,5 +0,0 @@
---- bin/pg_ctl/postmaster.opts.default.sample~	Mon Apr 17 05:45:17 2000
-+++ bin/pg_ctl/postmaster.opts.default.sample	Tue May 23 02:46:30 2000
-@@ -1 +1 @@
--
-+-i -o "-F"
diff --git a/databases/postgresql91-server/files/patch-bd b/databases/postgresql91-server/files/patch-bd
deleted file mode 100644
index 341696bfb087..000000000000
--- a/databases/postgresql91-server/files/patch-bd
+++ /dev/null
@@ -1,42 +0,0 @@
-Here are the two extra patch files that will allow PostgreSQL to
-compile and run on Alpha.  The DB is 64-bit capable so really only a few
-bits of configuration for FreeBSD were needed. 
-
---- backend/main/main.c.orig    Wed Aug 30 16:05:39 2000
-+++ backend/main/main.c Wed Aug 30 16:06:10 2000
-@@ -14,7 +14,7 @@
-  */
- #include <unistd.h>
- 
--#if defined(__alpha__) && !defined(linux)
-+#if defined(__alpha__) && !defined(linux) && !defined(__FreeBSD__)
- #include <sys/sysinfo.h>
- #include "machine/hal_sysinfo.h"
- #define ASSEMBLER
-
-
-
-
-
-
-
---- include/port/freebsd.h.orig Tue Jul 13 16:12:49 1999
-+++ include/port/freebsd.h      Wed Aug 30 21:12:51 2000
-@@ -3,6 +3,12 @@
- #if defined(__i386__)
- #define NEED_I386_TAS_ASM
- #define HAS_TEST_AND_SET
-+typedef unsigned char slock_t;
-+#endif
-+
-+#if defined (__alpha__)
-+#define HAS_TEST_AND_SET
-+typedef long int slock_t;
- #endif
- 
- #if defined(__sparc__)
-@@ -28,4 +34,3 @@
- /* #   undef HAS_TEST_AND_SET */
- #endif
- 
--typedef unsigned char slock_t;
diff --git a/databases/postgresql91-server/files/patch-be b/databases/postgresql91-server/files/patch-be
deleted file mode 100644
index 2f8c3c55566f..000000000000
--- a/databases/postgresql91-server/files/patch-be
+++ /dev/null
@@ -1,9 +0,0 @@
-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/postgresql91-server/files/patch-contrib-retep-build b/databases/postgresql91-server/files/patch-contrib-retep-build
new file mode 100644
index 000000000000..30df3a0e72c9
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-contrib-retep-build
@@ -0,0 +1,10 @@
+--- contrib/retep/build.xml~	Fri Mar 16 22:50:36 2001
++++ contrib/retep/build.xml	Wed Apr 18 09:24:20 2001
+@@ -38,6 +38,7 @@
+   <target name="compile" depends="checks,prepare">
+     <javac srcdir="${src}" destdir="${dest}">
+       <include name="${package}/**" />
++      <exclude name="${package}/**" unless="jdk1.2+" />
+     </javac>
+   </target>
+ 
diff --git a/databases/postgresql91-server/files/patch-doc-makefile b/databases/postgresql91-server/files/patch-doc-makefile
new file mode 100644
index 000000000000..fa27bed2af3f
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-doc-makefile
@@ -0,0 +1,19 @@
+--- doc/Makefile~	Sun Jan  7 03:03:22 2001
++++ doc/Makefile	Wed Apr 18 08:12:30 2001
+@@ -43,10 +43,13 @@
+ 	gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - )
+ endif
+ 
+-
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html
+-
++ifdef found_html
++	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
++endif
++ifdef found_man
++	$(mkinstalldirs) $(DESTDIR)$(mandir)
++endif
+ 
+ uninstall:
+ ifdef found_html
diff --git a/databases/postgresql91-server/files/patch-jdbc-build-xml b/databases/postgresql91-server/files/patch-jdbc-build-xml
new file mode 100644
index 000000000000..b1c703a9c978
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-jdbc-build-xml
@@ -0,0 +1,10 @@
+--- src/interfaces/jdbc/build.xml~	Fri Mar 16 22:50:43 2001
++++ src/interfaces/jdbc/build.xml	Wed Apr 18 08:57:57 2001
+@@ -120,6 +120,7 @@
+     <javac srcdir="${src}" destdir="${dest}">
+       <include name="example/**" />
+       <exclude name="example/corba/**"/>
++      <exclude name="example/blobtest.java" unless="jdk1.2+"/>
+     </javac>
+   </target>
+ 
diff --git a/databases/postgresql91-server/files/patch-jdbc1-statement b/databases/postgresql91-server/files/patch-jdbc1-statement
new file mode 100644
index 000000000000..41a9a2971f5a
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-jdbc1-statement
@@ -0,0 +1,13 @@
+--- src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java~	Fri Feb 23 19:12:23 2001
++++ src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java	Wed Apr 18 08:51:03 2001
+@@ -288,8 +288,8 @@
+ 	 */
+ 	public java.sql.ResultSet getResultSet() throws SQLException
+ 	{
+-          if (result != null) && ((org.postgresql.ResultSet)result.reallyResultSet())
+-            return result;
++          if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet())
++	    return result;
+           return null;
+ 	}
+ 
diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl
index 753e0b8aaf80..e775aab1d5fd 100644
--- a/databases/postgresql91-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql91-server/files/pgsql.sh.tmpl
@@ -2,28 +2,29 @@
 
 # $FreeBSD$
 #
-# For postmaster startup options, edit $PGDATA/postmaster.opts.default
-# Preinstalled options are -i -o "-F"
+# For postmaster startup options, edit $PGDATA/postgresql.conf
+
+PGBIN=%%PREFIX%%/%%PG_PREFIX%%bin
 
 case $1 in
 start)
-    [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
+    [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib
+    [ -x ${PGBIN}/pg_ctl ] && {
 	su -l pgsql -c \
-	    'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1'
+	    'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog'
 	echo -n ' pgsql'
     }
     ;;
 
 stop)
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop'
+    [ -x ${PGBIN}/pg_ctl ] && {
+	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl stop -m fast'
     }
     ;;
 
 status)
-    [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && {
-	exec su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status'
+    [ -x ${PGBIN}/pg_ctl ] && {
+	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl status'
     }
     ;;
 
diff --git a/databases/postgresql91-server/files/post-install-notes b/databases/postgresql91-server/files/post-install-notes
index f77271d85113..6b7192b31895 100644
--- a/databases/postgresql91-server/files/post-install-notes
+++ b/databases/postgresql91-server/files/post-install-notes
@@ -15,5 +15,8 @@ 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/010.pgsql.sh start
+If you built with Java support, add
+/usr/local/share/java/classes/postgresql.jar to your classpath.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8).
diff --git a/databases/postgresql91-server/files/pre-install-notes b/databases/postgresql91-server/files/pre-install-notes
index 72388933bd6d..697ce3cedb79 100644
--- a/databases/postgresql91-server/files/pre-install-notes
+++ b/databases/postgresql91-server/files/pre-install-notes
@@ -1,9 +1,21 @@
-# ----------------------------------------------------------------
-# 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.
-# --------------------------------------------------------------
+ * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
+
+The PostgreSQL port now obeys hier(7) by default, which means that it
+installs into:
+
+%%PREFIX%%/bin
+%%PREFIX%%/lib
+%%PREFIX%%/include/pgsql
+
+You *must* move away your old installation to avoid problems with
+ldconfig(8) and user's PATH:s. If you rather install using the
+old-fashion layout, cancel at next screen and run make as:
+
+$ make -DWITH_OLD_LAYOUT
+
+As always, you *must* dump existing databases before stopping and
+removing your old postgresql, as part of the update.  This is *NOT*
+done by this port!
+
+If you want JAVA support, I will try to determine your JAVA_HOME using
+javavmwrapper. If you want a different JVM, please set JAVA_HOME.