4 files changed, 77 insertions, 86 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 1cd367508fbf..7e10dd3472d1 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.1
+PORTVERSION?=	7.3.2
 CATEGORIES?=	databases
 MASTER_SITES=	ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \
 		ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \
@@ -24,9 +24,7 @@ MASTER_SITES=	ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \
 		ftp://ftp.postgresql.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 DISTFILES=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-test-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@pingpong.net
 
@@ -65,17 +63,10 @@ PLIST_SUB+=	GETTEXT="@comment "
 CFLAGS+= -O3 -funroll-loops
 .endif
 
-.if defined(WITH_DEBUG) && defined(WITH_STRIPBIN)
-	@${ECHO} "WITH_DEBUG and WITH_STRIPBIN are mutually exclusive tunables."
-	@${ECHO} "Please choose one or the other."
-	@exit ${FALSE}
-.endif
-
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if defined(WITH_STRIPBIN)
+INSTALL_TARGET=	install
+.else
 INSTALL_TARGET=	install-strip
 .endif
 
@@ -89,35 +80,18 @@ PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
 .else
-SERVERBINARIES+=	postgres
 PLIST_SUB+=	SERVER=""
-INSTALL_TARGET=	install install-all-headers
-.endif
-
-.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
-	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
+INSTALL_TARGET+= install-all-headers
+MAKEFILE=	GNUmakefile
 .endif
 
 .if defined(WITH_MIT_KRB5)
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
-.if !exists(${KRB5CONFIG})
-	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
-	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
-	@exit 1
-.endif
 WITH_KRB5=	yes
 .endif
 
 .if defined(WITH_HEIMDAL_KRB5)
 KRB5CONF=	/usr/bin/krb5-config
-.if !exists(${KRB5CONFIG})
-	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
-	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
-	@${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)."
-	@exit 1
-.endif
 LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
 WITH_KRB5=	yes
 .endif
@@ -131,6 +105,10 @@ LDFLAGS+=	`${KRB5CONF} --libs krb5`
 CFLAGS+= -O3 -funroll-loops
 .endif
 
+.if defined(WITH_TESTS)
+DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
+.endif
+
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
 		droplang.1 dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 \
 		pg_config.1 pg_controldata.1 pg_ctl.1 pg_dump.1 pg_dumpall.1 \
@@ -175,8 +153,25 @@ pre-everything::
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
-	@${ECHO} "	WITH_STRIPBIN		Installs stripped binaries"
+	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
+	@${ECHO} "				building the module"
 	@${ECHO} ""
+.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
+	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
+	@${ECHO} "Please choose one or the other."
+	@exit 1
+.endif
+.if defined(WITH_MIT_KRB5) && !exists(${KRB5CONF})
+	@${ECHO} "Unable to find krb5-config in your local base, please verify that"
+	@${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable."
+	@exit 1
+.endif
+.if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF})
+	@${ECHO} "Unable to find krb5-config in the base system.  Undefine"
+	@${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf"
+	@${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)."
+	@exit 1
+.endif
 
 .if defined(WITHOUT_SERVER)
 do-install:
@@ -196,14 +191,7 @@ post-install:
 	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
-.if !defined(DEBUG_FLAGS)
-.for file in ecpg pg_dump pg_id pg_restore psql ${SERVERBINARIES}
-	@ strip ${PREFIX}/bin/${file}
-.endfor
-.endif
 .if !defined(WITHOUT_SERVER)
-# install shell defaults for pgsql user
-	@ strip ${PREFIX}/bin/postgres
 .for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
@@ -224,5 +212,16 @@ post-install:
 			${PREFIX}/share/postgresql
 .endif
 
+.if defined(WITH_TESTS)
+check:
+	@if [ `id -u` != 0 ] ; then \
+	  ${ECHO} "Running postgresql regressions tests" ;\
+	  cd ${WRKSRC}; ${GMAKE} check ;\
+	 else \
+	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
+	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
+	 fi
+.endif
+
 .include <bsd.port.mk>
 .endif
diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo
index b83a685dc1c3..934a97ecd98a 100644
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.1.tar.gz) = d31f4be7ada55e4914d1a9134e4441c7
-MD5 (postgresql/postgresql-opt-7.3.1.tar.gz) = 65e3db9df55b71b504a2f385da231de8
-MD5 (postgresql/postgresql-docs-7.3.1.tar.gz) = 42384cb2ded505243878231acb779bd6
-MD5 (postgresql/postgresql-test-7.3.1.tar.gz) = 8f231ca3470f3be6b33e1def77dcf7fc
+MD5 (postgresql/postgresql-base-7.3.2.tar.gz) = 2cd99c2d455c653fdfe74f5dd658d15c
+MD5 (postgresql/postgresql-opt-7.3.2.tar.gz) = c54a5b0be96b60259bd37f6a5b60abb9
+MD5 (postgresql/postgresql-test-7.3.2.tar.gz) = 9818eb4c50a2fe9057c7df5ae270972c
+MD5 (postgresql/postgresql-docs-7.3.2.tar.gz) = e91131aeed6919a00ab231db2298bd0b
diff --git a/databases/postgresql-devel-server/files/patch-src::include::port::freebsd.h b/databases/postgresql-devel-server/files/patch-src::include::port::freebsd.h
deleted file mode 100644
index 01891af61d0e..000000000000
--- a/databases/postgresql-devel-server/files/patch-src::include::port::freebsd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/port/freebsd.h.orig	Wed Jan  1 16:43:31 2003
-+++ src/include/port/freebsd.h	Wed Jan  1 16:43:39 2003
-@@ -7,6 +7,7 @@
- #if defined(__sparc__)
- #define NEED_SPARC_TAS_ASM
- #define HAS_TEST_AND_SET
-+typedef unsigned char slock_t;
- #endif
- 
- #if defined(__alpha__)
diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist
index 45d3fa08c02e..effd8e4f2f71 100644
--- a/databases/postgresql-devel-server/pkg-plist
+++ b/databases/postgresql-devel-server/pkg-plist
@@ -85,52 +85,54 @@ lib/libpq.so.3
 %%SERVER%%share/postgresql/conversion_create.sql
 share/postgresql/post-install-notes
 @unexec rmdir %D/share/postgresql 2>/dev/null || true
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
-%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
-%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
-%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
-%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
 %%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
 %%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
 %%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true