Upgrade to 7.2, and spilit into several ports.

PR: ports/34855 Submitted by: maintainer.
author: Vanilla I. Shu <vanilla@FreeBSD.org> 2002-02-19 08:23:22 +0000
committer: Vanilla I. Shu <vanilla@FreeBSD.org> 2002-02-19 08:23:22 +0000
commit: 0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7 (patch)
tree: e2c20382071c1aac790898564dea14a5b332a404 /databases/postgresql83-server
parent: 5416e71b191a05ec09d024063c88e8d0afee5954 (diff)
download: ports-0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7.tar.gz
ports-0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7.zip
23 files changed, 1006 insertions, 796 deletions
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 4a30008d77bc..0f192fc19631 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -5,131 +5,142 @@
 # $FreeBSD$
 #
 
-PORTNAME=	postgresql
-PORTVERSION=	7.1.3
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \
-		ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
-		ftp://ftp.de.postgresql.org/%SUBDIR%/ \
-		ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+PORTNAME?=	postgresql
+PORTVERSION?=	7.2
+CATEGORIES?=	databases
+MASTER_SITES=	ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+		ftp://ftp.de.postgresql.org/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.chg.ru/pub/databases/postgresql/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/db/postgresql/&,}
+		ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \
+		ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \
+		ftp://ftp4.jp.postgresql.org/mirror/postgresql/%SUBDIR%/ \
+		ftp://ftp.us.postgresql.org/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
-DISTFILES=	${PORTNAME}-base-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-opt-${PORTVERSION}${EXTRACT_SUFX}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}-docs-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
+		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
+.if !defined(POSTGRESQL_SUBPORT) && !defined(NOPORTDOCS)
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
-MAINTAINER=	girgen@partitur.se
+MAINTAINER?=	girgen@partitur.se
 
+WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
-INSTALLS_SHLIB=	YES
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
 
-DOCDIR=		${WRKDIR}/${DISTNAME}/doc
-PLIST=		${WRKDIR}/.PLIST.generated
+.if defined(POSTGRESQL_SUBPORT)
+## the POSTGRESQL_SUBPORTS use this port's distinfo
+MD5_FILE=	${.CURDIR}/../postgresql7/distinfo
+.else
+
+## The rest of this file is for normal base installation
+INSTALLS_SHLIB=	YES
 
 USE_GMAKE=	YES
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--enable-locale \
-		--enable-syslog --with-CXX \
-		--sysconfdir=${PREFIX}/etc/postgresql \
-		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
-		--with-libraries=${PREFIX}/lib
-.if defined(WITH_OLD_LAYOUT)
-CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/pgsql/include \
-		--datadir=${PREFIX}/share \
-		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		--prefix=${PREFIX}/pgsql
-PG_PREFIX=	pgsql/
-PG_INCLUDE=	pgsql/include
-LDCONFIG_DIRS=	%%PREFIX%%/pgsql/lib
-MANPREFIX=	${PREFIX}/pgsql
-.else
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc --includedir=${PREFIX}/include/pgsql
-PG_PREFIX=""
-PG_INCLUDE=	include/pgsql
+CONFIGURE_ARGS=	--enable-locale --enable-syslog --with-CXX \
+		--docdir=${PREFIX}/share/doc --with-libdir=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include
+
+.if !defined(WITHOUT_GNUGETOPT)
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .endif
 
-PLIST_SUB=	PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}"
+# if you want localized messages, make -DWITH_GETTEXT
+# WARNING: this seems to require relinking binaries depending on
+# libpq.so, including for example mod_php and tcl.
+.if defined(WITH_GETTEXT)
+CONFIGURE_ARGS+=--enable-nls
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+PLIST_SUB+=	GETTEXT=""
+.else
+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}"
+.endif
 
 MAN1=		createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
 		dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \
 		pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_restore.1 \
 		pgaccess.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \
 		vacuumdb.1
-MANL=		abort.l alter_group.l alter_table.l alter_user.l \
-		begin.l checkpoint.l close.l cluster.l comment.l commit.l copy.l \
-		create_aggregate.l create_constraint_trigger.l \
-		create_database.l create_function.l create_group.l \
-		create_index.l create_language.l create_operator.l \
-		create_rule.l create_sequence.l create_table.l \
-		create_table_as.l create_trigger.l create_type.l \
-		create_user.l create_view.l declare.l delete.l \
-		drop_aggregate.l drop_database.l drop_function.l \
-		drop_group.l drop_index.l drop_language.l \
-		drop_operator.l drop_rule.l drop_sequence.l \
-		drop_table.l drop_trigger.l drop_type.l drop_user.l \
-		drop_view.l end.l explain.l fetch.l grant.l insert.l \
-		listen.l load.l lock.l move.l notify.l reindex.l \
-		reset.l revoke.l rollback.l select.l select_into.l \
-		set.l set_constraints.l set_transaction.l show.l \
-		truncate.l unlisten.l update.l vacuum.l
+MAN7=		abort.7 alter_group.7 alter_table.7 alter_user.7 analyze.7 \
+		begin.7 checkpoint.7 close.7 cluster.7 comment.7 commit.7 copy.7 \
+		create_aggregate.7 create_constraint_trigger.7 \
+		create_database.7 create_function.7 create_group.7 \
+		create_index.7 create_language.7 create_operator.7 \
+		create_rule.7 create_sequence.7 create_table.7 \
+		create_table_as.7 create_trigger.7 create_type.7 \
+		create_user.7 create_view.7 declare.7 delete.7 \
+		drop_aggregate.7 drop_database.7 drop_function.7 \
+		drop_group.7 drop_index.7 drop_language.7 \
+		drop_operator.7 drop_rule.7 drop_sequence.7 \
+		drop_table.7 drop_trigger.7 drop_type.7 drop_user.7 \
+		drop_view.7 end.7 explain.7 fetch.7 grant.7 insert.7 \
+		listen.7 load.7 lock.7 move.7 notify.7 reindex.7 \
+		reset.7 revoke.7 rollback.7 select.7 select_into.7 \
+		set.7 set_constraints.7 set_transaction.7 show.7 \
+		set_session_authorization.7 \
+		truncate.7 unlisten.7 update.7 vacuum.7
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		WRKDIR="${WRKDIR}" \
 		FILESDIR="${FILESDIR}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
-		NO_OPENSSL="${NO_OPENSSL}" \
 		DISTNAME="${DISTNAME}"
 
 # We must .include here because we need the Makefile.inc @ pre-install
 # to determine the correct plist.
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
+
+.if defined(WITHOUT_MULTIBYTE)
+PLIST_SUB+=	MULTIBYTE="@comment "
 .else
-# make utility targets like depends and describe happy
-LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83 \
-		tk83:${PORTSDIR}/x11-toolkits/tk83
+PLIST_SUB+=	MULTIBYTE=""
+CONFIGURE_ARGS+=--enable-multibyte=${MULTIBYTE_ENCODING}
 .endif
 
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
 
 pre-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
