4 files changed, 56 insertions, 9 deletions

diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 86c82e2a55e4..131229431445 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.b1.2003.08.26
+PORTVERSION?=	7.4.b3.2003.09.30
 CATEGORIES?=	databases
 MASTER_SITES=	http://freebsd.sean.chittenden.org/ports/ \
 		http://people.freebsd.org/~seanc/ports/
+PATCH_SITES=	http://people.FreeBSD.org/~seanc/patches/pgsql/
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	postgresql
 
@@ -53,6 +54,17 @@ PLIST_SUB+=	GETTEXT="@comment "
 CFLAGS+= -O3 -funroll-loops
 .endif
 
+.if defined(WITH_PGBLOCKSIZE)
+.if (${WITH_PGBLOCKSIZE} == "16K")
+PATCHFILES+=	"patch-pgblocksize-16K"
+.elif (${WITH_PGBLOCKSIZE} == "32K")
+PATCHFILES+=	"patch-pgblocksize-32K"
+.elif (${WITH_PGBLOCKSIZE} == "65K")
+#	This block size doesn't work, for use by developers only!!!
+PATCHFILES+=	"patch-pgblocksize-65K"
+.endif
+.endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 INSTALL_TARGET=	install
@@ -106,18 +118,22 @@ pre-everything::
 	@${ECHO} ""
 	@${ECHO} "${PORTNAME} has several tunables that can be used to configure PostgreSQL:"
 	@${ECHO} ""
-	@${ECHO} "	WITHOUT_GNUGETOPT	Don't install GNU getopt (will"
-	@${ECHO} "				still be used if already installed)"
+	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
+	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
+	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
+	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
+	@${ECHO} "	WITH_PGBLOCKSIZE	It's possible to change the blocksize to \"16K\""
+	@${ECHO} "				or \"32K\" (defaults to 8K and different"
+	@${ECHO} "				block sizes require a dump, initdb, reload!)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
+	@${ECHO} "	WITHOUT_GNUGETOPT	Don't install GNU getopt (will"
+	@${ECHO} "				still be used if already installed)"
+	@${ECHO} "	WITHOUT_PGCRYPTO	Builds without pgcrypto support"
 	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
 	@${ECHO} "				PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
-	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
-	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
-	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
-	@${ECHO} "	WITHOUT_PGCRYPTO	Builds without pgcrypto support"
-	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
+	@${ECHO} ""
 	@${ECHO} ""
 .if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5)
 	@${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive."
diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo
index 690e5afd165a..dd473522b7b3 100644
--- a/databases/postgresql-devel/distinfo
+++ b/databases/postgresql-devel/distinfo
@@ -1 +1,4 @@
-MD5 (postgresql/postgresql-7.4.b1.2003.08.26.tar.bz2) = 013ad1f2ce2e032137552fb30264be8d
+MD5 (postgresql/postgresql-7.4.b3.2003.09.30.tar.bz2) = d4bbe0f4239b4f72e1de12bb222b73e8
+MD5 (postgresql/patch-pgblocksize-16K) = 2ac9dac033302e9ce15816db0e346d55
+MD5 (postgresql/patch-pgblocksize-32K) = 0910cbfbecbb25e2bd23ebe50eb29287
+MD5 (postgresql/patch-pgblocksize-65K) = 0e197b76e262bb5efe1ebf0f5c0a80ee
diff --git a/databases/postgresql-devel/pkg-message b/databases/postgresql-devel/pkg-message
index f3a38abc077a..e839fed675cd 100644
--- a/databases/postgresql-devel/pkg-message
+++ b/databases/postgresql-devel/pkg-message
@@ -30,3 +30,18 @@ You can then start PostgreSQL by running:
 For postmaster settings, see ~pgsql/data/postgresql.conf
 For more tips, read ~pgsql/post-install-notes
 ======================================================================
+
+	* DEFAULT BLOCK SIZE CONFIGURABLE *
+
+Starting with 7.4, PostgreSQL's block size for the -devel port can be
+changed from the default 8K blocks to either 16K or 32K blocks by
+setting WITH_PGBLOCKSIZE to either "16K" or "32K".  Changing block
+sizes has uncertain performance implications and can result in faster
+operation, in other cases slower.  Benchmarking and testing your
+installation is *highly recommended* before using these values in any
+form of production!  When changing block sizes, it is necesary to
+dump, initdb, and reload data when changing block sizes.  Be careful
+when switching from databases/postgresql-devel and
+databases/postgresql7 or from databases/postgresql-devel -> src
+tarball builds that have different block sizes!
+======================================================================
diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist
index 833aaadafecd..aee048084434 100644
--- a/databases/postgresql-devel/pkg-plist
+++ b/databases/postgresql-devel/pkg-plist
@@ -338,6 +338,7 @@ include/postgresql/server/utils/timestamp.h
 include/postgresql/server/utils/tqual.h
 include/postgresql/server/utils/tuplesort.h
 include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/pg_config.h
 include/postgresql/server/pg_config_os.h
@@ -447,6 +448,7 @@ lib/libecpg_compat.so
 %%SERVER%%share/postgresql/postgresql.conf.sample
 %%PGCRYPTO%%share/doc/postgresql/contrib/README.pgcrypto
 @unexec rmdir %D/share/doc/postgresql/contrib 2> /dev/null || true
+@unexec rm -f %D/share/doc/postgresql/* 2>/dev/null || true
 @unexec rmdir %D/share/doc/postgresql 2> /dev/null || true
 %%PGCRYPTO%%share/postgresql/contrib/pgcrypto.sql
 @unexec rmdir %D/share/postgresql/contrib 2> /dev/null || true
@@ -470,6 +472,7 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.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
@@ -478,6 +481,14 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
@@ -493,6 +504,7 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -502,6 +514,7 @@ share/postgresql/post-install-notes
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo