11 files changed, 112 insertions, 579 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index b6de1b047a54..c1825160da27 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.2
+PORTVERSION?=	7.2.1
 CATEGORIES?=	databases
 MASTER_SITES=	ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+		ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
+		ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.de.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.chg.ru/pub/databases/postgresql/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \
@@ -39,8 +41,6 @@ MD5_FILE=	${.CURDIR}/../postgresql7/distinfo
 ## The rest of this file is for normal base installation
 INSTALLS_SHLIB=	YES
 
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--enable-locale --enable-syslog --with-CXX \
 		--docdir=${PREFIX}/share/doc --with-libdir=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include
@@ -64,13 +64,6 @@ PLIST_SUB+=	GETTEXT=""
 PLIST_SUB+=	GETTEXT="@comment "
 .endif
 
-.if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
-PLIST_SUB+=	SERVER="@comment "
-.else
-PLIST_SUB+=	SERVER=""
-.endif
-
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
@@ -113,6 +106,13 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+.if defined(WITHOUT_SERVER)
+PKGMESSAGE=	${PKGDIR}/pkg-message.client
+PLIST_SUB+=	SERVER="@comment "
+.else
+PLIST_SUB+=	SERVER=""
+.endif
+
 .if defined(WITHOUT_MULTIBYTE)
 PLIST_SUB+=	MULTIBYTE="@comment "
 .else
@@ -138,14 +138,15 @@ post-install:
 		${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_passwd pg_restore postgres psql
-	@ strip ${PREFIX}/${PG_PREFIX}bin/${file}
+.for file in ecpg pg_dump pg_id pg_passwd pg_restore psql
+	@ 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; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
+	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
 		< ${FILESDIR}/dot.$i.in \
 		> ${PREFIX}/share/postgresql/dot.$i.dist; \
 	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
@@ -164,6 +165,16 @@ post-install:
 			${WRKSRC}/src/interfaces/odbc/odbc.sql \
 			${WRKSRC}/src/interfaces/odbc/odbc-drop.sql \
 			${PREFIX}/share/postgresql
+.else
+do-install:
+	@ cd ${WRKSRC}; \
+	${GMAKE} -C src/bin install ;\
+	${GMAKE} -C src/include install ;\
+	${GMAKE} -C src/interfaces install
+.if !defined(NOPORTDOCS)
+	@ cd ${WRKSRC}; \
+	${GMAKE} -C doc install
+.endif
 .endif
 
 post-clean:
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 1629a384c715..0aad32ada824 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-base-7.2.tar.gz) = e391631127e88dcd665b0f7aa09c764f
-MD5 (postgresql/postgresql-opt-7.2.tar.gz) = c3f5fa9045fc0cdebec64869e92bad59
-MD5 (postgresql/postgresql-docs-7.2.tar.gz) = dc229ee6a768814e0e2497ab002b2c9b
+MD5 (postgresql/postgresql-base-7.2.1.tar.gz) = e294084800e9470d582b57e3d38ec247
+MD5 (postgresql/postgresql-opt-7.2.1.tar.gz) = 5844486d9f3d449e9d1d02666315059f
+MD5 (postgresql/postgresql-docs-7.2.1.tar.gz) = eff48d40b0c1bde1854c77c0b2e1b565
diff --git a/databases/postgresql74-server/files/502.pgsql b/databases/postgresql74-server/files/502.pgsql
index 160de10370e0..32d473826f40 100644
--- a/databases/postgresql74-server/files/502.pgsql
+++ b/databases/postgresql74-server/files/502.pgsql
@@ -11,6 +11,20 @@
 # In public domain, do what you like with it,
 # and use it at your own risk... :)
 #
+############################
+
+# arguments to pg_dump
+PGDUMP_ARGS="-b -F c"
+
+# the directory where the backups will reside
+# ${HOME} is pgsql's home directory
+PGBACKUPDIR=${HOME}/backups
+
+# some data is amazingly more compressed with bzip2, esp. blobs, it seems
+# if your're short on diskspace, give it a try and set USEBZIP=yes
+USEBZIP=no
+
+############################
 
 DIR=`dirname $0`
 progname=`basename $0`
@@ -19,58 +33,56 @@ PRG=`cd $DIR; pwd `/$progname
 # Run as user pgsql
 if [ `id -un` != pgsql ]; then
     su -l pgsql -c ${PRG}
-    exit 0
+    exit $?
+fi
+
+if [ X${USEBZIP} = Xyes ]; then
+    BZIP=`which bzip2 || echo true`
+else
+    BZIP=true
 fi
 
 # PGBACKUPDIR must be writeable by user pgsql
 # ~pgsql is just that under normal circumstances,
 # but this might not be where you want the backups...
-PGBACKUPDIR=${HOME}/backups
 if [ ! -d ${PGBACKUPDIR} ] ; then 
     echo Creating ${PGBACKUPDIR}
     mkdir ${PGBACKUPDIR}
     chmod 700 ${PGBACKUPDIR}
 fi
 
-PGLOGDIR=/var/log/pgsql
-PGDIR=`cd ${PGDATA}/../ && pwd`
-
-GZIP=/usr/bin/bzip2
-GZIPEXT=bz2
-
 echo
-echo "PostgreSQL maintenance..."
+echo "PostgreSQL maintenance"
 
 # Protect the data
 umask 077
-
-dbname=`${PGBINDIR}/psql -q -t -A -d template1 -c "SELECT datname FROM pg_database WHERE datname != 'template0'"`
-
-rc=0
-
-echo -n "ALL"
-PGERRALL=/tmp/PGERRALL.$$
-
-${PGBINDIR}/pg_dumpall 2> $PGERRALL | ${GZIP} > ${PGBACKUPDIR}/pgdumpall_`date "+%Y%m%d"`.${GZIPEXT}
-
-for i in ${dbname}; do
-    echo -n " $i"
-    ${PGBINDIR}/pg_dump $i 2>> $PGERRALL | ${GZIP} > ${PGBACKUPDIR}/pgdump_${i}_`date "+%Y%m%d"`.${GZIPEXT}
-    ${PGBINDIR}/vacuumdb --quiet  --analyze $i || rc=3
+dbnames=`psql -q -t -A -d template1 -c "SELECT datname FROM pg_database WHERE datname != 'template0'"`
+rc=$?
+for db in ${dbnames}; do
+    echo -n " $db"
+    file=${PGBACKUPDIR}/pgdump_${db}_`date "+%Y%m%d"`
+    pg_dump ${PGDUMP_ARGS} -d $db -f ${file}
+    [ $? -gt 0 ] && rc=3
+    ${BZIP} ${file}
 done
 
-if [ -s "${PGERRALL}" ]
-then
-    echo
-    echo 'Something went wrong!'
+if [ $rc -gt 0 ]; then
     echo
-    echo `cat ${PGERRALL}`
-    rc=3
+    echo "Errors were reported during backup."
 fi
-rm ${PGERRALL}
 
 echo
+echo "vacuuming..."
+vacuumdb -a -z -q
+if [ $? -gt 0 ]
+then
+    echo
+    echo "Errors were reported vacuum."
+    rc=3
+fi
 
+# cleaning up old data
 find ${PGBACKUPDIR} \( -name 'pgdump_*'.${GZIPEXT} -o -name 'pgdumpall_*'.${GZIPEXT} \) \
 		    -a -atime +7 -delete
+
 exit $rc
diff --git a/databases/postgresql74-server/files/dot.cshrc.in b/databases/postgresql74-server/files/dot.cshrc.in
index a326041bff7b..724212c70b23 100644
--- a/databases/postgresql74-server/files/dot.cshrc.in
+++ b/databases/postgresql74-server/files/dot.cshrc.in
@@ -1,6 +1,6 @@
-set path = ( %%PREFIX%%/%%PG_PREFIX%%bin $path )
+set path = ( %%PREFIX%%/bin $path )
 
-setenv PGLIB %%PREFIX%%/%%PG_PREFIX%%lib
+setenv PGLIB %%PREFIX%%/lib
 
 # note: PGDATA can be overridden by the -D startup option
 setenv PGDATA $HOME/data
diff --git a/databases/postgresql74-server/files/dot.profile.in b/databases/postgresql74-server/files/dot.profile.in
index 4aca6aadd19a..96344d533921 100644
--- a/databases/postgresql74-server/files/dot.profile.in
+++ b/databases/postgresql74-server/files/dot.profile.in
@@ -1,7 +1,7 @@
 # both new and old layout's paths, but new path first...
-PATH=%%PREFIX%%/%%PG_PREFIX%%bin:${PATH}
+PATH=%%PREFIX%%/bin:${PATH}
 
-PGLIB=%%PREFIX%%/%%PG_PREFIX%%lib
+PGLIB=%%PREFIX%%/lib
 
 # note: PGDATA can be overridden by the -D startup option
 PGDATA=${HOME}/data
diff --git a/databases/postgresql74-server/files/patch-src::backend::utils::init::findbe.c b/databases/postgresql74-server/files/patch-src::backend::utils::init::findbe.c
deleted file mode 100644
index e453be9d93da..000000000000
--- a/databases/postgresql74-server/files/patch-src::backend::utils::init::findbe.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/backend/utils/init/findbe.c.orig	Tue Feb 19 16:03:38 2002
-+++ src/backend/utils/init/findbe.c	Tue Feb 19 16:03:45 2002
-@@ -13,9 +13,9 @@
-  */
- #include "postgres.h"
- 
-+#include <sys/types.h>
- #include <grp.h>
- #include <pwd.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- 
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index cd78771219ed..d67d9b642f1b 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-server/files/pgsql.sh.tmpl
@@ -4,28 +4,32 @@
 #
 # For postmaster startup options, edit $PGDATA/postgresql.conf
 
-PGBIN=%%PREFIX%%/%%PG_PREFIX%%bin
+PREFIX=%%PREFIX%%
+PGBIN=${PREFIX}/bin
 
 case $1 in
 start)
-    [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib
+    [ -d ${PREFIX}/lib ] && /sbin/ldconfig -m ${PREFIX}/lib
+    touch /var/log/pgsql
+    chmod 600 /var/log/pgsql
+    chown pgsql:pgsql /var/log/pgsql
     [ -x ${PGBIN}/pg_ctl ] && {
 	su -l pgsql -c \
-	    '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog'
+	    '[ -d ${PGDATA} ] && exec %%PREFIX%%/bin/pg_ctl start -s -w -l /var/log/pgsql'
 	echo -n ' pgsql'
     }
     ;;
 
 stop)
     [ -x ${PGBIN}/pg_ctl ] && {
-	su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl stop -s -m fast'
+	su -l pgsql -c 'exec %%PREFIX%%/bin/pg_ctl stop -s -m fast'
 	echo -n ' pgsql'
     }
     ;;
 
 status)
     [ -x ${PGBIN}/pg_ctl ] && {
-	exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl status'
+	exec su -l pgsql -c 'exec %%PREFIX%%/bin/pg_ctl status'
     }
     ;;
 
diff --git a/databases/postgresql74-server/files/post-install-notes b/databases/postgresql74-server/files/post-install-notes
index 5480550a1ed4..55816362579b 100644
--- a/databases/postgresql74-server/files/post-install-notes
+++ b/databases/postgresql74-server/files/post-install-notes
@@ -24,12 +24,17 @@ postgresql-plperl, postgresql-pltcl & postgresql-plruby
 
 etc etc...
 
+Note that many files have moved around compared to previous versions
+of PostgreSQL. For example, plpgsql.so and all other language modules
+are now in /usr/local/lib/postgresql.
+
 If you have many tables and many clients running, consider raising
-kern.maxfiles using sysctl(8).
+kern.maxfiles using sysctl(8), or reconfigure your kernel
+appropriately.
 
 You should vacuum and backup your database regularly. There is a
 periodic script, /usr/local/share/postgresql/502.pgsql, that you may
-use.
+find useful.
 
 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index 3074f550e5bb..5f88a3e82c56 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -1,5 +1,5 @@
-bin/postmaster
-bin/postgres
+%%SERVER%%bin/postmaster
+%%SERVER%%bin/postgres
 bin/ecpg
 bin/initdb
 bin/initlocation
@@ -61,16 +61,16 @@ lib/libpgeasy.so.2
 lib/libpq++.so
 lib/libpq++.a
 lib/libpq++.so.4
-lib/postgresql/plpgsql.so
+%%SERVER%%lib/postgresql/plpgsql.so
 @unexec rmdir %D/lib/postgresql 2>/dev/null || true
 %%SERVER%%share/postgresql/502.pgsql
 %%SERVER%%share/postgresql/odbc.sql
 %%SERVER%%share/postgresql/odbc-drop.sql
-share/postgresql/postgres.bki
-share/postgresql/postgres.description
-share/postgresql/pg_hba.conf.sample
-share/postgresql/pg_ident.conf.sample
-share/postgresql/postgresql.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/pg_hba.conf.sample
+%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/postgresql.conf.sample
 share/postgresql/post-install-notes
 @unexec rmdir %D/share/postgresql 2>/dev/null || true
 %%PORTDOCS%%share/doc/postgresql/html/index.html
@@ -221,6 +221,7 @@ share/postgresql/post-install-notes
 %%PORTDOCS%%share/doc/postgresql/html/regress-evaluation.html
 %%PORTDOCS%%share/doc/postgresql/html/regress-platform.html
 %%PORTDOCS%%share/doc/postgresql/html/release.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-2.html
 %%PORTDOCS%%share/doc/postgresql/html/release-7-1-3.html
 %%PORTDOCS%%share/doc/postgresql/html/release-7-1-2.html
 %%PORTDOCS%%share/doc/postgresql/html/release-7-1-1.html
@@ -611,13 +612,12 @@ share/postgresql/post-install-notes
 %%PORTDOCS%%share/doc/postgresql/html/doc-build.html
 %%PORTDOCS%%share/doc/postgresql/html/doc-sources.html
 %%PORTDOCS%%share/doc/postgresql/html/setindex.html
-%%PORTDOCS%%share/doc/postgresql/html/ln8.html
 %%PORTDOCS%%share/doc/postgresql/html/ln25.html
 %%PORTDOCS%%share/doc/postgresql/html/ln650.html
-%%PORTDOCS%%share/doc/postgresql/html/ln13544.html
-%%PORTDOCS%%share/doc/postgresql/html/ln19341.html
-%%PORTDOCS%%share/doc/postgresql/html/ln31695.html
-%%PORTDOCS%%share/doc/postgresql/html/ln43726.html
+%%PORTDOCS%%share/doc/postgresql/html/ln13560.html
+%%PORTDOCS%%share/doc/postgresql/html/ln19374.html
+%%PORTDOCS%%share/doc/postgresql/html/ln31728.html
+%%PORTDOCS%%share/doc/postgresql/html/ln43811.html
 %%PORTDOCS%%share/doc/postgresql/html/catalogs.gif
 %%PORTDOCS%%share/doc/postgresql/html/connections.gif
 %%PORTDOCS%%share/doc/postgresql/html/stylesheet.css