-.if !defined(BATCH)
-# remind folks twice for a while, so they really don't miss the layout shift
-	@ ${SED} "s|/usr/local|${PREFIX}|g" < ${PKGMESSAGE} | head -n 25 | more -e
-.endif
-	@ ${CP} ${PKGDIR}/pkg-plist ${PLIST}
-.if defined(WITHOUT_MULTIBYTE)
-	@${CP} ${PLIST} ${PLIST}.nomulti ;\
-	 ${GREP} -v bin/pg_encoding ${PLIST}.nomulti > ${PLIST}
-.endif
-.if defined(WITH_TCL)
-	@ ${CP} ${PLIST} ${PLIST}.notcl ;\
-	  ${CAT} ${PKGDIR}/${TCL_PLIST} ${PLIST}.notcl > ${PLIST} ;\
-	  ${RM} ${PLIST}.notcl
-.endif
-.if defined(WITH_ODBC)
-	@ ${CP} ${PLIST} ${PLIST}.noodbc ;\
-	  ${CAT} ${PKGDIR}/pkg-plist.odbc ${PLIST}.noodbc > ${PLIST} ;\
-	  ${RM} ${PLIST}.noodbc
-.endif
-.if defined(WITH_JDBC)
-	@ ${CP} ${PLIST} ${PLIST}.nojdbc ;\
-	  ${CAT} ${PKGDIR}/pkg-plist.jdbc ${PLIST}.nojdbc > ${PLIST} ;\
-	  ${RM} ${PLIST}.nojdbc
-.endif
-.if !defined(NOPORTDOCS)
-	@ ${CAT} ${PKGDIR}/pkg-plist.doc >> ${PLIST}
+.if !defined(WITHOUT_SERVER)
+	@ ${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 .endif
 
+post-build:
+	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/odbc odbc-drop.sql
+
 post-install:
+	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
+	${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_passwd pg_restore postgres psql
+	@ strip ${PREFIX}/${PG_PREFIX}bin/${file}
+.endfor
+.endif
+.if !defined(WITHOUT_SERVER)
 # install shell defaults for pgsql user
 .for i in profile cshrc
 	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
@@ -142,57 +153,19 @@ post-install:
 .endfor
 	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%PG_PREFIX%%|${PG_PREFIX}|g" \
 		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/010.pgsql.sh
-	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh
-	@ ${CHOWN} root:pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh
-.if defined(WITH_TCL)
-# Preparing a loadable TCL-package (pkgIndex.tcl)
-	@${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
-		> ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl
-.endif
-.if defined(WITH_JDBC)
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
-	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/jars/postgresql.jar \
-			  ${PREFIX}/share/java/classes/postgresql.jar
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-	@ ${ECHO_MSG} "Putting postgresql.jar in"
-	@ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar"
-	@ ${ECHO_MSG} "Add this to your CLASSPATH!"
-	@ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:"
-	@ ${ECHO_MSG} "  'postgresql.*' -> 'org.postgresql.*'!"
-	@ ${ECHO_MSG} "---------------------------------------------------------"
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} -m 0555 ${PREFIX}/share/examples/postgresql ;\
-	  cd ${WRKSRC}/src/interfaces/jdbc/example ;\
-	  pax -rw . ${PREFIX}/share/examples/postgresql
-.for i in README Implementation
-	@ ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
-			  ${PREFIX}/share/examples/postgresql
-.endfor
-	@ ${ECHO_MSG} "---------------------------------------------------------------"
-	@ ${ECHO_MSG} "Putting java examples into ${PREFIX}/share/examples/postgresql"
-	@ ${ECHO_MSG} "---------------------------------------------------------------"
-.endif
-.endif
-.if !defined(DEBUG_FLAGS)
-.for file in ecpg pg_dump pg_id pg_passwd pg_restore postgres psql
-	@ strip ${PREFIX}/${PG_PREFIX}bin/${file}
-.endfor
-.endif
-# information overload mode activated, sorry about this... ;-)
-	@ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
-		${SED} "s|/usr/local|${PREFIX}|g" |\
-		tee ${PREFIX}/share/postgresql/post-install-notes ;\
+		> ${PREFIX}/etc/rc.d/010.pgsql.sh ;\
+	${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh ;\
+	${CHOWN} root:pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh ;\
 	${INSTALL_DATA} ${PREFIX}/share/postgresql/post-install-notes ~pgsql/. ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/.
-.if defined(WITH_OLD_LAYOUT)
-	@ ${CHOWN} root:pgsql ${PREFIX}/${PG_PREFIX}lib
+	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	${INSTALL_DATA} ${FILESDIR}/502.pgsql \
+			${WRKSRC}/src/interfaces/odbc/odbc.sql \
+			${WRKSRC}/src/interfaces/odbc/odbc-drop.sql \
+			${PREFIX}/share/postgresql
 .endif
 
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
-post-extract: ${POSTEXTRACT}
-
 .include <bsd.port.mk>
+.endif
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 23e07754313f..1629a384c715 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-base-7.1.3.tar.gz) = f932dea12806972402aaaf17a2a97034
-MD5 (postgresql/postgresql-opt-7.1.3.tar.gz) = e84e9c51b31567d4571c7612e0c0fbd6
-MD5 (postgresql/postgresql-docs-7.1.3.tar.gz) = 7061ab7f7ec3c4d18f8e6cb2858896d0
+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
diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql
new file mode 100644
index 000000000000..160de10370e0
--- /dev/null
+++ b/databases/postgresql83-server/files/502.pgsql
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# $Id: 502.pgsql.in,v 1.17 2001/10/29 10:12:32 henrik Exp $
+#
+# Maintenance shell script to vacuum and backup database
+# Put this in /usr/local/etc/periodic/daily, and it will be run 
+# every night
+#
+# Written by Palle Girgensohn <girgen@partitur.se>
+#
+# In public domain, do what you like with it,
+# and use it at your own risk... :)
+#
+
+DIR=`dirname $0`
+progname=`basename $0`
+PRG=`cd $DIR; pwd `/$progname
+
+# Run as user pgsql
+if [ `id -un` != pgsql ]; then
+    su -l pgsql -c ${PRG}
+    exit 0
+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..."
+
+# 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
+done
+
+if [ -s "${PGERRALL}" ]
+then
+    echo
+    echo 'Something went wrong!'
+    echo
+    echo `cat ${PGERRALL}`
+    rc=3
+fi
+rm ${PGERRALL}
+
+echo
+
+find ${PGBACKUPDIR} \( -name 'pgdump_*'.${GZIPEXT} -o -name 'pgdumpall_*'.${GZIPEXT} \) \
+		    -a -atime +7 -delete
+exit $rc
diff --git a/databases/postgresql83-server/files/patch-contrib-retep-build b/databases/postgresql83-server/files/patch-contrib-retep-build
deleted file mode 100644
index 80f40f1cc86d..000000000000
--- a/databases/postgresql83-server/files/patch-contrib-retep-build
+++ /dev/null
@@ -1,37 +0,0 @@
-===================================================================
-RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/retep/build.xml,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- contrib/retep/build.xml	2001/03/11 11:06:59	1.4
-+++ contrib/retep/build.xml	2001/05/16 16:20:51	1.5
-@@ -2,7 +2,7 @@
- 
-   build file to build the donated retep tools packages
- 
--  $Id: build.xml,v 1.4 2001/03/11 11:06:59 petere Exp $
-+  $Id: build.xml,v 1.5 2001/05/16 16:20:51 momjian Exp $
- 
- -->
- 
-@@ -22,6 +22,11 @@
-     <available property="xml" classname="org.xml.sax.Parser" />
-   </target>
- 
-+  <target name="warning" depends="checks" unless="jdk1.2+">
-+    <echo message="WARNING -- contributed retep tools need jdk1.2 or later -- compilation NOT done." />
-+  </target>
-+
-+
-   <!-- Prepares the build by creating a directory to place the class files -->
-   <target name="prepare">
-     <mkdir dir="${dest}" />
-@@ -35,7 +40,7 @@
-   </target>
- 
-   <!-- Builds the XML Tools -->
--  <target name="compile" depends="checks,prepare">
-+  <target name="compile" depends="checks,prepare,warning" if="jdk1.2+">
-     <javac srcdir="${src}" destdir="${dest}">
-       <include name="${package}/**" />
-     </javac>
diff --git a/databases/postgresql83-server/files/patch-doc-makefile b/databases/postgresql83-server/files/patch-doc-makefile
deleted file mode 100644
index fa27bed2af3f..000000000000
--- a/databases/postgresql83-server/files/patch-doc-makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/Makefile~	Sun Jan  7 03:03:22 2001
-+++ doc/Makefile	Wed Apr 18 08:12:30 2001
-@@ -43,10 +43,13 @@
- 	gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - )
- endif
- 
--
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html
--
-+ifdef found_html
-+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
-+endif
-+ifdef found_man
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)
-+endif
- 
- uninstall:
- ifdef found_html
diff --git a/databases/postgresql83-server/files/patch-jdbc-Connection b/databases/postgresql83-server/files/patch-jdbc-Connection
deleted file mode 100644
index 26fbc260d639..000000000000
--- a/databases/postgresql83-server/files/patch-jdbc-Connection
+++ /dev/null
@@ -1,51 +0,0 @@
-===================================================================
-RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Connection.java,v
-retrieving revision 1.14
-retrieving revision 1.16
-diff -u -r1.14 -r1.16
---- src/interfaces/jdbc/org/postgresql/Connection.java	2001/01/31 08:26:01	1.14
-+++ src/interfaces/jdbc/org/postgresql/Connection.java	2001/06/01 20:57:58	1.16
-@@ -10,7 +10,7 @@
- import org.postgresql.util.*;
- 
- /**
-- * $Id: Connection.java,v 1.14 2001/01/31 08:26:01 peter Exp $
-+ * $Id: Connection.java,v 1.16 2001/06/01 20:57:58 momjian Exp $
-  *
-  * This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
-  * JDBC2 versions of the Connection class.
-@@ -267,7 +267,8 @@
-       //
-       firstWarning = null;
- 
--      java.sql.ResultSet initrset = ExecSQL("set datestyle to 'ISO'; select getdatabaseencoding()");
-+      java.sql.ResultSet initrset = ExecSQL("set datestyle to 'ISO'; " +
-+        "select case when pg_encoding_to_char(1) = 'SQL_ASCII' then 'UNKNOWN' else getdatabaseencoding() end");
- 
-       String dbEncoding = null;
-       //retrieve DB properties
-@@ -307,9 +308,23 @@
-         } else if (dbEncoding.equals("EUC_TW")) {
-           dbEncoding = "EUC_TW";
-         } else if (dbEncoding.equals("KOI8")) {
--          dbEncoding = "KOI8_R";
-+	  // try first if KOI8_U is present, it's a superset of KOI8_R
-+	    try {
-+        	dbEncoding = "KOI8_U";
-+		"test".getBytes(dbEncoding);
-+	    }
-+	    catch(UnsupportedEncodingException uee) {
-+	    // well, KOI8_U is still not in standard JDK, falling back to KOI8_R :(
-+        	dbEncoding = "KOI8_R";
-+	    }
-+
-         } else if (dbEncoding.equals("WIN")) {
-           dbEncoding = "Cp1252";
-+        } else if (dbEncoding.equals("UNKNOWN")) {
-+          //This isn't a multibyte database so we don't have an encoding to use
-+          //We leave dbEncoding null which will cause the default encoding for the
-+          //JVM to be used
-+          dbEncoding = null;
-         } else {
-           dbEncoding = null;
-         }
diff --git a/databases/postgresql83-server/files/patch-jdbc-build-xml b/databases/postgresql83-server/files/patch-jdbc-build-xml
deleted file mode 100644
index b1c703a9c978..000000000000
--- a/databases/postgresql83-server/files/patch-jdbc-build-xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interfaces/jdbc/build.xml~	Fri Mar 16 22:50:43 2001
-+++ src/interfaces/jdbc/build.xml	Wed Apr 18 08:57:57 2001
-@@ -120,6 +120,7 @@
-     <javac srcdir="${src}" destdir="${dest}">
-       <include name="example/**" />
-       <exclude name="example/corba/**"/>
-+      <exclude name="example/blobtest.java" unless="jdk1.2+"/>
-     </javac>
-   </target>
- 
diff --git a/databases/postgresql83-server/files/patch-jdbc-getdate b/databases/postgresql83-server/files/patch-jdbc-getdate
deleted file mode 100644
index 744407ae14b5..000000000000
--- a/databases/postgresql83-server/files/patch-jdbc-getdate
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java~	Fri Feb 23 19:12:23 2001
-+++ src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java	Wed May  9 04:31:11 2001
-@@ -423,8 +423,13 @@
-     String s = getString(columnIndex);
-     if(s==null)
-       return null;
--
--    return java.sql.Date.valueOf(s);
-+    // length == 10: SQL Date
-+    // length >  10: SQL Timestamp, assumes PGDATESTYLE=ISO
-+    try {
-+      return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0,10));
-+    } catch (NumberFormatException e) {
-+      throw new PSQLException("postgresql.res.baddate", s);
-+    }
-   }
- 
-   /**
-@@ -441,8 +446,13 @@
- 
-     if(s==null)
-       return null; // SQL NULL
--
--    return java.sql.Time.valueOf(s);
-+    // length == 8: SQL Time
-+    // length >  8: SQL Timestamp
-+    try {
-+      return java.sql.Time.valueOf((s.length() == 8) ? s : s.substring(11,19));
-+    } catch (NumberFormatException e) {
-+      throw new PSQLException("postgresql.res.badtime",s);
-+    }
-   }
- 
-   /**
diff --git a/databases/postgresql83-server/files/patch-src::backend::utils::init::findbe.c b/databases/postgresql83-server/files/patch-src::backend::utils::init::findbe.c
new file mode 100644
index 000000000000..e453be9d93da
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-src::backend::utils::init::findbe.c
@@ -0,0 +1,13 @@
+--- 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/postgresql83-server/files/pkgIndex.tcl.in b/databases/postgresql83-server/files/pkgIndex.tcl.in
deleted file mode 100644
index bd8329b15c69..000000000000
--- a/databases/postgresql83-server/files/pkgIndex.tcl.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# Package-index file for Pgtcl-package. Enables you to load PostgreSQL
-# interface functions right into you TCL-interpreter as simply as
-#	package require Pgtcl
-package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so"
diff --git a/databases/postgresql83-server/files/post-install-notes b/databases/postgresql83-server/files/post-install-notes
index 9347fc51c247..5480550a1ed4 100644
--- a/databases/postgresql83-server/files/post-install-notes
+++ b/databases/postgresql83-server/files/post-install-notes
@@ -1,25 +1,49 @@
+The PostgreSQL port has a collection of "side orders":
 
-Now that PostgreSQL is installed, you should read the documentation and
-implementation guides. These can be found at:
+p5-Pg
+  A perl5 API for client access to PostgreSQL databases.
 
-		http://www.PostgreSQL.org/docs
+postgresql-tcltk 
+  If you want tcl/tk client support. You get a neat GUI, pgaccess, as
+  a bonus!
 
-You may wish to subscribe to the PostgreSQL user-support mailing list.
-Send an e-mail to pgsql-questions-request@postgresql.org with the
-text "subscribe" in the message body.
+postgresql-jdbc
+  For Java JDBC support.
 
-If you built PostgreSQL with TCL/TK support, you can use the pgaccess
-utility to get a TCL/TK based database frontend for database
-operations. You do NOT need to install the pgaccess port separately.
+postgresql-odbc
+  For client access from unix applications using ODBC as access
+  method. Not needed to access unix PostgreSQL servers from Win32
+  using ODBC. See below.
 
-If you built in the TCL support, you can load the Pg package into your
-TCL scripts as easily as ``package require Pgtcl''.
+ruby-postgres, py-PyGreSQL
+  For client access to PostgreSQL databases using the ruby & python
+  languages.
 
-If you built with Java support, add
-/usr/local/share/java/classes/postgresql.jar to your classpath.
+postgresql-plperl, postgresql-pltcl & postgresql-plruby
+  For using perl5, tcl & ruby as procedural languages.
+
+etc etc...
 
 If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8).
 
-Use createlang(1) to install languages into your database.
-Supported languages are 'plpgsql', 'pltcl', 'pltclu', and 'plperl'.
+You should vacuum and backup your database regularly. There is a
+periodic script, /usr/local/share/postgresql/502.pgsql, that you may
+use.
+
+To allow many simultaneous connections to your PostgreSQL server, you
+should raise the SystemV shared memory limits in your kernel. Here are
+example values for allowing up to 180 clients (tinkering in
+postgresql.conf also needed, of course):
+  options         SYSVSHM
+  options         SYSVSEM
+  options         SYSVMSG
+  options         SHMMAXPGS=65536
+  options         SEMMNI=40
+  options         SEMMNS=240
+  options         SEMUME=40
+  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
+to get the functions required for ODBC compliance.
diff --git a/databases/postgresql83-server/files/pre-install-notes b/databases/postgresql83-server/files/pre-install-notes
deleted file mode 100644
index 697ce3cedb79..000000000000
--- a/databases/postgresql83-server/files/pre-install-notes
+++ /dev/null
@@ -1,21 +0,0 @@
- * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-%%PREFIX%%/bin
-%%PREFIX%%/lib
-%%PREFIX%%/include/pgsql
-
-You *must* move away your old installation to avoid problems with
-ldconfig(8) and user's PATH:s. If you rather install using the
-old-fashion layout, cancel at next screen and run make as:
-
-$ make -DWITH_OLD_LAYOUT
-
-As always, you *must* dump existing databases before stopping and
-removing your old postgresql, as part of the update.  This is *NOT*
-done by this port!
-
-If you want JAVA support, I will try to determine your JAVA_HOME using
-javavmwrapper. If you want a different JVM, please set JAVA_HOME.
diff --git a/databases/postgresql83-server/pkg-comment b/databases/postgresql83-server/pkg-comment
index 2125016b133c..2f1197a9821f 100644
--- a/databases/postgresql83-server/pkg-comment
+++ b/databases/postgresql83-server/pkg-comment
@@ -1 +1 @@
-A robust, next generation, object-relational DBMS
+The most advanced open-source database available anywhere
diff --git a/databases/postgresql83-server/pkg-descr b/databases/postgresql83-server/pkg-descr
index 463e4e49815f..f8f8a9e0d422 100644
--- a/databases/postgresql83-server/pkg-descr
+++ b/databases/postgresql83-server/pkg-descr
@@ -1,8 +1,7 @@
-PostgreSQL is a robust, next-generation, Object-Relational DBMS (ORDBMS), 
-derived from the Berkeley Postgres database management system.  While 
-PostgreSQL retains the powerful object-relational data model, rich data types 
-and easy extensibility of Postgres, it replaces the PostQuel query language 
-with an extended subset of SQL.
+PostgreSQL is a sophisticated Object-Relational DBMS, supporting
+almost all SQL constructs, including subselects, transactions, and
+user-defined types and functions. It is the most advanced open-source
+database available anywhere. Commercial Support is also available.
 
 The original Postgres code was the effort of many graduate students, 
 undergraduate students, and staff programmers working under the direction of 
diff --git a/databases/postgresql83-server/pkg-install b/databases/postgresql83-server/pkg-install
index cfc983fc2f66..ffcd42a5796c 100644
--- a/databases/postgresql83-server/pkg-install
+++ b/databases/postgresql83-server/pkg-install
@@ -8,6 +8,18 @@ DB_DIR=${PKG_PREFIX}/pgsql
 
 case $2 in
 PRE-INSTALL)
+	echo "
+=========== BACKUP YOUR DATA! =============
+As always, backup your data before
+upgrading. If the upgrade leads to a higher
+minor revision (e.g. 7.1.x -> 7.2), a dump
+and restore of all databases is
+required. This is *NOT* done by the port!
+
+Press ctrl-C *now* if you need to pg_dump.
+===========================================
+"
+	sleep 3
 	USER=pgsql
 	GROUP=${USER}
 	UID=70
diff --git a/databases/postgresql83-server/pkg-message b/databases/postgresql83-server/pkg-message
index 1a3f9f1e4147..5138a7841bee 100644
--- a/databases/postgresql83-server/pkg-message
+++ b/databases/postgresql83-server/pkg-message
@@ -1,4 +1,3 @@
-
 ======================================================================
 
       * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
@@ -8,23 +7,21 @@ installs into:
 
 /usr/local/bin
 /usr/local/lib
-/usr/local/include/pgsql
+/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
+                           handles standard install nowadays)
 
 You *must* move away your old installation from users' and
-ldconfig(8)'s PATHs. If you rather install using the old-fashion
-layout, cancel now and build the port with "make -DWITH_OLD_LAYOUT".
+ldconfig(8)'s PATHs.
 
 The pgsql user's home dir is /usr/local/pgsql by default, but can be
 changed with for example chpass(1). Datadir defaults to ~pgsql/data,
 but can be changed by modifying the ~pgsql/.profile script.
 
-As always, backup your data before upgrading. If the upgrade leads to
-a higher minor revision (i.e. 7.0.x -> 7.1.x), a dump and restore of
-all databases is required. This is *NOT* done by the port!
-
 ======================================================================
 
-To initialize the database, you should run initdb as the "pgsql" user.
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
 
 Example:
 
@@ -35,4 +32,5 @@ You can then start PostgreSQL by running:
   /usr/local/etc/rc.d/010.pgsql.sh start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
 ======================================================================
diff --git a/databases/postgresql83-server/pkg-message.client b/databases/postgresql83-server/pkg-message.client
new file mode 100644
index 000000000000..48646e8c9901
--- /dev/null
+++ b/databases/postgresql83-server/pkg-message.client
@@ -0,0 +1,16 @@
+======================================================================
+
+      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
+
+The PostgreSQL port now obeys hier(7) by default, which means that it
+installs into:
+
+/usr/local/bin
+/usr/local/lib
+/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
+                           handles standard install nowadays)
+
+You *must* move away your old installation from users' and
+ldconfig(8)'s PATHs.
+
+======================================================================
diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist
index a7493ddb7898..3074f550e5bb 100644
--- a/databases/postgresql83-server/pkg-plist
+++ b/databases/postgresql83-server/pkg-plist
@@ -1,91 +1,670 @@
-%%PG_PREFIX%%bin/postmaster
-%%PG_PREFIX%%bin/postgres
-%%PG_PREFIX%%bin/ecpg
-%%PG_PREFIX%%bin/initdb
-%%PG_PREFIX%%bin/initlocation
-%%PG_PREFIX%%bin/ipcclean
-%%PG_PREFIX%%bin/pg_ctl
-%%PG_PREFIX%%bin/pg_dump
-%%PG_PREFIX%%bin/pg_restore
-%%PG_PREFIX%%bin/pg_encoding
-%%PG_PREFIX%%bin/pg_dumpall
-%%PG_PREFIX%%bin/pg_id
-%%PG_PREFIX%%bin/pg_passwd
-%%PG_PREFIX%%bin/psql
-%%PG_PREFIX%%bin/createdb
-%%PG_PREFIX%%bin/dropdb
-%%PG_PREFIX%%bin/createuser
-%%PG_PREFIX%%bin/dropuser
-%%PG_PREFIX%%bin/droplang
-%%PG_PREFIX%%bin/vacuumdb
-%%PG_PREFIX%%bin/createlang
-%%PG_PREFIX%%bin/pg_config
-etc/rc.d/010.pgsql.sh
-%%PG_INCLUDE%%/lib/dllist.h
-@dirrm %%PG_INCLUDE%%/lib
-%%PG_INCLUDE%%/libpq/pqcomm.h
-%%PG_INCLUDE%%/libpq/libpq-fs.h
-@dirrm %%PG_INCLUDE%%/libpq
-%%PG_INCLUDE%%/libpq++/pgconnection.h
-%%PG_INCLUDE%%/libpq++/pgdatabase.h
-%%PG_INCLUDE%%/libpq++/pgtransdb.h
-%%PG_INCLUDE%%/libpq++/pgcursordb.h
-%%PG_INCLUDE%%/libpq++/pglobject.h
-@dirrm %%PG_INCLUDE%%/libpq++
-%%PG_INCLUDE%%/c.h
-%%PG_INCLUDE%%/postgres_ext.h
-%%PG_INCLUDE%%/postgres_fe.h
-%%PG_INCLUDE%%/os.h
-%%PG_INCLUDE%%/config.h
-%%PG_INCLUDE%%/libpq-fe.h
-%%PG_INCLUDE%%/libpq-int.h
-%%PG_INCLUDE%%/pqexpbuffer.h
-%%PG_INCLUDE%%/ecpgerrno.h
-%%PG_INCLUDE%%/ecpglib.h
-%%PG_INCLUDE%%/ecpgtype.h
-%%PG_INCLUDE%%/sqlca.h
-%%PG_INCLUDE%%/sql3types.h
-%%PG_INCLUDE%%/libpgeasy.h
-%%PG_INCLUDE%%/libpq++.h
-@dirrm %%PG_INCLUDE%%
-%%PG_PREFIX%%lib/libpq.so
-%%PG_PREFIX%%lib/libpq.a
-%%PG_PREFIX%%lib/libpq.so.2
-%%PG_PREFIX%%lib/libecpg.so
-%%PG_PREFIX%%lib/libecpg.a
-%%PG_PREFIX%%lib/libecpg.so.3
-%%PG_PREFIX%%lib/libpgeasy.so
-%%PG_PREFIX%%lib/libpgeasy.a
-%%PG_PREFIX%%lib/libpgeasy.so.2
-%%PG_PREFIX%%lib/libpq++.so
-%%PG_PREFIX%%lib/libpq++.a
-%%PG_PREFIX%%lib/libpq++.so.3
-%%PG_PREFIX%%lib/plpgsql.so
-share/postgresql/global.bki
-share/postgresql/global.description
-share/postgresql/post-install-notes
-share/postgresql/template1.bki
-share/postgresql/template1.description
+bin/postmaster
+bin/postgres
+bin/ecpg
+bin/initdb
+bin/initlocation
+bin/ipcclean
+bin/pg_ctl
+bin/pg_dump
+bin/pg_restore
+bin/pg_dumpall
+bin/pg_id
+bin/pg_passwd
+bin/psql
+bin/createdb
+bin/dropdb
+bin/createuser
+bin/dropuser
+bin/droplang
+bin/vacuumdb
+bin/createlang
+bin/pg_config
+%%MULTIBYTE%%bin/pg_encoding
+include/libpq/libpq-fs.h
+@dirrm include/libpq
+include/postgresql/internal/libpq/pqcomm.h
+@dirrm include/postgresql/internal/libpq
+include/postgresql/internal/lib/dllist.h
+@dirrm include/postgresql/internal/lib
+include/postgresql/internal/c.h
+include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/libpq-int.h
+include/postgresql/internal/pqexpbuffer.h
+@dirrm include/postgresql/internal
+@dirrm include/postgresql
+include/libpq++/pgconnection.h
+include/libpq++/pgdatabase.h
+include/libpq++/pgtransdb.h
+include/libpq++/pgcursordb.h
+include/libpq++/pglobject.h
+@dirrm include/libpq++
+include/postgres_ext.h
+include/pg_config.h
+include/pg_config_os.h
+include/libpq-fe.h
+include/ecpgerrno.h
+include/ecpglib.h
+include/ecpgtype.h
+include/sqlca.h
+include/sql3types.h
+include/libpgeasy.h
+include/libpq++.h
+lib/libpq.so
+lib/libpq.a
+lib/libpq.so.2
+lib/libecpg.so
+lib/libecpg.a
+lib/libecpg.so.3
+lib/libpgeasy.so
+lib/libpgeasy.a
+lib/libpgeasy.so.2
+lib/libpq++.so
+lib/libpq++.a
+lib/libpq++.so.4
+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
-@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
-@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
-@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
-@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist
-@exec [ -f %D/share/postgresql/post-install-notes ] && cp %D/share/postgresql/post-install-notes ~pgsql && chown pgsql:pgsql ~pgsql/post-install-notes
-@unexec [ -f ~pgsql/post-install-notes ] && rm ~pgsql/post-install-notes
-share/postgresql/dot.profile.dist
-share/postgresql/dot.cshrc.dist
-@dirrm share/postgresql
-@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/.
-@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.
-@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
-@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
-@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true
-@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true
-@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true
-@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true
-@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true
-@unexec rmdir ~pgsql 2> /dev/null || true
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+share/postgresql/post-install-notes
+@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%PORTDOCS%%share/doc/postgresql/html/index.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-welcome.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-start.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-arch.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-createdb.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-accessdb.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-sql.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-concepts.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-table.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-populate.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-select.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-join.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-agg.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-update.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-delete.html
+%%PORTDOCS%%share/doc/postgresql/html/user.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-advanced.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-views.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-fk.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-transactions.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-inheritance.html
+%%PORTDOCS%%share/doc/postgresql/html/tutorial-conclusion.html
+%%PORTDOCS%%share/doc/postgresql/html/preface.html
+%%PORTDOCS%%share/doc/postgresql/html/history.html
+%%PORTDOCS%%share/doc/postgresql/html/resources.html
+%%PORTDOCS%%share/doc/postgresql/html/notation.html
+%%PORTDOCS%%share/doc/postgresql/html/bug-reporting.html
+%%PORTDOCS%%share/doc/postgresql/html/y2k.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-syntax.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-syntax-columns.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-expressions.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-precedence.html
+%%PORTDOCS%%share/doc/postgresql/html/queries.html
+%%PORTDOCS%%share/doc/postgresql/html/queries-union.html
+%%PORTDOCS%%share/doc/postgresql/html/queries-table-expressions.html
+%%PORTDOCS%%share/doc/postgresql/html/queries-select-lists.html
+%%PORTDOCS%%share/doc/postgresql/html/queries-order.html
+%%PORTDOCS%%share/doc/postgresql/html/queries-limit.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-money.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-character.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-binary.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-datetime.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-boolean.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-geometric.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-net-types.html
+%%PORTDOCS%%share/doc/postgresql/html/datatype-bit.html
+%%PORTDOCS%%share/doc/postgresql/html/functions.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-comparison.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-math.html
+%%PORTDOCS%%share/doc/postgresql/html/arrays.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-string.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-binarystring.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-matching.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-formatting.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-datetime.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-geometry.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-net.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-sequence.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-conditional.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-misc.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-aggregate.html
+%%PORTDOCS%%share/doc/postgresql/html/functions-subquery.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv-overview.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv-oper.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv-func.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv-query.html
+%%PORTDOCS%%share/doc/postgresql/html/typeconv-union-case.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-types.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-multicolumn.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-unique.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-functional.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-opclass.html
+%%PORTDOCS%%share/doc/postgresql/html/keys.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-partial.html
+%%PORTDOCS%%share/doc/postgresql/html/indexes-examine.html
+%%PORTDOCS%%share/doc/postgresql/html/inherit.html
+%%PORTDOCS%%share/doc/postgresql/html/mvcc.html
+%%PORTDOCS%%share/doc/postgresql/html/transaction-iso.html
+%%PORTDOCS%%share/doc/postgresql/html/xact-read-committed.html
+%%PORTDOCS%%share/doc/postgresql/html/xact-serializable.html
+%%PORTDOCS%%share/doc/postgresql/html/applevel-consistency.html
+%%PORTDOCS%%share/doc/postgresql/html/locking-tables.html
+%%PORTDOCS%%share/doc/postgresql/html/locking-indexes.html
+%%PORTDOCS%%share/doc/postgresql/html/manage.html
+%%PORTDOCS%%share/doc/postgresql/html/db-accessing.html
+%%PORTDOCS%%share/doc/postgresql/html/db-destroy.html
+%%PORTDOCS%%share/doc/postgresql/html/performance-tips.html
+%%PORTDOCS%%share/doc/postgresql/html/planner-stats.html
+%%PORTDOCS%%share/doc/postgresql/html/explicit-joins.html
+%%PORTDOCS%%share/doc/postgresql/html/populate.html
+%%PORTDOCS%%share/doc/postgresql/html/datetime-appendix.html
+%%PORTDOCS%%share/doc/postgresql/html/timezones.html
+%%PORTDOCS%%share/doc/postgresql/html/units-history.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-keywords-appendix.html
+%%PORTDOCS%%share/doc/postgresql/html/biblio.html
+%%PORTDOCS%%share/doc/postgresql/html/admin.html
+%%PORTDOCS%%share/doc/postgresql/html/installation.html
+%%PORTDOCS%%share/doc/postgresql/html/install-requirements.html
+%%PORTDOCS%%share/doc/postgresql/html/install-getsource.html
+%%PORTDOCS%%share/doc/postgresql/html/install-upgrading.html
+%%PORTDOCS%%share/doc/postgresql/html/install-procedure.html
+%%PORTDOCS%%share/doc/postgresql/html/install-post.html
+%%PORTDOCS%%share/doc/postgresql/html/supported-platforms.html
+%%PORTDOCS%%share/doc/postgresql/html/install-win32.html
+%%PORTDOCS%%share/doc/postgresql/html/runtime.html
+%%PORTDOCS%%share/doc/postgresql/html/creating-cluster.html
+%%PORTDOCS%%share/doc/postgresql/html/postmaster-start.html
+%%PORTDOCS%%share/doc/postgresql/html/runtime-config.html
+%%PORTDOCS%%share/doc/postgresql/html/kernel-resources.html
+%%PORTDOCS%%share/doc/postgresql/html/postmaster-shutdown.html
+%%PORTDOCS%%share/doc/postgresql/html/ssl-tcp.html
+%%PORTDOCS%%share/doc/postgresql/html/ssh-tunnels.html
+%%PORTDOCS%%share/doc/postgresql/html/client-authentication.html
+%%PORTDOCS%%share/doc/postgresql/html/auth-methods.html
+%%PORTDOCS%%share/doc/postgresql/html/client-authentication-problems.html
+%%PORTDOCS%%share/doc/postgresql/html/charset.html
+%%PORTDOCS%%share/doc/postgresql/html/recode.html
+%%PORTDOCS%%share/doc/postgresql/html/multibyte.html
+%%PORTDOCS%%share/doc/postgresql/html/managing-databases.html
+%%PORTDOCS%%share/doc/postgresql/html/manage-ag-dropdb.html
+%%PORTDOCS%%share/doc/postgresql/html/user-manag.html
+%%PORTDOCS%%share/doc/postgresql/html/groups.html
+%%PORTDOCS%%share/doc/postgresql/html/privileges.html
+%%PORTDOCS%%share/doc/postgresql/html/perm-functions.html
+%%PORTDOCS%%share/doc/postgresql/html/maintenance.html
+%%PORTDOCS%%share/doc/postgresql/html/routine-vacuuming.html
+%%PORTDOCS%%share/doc/postgresql/html/logfile-maintenance.html
+%%PORTDOCS%%share/doc/postgresql/html/backup.html
+%%PORTDOCS%%share/doc/postgresql/html/backup-file.html
+%%PORTDOCS%%share/doc/postgresql/html/migration.html
+%%PORTDOCS%%share/doc/postgresql/html/monitoring.html
+%%PORTDOCS%%share/doc/postgresql/html/monitoring-stats.html
+%%PORTDOCS%%share/doc/postgresql/html/wal.html
+%%PORTDOCS%%share/doc/postgresql/html/wal-implementation.html
+%%PORTDOCS%%share/doc/postgresql/html/wal-configuration.html
+%%PORTDOCS%%share/doc/postgresql/html/storage.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq.html
+%%PORTDOCS%%share/doc/postgresql/html/failure.html
+%%PORTDOCS%%share/doc/postgresql/html/failure-disk-failed.html
+%%PORTDOCS%%share/doc/postgresql/html/regress.html
+%%PORTDOCS%%share/doc/postgresql/html/regress-run.html
+%%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-1-3.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-1-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-1-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-0-3.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-0-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-0-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-7-0.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-5-3.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-5-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-5-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-5.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-4-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-4-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-4.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-3-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-3-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-3.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-2-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-2.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-1-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-1.html
+%%PORTDOCS%%share/doc/postgresql/html/release-6-0.html
+%%PORTDOCS%%share/doc/postgresql/html/release-1-09.html
+%%PORTDOCS%%share/doc/postgresql/html/release-1-02.html
+%%PORTDOCS%%share/doc/postgresql/html/release-1-01.html
+%%PORTDOCS%%share/doc/postgresql/html/release-1-0.html
+%%PORTDOCS%%share/doc/postgresql/html/release-0-03.html
+%%PORTDOCS%%share/doc/postgresql/html/release-0-02.html
+%%PORTDOCS%%share/doc/postgresql/html/release-0-01.html
+%%PORTDOCS%%share/doc/postgresql/html/programmer.html
+%%PORTDOCS%%share/doc/postgresql/html/programmer-client.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-connect.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-exec.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-async.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-fastpath.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-notify.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-copy.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-trace.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-control.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-envars.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-threading.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-build.html
+%%PORTDOCS%%share/doc/postgresql/html/libpq-example.html
+%%PORTDOCS%%share/doc/postgresql/html/largeobjects.html
+%%PORTDOCS%%share/doc/postgresql/html/lo-implementation.html
+%%PORTDOCS%%share/doc/postgresql/html/lo-interfaces.html
+%%PORTDOCS%%share/doc/postgresql/html/lo-funcs.html
+%%PORTDOCS%%share/doc/postgresql/html/lo-libpq.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqplusplus.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-init.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-classes.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-connect.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-exec.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-notify.html
+%%PORTDOCS%%share/doc/postgresql/html/libpqpp-copy.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl.html
+%%PORTDOCS%%share/doc/postgresql/html/libpgtcl-loading.html
+%%PORTDOCS%%share/doc/postgresql/html/libpgtcl-ref.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgconnect.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgdisconnect.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgconndefaults.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgexec.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgresult.html
+%%PORTDOCS%%share/doc/postgresql/html/pgeasy.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgselect.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglisten.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglocreat.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgloopen.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgloclose.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgloread.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglowrite.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglolseek.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglotell.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pglounlink.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgloimport.html
+%%PORTDOCS%%share/doc/postgresql/html/pgtcl-pgloexport.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg-concept.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg-use.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg-limitations.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg-porting.html
+%%PORTDOCS%%share/doc/postgresql/html/ecpg-develop.html
+%%PORTDOCS%%share/doc/postgresql/html/odbc.html
+%%PORTDOCS%%share/doc/postgresql/html/odbc-install.html
+%%PORTDOCS%%share/doc/postgresql/html/odbc-config.html
+%%PORTDOCS%%share/doc/postgresql/html/odbc-windows.html
+%%PORTDOCS%%share/doc/postgresql/html/odbc-applixware.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-use.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-query.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-update.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-ddl.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-binary-data.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-ext.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-thread.html
+%%PORTDOCS%%share/doc/postgresql/html/jdbc-reading.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pg-functions.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-connect.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-get-defhost.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-set-defhost.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-get-defport.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-set-defport.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-get-defopt.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-set-defopt.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-get-deftty.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-set-deftty.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-get-defbase.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-set-defbase.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pg-pgobject.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-query.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-reset.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-close.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-fileno.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-getnotify.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-inserttable.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-putline.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-getline.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-endcopy.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-locreate.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-getlo.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-loimport.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pg-db.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-pkey.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-get-databases.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-get-tables.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-get-attnames.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-get.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-insert.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-update.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-clear.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-delete.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pg-pgqueryobject.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-getresult.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-dictresult.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-listfields.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-fieldname.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-fieldnum.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pgqueryobject-ntuples.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pg-pglarge.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-open.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-close.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-read.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-write.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-seek.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-tell.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-unlink.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-size.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-pglargeobject-export.html
+%%PORTDOCS%%share/doc/postgresql/html/pygresql-db-api.html
+%%PORTDOCS%%share/doc/postgresql/html/programmer-server.html
+%%PORTDOCS%%share/doc/postgresql/html/arch-pg.html
+%%PORTDOCS%%share/doc/postgresql/html/extend.html
+%%PORTDOCS%%share/doc/postgresql/html/type-system.html
+%%PORTDOCS%%share/doc/postgresql/html/pg-system-catalogs.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-sql.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-pl.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-internal.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-c.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-overload.html
+%%PORTDOCS%%share/doc/postgresql/html/xfunc-plhandler.html
+%%PORTDOCS%%share/doc/postgresql/html/xtypes.html
+%%PORTDOCS%%share/doc/postgresql/html/xoper.html
+%%PORTDOCS%%share/doc/postgresql/html/xoper-example.html
+%%PORTDOCS%%share/doc/postgresql/html/xoper-optimization.html
+%%PORTDOCS%%share/doc/postgresql/html/xaggr.html
+%%PORTDOCS%%share/doc/postgresql/html/rules.html
+%%PORTDOCS%%share/doc/postgresql/html/querytree.html
+%%PORTDOCS%%share/doc/postgresql/html/rules-views.html
+%%PORTDOCS%%share/doc/postgresql/html/rules-insert.html
+%%PORTDOCS%%share/doc/postgresql/html/rules-permissions.html
+%%PORTDOCS%%share/doc/postgresql/html/rules-triggers.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex-am.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex-support.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex-strategies.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex-opclass.html
+%%PORTDOCS%%share/doc/postgresql/html/xindex-operators.html
+%%PORTDOCS%%share/doc/postgresql/html/indexcost.html
+%%PORTDOCS%%share/doc/postgresql/html/gist.html
+%%PORTDOCS%%share/doc/postgresql/html/triggers.html
+%%PORTDOCS%%share/doc/postgresql/html/trigger-manager.html
+%%PORTDOCS%%share/doc/postgresql/html/trigger-datachanges.html
+%%PORTDOCS%%share/doc/postgresql/html/trigger-examples.html
+%%PORTDOCS%%share/doc/postgresql/html/spi.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spiconnect.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifinish.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spiexec.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spiprepare.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spiexecp.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicursor-open.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicursor-find.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifnumber.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicursor-fetch.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicursor-move.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicursor-close.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spisaveplan.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-interface-support.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifname.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spigetvalue.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spigetbinval.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spigettype.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spigettypeid.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spigetrelname.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-memory.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicopytuple.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicopytupledesc.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spicopytupleintoslot.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spimodifytuple.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spipalloc.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spirepalloc.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spipfree.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifreetuple.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifreetuptable.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-spifreeplan.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-visibility.html
+%%PORTDOCS%%share/doc/postgresql/html/spi-examples.html
+%%PORTDOCS%%share/doc/postgresql/html/programmer-pl.html
+%%PORTDOCS%%share/doc/postgresql/html/xplang.html
+%%PORTDOCS%%share/doc/postgresql/html/xplang-install.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-structure.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-declarations.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-expressions.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-statements.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-control-structures.html
+%%PORTDOCS%%share/doc/postgresql/html/pltcl.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-cursors.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-errors-and-messages.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-trigger.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-examples.html
+%%PORTDOCS%%share/doc/postgresql/html/plpgsql-porting.html
+%%PORTDOCS%%share/doc/postgresql/html/pltcl-description.html
+%%PORTDOCS%%share/doc/postgresql/html/plperl.html
+%%PORTDOCS%%share/doc/postgresql/html/plperl-description.html
+%%PORTDOCS%%share/doc/postgresql/html/plperl-install.html
+%%PORTDOCS%%share/doc/postgresql/html/plpython.html
+%%PORTDOCS%%share/doc/postgresql/html/plpython-install.html
+%%PORTDOCS%%share/doc/postgresql/html/plpython-using.html
+%%PORTDOCS%%share/doc/postgresql/html/reference.html
+%%PORTDOCS%%share/doc/postgresql/html/reference-preface.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-commands.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-abort.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-altergroup.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-altertable.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-alteruser.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-analyze.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-begin.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-checkpoint.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-close.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-cluster.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-comment.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-commit.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-copy.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createaggregate.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createconstraint.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createdatabase.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createfunction.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-creategroup.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createindex.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createlanguage.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createoperator.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createrule.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createsequence.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createtable.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createtableas.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createtrigger.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createtype.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createuser.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-createview.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-declare.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-delete.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropaggregate.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropdatabase.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropfunction.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropgroup.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropindex.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-droplanguage.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropoperator.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-droprule.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropsequence.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-droptable.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-droptrigger.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-droptype.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropuser.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-dropview.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-end.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-explain.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-fetch.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-grant.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-insert.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-listen.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-load.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-lock.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-move.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-notify.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-reindex.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-reset.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-revoke.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-rollback.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-select.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-selectinto.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-set.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-set-constraints.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-set-session-authorization.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-set-transaction.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-show.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-truncate.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-unlisten.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-update.html
+%%PORTDOCS%%share/doc/postgresql/html/sql-vacuum.html
+%%PORTDOCS%%share/doc/postgresql/html/reference-client.html
+%%PORTDOCS%%share/doc/postgresql/html/app-createdb.html
+%%PORTDOCS%%share/doc/postgresql/html/app-createlang.html
+%%PORTDOCS%%share/doc/postgresql/html/app-createuser.html
+%%PORTDOCS%%share/doc/postgresql/html/app-dropdb.html
+%%PORTDOCS%%share/doc/postgresql/html/app-droplang.html
+%%PORTDOCS%%share/doc/postgresql/html/app-dropuser.html
+%%PORTDOCS%%share/doc/postgresql/html/app-ecpg.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgaccess.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgconfig.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgdump.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pg-dumpall.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgrestore.html
+%%PORTDOCS%%share/doc/postgresql/html/app-psql.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgtclsh.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pgtksh.html
+%%PORTDOCS%%share/doc/postgresql/html/app-vacuumdb.html
+%%PORTDOCS%%share/doc/postgresql/html/reference-server.html
+%%PORTDOCS%%share/doc/postgresql/html/app-initdb.html
+%%PORTDOCS%%share/doc/postgresql/html/app-initlocation.html
+%%PORTDOCS%%share/doc/postgresql/html/app-ipcclean.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pg-ctl.html
+%%PORTDOCS%%share/doc/postgresql/html/app-pg-passwd.html
+%%PORTDOCS%%share/doc/postgresql/html/app-postgres.html
+%%PORTDOCS%%share/doc/postgresql/html/app-postmaster.html
+%%PORTDOCS%%share/doc/postgresql/html/developer.html
+%%PORTDOCS%%share/doc/postgresql/html/source.html
+%%PORTDOCS%%share/doc/postgresql/html/overview.html
+%%PORTDOCS%%share/doc/postgresql/html/connect-estab.html
+%%PORTDOCS%%share/doc/postgresql/html/parser-stage.html
+%%PORTDOCS%%share/doc/postgresql/html/rule-system.html
+%%PORTDOCS%%share/doc/postgresql/html/planner-optimizer.html
+%%PORTDOCS%%share/doc/postgresql/html/executor.html
+%%PORTDOCS%%share/doc/postgresql/html/catalogs.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-aggregate.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-attrdef.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-attribute.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-class.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-database.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-description.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-group.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-index.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-inherits.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-language.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-largeobject.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-listener.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-operator.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-proc.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-relcheck.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-rewrite.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-shadow.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-statistic.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-trigger.html
+%%PORTDOCS%%share/doc/postgresql/html/catalog-pg-type.html
+%%PORTDOCS%%share/doc/postgresql/html/protocol.html
+%%PORTDOCS%%share/doc/postgresql/html/protocol-protocol.html
+%%PORTDOCS%%share/doc/postgresql/html/protocol-message-types.html
+%%PORTDOCS%%share/doc/postgresql/html/protocol-message-formats.html
+%%PORTDOCS%%share/doc/postgresql/html/compiler.html
+%%PORTDOCS%%share/doc/postgresql/html/bki.html
+%%PORTDOCS%%share/doc/postgresql/html/bki-commands.html
+%%PORTDOCS%%share/doc/postgresql/html/bki-example.html
+%%PORTDOCS%%share/doc/postgresql/html/page.html
+%%PORTDOCS%%share/doc/postgresql/html/geqo.html
+%%PORTDOCS%%share/doc/postgresql/html/geqo-intro2.html
+%%PORTDOCS%%share/doc/postgresql/html/geqo-pg-intro.html
+%%PORTDOCS%%share/doc/postgresql/html/geqo-biblio.html
+%%PORTDOCS%%share/doc/postgresql/html/nls.html
+%%PORTDOCS%%share/doc/postgresql/html/nls-programmer.html
+%%PORTDOCS%%share/doc/postgresql/html/cvs.html
+%%PORTDOCS%%share/doc/postgresql/html/cvs-tree.html
+%%PORTDOCS%%share/doc/postgresql/html/cvsup.html
+%%PORTDOCS%%share/doc/postgresql/html/docguide.html
+%%PORTDOCS%%share/doc/postgresql/html/doc-toolsets.html
+%%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/catalogs.gif
+%%PORTDOCS%%share/doc/postgresql/html/connections.gif
+%%PORTDOCS%%share/doc/postgresql/html/stylesheet.css
+%%PORTDOCS%%@dirrm share/doc/postgresql/html
+%%PORTDOCS%%@dirrm share/doc/postgresql
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.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/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%@unexec rmdir share/locale/*/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir share/locale/* 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir share/locale 2>/dev/null || true
+%%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
+%%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
+%%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
+%%SERVER%%@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist
+%%SERVER%%@exec [ -f %D/share/postgresql/post-install-notes ] && cp %D/share/postgresql/post-install-notes ~pgsql && chown pgsql:pgsql ~pgsql/post-install-notes
+%%SERVER%%@unexec [ -f ~pgsql/post-install-notes ] && rm ~pgsql/post-install-notes
+%%SERVER%%share/postgresql/dot.profile.dist
+%%SERVER%%share/postgresql/dot.cshrc.dist
+%%SERVER%%@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/.
+%%SERVER%%@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.
+%%SERVER%%@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
+%%SERVER%%@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
+%%SERVER%%@unexec rmdir ~pgsql 2> /dev/null || true
+%%SERVER%%@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually."
+%%SERVER%%@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%SERVER%%etc/rc.d/010.pgsql.sh
diff --git a/databases/postgresql83-server/pkg-plist.jdbc b/databases/postgresql83-server/pkg-plist.jdbc
deleted file mode 100644
index 8f7bd41a54d7..000000000000
--- a/databases/postgresql83-server/pkg-plist.jdbc
+++ /dev/null
@@ -1,27 +0,0 @@
-share/examples/postgresql/corba/StockClient.java
-share/examples/postgresql/corba/StockDB.java
-share/examples/postgresql/corba/StockDispenserImpl.java
-share/examples/postgresql/corba/StockItemImpl.java
-share/examples/postgresql/corba/StockServer.java
-share/examples/postgresql/corba/readme
-share/examples/postgresql/corba/stock.idl
-share/examples/postgresql/corba/stock.sql
-@dirrm share/examples/postgresql/corba
-share/examples/postgresql/ImageViewer.java
-share/examples/postgresql/Unicode.java
-share/examples/postgresql/basic.java
-share/examples/postgresql/blobtest.java
-share/examples/postgresql/datestyle.java
-share/examples/postgresql/metadata.java
-share/examples/postgresql/psql.java
-share/examples/postgresql/threadsafe.java
-share/examples/postgresql/README
-share/examples/postgresql/Implementation
-@dirrm share/examples/postgresql
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-share/postgresql/java/retepTools.jar
-@dirrm share/postgresql/java
-share/java/classes/postgresql.jar
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
diff --git a/databases/postgresql83-server/pkg-plist.notk b/databases/postgresql83-server/pkg-plist.notk
deleted file mode 100644
index 8dcbc5f88bd6..000000000000
--- a/databases/postgresql83-server/pkg-plist.notk
+++ /dev/null
@@ -1,6 +0,0 @@
-%%PG_PREFIX%%bin/pgtclsh
-%%PG_INCLUDE%%/libpgtcl.h
-%%PG_PREFIX%%lib/libpgtcl.a
-%%PG_PREFIX%%lib/libpgtcl.so
-%%PG_PREFIX%%lib/libpgtcl.so.2
-%%PG_PREFIX%%lib/pltcl.so
diff --git a/databases/postgresql83-server/pkg-plist.odbc b/databases/postgresql83-server/pkg-plist.odbc
deleted file mode 100644
index f047b7cb64a1..000000000000
--- a/databases/postgresql83-server/pkg-plist.odbc
+++ /dev/null
@@ -1,10 +0,0 @@
-%%PG_INCLUDE%%/iodbc/iodbc.h
-%%PG_INCLUDE%%/iodbc/isql.h
-%%PG_INCLUDE%%/iodbc/isqlext.h
-@dirrm %%PG_INCLUDE%%/iodbc
-%%PG_PREFIX%%lib/libpsqlodbc.a
-%%PG_PREFIX%%lib/libpsqlodbc.so
-%%PG_PREFIX%%lib/libpsqlodbc.so.0
-etc/postgresql/odbcinst.ini
-@dirrm etc/postgresql
-share/postgresql/odbc.sql
diff --git a/databases/postgresql83-server/pkg-plist.tcl b/databases/postgresql83-server/pkg-plist.tcl
deleted file mode 100644
index da5f4367cb80..000000000000
--- a/databases/postgresql83-server/pkg-plist.tcl
+++ /dev/null
@@ -1,148 +0,0 @@
-%%PG_PREFIX%%bin/pgaccess
-%%PG_PREFIX%%bin/pgtclsh
-%%PG_PREFIX%%bin/pgtksh
-%%PG_INCLUDE%%/libpgtcl.h
-%%PG_PREFIX%%lib/libpgtcl.a
-%%PG_PREFIX%%lib/libpgtcl.so
-%%PG_PREFIX%%lib/libpgtcl.so.2
-%%PG_PREFIX%%lib/pltcl.so
-lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl
-share/postgresql/pgaccess/images/icon_button.gif
-share/postgresql/pgaccess/images/icon_checkbutton.gif
-share/postgresql/pgaccess/images/icon_entry.gif
-share/postgresql/pgaccess/images/icon_frame.gif
-share/postgresql/pgaccess/images/icon_label.gif
-share/postgresql/pgaccess/images/icon_listbox.gif
-share/postgresql/pgaccess/images/icon_query.gif
-share/postgresql/pgaccess/images/icon_radiobutton.gif
-share/postgresql/pgaccess/images/icon_text.gif
-share/postgresql/pgaccess/lib/database.tcl
-share/postgresql/pgaccess/lib/forms.tcl
-share/postgresql/pgaccess/lib/functions.tcl
-share/postgresql/pgaccess/lib/help/abort.hlp
-share/postgresql/pgaccess/lib/help/add_records.hlp
-share/postgresql/pgaccess/lib/help/alter_table.hlp
-share/postgresql/pgaccess/lib/help/alter_user.hlp
-share/postgresql/pgaccess/lib/help/author.hlp
-share/postgresql/pgaccess/lib/help/begin.hlp
-share/postgresql/pgaccess/lib/help/close.hlp
-share/postgresql/pgaccess/lib/help/cluster.hlp
-share/postgresql/pgaccess/lib/help/commit.hlp
-share/postgresql/pgaccess/lib/help/copy.hlp
-share/postgresql/pgaccess/lib/help/copyrights.hlp
-share/postgresql/pgaccess/lib/help/create_aggregate.hlp
-share/postgresql/pgaccess/lib/help/create_database.hlp
-share/postgresql/pgaccess/lib/help/create_function.hlp
-share/postgresql/pgaccess/lib/help/create_index.hlp
-share/postgresql/pgaccess/lib/help/create_language.hlp
-share/postgresql/pgaccess/lib/help/create_operator.hlp
-share/postgresql/pgaccess/lib/help/create_rule.hlp
-share/postgresql/pgaccess/lib/help/create_sequence.hlp
-share/postgresql/pgaccess/lib/help/create_table.hlp
-share/postgresql/pgaccess/lib/help/create_table_as.hlp
-share/postgresql/pgaccess/lib/help/create_trigger.hlp
-share/postgresql/pgaccess/lib/help/create_type.hlp
-share/postgresql/pgaccess/lib/help/create_user.hlp
-share/postgresql/pgaccess/lib/help/create_view.hlp
-share/postgresql/pgaccess/lib/help/data_types.hlp
-share/postgresql/pgaccess/lib/help/datefunc.hlp
-share/postgresql/pgaccess/lib/help/declare.hlp
-share/postgresql/pgaccess/lib/help/delete.hlp
-share/postgresql/pgaccess/lib/help/drop_aggregate.hlp
-share/postgresql/pgaccess/lib/help/drop_database.hlp
-share/postgresql/pgaccess/lib/help/drop_function.hlp
-share/postgresql/pgaccess/lib/help/drop_index.hlp
-share/postgresql/pgaccess/lib/help/drop_language.hlp
-share/postgresql/pgaccess/lib/help/drop_operator.hlp
-share/postgresql/pgaccess/lib/help/drop_rule.hlp
-share/postgresql/pgaccess/lib/help/drop_sequence.hlp
-share/postgresql/pgaccess/lib/help/drop_table.hlp
-share/postgresql/pgaccess/lib/help/drop_trigger.hlp
-share/postgresql/pgaccess/lib/help/drop_type.hlp
-share/postgresql/pgaccess/lib/help/drop_user.hlp
-share/postgresql/pgaccess/lib/help/drop_view.hlp
-share/postgresql/pgaccess/lib/help/explain.hlp
-share/postgresql/pgaccess/lib/help/fetch.hlp
-share/postgresql/pgaccess/lib/help/form_design.hlp
-share/postgresql/pgaccess/lib/help/forms.hlp
-share/postgresql/pgaccess/lib/help/functions.hlp
-share/postgresql/pgaccess/lib/help/geomfunc.hlp
-share/postgresql/pgaccess/lib/help/grant.hlp
-share/postgresql/pgaccess/lib/help/history.hlp
-share/postgresql/pgaccess/lib/help/index.hlp
-share/postgresql/pgaccess/lib/help/inheritance.hlp
-share/postgresql/pgaccess/lib/help/insert.hlp
-share/postgresql/pgaccess/lib/help/ipv4func.hlp
-share/postgresql/pgaccess/lib/help/isolation.hlp
-share/postgresql/pgaccess/lib/help/keywords.hlp
-share/postgresql/pgaccess/lib/help/listen.hlp
-share/postgresql/pgaccess/lib/help/load.hlp
-share/postgresql/pgaccess/lib/help/lock.hlp
-share/postgresql/pgaccess/lib/help/mathfunc.hlp
-share/postgresql/pgaccess/lib/help/move.hlp
-share/postgresql/pgaccess/lib/help/mvcc.hlp
-share/postgresql/pgaccess/lib/help/new_query.hlp
-share/postgresql/pgaccess/lib/help/new_table.hlp
-share/postgresql/pgaccess/lib/help/notify.hlp
-share/postgresql/pgaccess/lib/help/open_query.hlp
-share/postgresql/pgaccess/lib/help/open_table.hlp
-share/postgresql/pgaccess/lib/help/pgfunctions.hlp
-share/postgresql/pgaccess/lib/help/postgresql.hlp
-share/postgresql/pgaccess/lib/help/queries.hlp
-share/postgresql/pgaccess/lib/help/reports.hlp
-share/postgresql/pgaccess/lib/help/reset.hlp
-share/postgresql/pgaccess/lib/help/revoke.hlp
-share/postgresql/pgaccess/lib/help/rollback.hlp
-share/postgresql/pgaccess/lib/help/schema.hlp
-share/postgresql/pgaccess/lib/help/scripts.hlp
-share/postgresql/pgaccess/lib/help/select.hlp
-share/postgresql/pgaccess/lib/help/select_into.hlp
-share/postgresql/pgaccess/lib/help/sequences.hlp
-share/postgresql/pgaccess/lib/help/set.hlp
-share/postgresql/pgaccess/lib/help/show.hlp
-share/postgresql/pgaccess/lib/help/sql_guide.hlp
-share/postgresql/pgaccess/lib/help/sqlfunc.hlp
-share/postgresql/pgaccess/lib/help/stringfunc.hlp
-share/postgresql/pgaccess/lib/help/tables.hlp
-share/postgresql/pgaccess/lib/help/unlisten.hlp
-share/postgresql/pgaccess/lib/help/update.hlp
-share/postgresql/pgaccess/lib/help/users.hlp
-share/postgresql/pgaccess/lib/help/vacuum.hlp
-share/postgresql/pgaccess/lib/help/view_table_structure.hlp
-share/postgresql/pgaccess/lib/help/views.hlp
-share/postgresql/pgaccess/lib/help/visual_designer.hlp
-share/postgresql/pgaccess/lib/help/y2k.hlp
-share/postgresql/pgaccess/lib/help.tcl
-share/postgresql/pgaccess/lib/languages/czech
-share/postgresql/pgaccess/lib/languages/chinese_big5
-share/postgresql/pgaccess/lib/languages/chinese_gb
-share/postgresql/pgaccess/lib/languages/deutsch
-share/postgresql/pgaccess/lib/languages/euskara
-share/postgresql/pgaccess/lib/languages/francais
-share/postgresql/pgaccess/lib/languages/italiano
-share/postgresql/pgaccess/lib/languages/japanese
-share/postgresql/pgaccess/lib/languages/magyar
-share/postgresql/pgaccess/lib/languages/nederlands
-share/postgresql/pgaccess/lib/languages/portugues
-share/postgresql/pgaccess/lib/languages/romana
-share/postgresql/pgaccess/lib/languages/russian.koi8r
-share/postgresql/pgaccess/lib/languages/russian_win
-share/postgresql/pgaccess/lib/languages/spanish
-share/postgresql/pgaccess/lib/mainlib.tcl
-share/postgresql/pgaccess/lib/preferences.tcl
-share/postgresql/pgaccess/lib/queries.tcl
-share/postgresql/pgaccess/lib/reports.tcl
-share/postgresql/pgaccess/lib/schema.tcl
-share/postgresql/pgaccess/lib/scripts.tcl
-share/postgresql/pgaccess/lib/sequences.tcl
-share/postgresql/pgaccess/lib/tables.tcl
-share/postgresql/pgaccess/lib/users.tcl
-share/postgresql/pgaccess/lib/views.tcl
-share/postgresql/pgaccess/lib/visualqb.tcl
-share/postgresql/pgaccess/main.tcl
-@dirrm share/postgresql/pgaccess/images
-@dirrm share/postgresql/pgaccess/lib/help
-@dirrm share/postgresql/pgaccess/lib/languages
-@dirrm share/postgresql/pgaccess/lib
-@dirrm share/postgresql/pgaccess
-@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3
diff --git a/databases/postgresql83-server/scripts/configure.postgresql b/databases/postgresql83-server/scripts/configure.postgresql
index 0b288ad43d25..0d4e224e6561 100644
--- a/databases/postgresql83-server/scripts/configure.postgresql
+++ b/databases/postgresql83-server/scripts/configure.postgresql
@@ -10,23 +10,24 @@ fi
 
 if [ ! "${BATCH}" ]; then
 	dialog --title "Backup your data NOW" \
-	--msgbox "`sed -e \"s#%%PREFIX%%#${PREFIX}#\" < ${FILESDIR}/pre-install-notes`" \
-	-1 -1
+	--yesno "As always, backup your data before
+upgrading. If the upgrade leads to a higher
+minor revision (e.g. 7.1.x -> 7.2, a dump
+and restore of all databases is
+required. This is *NOT* done by the port!
+
+Select 'Yes' to continue the installation." -1 -1
+	if [ $1 -eq 1 ] ; then exit 1; fi
 fi
 
 if [ "${BATCH}" ]; then
-	set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TCLTK\"
+	set \"MultiByte\" \"KRB5\"
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 					--checklist "\n\
 Please select desired options:" -1 -1 7 \
-JDBC       "Java DataBase Connectivity" OFF \
 MultiByte  "Multibyte for Multilingualism" ON \
-ODBC       "Open Database Connectivity" ON \
-TCL        "Tcl" ON \
-TCLTK      "Tcl/Tk" ON \
-SSL        "Secure Socket Layer" ON \
-KRB5       "Kerberos 5" OFF \
+KRB5       "Kerberos 5" ON \
 2> /tmp/checklist.tmp.$$
 
 	retval=$?
@@ -52,82 +53,9 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
-		\"JDBC\")
-			# We use JAVA_HOME if set correctly. If the user has
-			# specified a JVM with JAVA_HOME or via the javavmwrapper,
-			# we validate that it really exists. It is unnecessarily
-			# complicated and error prone to try to figure out the
-			# correct java version just to be able to determine a
-			# BUILD_DEPEND in this case. Instead, assume that a set
-			# JAVA_HOME together with simple sanity check mean we have
-			# an installed JVM, and we don't bother setting
-			# BUILD_DEPENDS.
-
-			echo "# JDBC"
-			# if JAVA_HOME is set and exists, use it
-			if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
-				echo JAVA_HOME=${JAVA_HOME}
-			else
-				# No JAVA_HOME, check javavmwrapper's config file
-				if [ -r "${LOCALBASE}/etc/javavms" ]; then
-					VMS=`/usr/bin/sed 's|#.*||' < "${LOCALBASE}/etc/javavms" | uniq`
-					for JAVAVM in ${VMS}; do
-						if [ -x "${JAVAVM}" ]; then
-							JAVA_HOME=`echo ${JAVAVM} | /usr/bin/sed 's|/bin/java$||`
-							break
-						fi
-					done
-				fi
-				if [ "${JAVA_HOME}" -a -x "${JAVA_HOME}/bin/javac" ]; then
-					# yep, wrapper was good
-					echo JAVA_HOME=${JAVA_HOME}
-				else
-					# nothing, use our boring 1.1.8, the only native non-beta jdk :(
-					echo BUILD_DEPENDS+=    \${LOCALBASE}/jdk1.1.8/bin/javac:\${PORTSDIR}/java/jdk
-					echo JAVA_HOME=\${LOCALBASE}/jdk1.1.8
-				fi
-			fi
-			cat <<-EOF
-				BUILD_DEPENDS+=	\${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant
-				CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant
-				WITH_JDBC=YES
-				MAKE_ENV+=	JAVA_HOME=\${JAVA_HOME}
-				SCRIPTS_ENV+=	JAVA_HOME=\${JAVA_HOME}
-				CONFIGURE_ARGS+=	--with-java
-
-			EOF
-			;;
 		\"MultiByte\")
 			MULTIBYTE=1
 			;;
-		\"ODBC\")
-			cat <<-EOF
-				# ODBC
-				WITH_ODBC=YES
-				CONFIGURE_ARGS+=  --with-odbc
-
-			EOF
-			;;
-		\"TCL\")
-			TCL=1
-			;;
-		\"TCLTK\")
-			echo "#TCLTK"
-			echo WITH_TK=YES
-			echo
-			TCL=1
-			;;
-		\"SSL\")
-			cat <<-EOF
-				# SSL
-				USE_OPENSSL=    yes
-				CFLAGS+=	-DUSE_SSL
-				WITH_SSL=	yes
-				CONFIGURE_ENV+=	LDFLAGS="-L\${OPENSSLLIB} -lssl -lcrypto"
-				CONFIGURE_ARGS+=	--with-openssl
-
-			EOF
-			;;
 		\"KRB5\")
 			KRB5=1
 			;;
@@ -144,7 +72,7 @@ done
 
 exec > /dev/stderr
 
-# if multibyte, determine charset
+# if multibyte, determine default charset
 echo "# Multibyte" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 if [ ! "${MULTIBYTE}" ]; then
@@ -153,25 +81,34 @@ else
 	if [ "${BATCH}" ]; then
 		set "nothing"
 	else
-		/usr/bin/dialog --title "configuration options" --clear \
+		/usr/bin/dialog --title "Default encoding system" --clear \
 						--radiolist "\n\
-Please select desired options:" -1 -1 16 \
+Please select the default encoding:" -1 -1 16 \
 nothing       "Default Encoding" ON \
-SQL_ASCII     "SQL_ASCII" OFF \
-LATIN1        "LATIN1" OFF \
-LATIN2        "LATIN2" OFF \
-LATIN3        "LATIN3" OFF \
-LATIN4        "LATIN4" OFF \
-LATIN5        "LATIN5" OFF \
-EUC_JP        "EUC_JP" OFF \
-EUC_CN        "EUC_CN" OFF \
-EUC_KR        "EUC_KR" OFF \
-EUC_TW        "EUC_TW" OFF \
-KOI8          "KOI8" OFF \
-UNICODE       "UNICODE" OFF \
-MULE_INTERNAL "MULE_INTERNAL" OFF \
-WIN           "WIN" OFF \
-ALT           "ALT" OFF \
+SQL_ASCII     "SQL_ASCII - ASCII" OFF \
+EUC_JP        "Japanese EUC" OFF \
+EUC_CN        "Chinese EUC" OFF \
+EUC_KR        "Korean EUC" OFF \
+EUC_TW        "Taiwan EUC" OFF \
+UNICODE       "Unicode (UTF-8)" OFF \
+MULE_INTERNAL "Mule internal code" OFF \
+LATIN1        "ISO 8859-1" OFF \
+LATIN2        "ISO 8859-2" OFF \
+LATIN3        "ISO 8859-3" OFF \
+LATIN4        "ISO 8859-4" OFF \
+LATIN5        "ISO 8859-9" OFF \
+LATIN6        "ISO 8859-10" OFF \
+LATIN7        "ISO 8859-13" OFF \
+LATIN8        "ISO 8859-14" OFF \
+LATIN9        "ISO 8859-15" OFF \
+LATIN10       "ISO 8859-16" OFF \
+ISO-8859-5    "ECMA-113 Latin/Cyrillic" OFF \
+ISO-8859-6    "ECMA-114 Latin/Arabic" OFF \
+ISO-8859-7    "ECMA-118 Latin/Greek" OFF \
+ISO-8859-8    "ECMA-121 Latin/Hebrew" OFF \
+KOI8          "KOI8-R(U)" OFF \
+WIN           "Windows CP1251" OFF \
+ALT           "Windows CP866" OFF \
 2> /tmp/checklist.tmp.$$
 
 		retval=$?
@@ -188,91 +125,41 @@ ALT           "ALT" OFF \
 	fi
 
     if [ "$1" = "nothing" ]; then
-		echo "CONFIGURE_ARGS+=	--enable-multibyte" \
+		echo "MULTIBYTE_ENCODING=yes" \
 			>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	else
-		echo "CONFIGURE_ARGS+=	--enable-multibyte=$1" \
+		echo "MULTIBYTE_ENCODING=$1" \
 			>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	fi
 fi
-echo
-
-if [ "${TCL}" ]; then
-	echo "# TCL" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	if [ "${BATCH}" ]; then
-		echo WITH_TCL=8.3  >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	else
-		dialog --title "TCL version" \
-			   --inputbox "Please enter TCL version. Default is 8.3." -1 -1 "8.3" \
-			2> /tmp/checklist.tmp.$$
-		retval=$?
-		if [ -s /tmp/checklist.tmp.$$ ]; then
-			set `cat /tmp/checklist.tmp.$$`
-		fi
-		rm -f /tmp/checklist.tmp.$$
-		case $retval in
-			0)	if [ -z "$*" ]; then
-					echo "Nothing selected"
-				fi
-				;;
-			1)	echo "Cancel pressed."
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-				;;
-		esac
-		echo WITH_TCL=$1 >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	fi
-	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-		CONFIGURE_ARGS+= --with-tcl --with-tclconfig="\${TCLCONFIG}"
-		TCLV=\${WITH_TCL:S/.//}
-		TCL_INCDIR=		\${LOCALBASE}/include/tcl\${WITH_TCL}
-		MAKE_ENV+=		TCL_INCDIR=\${TCL_INCDIR}
-		LIB_DEPENDS+=	tcl\${TCLV}:\${PORTSDIR}/lang/tcl\${TCLV}
-		TCLCONFIG=		"\${LOCALBASE}/lib/tcl\${WITH_TCL}"
-		.if defined(WITH_TK)
-		CONFIGURE_ARGS+= --with-tkconfig="\${TKCONFIG}"
-		TK_INCDIR=		\${LOCALBASE}/include/tk\${WITH_TCL}
-		CONFIGURE_ENV+=	WISH=\${LOCALBASE}/bin/wish\${WITH_TCL}
-		LIB_DEPENDS+=	tk\${TCLV}:\${PORTSDIR}/x11-toolkits/tk\${TCLV}
-		TKCONFIG=		"\${LOCALBASE}/lib/tk\${WITH_TCL}"
-		TCLCONFIG+=		\${TKCONFIG}
-		TCL_PLIST=     pkg-plist.tcl
-		.else
-		TCL_PLIST=     pkg-plist.notk
-		CONFIGURE_ARGS+=        --without-tk
-		.endif
-
-	EOF
-fi
 
 if [ "${KRB5}" ]; then
-	if [ "${BATCH}" ]; then
-		# never gets here, but what the heck...
-		echo KRB5_HOME=\${LOCALBASE} >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+	if [ -r "/usr/bin/krb5-config" ]; then
+		echo "	########################################################################"
+		echo "	### PostgreSQL does not build with Hiemdal kerberos. Edit            ###"
+		echo "	### /etc/make.conf and turn the knob MAKE_KERBEROS5 off and make     ###"
+		echo "	### world (or remove all traces of Hiemdal from your system by:      ###"
+		echo "	### rm -f /usr/bin/krb5-config /usr/lib/libkrb5.* /usr/include/krb5* ###"
+		echo "	########################################################################"
+		KRB5=""
 	else
-		dialog --inputbox "Please enter the KRB5_HOME path" -1 -1 "${KRB_HOME:-${LOCALBASE}}" \
-			2> /tmp/checklist.tmp.$$
-		retval=$?
-		if [ -s /tmp/checklist.tmp.$$ ]; then
-			set `cat /tmp/checklist.tmp.$$`
+		KRB5CONF="`which krb5-config`"
+		if [ "$KRB5CONF" ]; then
+			cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				.if exists($KRB5CONF)
+				LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
+				CONFIGURE_ARGS+=	--with-krb5="`${KRB5CONF} --prefix krb5`"
+				CFLAGS+=	"`${KRB5CONF} --cflags krb5`"
+				LDFLAGS+=	"`${KRB5CONF} --libs krb5`"
+				.endif
+				EOF
+		else
+			echo "	########################################################"
+			echo "	### Unable to find krb5-config in your path.         ###"
+			echo "	### Please correct and build PostgreSQL again if you ###"
+			echo "	### want PostgreSQL to be compiled with kerberos     ###"
+			echo "	### support (ports/security/krb5).                   ###"
+			echo "	########################################################"
 		fi
-		rm -f /tmp/checklist.tmp.$$
-		case $retval in
-			0)	if [ -z "$*" ]; then
-					echo "No input"
-				fi
-				;;
-			1)	echo "Cancel pressed."
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-				;;
-		esac
-		echo KRB5_HOME=\"$1\" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	fi
-	cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-		.if defined(KRB5_HOME) && exists(\${KRB5_HOME})
-		CONFIGURE_KRB=	--with-krb5=\${KRB5_HOME}
-		.endif
-
-	EOF
 fi
author	Vanilla I. Shu <vanilla@FreeBSD.org>	2002-02-19 08:23:22 +0000
committer	Vanilla I. Shu <vanilla@FreeBSD.org>	2002-02-19 08:23:22 +0000
commit	0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7 (patch)
tree	e2c20382071c1aac790898564dea14a5b332a404 /databases/postgresql83-server
parent	5416e71b191a05ec09d024063c88e8d0afee5954 (diff)
download	ports-0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7.tar.gz ports-0c0bcdc10ba6c2d0bbf6c831f5bc05a32470a2e7.zip