11 files changed, 79 insertions, 59 deletions

diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 52d2c4703554..4d9a3589a421 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.4
-PORTREVISION?=	1
+PORTVERSION?=	8.1.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]* \
-		${PORTNAME}-client-8.0.* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.0.*
+CONFLICTS?=	${PORTNAME}-client-7.* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.* \
+		${PORTNAME}-client-8.[02-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[02-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
@@ -48,12 +48,11 @@ PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/pl src/utils
 INSTALL_DIRS?=	${BUILD_DIRS}
-PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
+USE_RC_SUBR=	postgresql
+SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -75,7 +74,7 @@ CONFIGURE_ARGS+=--with-openssl
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Coredump during build on alpha 4.x"
+BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
@@ -97,19 +96,19 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if defined(SERVER_ONLY) && defined(WITH_HIER)
-#PATCH_SITES+=	http://gppl.moonbone.ru/:hier801054
-#PATCHFILES+=	hier-Pg8.0.1-0.5.4.diff.gz:hier801054
-#USE_BISON=	yes
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
+PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
+USE_BISON=	yes
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_ICU)
+.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
@@ -119,6 +118,10 @@ PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 
 PATCH_DIST_STRIP=-p1
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -172,12 +175,12 @@ CONFIGURE_ARGS+=--with-krb5
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.20:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TESTS)
+.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
@@ -259,11 +262,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
-.  if exists(${MASTERDIR}/pkg-message${PKGNAMESUFFIX})
-post-build:
-	@ ${SED} "s|/usr/local|${PREFIX}|g" \
-		< ${MASTERDIR}/pkg-message${PKGNAMESUFFIX} \
-		> ${PKGMESSAGE}
+.  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
+SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
@@ -282,20 +283,13 @@ do-install:
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
+		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${RCSCRIPT} ;\
-	${CHMOD} 555 ${RCSCRIPT} ;\
-	${CHOWN} root:pgsql ${RCSCRIPT} ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 47f2c0c9e4d3..c71931c05124 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,18 @@
-MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
-SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
-SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
-MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
-SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
-SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
-MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
-SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
-SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
-MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
-SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
-SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
+MD5 (postgresql/postgresql-base-8.1.5.tar.bz2) = 30a42fd5fc5326edc217e28651e5053b
+SHA256 (postgresql/postgresql-base-8.1.5.tar.bz2) = cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
+SIZE (postgresql/postgresql-base-8.1.5.tar.bz2) = 8044522
+MD5 (postgresql/postgresql-opt-8.1.5.tar.bz2) = bcd3eec7cfc759dbfdde4f9e8fa07d27
+SHA256 (postgresql/postgresql-opt-8.1.5.tar.bz2) = 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
+SIZE (postgresql/postgresql-opt-8.1.5.tar.bz2) = 144784
+MD5 (postgresql/postgresql-docs-8.1.5.tar.bz2) = d104e7e645ea36407831ca59470c7a12
+SHA256 (postgresql/postgresql-docs-8.1.5.tar.bz2) = 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9
+SIZE (postgresql/postgresql-docs-8.1.5.tar.bz2) = 2489400
+MD5 (postgresql/postgresql-test-8.1.5.tar.bz2) = b3e050a0af7998d78f928b96d95fa6d7
+SHA256 (postgresql/postgresql-test-8.1.5.tar.bz2) = 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166
+SIZE (postgresql/postgresql-test-8.1.5.tar.bz2) = 947271
+MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
+SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
+SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
 MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
 SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
 SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
diff --git 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
index da57f46e3552..7c2831c41be0 100644
--- 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,5 +1,5 @@
---- src/backend/utils/misc/postgresql.conf.sample~	Tue Nov  8 00:45:49 2005
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  8 00:47:16 2005
+--- src/backend/utils/misc/postgresql.conf.sample.orig	Sun May 21 22:11:02 2006
++++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  7 17:23:50 2006
 @@ -206,6 +206,7 @@
  
  # - Where to Log -
@@ -16,3 +16,12 @@
  #silent_mode = off			# DO NOT USE without syslog or 
  					# redirect_stderr
  
+@@ -339,6 +341,8 @@
+ #---------------------------------------------------------------------------
+ # AUTOVACUUM PARAMETERS
+ #---------------------------------------------------------------------------
++
++autovacuum = on
+ 
+ #autovacuum = off			# enable autovacuum subprocess?
+ #autovacuum_naptime = 60		# time between autovacuum runs, in secs
diff --git a/databases/postgresql81-server/pkg-message-client b/databases/postgresql81-server/files/pkg-message-client.in
index 722d50cb4244..722d50cb4244 100644
--- a/databases/postgresql81-server/pkg-message-client
+++ b/databases/postgresql81-server/files/pkg-message-client.in
diff --git a/databases/postgresql81-server/pkg-message-contrib b/databases/postgresql81-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql81-server/pkg-message-contrib
+++ b/databases/postgresql81-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql81-server/pkg-message-plperl b/databases/postgresql81-server/files/pkg-message-plperl.in
index 5d0c83920563..5d0c83920563 100644
--- a/databases/postgresql81-server/pkg-message-plperl
+++ b/databases/postgresql81-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql81-server/pkg-message-plpython b/databases/postgresql81-server/files/pkg-message-plpython.in
index c413582b6295..c413582b6295 100644
--- a/databases/postgresql81-server/pkg-message-plpython
+++ b/databases/postgresql81-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql81-server/pkg-message-pltcl b/databases/postgresql81-server/files/pkg-message-pltcl.in
index 0902b858de0b..0902b858de0b 100644
--- a/databases/postgresql81-server/pkg-message-pltcl
+++ b/databases/postgresql81-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql81-server/pkg-message-server b/databases/postgresql81-server/files/pkg-message-server.in
index ad1e6d1e82b9..d22a731f40d8 100644
--- a/databases/postgresql81-server/pkg-message-server
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -5,10 +5,13 @@ 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, ${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.
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perfom vacuum on all
+databases nightly. Per default, it perfoms `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~pgsql/data/postgresql.conf.
 
 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
@@ -24,22 +27,34 @@ postgresql.conf also needed, of course):
   options         SEMMNU=120
 
 If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script /usr/local/share/postgresql/odbc.sql
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
+If you need to store any characters besides strict ASCII in your
+database, you will want to set a character set, and possibly a
+collation locale, before initializing the database. Add something
+similar to this to /etc/login.conf:
+---
+postgres:\
+	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
 ======================================================================
 
 To initialize the database, run
 
-  /usr/local/etc/rc.d/010.pgsql.sh initdb
+  %%PREFIX%%/etc/rc.d/postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  /usr/local/etc/rc.d/010.pgsql.sh start
+  %%PREFIX%%/etc/rc.d/postgresql start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
 
-NB. FreeBSD's PostgreSQL port now by default logs to syslog
+NB. FreeBSD's PostgreSQL port logs to syslog by default
     See ~pgsql/data/postgresql.conf for more info
 
 ======================================================================
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/postgresql.in
index 3456ed3d7282..3456ed3d7282 100644
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/postgresql.in
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 9e2451b51f86..db7177d31302 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -1,7 +1,6 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/010.pgsql.sh
 lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so