Update PostgreSQL to latest versions: 8.1.5, 8.0.9, 7.4.14 and 7.3.16.

Release notes:
8.1.5  http://www.postgresql.org/docs/8.1/static/release.html#RELEASE-8-1-5
8.0.9  http://www.postgresql.org/docs/8.0/static/release.html#RELEASE-8-0-9
7.4.14 http://www.postgresql.org/docs/7.4/static/release.html#RELEASE-7-4-14
7.3.16 http://www.postgresql.org/docs/7.3/static/release.html#RELEASE-7-3-16

Change name of the rc script from '010.pgsql.sh' to 'postgresql'

Add optional hierachy patch added for 7.4 and 8.1 ports.

Chase heimdal libs update [reported by several]

For 8.1+ the port enables autovacuum in ~pgsql/postgresql.conf when
running initdb

Cleanup the ports, moving pkg-message-* to files/pkg-message-*.in and
files/pgsql.sh.tmpl to files/postgresql.in. [ports/97767]

PR: ports/97767, submitted by delphij@FreeBSD.org

10 files changed, 52 insertions, 47 deletions

diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index d2d2961ce1c2..a4dc54058ea0 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.8
-PORTREVISION?=	1
+PORTVERSION?=	8.0.9
+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]* \
+CONFLICTS?=	${PORTNAME}-client-7.* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[1-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[1-9]*
 
@@ -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)
@@ -103,13 +102,13 @@ OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if defined(SERVER_ONLY) && defined(WITH_HIER)
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
 PATCH_SITES+=	http://gppl.moonbone.ru/:hier801055
 PATCHFILES+=	hier-Pg8.0.3-0.5.5.diff.gz:hier801055
 USE_BISON=	yes
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_ICU)
+.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
@@ -117,6 +116,10 @@ PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-808-icu-xx-2006-09-25.diff.gz:icu
 .  endif
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 PATCH_DIST_STRIP=-p1
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
@@ -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
@@ -264,11 +267,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
 
@@ -287,20 +288,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/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 7543c441ea65..792006ae1de0 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.0.8.tar.bz2) = 4d84ff56ae9669b250060f9e2e36f788
-SHA256 (postgresql/postgresql-base-8.0.8.tar.bz2) = 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183
-SIZE (postgresql/postgresql-base-8.0.8.tar.bz2) = 7823046
-MD5 (postgresql/postgresql-docs-8.0.8.tar.bz2) = ba6fbc2dff64d385f86344daeb51cab1
-SHA256 (postgresql/postgresql-docs-8.0.8.tar.bz2) = 60a93ee5b2b80f517696328d85f4db24791cb1099d89a0adc375ee740201dc54
-SIZE (postgresql/postgresql-docs-8.0.8.tar.bz2) = 2260219
-MD5 (postgresql/postgresql-opt-8.0.8.tar.bz2) = e129cb889239da6c800a21be00a35da7
-SHA256 (postgresql/postgresql-opt-8.0.8.tar.bz2) = 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926
-SIZE (postgresql/postgresql-opt-8.0.8.tar.bz2) = 134600
-MD5 (postgresql/postgresql-test-8.0.8.tar.bz2) = d3ade4260a468aa0e5d3a373b9acf52e
-SHA256 (postgresql/postgresql-test-8.0.8.tar.bz2) = 804ee10063a6586d95418109aa3085dad0a1a2d00a0632d3c40629b840107a8f
-SIZE (postgresql/postgresql-test-8.0.8.tar.bz2) = 931549
+MD5 (postgresql/postgresql-base-8.0.9.tar.bz2) = f9a044227ad6dc9c937d4853100733cb
+SHA256 (postgresql/postgresql-base-8.0.9.tar.bz2) = 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417
+SIZE (postgresql/postgresql-base-8.0.9.tar.bz2) = 7824961
+MD5 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 363e009214bfde8235d900da09c7c675
+SHA256 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
+SIZE (postgresql/postgresql-opt-8.0.9.tar.bz2) = 134706
+MD5 (postgresql/postgresql-docs-8.0.9.tar.bz2) = 0529eb29ac2c248a3b244b7bfc007456
+SHA256 (postgresql/postgresql-docs-8.0.9.tar.bz2) = b55d4a77c0c3b0f42c7233c08112b884e1463157160007efd70a63806ede632b
+SIZE (postgresql/postgresql-docs-8.0.9.tar.bz2) = 2262698
+MD5 (postgresql/postgresql-test-8.0.9.tar.bz2) = 8992a878fe5aa32e3da7fb84270614db
+SHA256 (postgresql/postgresql-test-8.0.9.tar.bz2) = f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea
+SIZE (postgresql/postgresql-test-8.0.9.tar.bz2) = 931363
 MD5 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 9fa75cd7b3f1cb913d2e6d310582a4bc
 SHA256 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = f3a1849f2d527759ef721502cb445a435e072cc9be820c2e489c9e4a71c7adbe
 SIZE (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 30555
diff --git a/databases/postgresql80-server/pkg-message-client b/databases/postgresql80-server/files/pkg-message-client.in
index 722d50cb4244..722d50cb4244 100644
--- a/databases/postgresql80-server/pkg-message-client
+++ b/databases/postgresql80-server/files/pkg-message-client.in
diff --git a/databases/postgresql80-server/pkg-message-contrib b/databases/postgresql80-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql80-server/pkg-message-contrib
+++ b/databases/postgresql80-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/postgresql80-server/pkg-message-plperl b/databases/postgresql80-server/files/pkg-message-plperl.in
index 5d0c83920563..5d0c83920563 100644
--- a/databases/postgresql80-server/pkg-message-plperl
+++ b/databases/postgresql80-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql80-server/pkg-message-plpython b/databases/postgresql80-server/files/pkg-message-plpython.in
index c413582b6295..c413582b6295 100644
--- a/databases/postgresql80-server/pkg-message-plpython
+++ b/databases/postgresql80-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql80-server/pkg-message-pltcl b/databases/postgresql80-server/files/pkg-message-pltcl.in
index 0902b858de0b..0902b858de0b 100644
--- a/databases/postgresql80-server/pkg-message-pltcl
+++ b/databases/postgresql80-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql80-server/pkg-message-server b/databases/postgresql80-server/files/pkg-message-server.in
index ad1e6d1e82b9..88c35ccff457 100644
--- a/databases/postgresql80-server/pkg-message-server
+++ b/databases/postgresql80-server/files/pkg-message-server.in
@@ -6,7 +6,7 @@ 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
+periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you
 may find useful. Per default, it perfoms vacuum on all databases
 nightly. See the script for instructions.
 
@@ -24,18 +24,30 @@ 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
 
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/postgresql.in
index d3014f580dc0..d3014f580dc0 100644
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/postgresql.in
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 654010402baa..b96587c84343 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-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