diff --git a/databases/postgresql74-server/pkg-plist.doc b/databases/postgresql74-server/pkg-plist.doc
deleted file mode 100644
index c4d50ecb24f0..000000000000
--- a/databases/postgresql74-server/pkg-plist.doc
+++ /dev/null
@@ -1,494 +0,0 @@
-share/doc/postgresql/html/admin.html
-share/doc/postgresql/html/advanced.html
-share/doc/postgresql/html/altern-locations.html
-share/doc/postgresql/html/app-createdb.html
-share/doc/postgresql/html/app-createlang.html
-share/doc/postgresql/html/app-createuser.html
-share/doc/postgresql/html/app-dropdb.html
-share/doc/postgresql/html/app-droplang.html
-share/doc/postgresql/html/app-dropuser.html
-share/doc/postgresql/html/app-ecpg.html
-share/doc/postgresql/html/app-initdb.html
-share/doc/postgresql/html/app-initlocation.html
-share/doc/postgresql/html/app-ipcclean.html
-share/doc/postgresql/html/app-pg-ctl.html
-share/doc/postgresql/html/app-pg-dumpall.html
-share/doc/postgresql/html/app-pg-passwd.html
-share/doc/postgresql/html/app-pgaccess.html
-share/doc/postgresql/html/app-pgadmin.html
-share/doc/postgresql/html/app-pgconfig.html
-share/doc/postgresql/html/app-pgdump.html
-share/doc/postgresql/html/app-pgrestore.html
-share/doc/postgresql/html/app-pgtclsh.html
-share/doc/postgresql/html/app-pgtksh.html
-share/doc/postgresql/html/app-postgres.html
-share/doc/postgresql/html/app-postmaster.html
-share/doc/postgresql/html/app-psql.html
-share/doc/postgresql/html/app-vacuumdb.html
-share/doc/postgresql/html/applevel-consistency.html
-share/doc/postgresql/html/arch-pg.html
-share/doc/postgresql/html/arch.html
-share/doc/postgresql/html/arrays.html
-share/doc/postgresql/html/auth-methods.html
-share/doc/postgresql/html/backup-file.html
-share/doc/postgresql/html/backup.html
-share/doc/postgresql/html/biblio.html
-share/doc/postgresql/html/bki-commands.html
-share/doc/postgresql/html/bki-example.html
-share/doc/postgresql/html/bki.html
-share/doc/postgresql/html/bug-reporting.html
-share/doc/postgresql/html/catalog-pg-aggregate.html
-share/doc/postgresql/html/catalog-pg-attrdef.html
-share/doc/postgresql/html/catalog-pg-attribute.html
-share/doc/postgresql/html/catalog-pg-class.html
-share/doc/postgresql/html/catalog-pg-database.html
-share/doc/postgresql/html/catalog-pg-description.html
-share/doc/postgresql/html/catalog-pg-group.html
-share/doc/postgresql/html/catalog-pg-index.html
-share/doc/postgresql/html/catalog-pg-inherits.html
-share/doc/postgresql/html/catalog-pg-language.html
-share/doc/postgresql/html/catalog-pg-operator.html
-share/doc/postgresql/html/catalog-pg-proc.html
-share/doc/postgresql/html/catalog-pg-relcheck.html
-share/doc/postgresql/html/catalog-pg-shadow.html
-share/doc/postgresql/html/catalog-pg-type.html
-share/doc/postgresql/html/catalogs.html
-share/doc/postgresql/html/charset.html
-share/doc/postgresql/html/client-authentication-problems.html
-share/doc/postgresql/html/client-authentication.html
-share/doc/postgresql/html/compiler.html
-share/doc/postgresql/html/connect-estab.html
-share/doc/postgresql/html/creating-cluster.html
-share/doc/postgresql/html/cvs-tree.html
-share/doc/postgresql/html/cvs.html
-share/doc/postgresql/html/cvsup.html
-share/doc/postgresql/html/datatype-bit.html
-share/doc/postgresql/html/datatype-boolean.html
-share/doc/postgresql/html/datatype-character.html
-share/doc/postgresql/html/datatype-datetime.html
-share/doc/postgresql/html/datatype-geometric.html
-share/doc/postgresql/html/datatype-money.html
-share/doc/postgresql/html/ecpg.html
-share/doc/postgresql/html/datatype-net-types.html
-share/doc/postgresql/html/datatype.html
-share/doc/postgresql/html/datetime-appendix.html
-share/doc/postgresql/html/db-accessing.html
-share/doc/postgresql/html/db-destroy.html
-share/doc/postgresql/html/developer.html
-share/doc/postgresql/html/doc-build.html
-share/doc/postgresql/html/doc-sources.html
-share/doc/postgresql/html/doc-toolsets.html
-share/doc/postgresql/html/docguide.html
-share/doc/postgresql/html/ecpg-concept.html
-share/doc/postgresql/html/ecpg-develop.html
-share/doc/postgresql/html/ecpg-limitations.html
-share/doc/postgresql/html/ecpg-porting.html
-share/doc/postgresql/html/ecpg-use.html
-share/doc/postgresql/html/executor.html
-share/doc/postgresql/html/explicit-joins.html
-share/doc/postgresql/html/extend.html
-share/doc/postgresql/html/functions-datetime.html
-share/doc/postgresql/html/functions-aggregate.html
-share/doc/postgresql/html/functions-comparison.html
-share/doc/postgresql/html/functions-conditional.html
-share/doc/postgresql/html/functions-formatting.html
-share/doc/postgresql/html/functions-geometry.html
-share/doc/postgresql/html/functions-matching.html
-share/doc/postgresql/html/functions-math.html
-share/doc/postgresql/html/functions-misc.html
-share/doc/postgresql/html/functions-net.html
-share/doc/postgresql/html/functions-string.html
-share/doc/postgresql/html/functions.html
-share/doc/postgresql/html/geqo-intro2.html
-share/doc/postgresql/html/geqo-pg-intro.html
-share/doc/postgresql/html/geqo.html
-share/doc/postgresql/html/gist.html
-share/doc/postgresql/html/groups.html
-share/doc/postgresql/html/history.html
-share/doc/postgresql/html/index.html
-share/doc/postgresql/html/indexcost.html
-share/doc/postgresql/html/indices-functional.html
-share/doc/postgresql/html/indices-multicolumn.html
-share/doc/postgresql/html/indices-opclass.html
-share/doc/postgresql/html/indices-types.html
-share/doc/postgresql/html/indices-unique.html
-share/doc/postgresql/html/indices.html
-share/doc/postgresql/html/inherit.html
-share/doc/postgresql/html/install-getsource.html
-share/doc/postgresql/html/install-post.html
-share/doc/postgresql/html/install-procedure.html
-share/doc/postgresql/html/install-requirements.html
-share/doc/postgresql/html/install-upgrading.html
-share/doc/postgresql/html/install-win32.html
-share/doc/postgresql/html/installation.html
-share/doc/postgresql/html/jdbc-ext.html
-share/doc/postgresql/html/jdbc-lo.html
-share/doc/postgresql/html/jdbc.html
-share/doc/postgresql/html/jdbc-query.html
-share/doc/postgresql/html/jdbc-reading.html
-share/doc/postgresql/html/jdbc-thread.html
-share/doc/postgresql/html/jdbc-update.html
-share/doc/postgresql/html/jdbc-use.html
-share/doc/postgresql/html/kernel-resources.html
-share/doc/postgresql/html/keys.html
-share/doc/postgresql/html/largeobjects.html
-share/doc/postgresql/html/libpgtcl-examples.html
-share/doc/postgresql/html/libpgtcl-ref.html
-share/doc/postgresql/html/libpq-async.html
-share/doc/postgresql/html/libpq-control.html
-share/doc/postgresql/html/libpq-copy.html
-share/doc/postgresql/html/libpq-envars.html
-share/doc/postgresql/html/libpq-example.html
-share/doc/postgresql/html/libpq-exec.html
-share/doc/postgresql/html/libpq-fastpath.html
-share/doc/postgresql/html/libpq-notify.html
-share/doc/postgresql/html/libpq.html
-share/doc/postgresql/html/libpq-threading.html
-share/doc/postgresql/html/libpq-trace.html
-share/doc/postgresql/html/libpqplusplus.html
-share/doc/postgresql/html/libpqpp-classes.html
-share/doc/postgresql/html/libpqpp-connect.html
-share/doc/postgresql/html/libpqpp-copy.html
-share/doc/postgresql/html/libpqpp-exec.html
-share/doc/postgresql/html/libpqpp-notify.html
-share/doc/postgresql/html/lisp.html
-share/doc/postgresql/html/ln11330.html
-share/doc/postgresql/html/ln1274.html
-share/doc/postgresql/html/ln15181.html
-share/doc/postgresql/html/ln24.html
-share/doc/postgresql/html/ln25010.html
-share/doc/postgresql/html/ln37176.html
-share/doc/postgresql/html/ln8.html
-share/doc/postgresql/html/lo-funcs.html
-share/doc/postgresql/html/lo-implementation.html
-share/doc/postgresql/html/lo-interfaces.html
-share/doc/postgresql/html/lo-libpq.html
-share/doc/postgresql/html/lo-sample.html
-share/doc/postgresql/html/locking-indices.html
-share/doc/postgresql/html/locking-tables.html
-share/doc/postgresql/html/manage-ag-accessdb.html
-share/doc/postgresql/html/manage-ag-dropdb.html
-share/doc/postgresql/html/manage.html
-share/doc/postgresql/html/managing-databases.html
-share/doc/postgresql/html/migration.html
-share/doc/postgresql/html/more-advanced.html
-share/doc/postgresql/html/multibyte.html
-share/doc/postgresql/html/mvcc.html
-share/doc/postgresql/html/non-atomic-values.html
-share/doc/postgresql/html/notation.html
-share/doc/postgresql/html/odbc-applixware.html
-share/doc/postgresql/html/odbc-config.html
-share/doc/postgresql/html/odbc-install.html
-share/doc/postgresql/html/odbc-windows.html
-share/doc/postgresql/html/odbc.html
-share/doc/postgresql/html/organization.html
-share/doc/postgresql/html/overview.html
-share/doc/postgresql/html/page.html
-share/doc/postgresql/html/parser-stage.html
-share/doc/postgresql/html/partial-index.html
-share/doc/postgresql/html/performance-tips.html
-share/doc/postgresql/html/perm-functions.html
-share/doc/postgresql/html/pg-system-catalogs.html
-share/doc/postgresql/html/pgeasy-chapter.html
-share/doc/postgresql/html/pgtcl-pgconndefaults.html
-share/doc/postgresql/html/pgtcl-pgconnect.html
-share/doc/postgresql/html/pgtcl-pgdisconnect.html
-share/doc/postgresql/html/pgtcl-pgexec.html
-share/doc/postgresql/html/pgtcl-pglisten.html
-share/doc/postgresql/html/pgtcl-pgloclose.html
-share/doc/postgresql/html/pgtcl-pglocreat.html
-share/doc/postgresql/html/pgtcl-pgloexport.html
-share/doc/postgresql/html/pgtcl-pgloimport.html
-share/doc/postgresql/html/pgtcl-pglolseek.html
-share/doc/postgresql/html/pgtcl-pgloopen.html
-share/doc/postgresql/html/pgtcl-pgloread.html
-share/doc/postgresql/html/pgtcl-pglotell.html
-share/doc/postgresql/html/pgtcl-pglounlink.html
-share/doc/postgresql/html/pgtcl-pglowrite.html
-share/doc/postgresql/html/pgtcl-pgresult.html
-share/doc/postgresql/html/pgtcl-pgselect.html
-share/doc/postgresql/html/pgtcl.html
-share/doc/postgresql/html/planner-optimizer.html
-share/doc/postgresql/html/plperl-use.html
-share/doc/postgresql/html/plperl.html
-share/doc/postgresql/html/plpgsql-description.html
-share/doc/postgresql/html/plpgsql-examples.html
-share/doc/postgresql/html/plpgsql-porting.html
-share/doc/postgresql/html/plpgsql-trigger.html
-share/doc/postgresql/html/plpgsql.html
-share/doc/postgresql/html/pltcl-description.html
-share/doc/postgresql/html/pltcl.html
-share/doc/postgresql/html/populate.html
-share/doc/postgresql/html/postgres.html
-share/doc/postgresql/html/postmaster-shutdown.html
-share/doc/postgresql/html/postmaster-start.html
-share/doc/postgresql/html/preface.html
-share/doc/postgresql/html/privileges.html
-share/doc/postgresql/html/programmer-client.html
-share/doc/postgresql/html/programmer-pl.html
-share/doc/postgresql/html/programmer-server.html
-share/doc/postgresql/html/programmer.html
-share/doc/postgresql/html/protocol-message-formats.html
-share/doc/postgresql/html/protocol-message-types.html
-share/doc/postgresql/html/protocol-protocol.html
-share/doc/postgresql/html/protocol.html
-share/doc/postgresql/html/pygresql.html
-share/doc/postgresql/html/pygresql-close.html
-share/doc/postgresql/html/pygresql-connect.html
-share/doc/postgresql/html/pygresql-db-api.html
-share/doc/postgresql/html/pygresql-db-clear.html
-share/doc/postgresql/html/pygresql-db-delete.html
-share/doc/postgresql/html/pygresql-db-get-attnames.html
-share/doc/postgresql/html/pygresql-db-get-databases.html
-share/doc/postgresql/html/pygresql-db-get-tables.html
-share/doc/postgresql/html/pygresql-db-get.html
-share/doc/postgresql/html/pygresql-db-insert.html
-share/doc/postgresql/html/pygresql-db-pkey.html
-share/doc/postgresql/html/pygresql-db-update.html
-share/doc/postgresql/html/pygresql-endcopy.html
-share/doc/postgresql/html/pygresql-fileno.html
-share/doc/postgresql/html/pygresql-get-defbase.html
-share/doc/postgresql/html/pygresql-get-defhost.html
-share/doc/postgresql/html/pygresql-get-defopt.html
-share/doc/postgresql/html/pygresql-get-defport.html
-share/doc/postgresql/html/pygresql-get-deftty.html
-share/doc/postgresql/html/pygresql-getline.html
-share/doc/postgresql/html/pygresql-getlo.html
-share/doc/postgresql/html/pygresql-getnotify.html
-share/doc/postgresql/html/pygresql-inserttable.html
-share/doc/postgresql/html/pygresql-locreate.html
-share/doc/postgresql/html/pygresql-loimport.html
-share/doc/postgresql/html/pygresql-pg-db.html
-share/doc/postgresql/html/pygresql-pg-functions.html
-share/doc/postgresql/html/pygresql-pg-pglarge.html
-share/doc/postgresql/html/pygresql-pg-pgobject.html
-share/doc/postgresql/html/pygresql-pg-pgqueryobject.html
-share/doc/postgresql/html/pygresql-pglargeobject-close.html
-share/doc/postgresql/html/pygresql-pglargeobject-export.html
-share/doc/postgresql/html/pygresql-pglargeobject-open.html
-share/doc/postgresql/html/pygresql-pglargeobject-read.html
-share/doc/postgresql/html/pygresql-pglargeobject-seek.html
-share/doc/postgresql/html/pygresql-pglargeobject-size.html
-share/doc/postgresql/html/pygresql-pglargeobject-tell.html
-share/doc/postgresql/html/pygresql-pglargeobject-unlink.html
-share/doc/postgresql/html/pygresql-pglargeobject-write.html
-share/doc/postgresql/html/pygresql-pgqueryobject-dictresult.html
-share/doc/postgresql/html/pygresql-pgqueryobject-fieldname.html
-share/doc/postgresql/html/query.html
-share/doc/postgresql/html/pygresql-pgqueryobject-fieldnum.html
-share/doc/postgresql/html/pygresql-pgqueryobject-getresult.html
-share/doc/postgresql/html/pygresql-pgqueryobject-listfields.html
-share/doc/postgresql/html/pygresql-pgqueryobject-ntuples.html
-share/doc/postgresql/html/pygresql-putline.html
-share/doc/postgresql/html/pygresql-query.html
-share/doc/postgresql/html/pygresql-reset.html
-share/doc/postgresql/html/pygresql-set-defbase.html
-share/doc/postgresql/html/pygresql-set-defhost.html
-share/doc/postgresql/html/pygresql-set-defopt.html
-share/doc/postgresql/html/pygresql-set-defport.html
-share/doc/postgresql/html/pygresql-set-deftty.html
-share/doc/postgresql/html/queries-limit.html
-share/doc/postgresql/html/queries-order.html
-share/doc/postgresql/html/queries-select-lists.html
-share/doc/postgresql/html/queries-union.html
-share/doc/postgresql/html/queries.html
-share/doc/postgresql/html/query-agg.html
-share/doc/postgresql/html/query-concepts.html
-share/doc/postgresql/html/query-delete.html
-share/doc/postgresql/html/query-join.html
-share/doc/postgresql/html/query-populate.html
-share/doc/postgresql/html/query-query.html
-share/doc/postgresql/html/query-selectinto.html
-share/doc/postgresql/html/query-table.html
-share/doc/postgresql/html/query-update.html
-share/doc/postgresql/html/recode.html
-share/doc/postgresql/html/recovery.html
-share/doc/postgresql/html/reference-client.html
-share/doc/postgresql/html/reference-server.html
-share/doc/postgresql/html/reference.html
-share/doc/postgresql/html/regress-platform.html
-share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-0-01.html
-share/doc/postgresql/html/release-0-02.html
-share/doc/postgresql/html/release-0-03.html
-share/doc/postgresql/html/release-1-0.html
-share/doc/postgresql/html/release-1-01.html
-share/doc/postgresql/html/release-1-02.html
-share/doc/postgresql/html/release-1-09.html
-share/doc/postgresql/html/release-6-0.html
-share/doc/postgresql/html/release-6-1-1.html
-share/doc/postgresql/html/release-6-1.html
-share/doc/postgresql/html/release-6-2-1.html
-share/doc/postgresql/html/release-6-2.html
-share/doc/postgresql/html/release-6-3-1.html
-share/doc/postgresql/html/release-6-3-2.html
-share/doc/postgresql/html/release-6-3.html
-share/doc/postgresql/html/release-6-4-1.html
-share/doc/postgresql/html/release-6-4-2.html
-share/doc/postgresql/html/release-6-4.html
-share/doc/postgresql/html/release-6-5-1.html
-share/doc/postgresql/html/release-6-5-2.html
-share/doc/postgresql/html/release-6-5-3.html
-share/doc/postgresql/html/release-6-5.html
-share/doc/postgresql/html/release-7-0-1.html
-share/doc/postgresql/html/release-7-0-2.html
-share/doc/postgresql/html/release-7-0-3.html
-share/doc/postgresql/html/release-7-0.html
-share/doc/postgresql/html/release-7-1.html
-share/doc/postgresql/html/release-7-1-1.html
-share/doc/postgresql/html/release-7-1-2.html
-share/doc/postgresql/html/release.html
-share/doc/postgresql/html/relmodel-formal.html
-share/doc/postgresql/html/relmodel-oper.html
-share/doc/postgresql/html/resources.html
-share/doc/postgresql/html/rule-system.html
-share/doc/postgresql/html/rules-insert.html
-share/doc/postgresql/html/rules-permissions.html
-share/doc/postgresql/html/rules-triggers.html
-share/doc/postgresql/html/rules-views.html
-share/doc/postgresql/html/rules.html
-share/doc/postgresql/html/runtime-config.html
-share/doc/postgresql/html/runtime.html
-share/doc/postgresql/html/source.html
-share/doc/postgresql/html/spi-examples.html
-share/doc/postgresql/html/spi-interface-support.html
-share/doc/postgresql/html/spi-memory.html
-share/doc/postgresql/html/spi-spiconnect.html
-share/doc/postgresql/html/spi-spicopytuple.html
-share/doc/postgresql/html/spi-spiexec.html
-share/doc/postgresql/html/spi-spiexecp.html
-share/doc/postgresql/html/spi-spifinish.html
-share/doc/postgresql/html/spi-spifname.html
-share/doc/postgresql/html/spi-spifnumber.html
-share/doc/postgresql/html/spi-spigetbinval.html
-share/doc/postgresql/html/spi-spigetrelname.html
-share/doc/postgresql/html/spi-spigettype.html
-share/doc/postgresql/html/spi-spigettypeid.html
-share/doc/postgresql/html/spi-spigetvalue.html
-share/doc/postgresql/html/spi-spimodifytuple.html
-share/doc/postgresql/html/spi-spipalloc.html
-share/doc/postgresql/html/spi-spipfree.html
-share/doc/postgresql/html/spi-spiprepare.html
-share/doc/postgresql/html/spi-spirepalloc.html
-share/doc/postgresql/html/spi-spisaveplan.html
-share/doc/postgresql/html/spi-visibility.html
-share/doc/postgresql/html/spi.html
-share/doc/postgresql/html/sql-abort.html
-share/doc/postgresql/html/sql-altergroup.html
-share/doc/postgresql/html/sql-altertable.html
-share/doc/postgresql/html/sql-alteruser.html
-share/doc/postgresql/html/sql-begin.html
-share/doc/postgresql/html/sql-checkpoint.html
-share/doc/postgresql/html/sql-close.html
-share/doc/postgresql/html/sql-cluster.html
-share/doc/postgresql/html/sql-commands.html
-share/doc/postgresql/html/sql-comment.html
-share/doc/postgresql/html/sql-commit.html
-share/doc/postgresql/html/sql-copy.html
-share/doc/postgresql/html/sql-createaggregate.html
-share/doc/postgresql/html/sql-createconstraint.html
-share/doc/postgresql/html/sql-createdatabase.html
-share/doc/postgresql/html/sql-createfunction.html
-share/doc/postgresql/html/sql-creategroup.html
-share/doc/postgresql/html/sql-createindex.html
-share/doc/postgresql/html/sql-createlanguage.html
-share/doc/postgresql/html/sql-createoperator.html
-share/doc/postgresql/html/sql-createrule.html
-share/doc/postgresql/html/sql-createsequence.html
-share/doc/postgresql/html/sql-createtable.html
-share/doc/postgresql/html/sql-createtableas.html
-share/doc/postgresql/html/sql-createtrigger.html
-share/doc/postgresql/html/sql-createtype.html
-share/doc/postgresql/html/sql-createuser.html
-share/doc/postgresql/html/sql-createview.html
-share/doc/postgresql/html/sql-declare.html
-share/doc/postgresql/html/sql-delete.html
-share/doc/postgresql/html/sql-dropaggregate.html
-share/doc/postgresql/html/sql-dropdatabase.html
-share/doc/postgresql/html/sql-dropfunction.html
-share/doc/postgresql/html/sql-dropgroup.html
-share/doc/postgresql/html/sql-dropindex.html
-share/doc/postgresql/html/sql-droplanguage.html
-share/doc/postgresql/html/sql-dropoperator.html
-share/doc/postgresql/html/sql-droprule.html
-share/doc/postgresql/html/sql-dropsequence.html
-share/doc/postgresql/html/sql-droptable.html
-share/doc/postgresql/html/sql-droptrigger.html
-share/doc/postgresql/html/sql-droptype.html
-share/doc/postgresql/html/sql-dropuser.html
-share/doc/postgresql/html/sql-dropview.html
-share/doc/postgresql/html/sql-end.html
-share/doc/postgresql/html/sql-explain.html
-share/doc/postgresql/html/sql-expressions.html
-share/doc/postgresql/html/sql-fetch.html
-share/doc/postgresql/html/sql-grant.html
-share/doc/postgresql/html/sql-insert.html
-share/doc/postgresql/html/sql-keywords-appendix.html
-share/doc/postgresql/html/sql-language.html
-share/doc/postgresql/html/sql-listen.html
-share/doc/postgresql/html/sql-load.html
-share/doc/postgresql/html/sql-lock.html
-share/doc/postgresql/html/sql-move.html
-share/doc/postgresql/html/sql-notify.html
-share/doc/postgresql/html/sql-precedence.html
-share/doc/postgresql/html/sql-reindex.html
-share/doc/postgresql/html/sql-reset.html
-share/doc/postgresql/html/sql-revoke.html
-share/doc/postgresql/html/sql-rollback.html
-share/doc/postgresql/html/sql-select.html
-share/doc/postgresql/html/sql-selectinto.html
-share/doc/postgresql/html/sql-set-constraints.html
-share/doc/postgresql/html/sql-set-transaction.html
-share/doc/postgresql/html/sql-set.html
-share/doc/postgresql/html/sql-show.html
-share/doc/postgresql/html/sql-syntax-columns.html
-share/doc/postgresql/html/sql-syntax.html
-share/doc/postgresql/html/sql-truncate.html
-share/doc/postgresql/html/sql-unlisten.html
-share/doc/postgresql/html/sql-update.html
-share/doc/postgresql/html/sql-vacuum.html
-share/doc/postgresql/html/sql.html
-share/doc/postgresql/html/ssh-tunnels.html
-share/doc/postgresql/html/ssl-tcp.html
-share/doc/postgresql/html/start-manage-db.html
-share/doc/postgresql/html/start-psql.html
-share/doc/postgresql/html/start.html
-share/doc/postgresql/html/storage.html
-share/doc/postgresql/html/supported-platforms.html
-share/doc/postgresql/html/timing-results.html
-share/doc/postgresql/html/transaction-iso.html
-share/doc/postgresql/html/trigger-datachanges.html
-share/doc/postgresql/html/trigger-examples.html
-share/doc/postgresql/html/trigger-manager.html
-share/doc/postgresql/html/triggers.html
-share/doc/postgresql/html/tutorial.html
-share/doc/postgresql/html/type-system.html
-share/doc/postgresql/html/typeconv-func.html
-share/doc/postgresql/html/typeconv-oper.html
-share/doc/postgresql/html/typeconv-query.html
-share/doc/postgresql/html/typeconv-union-case.html
-share/doc/postgresql/html/typeconv.html
-share/doc/postgresql/html/units-history.html
-share/doc/postgresql/html/user-manag.html
-share/doc/postgresql/html/user.html
-share/doc/postgresql/html/wal-configuration.html
-share/doc/postgresql/html/wal-implementation.html
-share/doc/postgresql/html/wal.html
-share/doc/postgresql/html/xact-read-committed.html
-share/doc/postgresql/html/xact-serializable.html
-share/doc/postgresql/html/xaggr.html
-share/doc/postgresql/html/xfunc-c.html
-share/doc/postgresql/html/xfunc-internal.html
-share/doc/postgresql/html/xfunc-overload.html
-share/doc/postgresql/html/xfunc-pl.html
-share/doc/postgresql/html/xfunc.html
-share/doc/postgresql/html/xindex.html
-share/doc/postgresql/html/xoper.html
-share/doc/postgresql/html/xplang.html
-share/doc/postgresql/html/xtypes.html
-share/doc/postgresql/html/y2k.html
-share/doc/postgresql/html/catalogs.gif
-share/doc/postgresql/html/clientserver.gif
-share/doc/postgresql/html/connections.gif
-@dirrm share/doc/postgresql/html
-@dirrm share/doc/postgresql
diff --git a/databases/postgresql74-server/scripts/configure.postgresql b/databases/postgresql74-server/scripts/configure.postgresql
index 4523b6e56d74..a8db5229c345 100644
--- a/databases/postgresql74-server/scripts/configure.postgresql
+++ b/databases/postgresql74-server/scripts/configure.postgresql
@@ -25,9 +25,10 @@ if [ "${BATCH}" ]; then
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 					--checklist "\n\
-Please select desired options:" -1 -1 7 \
+Please select desired options:" -1 -1 3 \
 MultiByte  "Multibyte for Multilingualism" ON \
-KRB5       "Kerberos 5" ON \
+KRB5       "Kerberos 5 (only if it exists)" ON \
+CLIENT     "PostgreSQL client only, no server" OFF \
 2> /tmp/checklist.tmp.$$
 
 	retval=$?
@@ -59,6 +60,9 @@ while [ "$1" ]; do
 		\"KRB5\")
 			KRB5=1
 			;;
+		\"CLIENT\")
+			CLIENT=1
+			;;
 		\"nothing\"|true)
 			;;
 		*)
@@ -163,3 +167,7 @@ if [ "${KRB5}" ]; then
 		fi
 	fi
 fi
+
+if [ ${CLIENT} ]; then
+	echo "WITHOUT_SERVER=yes" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+fi