In order to address a potential security hole recently identified with

the "LOAD" option, the PostgreSQL Global Development Group is
announcing the release of new versions of PostgreSQL.

Update to 7.3.9, 7.4.7 & 8.0.1.

Take the opportunity to reset PORTREVISION of slave ports.

Back out name change of startup script. The new script uses rc.subr(8),
and as such also uses rcorder(8). But, rcorder does not exist in FreeBSD
4.x. Hence rename the script it back to the top of the directory
list. [1]

The periodic script should of course be executable. [2]

[1] Noted by Niels Chr. Bank-Pedersen <ncbp at bank-pedersen dot dk>
[2] Noted by Fritz Heinrichmeyer <fritz.heinrichmeyer at fernuni-hagen dot de>

4 files changed, 18 insertions, 13 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 0ba712cd81fa..ece8e1062e8d 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.6
+PORTVERSION?=	7.4.7
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -48,7 +48,7 @@ PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
 USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/postgresql.sh
+RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -109,7 +109,7 @@ CFLAGS+=	-O3 -funroll-loops
 .  endif
 
 .  if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+CONFIGURE_ARGS+=--enable-debug
 INSTALL_TARGET=	install
 .  else
 INSTALL_TARGET=	install-strip
@@ -245,7 +245,7 @@ do-install:
 	${CHOWN} root:pgsql ${RCSCRIPT} ;\
 	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_DATA} ${FILESDIR}/502.pgsql \
+	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 	@ if [ -r ${PKGMESSAGE} ]; then \
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 5e767ee944da..0a40b21f8815 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.6.tar.bz2) = 650757097b7cff36ea6052ddb3a78987
-SIZE (postgresql/postgresql-base-7.4.6.tar.bz2) = 6534961
-MD5 (postgresql/postgresql-docs-7.4.6.tar.bz2) = 1a0567a4ac34dd1f02d5ba3e70e611c1
-SIZE (postgresql/postgresql-docs-7.4.6.tar.bz2) = 2412858
-MD5 (postgresql/postgresql-opt-7.4.6.tar.bz2) = f70f0c3f4b07fff02273a1ed9f8f55d6
-SIZE (postgresql/postgresql-opt-7.4.6.tar.bz2) = 331832
-MD5 (postgresql/postgresql-test-7.4.6.tar.bz2) = 8efd2d6dc0bdace536f473054bb5be67
-SIZE (postgresql/postgresql-test-7.4.6.tar.bz2) = 942380
+MD5 (postgresql/postgresql-base-7.4.7.tar.bz2) = 70c07688c89f5fc7dbd9b8caee123582
+SIZE (postgresql/postgresql-base-7.4.7.tar.bz2) = 6582981
+MD5 (postgresql/postgresql-docs-7.4.7.tar.bz2) = 4fed2346dd0ec798554c055afaa84a89
+SIZE (postgresql/postgresql-docs-7.4.7.tar.bz2) = 2417733
+MD5 (postgresql/postgresql-opt-7.4.7.tar.bz2) = b72409a2d57c73bf6347e0d19b2cfb6e
+SIZE (postgresql/postgresql-opt-7.4.7.tar.bz2) = 332158
+MD5 (postgresql/postgresql-test-7.4.7.tar.bz2) = f02ba2d7a954e7b083fdeba798709963
+SIZE (postgresql/postgresql-test-7.4.7.tar.bz2) = 944002
diff --git a/databases/postgresql74-server/pkg-plist-client b/databases/postgresql74-server/pkg-plist-client
index 322cd20f5aeb..bdce037056e9 100644
--- a/databases/postgresql74-server/pkg-plist-client
+++ b/databases/postgresql74-server/pkg-plist-client
@@ -475,6 +475,11 @@ share/postgresql/pg_service.conf.sample
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
diff --git a/databases/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server
index 4bb3fb0c8702..9da9fdf0c62c 100644
--- a/databases/postgresql74-server/pkg-plist-server
+++ b/databases/postgresql74-server/pkg-plist-server
@@ -1,7 +1,7 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/postgresql.sh
+etc/rc.d/010.pgsql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so