summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql/Makefile194
-rw-r--r--databases/postgresql/files/Makefile.custom23
-rw-r--r--databases/postgresql/files/md54
-rw-r--r--databases/postgresql/files/patch-sum22
-rw-r--r--databases/postgresql/files/pgsql.sh.tmpl26
-rw-r--r--databases/postgresql/files/post-install-notes4
-rw-r--r--databases/postgresql/patches/patch-aa73
-rw-r--r--databases/postgresql/patches/patch-ab123
-rw-r--r--databases/postgresql/patches/patch-ac48
-rw-r--r--databases/postgresql/patches/patch-ad38
-rw-r--r--databases/postgresql/patches/patch-ae79
-rw-r--r--databases/postgresql/patches/patch-af48
-rw-r--r--databases/postgresql/patches/patch-ag40
-rw-r--r--databases/postgresql/patches/patch-ah55
-rw-r--r--databases/postgresql/patches/patch-ai55
-rw-r--r--databases/postgresql/patches/patch-aj25
-rw-r--r--databases/postgresql/patches/patch-ak13
-rw-r--r--databases/postgresql/patches/patch-al29
-rw-r--r--databases/postgresql/patches/patch-am56
-rw-r--r--databases/postgresql/pkg/PLIST414
-rw-r--r--databases/postgresql/pkg/PLIST.dirrm22
-rw-r--r--databases/postgresql/pkg/PLIST.doc792
-rw-r--r--databases/postgresql/pkg/PLIST.notcl195
-rw-r--r--databases/postgresql/pkg/PLIST.tcl8
-rw-r--r--databases/postgresql/pkg/REQ2
25 files changed, 1649 insertions, 739 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 877849dce6b..52bd447c3d9 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,48 +1,84 @@
-# $NetBSD: Makefile,v 1.39 1999/09/06 18:19:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.40 1999/09/19 04:24:53 jlam Exp $
# FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
#
-DISTNAME= postgresql-6.4.2
+DISTNAME= postgresql-6.5.1
WRKSRC= ${WRKDIR}/${DISTNAME}/src
CATEGORIES= databases
MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \
ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \
ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/
-MAINTAINER= packages@netbsd.org
+MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.PostgreSQL.ORG/
BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison
-DEPENDS+= tk-8.0.5:../../x11/tk80 \
- tcl-8.0.5:../../lang/tcl80 \
- addnerd-1.6:../../sysutils/addnerd \
- ncurses-4.2:../../devel/ncurses
+DEPENDS+= addnerd-1.6:../../sysutils/addnerd
+
+# Evil stuff follows: I haven't figured out how to add flags to configure to
+# nicely disable the ncurses and readline checks in the configure script, yet.
+.if exists(${LOCALBASE}/include/ncurses.h)
+DEPENDS+= ncurses-4.2:../../devel/ncurses
+.endif
+.if exists(${LOCALBASE}/include/readline.h)
+DEPENDS+= readline-4.0:../../devel/readline
+.endif
# Needs ELF clue, mips has no TAS implementation
NOT_FOR_PLATFORM= *-*-alpha *-*-mips
-REQ_FILE= ${WRKDIR}/REQ
+MAKEFILE= GNUmakefile
+USE_GMAKE= YES
+USE_LIBTOOL= YES
+
+# Don't use GNU_CONFIGURE or else bsd.pkg.mk will override our custom PREFIX.
+HAS_CONFIGURE= YES
+
+.include "../../mk/bsd.prefs.mk"
+
+# If you want to use the tcl/tk frontend pgaccess, then you need to build
+# postgresql with tcl support by defining `PGSQL_USE_TCL=' in /etc/mk.conf
+# or by typing: ${MAKE} PGSQL_USE_TCL=.
+#
+.if defined(PGSQL_USE_TCL)
+DEPENDS+= tcl-8.0.5:../../lang/tcl80
+DEPENDS+= tk-8.0.5:../../x11/tk80
+
+TCLSH= ${LOCALBASE}/bin/tclsh8.0
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.0
+TCL_CONFIGDIR= ${LOCALBASE}/lib/tcl8.0
+TK_INCDIR= ${LOCALBASE}/include/tk8.0
+TK_CONFIGDIR= ${LOCALBASE}/lib/tk8.0
+
+USE_X11= YES
+CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ARGS+= --with-tcl \
+ --with-tclconfig="${TCL_CONFIGDIR}" \
+ --with-tkconfig="${TK_CONFIGDIR}" \
+ --with-includes="${TCL_INCDIR} ${TK_INCDIR}" \
+ --with-libraries="${LOCALBASE}/lib"
+.endif
PGUSER?= pgsql
PGGROUP?= ingres
-PLIST_SUBST= PGUSER=${PGUSER}
+PGPREFIX= ${PREFIX}/${PGUSER}
-USE_GMAKE=
-MAKEFILE= GNUmakefile
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}/${PGUSER} \
- --enable-locale \
- --with-tcl \
- --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" \
- --with-includes="${LOCALBASE}/include ${LOCALBASE}/include/tcl8.0 ${LOCALBASE}/include/tk8.0" \
- --with-libs=${PREFIX}/lib \
- --with-template=`${ECHO} ${OPSYS} | ${TR} '[A-Z]' '[a-z]'`
+BUILD_DEFS= PGUSER PGROUP
+MESSAGE_FILE= ${FILESDIR}/post-install-notes
+REQ_FILE= ${WRKDIR}/REQ
-INSTALL_TARGET= install install-man
+PLIST_SRC= ${PKGDIR}/PLIST.notcl
+.if defined(PGSQL_USE_TCL)
+PLIST_SRC+= ${PKGDIR}/PLIST.tcl
+.endif
+PLIST_SRC+= ${PKGDIR}/PLIST.doc ${PKGDIR}/PLIST.dirrm
+PLIST_SUBST= PGUSER=${PGUSER}
-BUILD_DEFS+= PGGROUP PGUSER
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} \
+ --prefix=${PGPREFIX} \
+ --with-template="${LOWER_OPSYS}" \
+ --enable-locale
+LDFLAGS+= -Wl,-R${PGPREFIX}/lib -L${PGPREFIX}/lib
pre-extract:
@(case "X${PGUSER}" in \
@@ -56,80 +92,74 @@ pre-extract:
if [ $$gooduser = "no" ]; then \
${ECHO} "You have choosen PGUSER=${PGUSER} which will"; \
${ECHO} "cause trouble, because postgres would get"; \
- ${ECHO} "installed to ${PREFIX}/${PGUSER}. So please"; \
+ ${ECHO} "installed to ${PGPREFIX}. So please"; \
${ECHO} "set PGUSER to something more reasonable"; \
${ECHO} "like pgsql."; \
${ECHO} ""; \
${FALSE}; \
fi)
+.if defined(PGSQL_USE_TCL)
+ @${ECHO} "Building PostgreSQL with \"libpgtcl\"."
+.else
+ @${ECHO} "To build the \"PostgreSQL Tcl interface library\","
+ @${ECHO} "libpgtcl, type: \"${MAKE} PGSQL_USE_TCL=\"."
+.endif
-post-build:
- @ ${ECHO} "------------------------------------------------------------"
- @ ${ECHO} "Dump existing databases, before installing new db version !!"
- @ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}... "
- @ ${ECHO} "------------------------------------------------------------"
+pre-build:
+ @${CP} ${FILESDIR}/Makefile.custom ${WRKSRC}
+post-build:
+ @${ECHO} "------------------------------------------------------------"
+ @${ECHO} "Dump existing databases, before installing new db version !!"
+ @${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}... "
+ @${ECHO} "------------------------------------------------------------"
+
pre-install:
- ${RM} -rf ${PREFIX}/${PGUSER}
- ${MKDIR} ${PREFIX}/${PGUSER}
- @${SED} \
+ ${RM} -rf ${PGPREFIX}
+ ${MKDIR} ${PGPREFIX}
+ @${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' \
-e 's|@PGUSER@|${PGUSER}|g' \
-e 's|@PGGROUP@|${PGGROUP}|g' \
-e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@LOCALBASE@|${LOCALBASE}|g' \
- <${PKGDIR}/REQ > ${REQ_FILE}
+ < ${PKGDIR}/REQ > ${REQ_FILE}
${SH} ${REQ_FILE} ${PKGNAME} INSTALL
post-install:
- @ if [ ! -f ${PREFIX}/${PGUSER}/.profile ]; then \
- ${ECHO} "PATH=\$${PATH}:${PREFIX}/${PGUSER}/bin" \
- > ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "MANPATH=\$${MANPATH}:${PREFIX}/${PGUSER}/man" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "PGLIB=${PREFIX}/${PGUSER}/lib" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "# note: PGDATA overwrites the -D startup option" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "PGDATA=${PREFIX}/${PGUSER}/data" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "DISPLAY=:0" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "export PATH MANPATH PGLIB PGDATA DISPLAY" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "# if you want to make regression tests use this TZ" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "#TZ=PST8PDT" \
- >> ${PREFIX}/${PGUSER}/.profile; \
- ${ECHO} "#export TZ" \
- >> ${PREFIX}/${PGUSER}/.profile; \
+ @${MV} ${PGPREFIX}/include/libpq++.H ${PGPREFIX}/include/libpq++.h
+ @${TOUCH} ${PGPREFIX}/include/port/bsd/.keep_me
+
+ @if [ ! -f ${PGPREFIX}/.profile ]; then \
+ (${ECHO} "PATH=\$${PATH}:${PGPREFIX}/bin"; \
+ ${ECHO} "MANPATH=\$${MANPATH}:${PGPREFIX}/man"; \
+ ${ECHO} "PGLIB=${PGPREFIX}/lib"; \
+ ${ECHO} "# note: PGDATA overwrites the -D startup option"; \
+ ${ECHO} "PGDATA=${PGPREFIX}/data"; \
+ ${ECHO} "DISPLAY=:0"; \
+ ${ECHO} "export PATH MANPATH PGLIB PGDATA DISPLAY"; \
+ ${ECHO}; \
+ ${ECHO} "# if you want to make regression tests use this TZ"; \
+ ${ECHO} "#TZ=PST8PDT"; \
+ ${ECHO} "#export TZ"; \
+ ) > ${PGPREFIX}/.profile; \
fi
- @${CHOWN} -R ${PGUSER}:${PGGROUP} ${PREFIX}/${PGUSER}
- @${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
- ${LDCONFIG} ${PREFIX}/${PGUSER}/lib || ${TRUE}
- @${ECHO} '${SETENV} PATH=${PREFIX}/${PGUSER}/bin:$$PATH ${PREFIX}/${PGUSER}/bin/initdb --pglib=${PREFIX}/${PGUSER}/lib --pgdata=${PREFIX}/${PGUSER}/data' | ${SU} -l ${PGUSER}
- @${SED} -e "s=!!PREFIX!!=${PREFIX}=g" -e "s=!!PGUSER!!=${PGUSER}=g" \
- < ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
- @${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh
- @${CHOWN} root:${PGGROUP} ${PREFIX}/etc/rc.d/pgsql.sh
+ @${SED} -e "s|@PGPREFIX@|${PGPREFIX}|g" \
+ -e "s|@PGUSER@|${PGUSER}|g" \
+ < ${FILESDIR}/pgsql.sh.tmpl > ${WRKDIR}/pgsql.sh
+ @${INSTALL} -c -o root -g ${PGGROUP} -m 554 \
+ ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql.sh
@${INSTALL} -c -o ${PGUSER} -g ${PGGROUP} -m 444 \
- ${FILESDIR}/post-install-notes ${PREFIX}/${PGUSER}
- -${MKDIR} ${PREFIX}/share/doc/pgsql
- ${CP} -R ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql
- ${RM} -rf ${PREFIX}/share/doc/pgsql/src/CVS \
- ${PREFIX}/share/doc/pgsql/src/graphics/CVS \
- ${PREFIX}/share/doc/pgsql/src/sgml/ref/CVS \
- ${PREFIX}/share/doc/pgsql/src/sgml/CVS \
- ${PREFIX}/share/doc/pgsql/CVS
-.if !defined(BATCH)
- @${CAT} ${FILESDIR}/post-install-notes
-.endif
- @case `${GREP} -c '^${PREFIX}/${PGUSER}/lib$$' /etc/ld.so.conf` in \
- 0) \
- ${ECHO} "************** WARNING ********************"; \
- ${ECHO} "Please add ${PREFIX}/${PGUSER}/lib to /etc/ld.so.conf";\
- ${ECHO} "so that this package is usable after any reboot"; \
- ${ECHO} "************** WARNING ********************"; \
- ;; \
- esac
+ ${FILESDIR}/post-install-notes ${PGPREFIX}
+
+ @cd ${WRKDIR}/${DISTNAME}/doc; ${MAKE_PROGRAM} ${INSTALL_TARGET}
+ @for file in \
+ FAQ FAQ_DEV README.fsync TODO bug.template internals.ps \
+ admin.ps.gz programmer.ps.gz tutorial.ps.gz user.ps.gz; do \
+ ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/$${file} \
+ ${PREFIX}/share/doc/postgresql/$${file}; \
+ done
+ @${CHOWN} -R ${PGUSER}:${PGGROUP} ${PGPREFIX}
+
+ @${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
+ @${ECHO} '${SETENV} PATH=${PGPREFIX}/bin:$$PATH ${PGPREFIX}/bin/initdb --pglib=${PGPREFIX}/lib --pgdata=${PGPREFIX}/data' | su -l ${PGUSER}
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom
new file mode 100644
index 00000000000..df9990a3aa8
--- /dev/null
+++ b/databases/postgresql/files/Makefile.custom
@@ -0,0 +1,23 @@
+# GNU Makefile to libtoolize PostgreSQL build.
+#
+# This file is included by Makefile.global, which is included by every
+# sub-Makefile in the build tree. Makefiles for shared libraries include
+# Makefile.global then Makefile.shlib.
+#
+# $NetBSD: Makefile.custom,v 1.1 1999/09/19 04:24:54 jlam Exp $
+
+CUSTOM_INSTALL= ${LIBTOOL} ${INSTALL}
+CUSTOM_CC= ${LIBTOOL} ${CC}
+CUSTOM_CXX= ${LIBTOOL} ${CXX}
+
+# installation directory for documentation
+PGDOCS= ${POSTGRESDIR}/../share/doc/postgresql
+
+# Rules to build object files from source files.
+# ${LIBTOOL} requires that there not be a -o flag when in compile mode.
+#
+%.o: %.c
+ ${CC} ${CPPFLAGS} ${CFLAGS} -c $<
+
+%.o: %.cc
+ ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $<
diff --git a/databases/postgresql/files/md5 b/databases/postgresql/files/md5
index 8f7850213bf..969615f38e0 100644
--- a/databases/postgresql/files/md5
+++ b/databases/postgresql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/01/04 13:05:01 frueauf Exp $
+$NetBSD: md5,v 1.5 1999/09/19 04:24:54 jlam Exp $
-MD5 (postgresql-6.4.2.tar.gz) = 4f5e0409921892ca08fff2d8c099b3d7
+MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51
diff --git a/databases/postgresql/files/patch-sum b/databases/postgresql/files/patch-sum
index 2549c747f99..bba739f323d 100644
--- a/databases/postgresql/files/patch-sum
+++ b/databases/postgresql/files/patch-sum
@@ -1,9 +1,15 @@
-$NetBSD: patch-sum,v 1.3 1999/09/06 17:22:22 hubertf Exp $
+$NetBSD: patch-sum,v 1.4 1999/09/19 04:24:54 jlam Exp $
-MD5 (patch-aa) = 1d70af90ce5d83575005c26a5b2ec04c
-MD5 (patch-ab) = bd14b65459c105bf7c3c90117ba0f9e2
-MD5 (patch-ac) = 435ba13b38ab12e79c8fcb80d91da669
-MD5 (patch-ad) = c40ca1bdfd5fc3e78b78b989021ccb89
-MD5 (patch-ae) = 4128395164f2bd50fb06b14252b36720
-MD5 (patch-af) = c292166fbd98522459d388082329fb72
-MD5 (patch-ag) = 314afa41b6fa073f6215f5dab6978074
+MD5 (patch-aa) = 5e8179c837c09090840c1b56d5c396d8
+MD5 (patch-ab) = 75e575fb9211ed9357e3e4789452d055
+MD5 (patch-ac) = ef8e86f21029d7bab85f74d0bcec874c
+MD5 (patch-ad) = 0c7ad509908b626485eb152ce4ff4ba8
+MD5 (patch-ae) = 74a20ce1af43193ee2a0152e88d8c852
+MD5 (patch-af) = 055fe149d55089efa39eaaedafc611b6
+MD5 (patch-ag) = 9fe78b65dbd36b7c1f5d2a928639ad23
+MD5 (patch-ah) = cb80c672fa0b4e68802dafada7924030
+MD5 (patch-ai) = 27e8d614ef112a233c29debd6d6f4692
+MD5 (patch-aj) = c87c762e2732893073917e5af535cc52
+MD5 (patch-ak) = 1e22bf0d5770426882fef94d528f324e
+MD5 (patch-al) = 1394c41ef6b8d6e89bd4875606d6f8b5
+MD5 (patch-am) = 03f21739e54e2b7eca7094a5a61d97a1
diff --git a/databases/postgresql/files/pgsql.sh.tmpl b/databases/postgresql/files/pgsql.sh.tmpl
index 74b18e9a493..d0f26122a21 100644
--- a/databases/postgresql/files/pgsql.sh.tmpl
+++ b/databases/postgresql/files/pgsql.sh.tmpl
@@ -1,26 +1,12 @@
#!/bin/sh
-# $NetBSD: pgsql.sh.tmpl,v 1.3 1999/01/04 14:10:16 frueauf Exp $
+# $NetBSD: pgsql.sh.tmpl,v 1.4 1999/09/19 04:24:54 jlam Exp $
# FreeBSD Id: pgsql.sh.tmpl,v 1.3 1997/10/05 21:00:49 andreas Exp
-# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested)
+# pgsql.sh - postgresql startup file for NetBSD
-# Changes:
-# - renamed startup script to be in sync with INSTALL file
-# - merged ldconfig start sequence from former postgrsql.sh script (andreas)
-# - modified the postmaster startup sequence as suggested in the
-# INSTALL file which was given as example for FreeBSD 2.2 (andreas)
-# - removed the commandline option
-# -D!!PREFIX!!/!!PGUSER!!/data \
-# because the postmaster process, which starts up under the
-# environment of the pgsql user, sets this with the PGDATA
-# environment variable in !!PREFIX!!/!!PGUSER!!/.profile
-#
-
-[ -d !!PREFIX!!/!!PGUSER!!/lib ] && /sbin/ldconfig -m !!PREFIX!!/!!PGUSER!!/lib
-
-[ -x !!PREFIX!!/pgsql/bin/postmaster ] && {
- su -l pgsql -c 'exec !!PREFIX!!/!!PGUSER!!/bin/postmaster \
- -S -o -F > !!PREFIX!!/!!PGUSER!!/errlog'
+if [ -x @PGPREFIX@/bin/postmaster ]; then
echo -n ' pgsql'
-}
+ su -l @PGUSER@ -c 'exec @PGPREFIX@/bin/postmaster \
+ -S -o -F > @PGPREFIX@/errlog'
+fi
diff --git a/databases/postgresql/files/post-install-notes b/databases/postgresql/files/post-install-notes
index 15d36a77b2b..aded8a71e2c 100644
--- a/databases/postgresql/files/post-install-notes
+++ b/databases/postgresql/files/post-install-notes
@@ -1,4 +1,4 @@
-$NetBSD: post-install-notes,v 1.2 1998/08/07 10:40:19 agc Exp $
+$NetBSD: post-install-notes,v 1.3 1999/09/19 04:24:54 jlam Exp $
Now that PostgreSQL is installed, you should read the documentation and
implementation guides. These can be found at:
@@ -9,6 +9,6 @@ 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.
-If you build PostgreSQL with TCL support, then you can use the
+If you built PostgreSQL with TCL support, then you can use the
TCL/TK based database frontend "pgaccess" for database operations.
diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
index 65822590641..2a3a2908874 100644
--- a/databases/postgresql/patches/patch-aa
+++ b/databases/postgresql/patches/patch-aa
@@ -1,35 +1,50 @@
-$NetBSD: patch-aa,v 1.1 1999/01/04 13:05:01 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 1999/09/19 04:24:54 jlam Exp $
---- include/utils/memutils.h.orig Mon Sep 7 07:35:48 1998
-+++ include/utils/memutils.h Tue Dec 29 00:50:38 1998
-@@ -58,13 +58,17 @@
- #define SHORTALIGN(LEN)\
- (((long)(LEN) + (sizeof (short) - 1)) & ~(sizeof (short) - 1))
+--- ./Makefile.global.in.orig Thu Jun 24 20:13:45 1999
++++ ./Makefile.global.in Sat Sep 18 03:20:03 1999
+@@ -54,6 +54,15 @@
+ ELF_SYSTEM= @ELF_SYS@
-+#if defined(m68k)
-+#define INTALIGN(LEN) SHORTALIGN(LEN)
-+#else
- #define INTALIGN(LEN)\
- (((long)(LEN) + (sizeof (int) - 1)) & ~(sizeof (int) -1))
-+#endif
+ LIBPQDIR:= $(SRCDIR)/interfaces/libpq
++LIBPGTCLDIR:= $(SRCDIR)/interfaces/libpgtcl
++
++ifneq ($(LIBTOOL),)
++LIBPQ:= $(LIBPQDIR)/libpq.la
++LIBPGTCL:= $(LIBPGTCLDIR)/libpgtcl.la
++else
++LIBPQ:= -L$(LIBPQDIR) -lpq
++LIBPGTCL:= -L$(LIBPGTCLDIR) -lpgtcl
++endif
- /*
- * LONGALIGN(LEN) - length (or address) aligned for longs
- */
--#if defined(sun) && ! defined(sparc)
-+#if (defined(sun) && ! defined(sparc)) || defined(m68k)
- #define LONGALIGN(LEN) SHORTALIGN(LEN)
- #elif defined (__alpha)
+ # For convenience, POSTGRESDIR is where BINDIR, and LIBDIR
+ # and other target destinations are rooted. Of course, each of these is
+@@ -200,6 +209,7 @@
+ #-------------------------------------------------------------
+ CC= @CC@
+ CPP= @CPP@
++CXX= @CXX@
+ YFLAGS= @YFLAGS@
+ YACC= @YACC@
+ LEX= @LEX@
+@@ -242,7 +252,7 @@
+ ##############################################################################
-@@ -81,7 +85,10 @@
- (((long)(LEN) + (sizeof (long) - 1)) & ~(sizeof (long) -1))
- #endif
+ ifneq ($(CUSTOM_INSTALL),)
+-INSTALL= $(CUSTOM_INSTALL)
++INSTALL:= $(CUSTOM_INSTALL)
+ endif
--#if ! defined(sco)
-+#if defined(m68k)
-+#define DOUBLEALIGN(LEN) SHORTALIGN(LEN)
-+#define MAXALIGN(LEN) SHORTALIGN(LEN)
-+#elif ! defined(sco)
- #define DOUBLEALIGN(LEN)\
- (((long)(LEN) + (sizeof (double) - 1)) & ~(sizeof (double) -1))
+ #
+@@ -273,7 +283,11 @@
+ # using a i486 or better.
+ ifneq ($(CUSTOM_CC),)
+- CC= $(CUSTOM_CC)
++ CC:= $(CUSTOM_CC)
++endif
++
++ifneq ($(CUSTOM_CXX),)
++ CXX:= $(CUSTOM_CXX)
+ endif
+
+ ifneq ($(CUSTOM_COPT),)
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
index a3cca8ffbf6..4daf00ae237 100644
--- a/databases/postgresql/patches/patch-ab
+++ b/databases/postgresql/patches/patch-ab
@@ -1,30 +1,101 @@
-$NetBSD: patch-ab,v 1.5 1999/01/04 13:05:01 frueauf Exp $
+$NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $
---- backend/storage/buffer/s_lock.c.orig Fri Sep 18 19:18:39 1998
-+++ backend/storage/buffer/s_lock.c Tue Dec 29 00:50:38 1998
-@@ -117,6 +117,25 @@
-
- #endif /* PPC */
-
-+#if defined(__m68k__)
-+static void
-+tas_dummy() /* really means: extern int tas(slock_t **lock); */
-+{
-+ __asm__(" \n\
-+.global _tas \n\
-+_tas: \n\
-+ movel sp@(0x4),a0 \n\
-+ tas a0@ \n\
-+ beq _success \n\
-+ moveq #-128,d0 \n\
-+ rts \n\
-+_success: \n\
-+ moveq #0,d0 \n\
-+ rts \n\
-+ ");
-+}
+--- ./Makefile.shlib.orig Fri Jul 16 18:46:16 1999
++++ ./Makefile.shlib Sat Sep 18 17:34:59 1999
+@@ -50,6 +50,7 @@
+ # on a platform where we don't know how to build a shared library.
+ shlib :=
+ install-shlib-dep :=
++lib_to_install := lib$(NAME).a
+
+ # For each platform we support shlibs on, set shlib and install-shlib-dep,
+ # and update flags as needed to build a shared lib. Note we depend on
+@@ -64,7 +65,7 @@
+ endif
+
+ ifeq ($(PORTNAME), freebsd)
+- ifdef BSD_SHLIB
++ ifneq $(BSD_SHLIB),)
+ install-shlib-dep := install-shlib
+ ifdef ELF_SYSTEM
+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+@@ -78,7 +79,8 @@
+ endif
+
+ ifeq ($(PORTNAME), bsd)
+- ifdef BSD_SHLIB
++ ifneq ($(BSD_SHLIB),)
++ ifeq ($(LIBTOOL),)
+ install-shlib-dep := install-shlib
+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+ ifdef ELF_SYSTEM
+@@ -87,11 +89,16 @@
+ LDFLAGS_SL := -x -Bshareable -Bforcearchive
+ endif
+ CFLAGS += $(CFLAGS_SL)
+- endif
++ else
++ lalib := lib$(NAME).la
++ lib_to_install := $(lalib)
++ LIBTOOL_FLAGS += -rpath $(LIBDIR) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION)
++ endif # !LIBTOOL
++ endif # BSD_SHLIB
+ endif
+
+ ifeq ($(PORTNAME), bsdi)
+- ifdef BSD_SHLIB
++ ifneq ($(BSD_SHLIB),)
+ ifeq ($(DLSUFFIX), .so)
+ install-shlib-dep := install-shlib
+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+@@ -183,7 +190,7 @@
+
+ # Default target definition. Note shlib is empty if not building a shlib.
+
+-all: lib$(NAME).a $(shlib)
++all: $(lib_to_install) $(shlib)
+
+ # Rules to build regular and shared libraries
+
+@@ -197,6 +204,21 @@
+ $(RANLIB) $@
+ endif
+
++ifneq ($(LIBTOOL),)
++ifneq ($(PORTNAME), win)
++
++ifeq ($(CXXLIB), true)
++LINKER= CXX
++else
++LINKER= CC
++endif
++
++$(lalib): $(OBJS)
++ $($(LINKER)) $(CPPFLAGS) $($(LINKER)FLAGS) -o $@ $(OBJS:.o=.lo) $(LIBTOOL_FLAGS)
++
++endif
++endif
+
-+#endif /* __m68k__ */
+ ifneq ($(shlib),)
+ ifneq ($(PORTNAME), win)
+
+@@ -228,8 +250,8 @@
+
+ .PHONY: all install-lib install-shlib
+
+-install-lib: lib$(NAME).a
+- $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(LIBDIR)/lib$(NAME).a
++install-lib: $(lib_to_install)
++ $(INSTALL) $(INSTL_LIB_OPTS) $(lib_to_install) $(LIBDIR)
+ install-shlib: $(shlib)
+ $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
+@@ -251,4 +273,8 @@
+ .PHONY: clean-shlib
- #else /* defined(__GNUC__) */
+ clean-shlib:
++ifneq ($(LIBTOOL),)
++ $(LIBTOOL) rm -rf $(lalib)
++else
+ rm -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX)
++endif
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
index 9776f054f7a..859c02313e4 100644
--- a/databases/postgresql/patches/patch-ac
+++ b/databases/postgresql/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.3 1999/01/04 13:05:01 frueauf Exp $
+$NetBSD: patch-ac,v 1.4 1999/09/19 04:24:54 jlam Exp $
---- configure.in-orig Sun Dec 13 21:08:20 1998
-+++ configure.in Tue Dec 29 01:33:56 1998
-@@ -786,7 +786,7 @@
- dnl If --with-tclconfig was given, don't check for tclsh, tcl
- if test -z "$TCL_DIRS"
- then
-- AC_PATH_PROG(TCLSH, tclsh)
-+ AC_PATH_PROG(TCLSH, tclsh8.0)
- if test -z "$TCLSH"
- then
- AC_PATH_PROG(TCLSH, tcl)
-@@ -834,9 +834,9 @@
- # library_dirs are set in the check for TCL
- for dir in $library_dirs
- do
-- if test -d "$dir" -a -r "$dir/tkConfig.sh"
-+ if test -d "$dir" -a -r "$dir/../tk8.0/tkConfig.sh"
- then
-- TK_CONFIG_SH=$dir/tkConfig.sh
-+ TK_CONFIG_SH=$dir/../tk8.0/tkConfig.sh
- break
- fi
- done
+--- ./bin/pg_dump/Makefile.in.orig Sun Jan 17 01:19:05 1999
++++ ./bin/pg_dump/Makefile.in Sat Sep 18 03:16:08 1999
+@@ -26,17 +26,13 @@
+ CFLAGS+= $(KRBFLAGS)
+ endif
+
+-all: submake pg_dump
++all: pg_dump
+
+-pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
+- $(CC) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
++pg_dump: $(OBJS)
++ $(CC) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS)
+
+ ../../utils/strdup.o:
+ $(MAKE) -C ../../utils strdup.o
+-
+-.PHONY: submake
+-submake:
+- $(MAKE) -C $(LIBPQDIR) libpq.a
+
+ install: pg_dump
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(BINDIR)/pg_dump$(X)
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
index 46c895b60ff..2c7083a9cfb 100644
--- a/databases/postgresql/patches/patch-ad
+++ b/databases/postgresql/patches/patch-ad
@@ -1,27 +1,15 @@
-$NetBSD: patch-ad,v 1.4 1999/01/04 13:05:01 frueauf Exp $
+$NetBSD: patch-ad,v 1.5 1999/09/19 04:24:54 jlam Exp $
---- configure-orig Sun Dec 13 21:08:20 1998
-+++ configure Tue Dec 29 01:34:06 1998
-@@ -5315,8 +5315,8 @@
+--- ./bin/pg_encoding/Makefile.orig Sat Jun 5 06:27:31 1999
++++ ./bin/pg_encoding/Makefile Sat Sep 18 03:16:50 1999
+@@ -19,8 +19,8 @@
- if test -z "$TCL_DIRS"
- then
-- # Extract the first word of "tclsh", so it can be a program name with args.
--set dummy tclsh; ac_word=$2
-+ # Extract the first word of "tclsh8.0", so it can be a program name with args.
-+set dummy tclsh8.0; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:5322: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
-@@ -5424,9 +5424,9 @@
- # library_dirs are set in the check for TCL
- for dir in $library_dirs
- do
-- if test -d "$dir" -a -r "$dir/tkConfig.sh"
-+ if test -d "$dir" -a -r "$dir/../tk8.0/tkConfig.sh"
- then
-- TK_CONFIG_SH=$dir/tkConfig.sh
-+ TK_CONFIG_SH=$dir/../tk8.0/tkConfig.sh
- break
- fi
- done
+ all: pg_encoding
+
+-pg_encoding: $(OBJS) $(LIBPQDIR)/libpq.a
+- $(CC) -o pg_encoding $(OBJS) -L$(LIBPQDIR) -lpq $(LDFLAGS)
++pg_encoding: $(OBJS)
++ $(CC) -o pg_encoding $(OBJS) $(LIBPQ) $(LDFLAGS)
+
+ install: pg_encoding
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X)
diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae
index e8eef3f7087..d28fcdb7403 100644
--- a/databases/postgresql/patches/patch-ae
+++ b/databases/postgresql/patches/patch-ae
@@ -1,63 +1,18 @@
-$NetBSD: patch-ae,v 1.8 1999/09/06 07:01:44 sakamoto Exp $
+$NetBSD: patch-ae,v 1.9 1999/09/19 04:24:54 jlam Exp $
-diff -rc2 config.sub config.sub
-*** config.sub Tue Mar 25 02:16:33 1997
---- config.sub Thu Mar 4 21:46:43 1999
-***************
-*** 150,154 ****
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
-! tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
- | arme[lb] | pyramid \
- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
---- 150,154 ----
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
-! tahoe | i860 | m68k | m68000 | m88k | ns32k | arm | arm32 \
- | arme[lb] | pyramid \
- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-***************
-*** 178,182 ****
- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-! | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
- ;;
- # Recognize the various machine names and aliases which stand
---- 178,182 ----
- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-! | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | arm32-*)
- ;;
- # Recognize the various machine names and aliases which stand
-diff -rc2 configure configure
-*** configure Sun Dec 13 15:08:20 1998
---- configure Thu Mar 4 21:52:02 1999
-***************
-*** 741,745 ****
- rm -f conftest.sh
- sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "template/$TEMPLATE" >conftest.sh
-! . conftest.sh
- rm -f conftest.sh
-
---- 741,745 ----
- rm -f conftest.sh
- sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "template/$TEMPLATE" >conftest.sh
-! . ./conftest.sh
- rm -f conftest.sh
-
-diff -rc2 configure.in configure.in
-*** configure.in Sun Dec 13 15:08:20 1998
---- configure.in Thu Mar 4 21:54:10 1999
-***************
-*** 148,152 ****
- rm -f conftest.sh
- sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "template/$TEMPLATE" >conftest.sh
-! . conftest.sh
- rm -f conftest.sh
- ]
---- 148,152 ----
- rm -f conftest.sh
- sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "template/$TEMPLATE" >conftest.sh
-! . ./conftest.sh
- rm -f conftest.sh
- ]
+--- ./bin/pg_id/Makefile.orig Sun Jan 17 01:19:10 1999
++++ ./bin/pg_id/Makefile Sat Sep 18 03:17:25 1999
+@@ -26,11 +26,8 @@
+
+ all: pg_id
+
+-pg_id: $(OBJS) $(LIBPQDIR)/libpq.a
+- $(CC) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
+-
+-$(LIBPQDIR)/libpq.a:
+- $(MAKE) -C $(LIBPQDIR) libpq.a
++pg_id: $(OBJS)
++ $(CC) -o pg_id $(OBJS) $(LIBPQ) $(LDFLAGS)
+
+ install: pg_id
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(BINDIR)/pg_id$(X)
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
index 922910f2e88..ea841cbc750 100644
--- a/databases/postgresql/patches/patch-af
+++ b/databases/postgresql/patches/patch-af
@@ -1,29 +1,21 @@
-$NetBSD: patch-af,v 1.5 1999/07/11 20:00:43 bad Exp $
+$NetBSD: patch-af,v 1.6 1999/09/19 04:24:54 jlam Exp $
-*** include/storage/s_lock.h Sat Apr 10 19:43:01 1999
---- include/storage/s_lock.h Wed Apr 7 03:06:53 1999
-***************
-*** 124,129 ****
---- 124,145 ----
-
-
-
-+ #if defined(__arm32__)
-+ #define TAS(lock) tas(lock)
-+
-+ static __inline__ int
-+ tas(volatile slock_t *lock)
-+ {
-+ register slock_t _res = 1;
-+
-+ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));
-+ return (int) _res;
-+ }
-+
-+ #endif /* __arm32__ */
-+
-+
-+
- #if defined(sparc)
- #define TAS(lock) tas(lock)
-
+--- ./bin/pgtclsh/Makefile.orig Tue Oct 27 16:51:54 1998
++++ ./bin/pgtclsh/Makefile Sat Sep 18 03:14:32 1999
+@@ -22,15 +22,12 @@
+ include Makefile.tkdefs
+ endif
+
+-CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
++CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
+
+ ifdef KRBVERS
+ LDFLAGS+= $(KRBLIBS)
+ CFLAGS+= $(KRBFLAGS)
+ endif
+-
+-LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
+-LIBPQ= -L$(LIBPQDIR) -lpq
+
+ # If we are here then TCL is available
+ PGMS = pgtclsh
diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag
index 930b87bbf3b..fcc64e17db3 100644
--- a/databases/postgresql/patches/patch-ag
+++ b/databases/postgresql/patches/patch-ag
@@ -1,19 +1,25 @@
-$NetBSD: patch-ag,v 1.3 1999/07/11 20:00:43 bad Exp $
+$NetBSD: patch-ag,v 1.4 1999/09/19 04:24:54 jlam Exp $
---- include/port/bsd.h.orig Sun Jul 19 03:19:53 1998
-+++ include/port/bsd.h Sun Jul 11 21:49:27 1999
-@@ -24,6 +24,14 @@
- #define HAS_TEST_AND_SET
- #endif
+--- ./bin/psql/Makefile.in.orig Sun Jan 17 01:19:19 1999
++++ ./bin/psql/Makefile.in Sat Sep 18 03:18:28 1999
+@@ -30,17 +30,13 @@
-+#if defined(__arm32__)
-+#define HAS_TEST_AND_SET
-+#endif
-+
-+#if defined(__powerpc__)
-+#define HAS_TEST_AND_SET
-+#endif
-+
- #if defined(__mips__)
- /* # undef HAS_TEST_AND_SET */
- #endif
+ OBJS= psql.o stringutils.o @STRDUP@ @STRERROR2@
+
+-all: submake psql
++all: psql
+
+-psql: $(OBJS) $(LIBPQDIR)/libpq.a
+- $(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
++psql: $(OBJS)
++ $(CC) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS)
+
+ ../../utils/strdup.o:
+ $(MAKE) -C ../../utils strdup.o
+-
+-.PHONY: submake
+-submake:
+- $(MAKE) -C $(LIBPQDIR) libpq.a
+
+ install: psql
+ $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(BINDIR)/psql$(X)
diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah
new file mode 100644
index 00000000000..f6200846257
--- /dev/null
+++ b/databases/postgresql/patches/patch-ah
@@ -0,0 +1,55 @@
+$NetBSD: patch-ah,v 1.3 1999/09/19 04:24:55 jlam Exp $
+
+--- ./configure.in.orig Sat May 29 20:06:44 1999
++++ ./configure.in Sat Sep 18 03:21:22 1999
+@@ -23,11 +23,7 @@
+ bsdi*) os=bsdi need_tas=no ;;
+ freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
+ freebsd*) os=freebsd need_tas=no elf=yes ;;
+- netbsd*)
+- os=bsd need_tas=no
+- case "$host_cpu" in
+- powerpc) elf=yes ;;
+- esac ;;
++ netbsd*) os=bsd need_tas=no elf=maybe ;; # mix of a.out & ELF platforms
+ openbsd*) os=bsd need_tas=no ;;
+ dgux*) os=dgux need_tas=no ;;
+ aix*) os=aix need_tas=no ;;
+@@ -58,13 +54,6 @@
+ exit;;
+ esac
+
+-if test "X$elf" = "Xyes"
+-then
+- ELF_SYS=true
+-else
+- ELF_SYS=
+-fi
+-
+ if test "X$need_tas" = "Xyes"
+ then
+ AC_LINK_FILES(backend/port/tas/${tas_file}, backend/port/tas.s)
+@@ -416,6 +405,23 @@
+
+ LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
+ echo "- setting LDFLAGS=$LDFLAGS"
++
++dnl Check for ELF after finding compiler.
++case "X$elf" in
++Xmaybe)
++ if ${CC} -E - -dM </dev/null | grep -q __ELF__; then
++ ELF_SYS=true
++ else
++ ELF_SYS=
++ fi
++ ;;
++Xyes)
++ ELF_SYS=true
++ ;;
++*)
++ ELF_SYS=
++ ;;
++esac
+
+ AC_SUBST(ELF_SYS)
+ AC_SUBST(PORTNAME)
diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai
new file mode 100644
index 00000000000..bf2e08acba1
--- /dev/null
+++ b/databases/postgresql/patches/patch-ai
@@ -0,0 +1,55 @@
+$NetBSD: patch-ai,v 1.3 1999/09/19 04:24:55 jlam Exp $
+
+--- ./configure.orig Sat May 29 20:06:44 1999
++++ ./configure Sat Sep 18 03:21:47 1999
+@@ -628,11 +628,7 @@
+ bsdi*) os=bsdi need_tas=no ;;
+ freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
+ freebsd*) os=freebsd need_tas=no elf=yes ;;
+- netbsd*)
+- os=bsd need_tas=no
+- case "$host_cpu" in
+- powerpc) elf=yes ;;
+- esac ;;
++ netbsd*) os=bsd need_tas=no elf=maybe ;; # mix of a.out & ELF platforms
+ openbsd*) os=bsd need_tas=no ;;
+ dgux*) os=dgux need_tas=no ;;
+ aix*) os=aix need_tas=no ;;
+@@ -663,13 +659,6 @@
+ exit;;
+ esac
+
+-if test "X$elf" = "Xyes"
+-then
+- ELF_SYS=true
+-else
+- ELF_SYS=
+-fi
+-
+ if test "X$need_tas" = "Xyes"
+ then
+
+@@ -1418,6 +1407,23 @@
+
+ LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
+ echo "- setting LDFLAGS=$LDFLAGS"
++
++# Check for ELF after finding compiler.
++case "X$elf" in
++Xmaybe)
++ if ${CC} -E - -dM </dev/null | grep -q __ELF__; then
++ ELF_SYS=true
++ else
++ ELF_SYS=
++ fi
++ ;;
++Xyes)
++ ELF_SYS=true
++ ;;
++*)
++ ELF_SYS=
++ ;;
++esac
+
+
+
diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj
new file mode 100644
index 00000000000..83a6357cbab
--- /dev/null
+++ b/databases/postgresql/patches/patch-aj
@@ -0,0 +1,25 @@
+$NetBSD: patch-aj,v 1.3 1999/09/19 04:24:55 jlam Exp $
+
+--- ./interfaces/ecpg/lib/Makefile.in.orig Wed Jun 30 19:57:23 1999
++++ ./interfaces/ecpg/lib/Makefile.in Sat Sep 18 03:05:04 1999
+@@ -12,7 +12,11 @@
+
+ NAME= ecpg
+ SO_MAJOR_VERSION= 3
++ifneq ($(LIBTOOL),)
++SO_MINOR_VERSION= 0 # bump this every time the patchlevel changes
++else
+ SO_MINOR_VERSION= 0.0
++endif
+
+ SRCDIR= @top_srcdir@
+ include $(SRCDIR)/Makefile.global
+@@ -25,7 +29,7 @@
+
+ OBJS= ecpglib.o typename.o
+
+-SHLIB_LINK= -L../../libpq -lpq
++SHLIB_LINK= $(LIBPQ)
+
+ # Shared library stuff, also default 'all' target
+ include $(SRCDIR)/Makefile.shlib
diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak
new file mode 100644
index 00000000000..329cde1f32e
--- /dev/null
+++ b/databases/postgresql/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 1999/09/19 04:24:55 jlam Exp $
+
+--- ./interfaces/libpgtcl/Makefile.in.orig Wed Jun 30 19:57:24 1999
++++ ./interfaces/libpgtcl/Makefile.in Sat Sep 18 03:05:39 1999
+@@ -27,7 +27,7 @@
+
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+
+-SHLIB_LINK+= -L../libpq -lpq
++SHLIB_LINK+= $(LIBPQ)
+
+ # If crypt is a separate library, rather than part of libc, it may need
+ # to be referenced separately to keep (broken) linkers happy. (This is
diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al
new file mode 100644
index 00000000000..05dd089a90b
--- /dev/null
+++ b/databases/postgresql/patches/patch-al
@@ -0,0 +1,29 @@
+$NetBSD: patch-al,v 1.1 1999/09/19 04:24:55 jlam Exp $
+
+--- ./interfaces/libpq++/Makefile.in.orig Wed Jul 7 23:30:16 1999
++++ ./interfaces/libpq++/Makefile.in Sat Sep 18 03:08:44 1999
+@@ -17,8 +17,6 @@
+ SRCDIR= @top_srcdir@
+ include $(SRCDIR)/Makefile.global
+
+-CXX=@CXX@
+-
+ SRCHEADERDIR = $(SRCDIR)/include
+ LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
+
+@@ -43,10 +41,13 @@
+ OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
+
+ ifeq ($(PORTNAME), win)
+-SHLIB_LINK+= --driver-name g++ -L../libpq -lpq
++SHLIB_LINK+= --driver-name g++ $(LIBPQ)
+ else
+-SHLIB_LINK= -L../libpq -lpq
++SHLIB_LINK= $(LIBPQ)
+ endif
++
++# Signify that we're building a C++ library.
++CXXLIB= true
+
+ # Shared library stuff, also default 'all' target
+ include $(SRCDIR)/Makefile.shlib
diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am
new file mode 100644
index 00000000000..3e6f382297a
--- /dev/null
+++ b/databases/postgresql/patches/patch-am
@@ -0,0 +1,56 @@
+$NetBSD: patch-am,v 1.1 1999/09/19 04:24:55 jlam Exp $
+
+--- ./pl/plpgsql/src/Makefile.in.orig Wed Jun 30 19:57:31 1999
++++ ./pl/plpgsql/src/Makefile.in Sat Sep 18 03:10:58 1999
+@@ -27,7 +27,7 @@
+
+ OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
+
+-SHLIB_LINK+= -L$(LIBPQDIR) -lpq
++SHLIB_LINK+= -L$(LIBPQ)
+
+ # If crypt is a separate library, rather than part of libc, it may need
+ # to be referenced separately to keep (broken) linkers happy. (This is
+@@ -44,12 +44,20 @@
+ # installed, however, so we ignore the install-shlib rule and do this
+ # instead:
+
++ifneq ($(LIBTOOL),)
++install: install-lib post-install-lib
++
++post-install-lib:
++ rm -f $(LIBDIR)/lib$(NAME).a
++ $(LN_S) -f $(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) $(LIBDIR)/plpgsql$(DLSUFFIX)
++else
+ install: $(shlib)
+ ifneq ($(shlib),)
+ $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/plpgsql$(DLSUFFIX)
+ else
+ @echo "plpgsql not installed due to lack of shared library support."
+ endif
++endif
+
+
+ pl_handler.o: pl_handler.c plpgsql.h pl.tab.h
+@@ -60,8 +68,10 @@
+
+ pl_funcs.o: pl_funcs.c plpgsql.h pl.tab.h
+
+-pl_parse.o: pl_gram.c pl_scan.c plpgsql.h
+- $(CC) $(CFLAGS) -c -o $@ pl_gram.c
++pl_parse.o: pl_parse.c plpgsql.h pl.tab.h
++
++pl_parse.c: pl_gram.c pl_scan.c plpgsql.h
++ $(LN_S) -f pl_gram.c pl_parse.c
+
+ pl_gram.c pl.tab.h: gram.y
+ $(YACC) $(YFLAGS) $<
+@@ -79,7 +89,7 @@
+
+ clean: clean-shlib
+ rm -f lib$(NAME).a
+- rm -f *.o pl.tab.h pl_gram.c pl_scan.c
++ rm -f *.o pl.tab.h pl_parse.c pl_gram.c pl_scan.c
+ # And the garbage that might have been left behind by partial build:
+ rm -f y.tab.c y.tab.h lex.yy.c
+ ifeq ($(PORTNAME), win)
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
deleted file mode 100644
index a9db02e5719..00000000000
--- a/databases/postgresql/pkg/PLIST
+++ /dev/null
@@ -1,414 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 1999/09/06 07:01:44 sakamoto Exp $
-etc/rc.d/pgsql.sh
-share/doc/pgsql/src/graphics/catalogs.gif
-share/doc/pgsql/src/graphics/catalogs.ps
-share/doc/pgsql/src/graphics/clientserver.ag
-share/doc/pgsql/src/graphics/clientserver.gif
-share/doc/pgsql/src/graphics/connections.ag
-share/doc/pgsql/src/graphics/connections.gif
-share/doc/pgsql/src/graphics/layout.ag
-share/doc/pgsql/src/graphics/layout.gif
-share/doc/pgsql/src/sgml/ref/abort.sgml
-share/doc/pgsql/src/sgml/ref/allfiles.sgml
-share/doc/pgsql/src/sgml/ref/alter_table.sgml
-share/doc/pgsql/src/sgml/ref/alter_user.sgml
-share/doc/pgsql/src/sgml/ref/begin.sgml
-share/doc/pgsql/src/sgml/ref/close.sgml
-share/doc/pgsql/src/sgml/ref/cluster.sgml
-share/doc/pgsql/src/sgml/ref/commands.sgml
-share/doc/pgsql/src/sgml/ref/commit.sgml
-share/doc/pgsql/src/sgml/ref/copy.sgml
-share/doc/pgsql/src/sgml/ref/create_aggregate.sgml
-share/doc/pgsql/src/sgml/ref/create_database.sgml
-share/doc/pgsql/src/sgml/ref/create_function.sgml
-share/doc/pgsql/src/sgml/ref/create_index.sgml
-share/doc/pgsql/src/sgml/ref/create_language.sgml
-share/doc/pgsql/src/sgml/ref/create_operator.sgml
-share/doc/pgsql/src/sgml/ref/create_rule.sgml
-share/doc/pgsql/src/sgml/ref/create_sequence.sgml
-share/doc/pgsql/src/sgml/ref/create_table.sgml
-share/doc/pgsql/src/sgml/ref/create_trigger.sgml
-share/doc/pgsql/src/sgml/ref/create_type.sgml
-share/doc/pgsql/src/sgml/ref/create_user.sgml
-share/doc/pgsql/src/sgml/ref/create_view.sgml
-share/doc/pgsql/src/sgml/ref/createdb.sgml
-share/doc/pgsql/src/sgml/ref/createuser.sgml
-share/doc/pgsql/src/sgml/ref/current_date.sgml
-share/doc/pgsql/src/sgml/ref/current_time.sgml
-share/doc/pgsql/src/sgml/ref/current_timestamp.sgml
-share/doc/pgsql/src/sgml/ref/current_user.sgml
-share/doc/pgsql/src/sgml/ref/declare.sgml
-share/doc/pgsql/src/sgml/ref/delete.sgml
-share/doc/pgsql/src/sgml/ref/destroydb.sgml
-share/doc/pgsql/src/sgml/ref/destroyuser.sgml
-share/doc/pgsql/src/sgml/ref/drop_aggregate.sgml
-share/doc/pgsql/src/sgml/ref/drop_database.sgml
-share/doc/pgsql/src/sgml/ref/drop_function.sgml
-share/doc/pgsql/src/sgml/ref/drop_index.sgml
-share/doc/pgsql/src/sgml/ref/drop_language.sgml
-share/doc/pgsql/src/sgml/ref/drop_operator.sgml
-share/doc/pgsql/src/sgml/ref/drop_rule.sgml
-share/doc/pgsql/src/sgml/ref/drop_sequence.sgml
-share/doc/pgsql/src/sgml/ref/drop_table.sgml
-share/doc/pgsql/src/sgml/ref/drop_trigger.sgml
-share/doc/pgsql/src/sgml/ref/drop_type.sgml
-share/doc/pgsql/src/sgml/ref/drop_user.sgml
-share/doc/pgsql/src/sgml/ref/drop_view.sgml
-share/doc/pgsql/src/sgml/ref/explain.sgml
-share/doc/pgsql/src/sgml/ref/fetch.sgml
-share/doc/pgsql/src/sgml/ref/grant.sgml
-share/doc/pgsql/src/sgml/ref/initdb.sgml
-share/doc/pgsql/src/sgml/ref/initlocation.sgml
-share/doc/pgsql/src/sgml/ref/insert.sgml
-share/doc/pgsql/src/sgml/ref/listen.sgml
-share/doc/pgsql/src/sgml/ref/load.sgml
-share/doc/pgsql/src/sgml/ref/lock.sgml
-share/doc/pgsql/src/sgml/ref/move.sgml
-share/doc/pgsql/src/sgml/ref/notify.sgml
-share/doc/pgsql/src/sgml/ref/pg_dump.sgml
-share/doc/pgsql/src/sgml/ref/pg_dumpall.sgml
-share/doc/pgsql/src/sgml/ref/pg_upgrade.sgml
-share/doc/pgsql/src/sgml/ref/psql-ref.sgml
-share/doc/pgsql/src/sgml/ref/reset.sgml
-share/doc/pgsql/src/sgml/ref/revoke.sgml
-share/doc/pgsql/src/sgml/ref/rollback.sgml
-share/doc/pgsql/src/sgml/ref/select.sgml
-share/doc/pgsql/src/sgml/ref/set.sgml
-share/doc/pgsql/src/sgml/ref/show.sgml
-share/doc/pgsql/src/sgml/ref/unlisten.sgml
-share/doc/pgsql/src/sgml/ref/update.sgml
-share/doc/pgsql/src/sgml/ref/vacuum.sgml
-share/doc/pgsql/src/sgml/about.sgml
-share/doc/pgsql/src/sgml/admin.sgml
-share/doc/pgsql/src/sgml/advanced.sgml
-share/doc/pgsql/src/sgml/arch-dev.sgml
-share/doc/pgsql/src/sgml/arch-pg.sgml
-share/doc/pgsql/src/sgml/arch.sgml
-share/doc/pgsql/src/sgml/array.sgml
-share/doc/pgsql/src/sgml/biblio.sgml
-share/doc/pgsql/src/sgml/bki.sgml
-share/doc/pgsql/src/sgml/compiler.sgml
-share/doc/pgsql/src/sgml/config.sgml
-share/doc/pgsql/src/sgml/contacts.sgml
-share/doc/pgsql/src/sgml/current.sgml
-share/doc/pgsql/src/sgml/datatype.sgml
-share/doc/pgsql/src/sgml/dfunc.sgml
-share/doc/pgsql/src/sgml/docguide.sgml
-share/doc/pgsql/src/sgml/ecpg.sgml
-share/doc/pgsql/src/sgml/environ.sgml
-share/doc/pgsql/src/sgml/extend.sgml
-share/doc/pgsql/src/sgml/func-ref.sgml
-share/doc/pgsql/src/sgml/func.sgml
-share/doc/pgsql/src/sgml/geqo.sgml
-share/doc/pgsql/src/sgml/gist.sgml
-share/doc/pgsql/src/sgml/history.sgml
-share/doc/pgsql/src/sgml/indices.sgml
-share/doc/pgsql/src/sgml/info.sgml
-share/doc/pgsql/src/sgml/inherit.sgml
-share/doc/pgsql/src/sgml/install.sgml
-share/doc/pgsql/src/sgml/installation.sgml
-share/doc/pgsql/src/sgml/intro-ag.sgml
-share/doc/pgsql/src/sgml/intro-pg.sgml
-share/doc/pgsql/src/sgml/intro.sgml
-share/doc/pgsql/src/sgml/jdbc.sgml
-share/doc/pgsql/src/sgml/keys.sgml
-share/doc/pgsql/src/sgml/legal.sgml
-share/doc/pgsql/src/sgml/libpgtcl.sgml
-share/doc/pgsql/src/sgml/libpq++.sgml
-share/doc/pgsql/src/sgml/libpq.sgml
-share/doc/pgsql/src/sgml/lobj.sgml
-share/doc/pgsql/src/sgml/manage.sgml
-share/doc/pgsql/src/sgml/notation.sgml
-share/doc/pgsql/src/sgml/odbc.sgml
-share/doc/pgsql/src/sgml/oper.sgml
-share/doc/pgsql/src/sgml/page.sgml
-share/doc/pgsql/src/sgml/pg_options.sgml
-share/doc/pgsql/src/sgml/pgaccess.sgml
-share/doc/pgsql/src/sgml/ports.sgml
-share/doc/pgsql/src/sgml/postgres.sgml
-share/doc/pgsql/src/sgml/programmer.sgml
-share/doc/pgsql/src/sgml/protocol.sgml
-share/doc/pgsql/src/sgml/psql.sgml
-share/doc/pgsql/src/sgml/query-ug.sgml
-share/doc/pgsql/src/sgml/query.sgml
-share/doc/pgsql/src/sgml/recovery.sgml
-share/doc/pgsql/src/sgml/reference.sgml
-share/doc/pgsql/src/sgml/regress.sgml
-share/doc/pgsql/src/sgml/release.sgml
-share/doc/pgsql/src/sgml/rules.sgml
-share/doc/pgsql/src/sgml/runtime.sgml
-share/doc/pgsql/src/sgml/security.sgml
-share/doc/pgsql/src/sgml/signals.sgml
-share/doc/pgsql/src/sgml/spi.sgml
-share/doc/pgsql/src/sgml/start-ag.sgml
-share/doc/pgsql/src/sgml/start.sgml
-share/doc/pgsql/src/sgml/storage.sgml
-share/doc/pgsql/src/sgml/syntax.sgml
-share/doc/pgsql/src/sgml/trigger.sgml
-share/doc/pgsql/src/sgml/tutorial.sgml
-share/doc/pgsql/src/sgml/typeconv.sgml
-share/doc/pgsql/src/sgml/user.sgml
-share/doc/pgsql/src/sgml/xaggr.sgml
-share/doc/pgsql/src/sgml/xfunc.sgml
-share/doc/pgsql/src/sgml/xindex.sgml
-share/doc/pgsql/src/sgml/xoper.sgml
-share/doc/pgsql/src/sgml/xplang.sgml
-share/doc/pgsql/src/sgml/xtypes.sgml
-share/doc/pgsql/src/sgml/y2k.sgml
-share/doc/pgsql/src/sgml/Makefile
-share/doc/pgsql/src/Makefile
-share/doc/pgsql/tutorial.tar.gz
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/programmer.tar.gz
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/postgres.tar.gz
-share/doc/pgsql/bug.template
-share/doc/pgsql/admin.tar.gz
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/TODO
-share/doc/pgsql/README.mb.jp
-share/doc/pgsql/user.tar.gz
-share/doc/pgsql/README.locale
-share/doc/pgsql/README.inet
-share/doc/pgsql/README.fsync
-share/doc/pgsql/Makefile
-share/doc/pgsql/FAQ_Linux
-share/doc/pgsql/FAQ_Irix
-share/doc/pgsql/FAQ_HPUX
-share/doc/pgsql/FAQ_FreeBSD
-share/doc/pgsql/FAQ_DEV
-share/doc/pgsql/FAQ_CVS
-share/doc/pgsql/FAQ
-share/doc/pgsql/README.mb
-share/doc/pgsql/user.ps.gz
-${PGUSER}/lib/global1.bki.source
-${PGUSER}/lib/global1.description
-${PGUSER}/lib/local1_template1.bki.source
-${PGUSER}/lib/local1_template1.description
-${PGUSER}/lib/pg_hba.conf.sample
-${PGUSER}/lib/pg_geqo.sample
-${PGUSER}/lib/libpq.a
-${PGUSER}/lib/libpq.so.2.0
-${PGUSER}/lib/libpq.so.2
-${PGUSER}/lib/libpq.so
-${PGUSER}/lib/libecpg.a
-${PGUSER}/lib/libecpg.so.2.6.2
-${PGUSER}/lib/libecpg.so.2
-${PGUSER}/lib/libecpg.so
-${PGUSER}/lib/libpq++.a
-${PGUSER}/lib/libpq++.so.2.0
-${PGUSER}/lib/libpq++.so.2
-${PGUSER}/lib/libpq++.so
-${PGUSER}/lib/libpgtcl.a
-${PGUSER}/lib/libpgtcl.so.2.0
-${PGUSER}/lib/libpgtcl.so.2
-${PGUSER}/lib/libpgtcl.so
-${PGUSER}/lib/plpgsql.so
-${PGUSER}/lib/pltcl.so
-${PGUSER}/bin/postgres
-${PGUSER}/bin/postmaster
-${PGUSER}/bin/ecpg
-${PGUSER}/bin/pg_id
-${PGUSER}/bin/pg_version
-${PGUSER}/bin/psql
-${PGUSER}/bin/pg_dump
-${PGUSER}/bin/pg_dumpall
-${PGUSER}/bin/pg_upgrade
-${PGUSER}/bin/pg_passwd
-${PGUSER}/bin/cleardbdir
-${PGUSER}/bin/createdb
-${PGUSER}/bin/createuser
-${PGUSER}/bin/destroydb
-${PGUSER}/bin/destroyuser
-${PGUSER}/bin/initdb
-${PGUSER}/bin/initlocation
-${PGUSER}/bin/ipcclean
-${PGUSER}/bin/pgaccess
-${PGUSER}/bin/pgtclsh
-${PGUSER}/bin/pgtksh
-${PGUSER}/man/man1/cleardbdir.1
-${PGUSER}/man/man1/createdb.1
-${PGUSER}/man/man1/createuser.1
-${PGUSER}/man/man1/destroydb.1
-${PGUSER}/man/man1/destroyuser.1
-${PGUSER}/man/man1/ecpg.1
-${PGUSER}/man/man1/initdb.1
-${PGUSER}/man/man1/initlocation.1
-${PGUSER}/man/man1/ipcclean.1
-${PGUSER}/man/man1/pg_dump.1
-${PGUSER}/man/man1/pg_dumpall.1
-${PGUSER}/man/man1/pg_passwd.1
-${PGUSER}/man/man1/pg_upgrade.1
-${PGUSER}/man/man1/postgres.1
-${PGUSER}/man/man1/postmaster.1
-${PGUSER}/man/man1/psql.1
-${PGUSER}/man/man3/catalogs.3
-${PGUSER}/man/man3/libpq.3
-${PGUSER}/man/man5/pg_hba.conf.5
-${PGUSER}/man/manl/abort.l
-${PGUSER}/man/manl/alter_table.l
-${PGUSER}/man/manl/alter_user.l
-${PGUSER}/man/manl/begin.l
-${PGUSER}/man/manl/close.l
-${PGUSER}/man/manl/cluster.l
-${PGUSER}/man/manl/commit.l
-${PGUSER}/man/manl/copy.l
-${PGUSER}/man/manl/create_aggregate.l
-${PGUSER}/man/manl/create_database.l
-${PGUSER}/man/manl/create_function.l
-${PGUSER}/man/manl/create_index.l
-${PGUSER}/man/manl/create_language.l
-${PGUSER}/man/manl/create_operator.l
-${PGUSER}/man/manl/create_rule.l
-${PGUSER}/man/manl/create_sequence.l
-${PGUSER}/man/manl/create_table.l
-${PGUSER}/man/manl/create_trigger.l
-${PGUSER}/man/manl/create_type.l
-${PGUSER}/man/manl/create_user.l
-${PGUSER}/man/manl/create_version.l
-${PGUSER}/man/manl/create_view.l
-${PGUSER}/man/manl/declare.l
-${PGUSER}/man/manl/delete.l
-${PGUSER}/man/manl/drop.l
-${PGUSER}/man/manl/drop_aggregate.l
-${PGUSER}/man/manl/drop_database.l
-${PGUSER}/man/manl/drop_function.l
-${PGUSER}/man/manl/drop_index.l
-${PGUSER}/man/manl/drop_language.l
-${PGUSER}/man/manl/drop_operator.l
-${PGUSER}/man/manl/drop_rule.l
-${PGUSER}/man/manl/drop_sequence.l
-${PGUSER}/man/manl/drop_table.l
-${PGUSER}/man/manl/drop_trigger.l
-${PGUSER}/man/manl/drop_type.l
-${PGUSER}/man/manl/drop_user.l
-${PGUSER}/man/manl/drop_view.l
-${PGUSER}/man/manl/end.l
-${PGUSER}/man/manl/explain.l
-${PGUSER}/man/manl/fetch.l
-${PGUSER}/man/manl/grant.l
-${PGUSER}/man/manl/insert.l
-${PGUSER}/man/manl/listen.l
-${PGUSER}/man/manl/load.l
-${PGUSER}/man/manl/lock.l
-${PGUSER}/man/manl/move.l
-${PGUSER}/man/manl/notify.l
-${PGUSER}/man/manl/reset.l
-${PGUSER}/man/manl/revoke.l
-${PGUSER}/man/manl/rollback.l
-${PGUSER}/man/manl/select.l
-${PGUSER}/man/manl/set.l
-${PGUSER}/man/manl/show.l
-${PGUSER}/man/manl/sql.l
-${PGUSER}/man/manl/update.l
-${PGUSER}/man/manl/vacuum.l
-${PGUSER}/data/base/template1/pg_proc
-${PGUSER}/data/base/template1/pg_type
-${PGUSER}/data/base/template1/pg_attribute
-${PGUSER}/data/base/template1/pg_class
-${PGUSER}/data/base/template1/pg_inherits
-${PGUSER}/data/base/template1/pg_index
-${PGUSER}/data/base/template1/pg_statistic
-${PGUSER}/data/base/template1/pg_operator
-${PGUSER}/data/base/template1/pg_opclass
-${PGUSER}/data/base/template1/pg_am
-${PGUSER}/data/base/template1/pg_amop
-${PGUSER}/data/base/template1/pg_amproc
-${PGUSER}/data/base/template1/pg_language
-${PGUSER}/data/base/template1/pg_parg
-${PGUSER}/data/base/template1/pg_aggregate
-${PGUSER}/data/base/template1/pg_ipl
-${PGUSER}/data/base/template1/pg_inheritproc
-${PGUSER}/data/base/template1/pg_rewrite
-${PGUSER}/data/base/template1/pg_listener
-${PGUSER}/data/base/template1/pg_description
-${PGUSER}/data/base/template1/pg_attribute_relid_attnam_index
-${PGUSER}/data/base/template1/pg_attribute_relid_attnum_index
-${PGUSER}/data/base/template1/pg_attribute_attrelid_index
-${PGUSER}/data/base/template1/pg_proc_oid_index
-${PGUSER}/data/base/template1/pg_proc_proname_narg_type_index
-${PGUSER}/data/base/template1/pg_proc_prosrc_index
-${PGUSER}/data/base/template1/pg_type_oid_index
-${PGUSER}/data/base/template1/pg_type_typname_index
-${PGUSER}/data/base/template1/pg_class_oid_index
-${PGUSER}/data/base/template1/pg_class_relname_index
-${PGUSER}/data/base/template1/pg_attrdef
-${PGUSER}/data/base/template1/pg_attrdef_adrelid_index
-${PGUSER}/data/base/template1/pg_relcheck
-${PGUSER}/data/base/template1/pg_relcheck_rcrelid_index
-${PGUSER}/data/base/template1/pg_trigger
-${PGUSER}/data/base/template1/pg_trigger_tgrelid_index
-${PGUSER}/data/base/template1/pg_description_objoid_index
-${PGUSER}/data/base/template1/PG_VERSION
-${PGUSER}/data/base/template1/pg_internal.init
-${PGUSER}/data/base/template1/pg_user
-${PGUSER}/data/base/template1/pg_rules
-${PGUSER}/data/base/template1/pg_views
-${PGUSER}/data/base/template1/pg_tables
-${PGUSER}/data/base/template1/pg_indexes
-${PGUSER}/data/pg_variable
-${PGUSER}/data/pg_database
-${PGUSER}/data/pg_shadow
-${PGUSER}/data/pg_group
-${PGUSER}/data/pg_log
-${PGUSER}/data/PG_VERSION
-${PGUSER}/data/pg_hba.conf
-${PGUSER}/data/pg_geqo.sample
-${PGUSER}/data/pg_pwd
-${PGUSER}/include/fmgr.h
-${PGUSER}/include/port/bsd
-${PGUSER}/include/lib/dllist.h
-${PGUSER}/include/libpq/pqcomm.h
-${PGUSER}/include/libpq/libpq-fs.h
-${PGUSER}/include/utils/geo_decls.h
-${PGUSER}/include/utils/elog.h
-${PGUSER}/include/utils/palloc.h
-${PGUSER}/include/access/attnum.h
-${PGUSER}/include/executor/spi.h
-${PGUSER}/include/commands/trigger.h
-${PGUSER}/include/os.h
-${PGUSER}/include/config.h
-${PGUSER}/include/c.h
-${PGUSER}/include/postgres.h
-${PGUSER}/include/postgres_ext.h
-${PGUSER}/include/libpq-fe.h
-${PGUSER}/include/libpq-int.h
-${PGUSER}/include/ecpgerrno.h
-${PGUSER}/include/ecpglib.h
-${PGUSER}/include/ecpgtype.h
-${PGUSER}/include/sqlca.h
-${PGUSER}/include/libpq++/pgenv.h
-${PGUSER}/include/libpq++/pgconnection.h
-${PGUSER}/include/libpq++/pgdatabase.h
-${PGUSER}/include/libpq++/pgtransdb.h
-${PGUSER}/include/libpq++/pgcursordb.h
-${PGUSER}/include/libpq++/pglobject.h
-${PGUSER}/include/libpq++.h
-${PGUSER}/include/libpgtcl.h
-${PGUSER}/.profile
-${PGUSER}/post-install-notes
-@dirrm ${PGUSER}/data/base/template1
-@dirrm ${PGUSER}/data/base
-@dirrm ${PGUSER}/data
-@dirrm ${PGUSER}/include/libpq++
-@dirrm ${PGUSER}/include/commands
-@dirrm ${PGUSER}/include/executor
-@dirrm ${PGUSER}/include/access
-@dirrm ${PGUSER}/include/utils
-@dirrm ${PGUSER}/include/port
-@dirrm ${PGUSER}/include/libpq
-@dirrm ${PGUSER}/include/lib
-@dirrm ${PGUSER}/include
-@dirrm ${PGUSER}/bin
-@dirrm ${PGUSER}/lib
-@dirrm ${PGUSER}/man/man1
-@dirrm ${PGUSER}/man/man3
-@dirrm ${PGUSER}/man/man5
-@dirrm ${PGUSER}/man/manl
-@dirrm ${PGUSER}/man
-@dirrm ${PGUSER}
-@dirrm share/doc/pgsql/src/sgml/ref
-@dirrm share/doc/pgsql/src/sgml
-@dirrm share/doc/pgsql/src/graphics
-@dirrm share/doc/pgsql/src
-@dirrm share/doc/pgsql
diff --git a/databases/postgresql/pkg/PLIST.dirrm b/databases/postgresql/pkg/PLIST.dirrm
new file mode 100644
index 00000000000..6ffca51cb6f
--- /dev/null
+++ b/databases/postgresql/pkg/PLIST.dirrm
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST.dirrm,v 1.1 1999/09/19 04:24:55 jlam Exp $
+@dirrm ${PGUSER}/man/manl
+@dirrm ${PGUSER}/man/man5
+@dirrm ${PGUSER}/man/man3
+@dirrm ${PGUSER}/man/man1
+@dirrm ${PGUSER}/man
+@dirrm ${PGUSER}/lib
+@dirrm ${PGUSER}/include/utils
+@dirrm ${PGUSER}/include/port/bsd
+@dirrm ${PGUSER}/include/port
+@dirrm ${PGUSER}/include/libpq
+@dirrm ${PGUSER}/include/libpq++
+@dirrm ${PGUSER}/include/lib
+@dirrm ${PGUSER}/include/executor
+@dirrm ${PGUSER}/include/commands
+@dirrm ${PGUSER}/include/access
+@dirrm ${PGUSER}/include
+@dirrm ${PGUSER}/data/base/template1
+@dirrm ${PGUSER}/data/base
+@dirrm ${PGUSER}/data
+@dirrm ${PGUSER}/bin
+@dirrm ${PGUSER}
diff --git a/databases/postgresql/pkg/PLIST.doc b/databases/postgresql/pkg/PLIST.doc
new file mode 100644
index 00000000000..f536c6c050b
--- /dev/null
+++ b/databases/postgresql/pkg/PLIST.doc
@@ -0,0 +1,792 @@
+@comment $NetBSD: PLIST.doc,v 1.1 1999/09/19 04:24:55 jlam Exp $
+share/doc/postgresql/FAQ
+share/doc/postgresql/FAQ_DEV
+share/doc/postgresql/README.fsync
+share/doc/postgresql/TODO
+share/doc/postgresql/admin.ps.gz
+share/doc/postgresql/admin/admin.htm
+share/doc/postgresql/admin/admin.html
+share/doc/postgresql/admin/biblio.htm
+share/doc/postgresql/admin/config.htm
+share/doc/postgresql/admin/config495.htm
+share/doc/postgresql/admin/config570.htm
+share/doc/postgresql/admin/config607.htm
+share/doc/postgresql/admin/copyright.htm
+share/doc/postgresql/admin/disk.htm
+share/doc/postgresql/admin/index.html
+share/doc/postgresql/admin/install-win32.htm
+share/doc/postgresql/admin/install-win321181.htm
+share/doc/postgresql/admin/install-win321190.htm
+share/doc/postgresql/admin/install.htm
+share/doc/postgresql/admin/install1119.htm
+share/doc/postgresql/admin/install1139.htm
+share/doc/postgresql/admin/install1148.htm
+share/doc/postgresql/admin/install761.htm
+share/doc/postgresql/admin/intro-ag.htm
+share/doc/postgresql/admin/layout.gif
+share/doc/postgresql/admin/layout.htm
+share/doc/postgresql/admin/manage-ag.htm
+share/doc/postgresql/admin/manage-ag1578.htm
+share/doc/postgresql/admin/manage-ag1621.htm
+share/doc/postgresql/admin/manage-ag1630.htm
+share/doc/postgresql/admin/newuser.htm
+share/doc/postgresql/admin/notation.htm
+share/doc/postgresql/admin/pg-options.htm
+share/doc/postgresql/admin/ports.htm
+share/doc/postgresql/admin/ports428.htm
+share/doc/postgresql/admin/postmaster.htm
+share/doc/postgresql/admin/preface.htm
+share/doc/postgresql/admin/recovery.htm
+share/doc/postgresql/admin/regress.htm
+share/doc/postgresql/admin/regress1794.htm
+share/doc/postgresql/admin/regress1801.htm
+share/doc/postgresql/admin/regress1838.htm
+share/doc/postgresql/admin/release.htm
+share/doc/postgresql/admin/release1893.htm
+share/doc/postgresql/admin/release1975.htm
+share/doc/postgresql/admin/release1986.htm
+share/doc/postgresql/admin/release1997.htm
+share/doc/postgresql/admin/release2038.htm
+share/doc/postgresql/admin/release2054.htm
+share/doc/postgresql/admin/release2073.htm
+share/doc/postgresql/admin/release2117.htm
+share/doc/postgresql/admin/release2139.htm
+share/doc/postgresql/admin/release2154.htm
+share/doc/postgresql/admin/release2163.htm
+share/doc/postgresql/admin/release2186.htm
+share/doc/postgresql/admin/release2200.htm
+share/doc/postgresql/admin/release2203.htm
+share/doc/postgresql/admin/release2228.htm
+share/doc/postgresql/admin/release2265.htm
+share/doc/postgresql/admin/release2272.htm
+share/doc/postgresql/admin/release2279.htm
+share/doc/postgresql/admin/release2286.htm
+share/doc/postgresql/admin/release2290.htm
+share/doc/postgresql/admin/runtime.htm
+share/doc/postgresql/admin/security.htm
+share/doc/postgresql/admin/security1467.htm
+share/doc/postgresql/admin/security1486.htm
+share/doc/postgresql/admin/security1510.htm
+share/doc/postgresql/admin/terminology.htm
+share/doc/postgresql/admin/trouble.htm
+share/doc/postgresql/admin/trouble1696.htm
+share/doc/postgresql/admin/trouble1711.htm
+share/doc/postgresql/admin/y2k.htm
+share/doc/postgresql/bug.template
+share/doc/postgresql/internals.ps
+share/doc/postgresql/postgres/about.htm
+share/doc/postgresql/postgres/advanced.htm
+share/doc/postgresql/postgres/advanced23214.htm
+share/doc/postgresql/postgres/advanced23236.htm
+share/doc/postgresql/postgres/advanced23256.htm
+share/doc/postgresql/postgres/app-createdb.htm
+share/doc/postgresql/postgres/app-createuser.htm
+share/doc/postgresql/postgres/app-destroydb.htm
+share/doc/postgresql/postgres/app-destroyuser.htm
+share/doc/postgresql/postgres/app-initdb.htm
+share/doc/postgresql/postgres/app-initlocation.htm
+share/doc/postgresql/postgres/app-pg-dump.htm
+share/doc/postgresql/postgres/app-pg-dumpall.htm
+share/doc/postgresql/postgres/app-pgaccess.htm
+share/doc/postgresql/postgres/app-pgadmin.htm
+share/doc/postgresql/postgres/app-postgres.htm
+share/doc/postgresql/postgres/app-postmaster.htm
+share/doc/postgresql/postgres/app-psql.htm
+share/doc/postgresql/postgres/app-vacuumdb.htm
+share/doc/postgresql/postgres/arch-pg.htm
+share/doc/postgresql/postgres/arch.htm
+share/doc/postgresql/postgres/arrays.htm
+share/doc/postgresql/postgres/biblio.htm
+share/doc/postgresql/postgres/bki.htm
+share/doc/postgresql/postgres/bki21904.htm
+share/doc/postgresql/postgres/bki21989.htm
+share/doc/postgresql/postgres/bki22013.htm
+share/doc/postgresql/postgres/bki22074.htm
+share/doc/postgresql/postgres/catalogs.gif
+share/doc/postgresql/postgres/clientserver.gif
+share/doc/postgresql/postgres/compiler.htm
+share/doc/postgresql/postgres/config.htm
+share/doc/postgresql/postgres/config12627.htm
+share/doc/postgresql/postgres/config12702.htm
+share/doc/postgresql/postgres/config12739.htm
+share/doc/postgresql/postgres/connections.gif
+share/doc/postgresql/postgres/copyright.htm
+share/doc/postgresql/postgres/createtableas.htm
+share/doc/postgresql/postgres/cvs.htm
+share/doc/postgresql/postgres/cvs23724.htm
+share/doc/postgresql/postgres/cvs23780.htm
+share/doc/postgresql/postgres/datatype.htm
+share/doc/postgresql/postgres/datatype1380.htm
+share/doc/postgresql/postgres/datatype1412.htm
+share/doc/postgresql/postgres/datatype1511.htm
+share/doc/postgresql/postgres/datatype703.htm
+share/doc/postgresql/postgres/datatype729.htm
+share/doc/postgresql/postgres/datatype793.htm
+share/doc/postgresql/postgres/datetime-appendix.htm
+share/doc/postgresql/postgres/datetime-appendix23641.htm
+share/doc/postgresql/postgres/dfunc.htm
+share/doc/postgresql/postgres/dfunc15567.htm
+share/doc/postgresql/postgres/dfunc15577.htm
+share/doc/postgresql/postgres/disk.htm
+share/doc/postgresql/postgres/docguide.htm
+share/doc/postgresql/postgres/docguide24006.htm
+share/doc/postgresql/postgres/docguide24037.htm
+share/doc/postgresql/postgres/docguide25253.htm
+share/doc/postgresql/postgres/docguide25274.htm
+share/doc/postgresql/postgres/docguide25300.htm
+share/doc/postgresql/postgres/docguide25388.htm
+share/doc/postgresql/postgres/docguide25668.htm
+share/doc/postgresql/postgres/ecpg.htm
+share/doc/postgresql/postgres/ecpg17490.htm
+share/doc/postgresql/postgres/ecpg17508.htm
+share/doc/postgresql/postgres/ecpg17650.htm
+share/doc/postgresql/postgres/ecpg17660.htm
+share/doc/postgresql/postgres/ecpg17680.htm
+share/doc/postgresql/postgres/ecpg17685.htm
+share/doc/postgresql/postgres/environ.htm
+share/doc/postgresql/postgres/extend.htm
+share/doc/postgresql/postgres/extend14525.htm
+share/doc/postgresql/postgres/extend14537.htm
+share/doc/postgresql/postgres/func-ref.htm
+share/doc/postgresql/postgres/functions.htm
+share/doc/postgresql/postgres/functions2183.htm
+share/doc/postgresql/postgres/functions2221.htm
+share/doc/postgresql/postgres/functions2364.htm
+share/doc/postgresql/postgres/functions2449.htm
+share/doc/postgresql/postgres/functions2667.htm
+share/doc/postgresql/postgres/geqo-biblio.htm
+share/doc/postgresql/postgres/geqo.htm
+share/doc/postgresql/postgres/geqo20921.htm
+share/doc/postgresql/postgres/geqo20944.htm
+share/doc/postgresql/postgres/geqo20982.htm
+share/doc/postgresql/postgres/gist.htm
+share/doc/postgresql/postgres/index.html
+share/doc/postgresql/postgres/inherit.htm
+share/doc/postgresql/postgres/install-win32.htm
+share/doc/postgresql/postgres/install-win3213313.htm
+share/doc/postgresql/postgres/install-win3213322.htm
+share/doc/postgresql/postgres/install.htm
+share/doc/postgresql/postgres/install12893.htm
+share/doc/postgresql/postgres/install13251.htm
+share/doc/postgresql/postgres/install13271.htm
+share/doc/postgresql/postgres/install13280.htm
+share/doc/postgresql/postgres/intro.htm
+share/doc/postgresql/postgres/intro177.htm
+share/doc/postgresql/postgres/intro60.htm
+share/doc/postgresql/postgres/jdbc.htm
+share/doc/postgresql/postgres/jdbc20288.htm
+share/doc/postgresql/postgres/jdbc20301.htm
+share/doc/postgresql/postgres/jdbc20308.htm
+share/doc/postgresql/postgres/jdbc20316.htm
+share/doc/postgresql/postgres/jdbc20334.htm
+share/doc/postgresql/postgres/jdbc20371.htm
+share/doc/postgresql/postgres/jdbc20402.htm
+share/doc/postgresql/postgres/jdbc20406.htm
+share/doc/postgresql/postgres/jdbc20410.htm
+share/doc/postgresql/postgres/jdbc20429.htm
+share/doc/postgresql/postgres/jdbc20459.htm
+share/doc/postgresql/postgres/keys.htm
+share/doc/postgresql/postgres/largeobjects.htm
+share/doc/postgresql/postgres/largeobjects17378.htm
+share/doc/postgresql/postgres/largeobjects17381.htm
+share/doc/postgresql/postgres/largeobjects17433.htm
+share/doc/postgresql/postgres/largeobjects17440.htm
+share/doc/postgresql/postgres/largeobjects17444.htm
+share/doc/postgresql/postgres/layout.gif
+share/doc/postgresql/postgres/layout.htm
+share/doc/postgresql/postgres/libpq-chapter.htm
+share/doc/postgresql/postgres/libpq-chapter18058.htm
+share/doc/postgresql/postgres/libpq-chapter18164.htm
+share/doc/postgresql/postgres/libpq-chapter18210.htm
+share/doc/postgresql/postgres/libpq-chapter18220.htm
+share/doc/postgresql/postgres/libpq-chapter18236.htm
+share/doc/postgresql/postgres/libpq-chapter18268.htm
+share/doc/postgresql/postgres/libpq-chapter18281.htm
+share/doc/postgresql/postgres/libpq-chapter18296.htm
+share/doc/postgresql/postgres/libpq-chapter18372.htm
+share/doc/postgresql/postgres/libpq-chapter18375.htm
+share/doc/postgresql/postgres/libpq-envars.htm
+share/doc/postgresql/postgres/libpqplusplus.htm
+share/doc/postgresql/postgres/libpqplusplus18476.htm
+share/doc/postgresql/postgres/libpqplusplus18486.htm
+share/doc/postgresql/postgres/libpqplusplus18516.htm
+share/doc/postgresql/postgres/libpqplusplus18617.htm
+share/doc/postgresql/postgres/libpqplusplus18640.htm
+share/doc/postgresql/postgres/libpqplusplus18683.htm
+share/doc/postgresql/postgres/manage-ag.htm
+share/doc/postgresql/postgres/manage-ag13710.htm
+share/doc/postgresql/postgres/manage-ag13753.htm
+share/doc/postgresql/postgres/manage-ag13762.htm
+share/doc/postgresql/postgres/manage.htm
+share/doc/postgresql/postgres/manage3306.htm
+share/doc/postgresql/postgres/manage3330.htm
+share/doc/postgresql/postgres/manage3371.htm
+share/doc/postgresql/postgres/mvcc.htm
+share/doc/postgresql/postgres/mvcc3058.htm
+share/doc/postgresql/postgres/mvcc3111.htm
+share/doc/postgresql/postgres/mvcc3123.htm
+share/doc/postgresql/postgres/mvcc3136.htm
+share/doc/postgresql/postgres/mvcc3213.htm
+share/doc/postgresql/postgres/mvcc3234.htm
+share/doc/postgresql/postgres/newuser.htm
+share/doc/postgresql/postgres/notation.htm
+share/doc/postgresql/postgres/odbc.htm
+share/doc/postgresql/postgres/odbc19825.htm
+share/doc/postgresql/postgres/odbc19863.htm
+share/doc/postgresql/postgres/odbc20031.htm
+share/doc/postgresql/postgres/odbc20053.htm
+share/doc/postgresql/postgres/operators.htm
+share/doc/postgresql/postgres/operators1716.htm
+share/doc/postgresql/postgres/operators1787.htm
+share/doc/postgresql/postgres/operators1857.htm
+share/doc/postgresql/postgres/operators1967.htm
+share/doc/postgresql/postgres/operators2026.htm
+share/doc/postgresql/postgres/operators2080.htm
+share/doc/postgresql/postgres/overview.htm
+share/doc/postgresql/postgres/overview20521.htm
+share/doc/postgresql/postgres/overview20546.htm
+share/doc/postgresql/postgres/overview20674.htm
+share/doc/postgresql/postgres/overview20730.htm
+share/doc/postgresql/postgres/overview20784.htm
+share/doc/postgresql/postgres/page.htm
+share/doc/postgresql/postgres/page22137.htm
+share/doc/postgresql/postgres/page22151.htm
+share/doc/postgresql/postgres/part-admin.htm
+share/doc/postgresql/postgres/part-appendix.htm
+share/doc/postgresql/postgres/part-developer.htm
+share/doc/postgresql/postgres/part-interfaces.htm
+share/doc/postgresql/postgres/part-programmer.htm
+share/doc/postgresql/postgres/part-tutorial.htm
+share/doc/postgresql/postgres/part-user.htm
+share/doc/postgresql/postgres/pg-options-dev.htm
+share/doc/postgresql/postgres/pg-options.htm
+share/doc/postgresql/postgres/pgtcl-pgconndefaults.htm
+share/doc/postgresql/postgres/pgtcl-pgconnect.htm
+share/doc/postgresql/postgres/pgtcl-pgdisconnect.htm
+share/doc/postgresql/postgres/pgtcl-pgexec.htm
+share/doc/postgresql/postgres/pgtcl-pglisten.htm
+share/doc/postgresql/postgres/pgtcl-pgloclose.htm
+share/doc/postgresql/postgres/pgtcl-pglocreat.htm
+share/doc/postgresql/postgres/pgtcl-pgloexport.htm
+share/doc/postgresql/postgres/pgtcl-pgloimport.htm
+share/doc/postgresql/postgres/pgtcl-pglolseek.htm
+share/doc/postgresql/postgres/pgtcl-pgloopen.htm
+share/doc/postgresql/postgres/pgtcl-pgloread.htm
+share/doc/postgresql/postgres/pgtcl-pglotell.htm
+share/doc/postgresql/postgres/pgtcl-pglounlink.htm
+share/doc/postgresql/postgres/pgtcl-pglowrite.htm
+share/doc/postgresql/postgres/pgtcl-pgresult.htm
+share/doc/postgresql/postgres/pgtcl-pgselect.htm
+share/doc/postgresql/postgres/pgtcl.htm
+share/doc/postgresql/postgres/pgtcl18759.htm
+share/doc/postgresql/postgres/pgtcl18763.htm
+share/doc/postgresql/postgres/ports.htm
+share/doc/postgresql/postgres/ports12560.htm
+share/doc/postgresql/postgres/postgres.htm
+share/doc/postgresql/postgres/postgres.html
+share/doc/postgresql/postgres/postmaster.htm
+share/doc/postgresql/postgres/preface.htm
+share/doc/postgresql/postgres/protocol.htm
+share/doc/postgresql/postgres/protocol21097.htm
+share/doc/postgresql/postgres/protocol21252.htm
+share/doc/postgresql/postgres/protocol21288.htm
+share/doc/postgresql/postgres/query.htm
+share/doc/postgresql/postgres/query23068.htm
+share/doc/postgresql/postgres/query23084.htm
+share/doc/postgresql/postgres/query23105.htm
+share/doc/postgresql/postgres/query23114.htm
+share/doc/postgresql/postgres/query23132.htm
+share/doc/postgresql/postgres/query23139.htm
+share/doc/postgresql/postgres/query23154.htm
+share/doc/postgresql/postgres/query23158.htm
+share/doc/postgresql/postgres/query23165.htm
+share/doc/postgresql/postgres/recovery.htm
+share/doc/postgresql/postgres/regress.htm
+share/doc/postgresql/postgres/regress13926.htm
+share/doc/postgresql/postgres/regress13933.htm
+share/doc/postgresql/postgres/regress13970.htm
+share/doc/postgresql/postgres/release.htm
+share/doc/postgresql/postgres/release14025.htm
+share/doc/postgresql/postgres/release14107.htm
+share/doc/postgresql/postgres/release14118.htm
+share/doc/postgresql/postgres/release14129.htm
+share/doc/postgresql/postgres/release14170.htm
+share/doc/postgresql/postgres/release14186.htm
+share/doc/postgresql/postgres/release14205.htm
+share/doc/postgresql/postgres/release14249.htm
+share/doc/postgresql/postgres/release14271.htm
+share/doc/postgresql/postgres/release14286.htm
+share/doc/postgresql/postgres/release14295.htm
+share/doc/postgresql/postgres/release14318.htm
+share/doc/postgresql/postgres/release14332.htm
+share/doc/postgresql/postgres/release14335.htm
+share/doc/postgresql/postgres/release14360.htm
+share/doc/postgresql/postgres/release14397.htm
+share/doc/postgresql/postgres/release14404.htm
+share/doc/postgresql/postgres/release14411.htm
+share/doc/postgresql/postgres/release14418.htm
+share/doc/postgresql/postgres/release14422.htm
+share/doc/postgresql/postgres/rules.htm
+share/doc/postgresql/postgres/rules14948.htm
+share/doc/postgresql/postgres/rules15109.htm
+share/doc/postgresql/postgres/rules15240.htm
+share/doc/postgresql/postgres/rules15254.htm
+share/doc/postgresql/postgres/runtime.htm
+share/doc/postgresql/postgres/security.htm
+share/doc/postgresql/postgres/security13599.htm
+share/doc/postgresql/postgres/security13618.htm
+share/doc/postgresql/postgres/security13642.htm
+share/doc/postgresql/postgres/signals.htm
+share/doc/postgresql/postgres/spi-spiconnect.htm
+share/doc/postgresql/postgres/spi-spicopytuple.htm
+share/doc/postgresql/postgres/spi-spiexec.htm
+share/doc/postgresql/postgres/spi-spiexecp.htm
+share/doc/postgresql/postgres/spi-spifinish.htm
+share/doc/postgresql/postgres/spi-spifname.htm
+share/doc/postgresql/postgres/spi-spifnumber.htm
+share/doc/postgresql/postgres/spi-spigetbinval.htm
+share/doc/postgresql/postgres/spi-spigetrelname.htm
+share/doc/postgresql/postgres/spi-spigettype.htm
+share/doc/postgresql/postgres/spi-spigettypeid.htm
+share/doc/postgresql/postgres/spi-spigetvalue.htm
+share/doc/postgresql/postgres/spi-spimodifytuple.htm
+share/doc/postgresql/postgres/spi-spipalloc.htm
+share/doc/postgresql/postgres/spi-spipfree.htm
+share/doc/postgresql/postgres/spi-spiprepare.htm
+share/doc/postgresql/postgres/spi-spirepalloc.htm
+share/doc/postgresql/postgres/spi-spisaveplan.htm
+share/doc/postgresql/postgres/spi.htm
+share/doc/postgresql/postgres/spi16142.htm
+share/doc/postgresql/postgres/spi16855.htm
+share/doc/postgresql/postgres/spi16877.htm
+share/doc/postgresql/postgres/spi16882.htm
+share/doc/postgresql/postgres/sql-abort.htm
+share/doc/postgresql/postgres/sql-altertable.htm
+share/doc/postgresql/postgres/sql-alteruser.htm
+share/doc/postgresql/postgres/sql-beginwork.htm
+share/doc/postgresql/postgres/sql-close.htm
+share/doc/postgresql/postgres/sql-cluster.htm
+share/doc/postgresql/postgres/sql-commands.htm
+share/doc/postgresql/postgres/sql-commit.htm
+share/doc/postgresql/postgres/sql-copy.htm
+share/doc/postgresql/postgres/sql-createaggregate.htm
+share/doc/postgresql/postgres/sql-createdatabase.htm
+share/doc/postgresql/postgres/sql-createfunction.htm
+share/doc/postgresql/postgres/sql-createindex.htm
+share/doc/postgresql/postgres/sql-createlanguage.htm
+share/doc/postgresql/postgres/sql-createoperator.htm
+share/doc/postgresql/postgres/sql-createrule.htm
+share/doc/postgresql/postgres/sql-createsequence.htm
+share/doc/postgresql/postgres/sql-createtable.htm
+share/doc/postgresql/postgres/sql-createtrigger.htm
+share/doc/postgresql/postgres/sql-createtype.htm
+share/doc/postgresql/postgres/sql-createuser.htm
+share/doc/postgresql/postgres/sql-createview.htm
+share/doc/postgresql/postgres/sql-declare.htm
+share/doc/postgresql/postgres/sql-delete.htm
+share/doc/postgresql/postgres/sql-dropaggregate.htm
+share/doc/postgresql/postgres/sql-dropdatabase.htm
+share/doc/postgresql/postgres/sql-dropfunction.htm
+share/doc/postgresql/postgres/sql-dropindex.htm
+share/doc/postgresql/postgres/sql-droplanguage.htm
+share/doc/postgresql/postgres/sql-dropoperator.htm
+share/doc/postgresql/postgres/sql-droprule.htm
+share/doc/postgresql/postgres/sql-dropsequence.htm
+share/doc/postgresql/postgres/sql-droptable.htm
+share/doc/postgresql/postgres/sql-droptrigger.htm
+share/doc/postgresql/postgres/sql-droptype.htm
+share/doc/postgresql/postgres/sql-dropuser.htm
+share/doc/postgresql/postgres/sql-dropview.htm
+share/doc/postgresql/postgres/sql-explain.htm
+share/doc/postgresql/postgres/sql-fetch.htm
+share/doc/postgresql/postgres/sql-grant.htm
+share/doc/postgresql/postgres/sql-insert.htm
+share/doc/postgresql/postgres/sql-language.htm
+share/doc/postgresql/postgres/sql-listen.htm
+share/doc/postgresql/postgres/sql-load.htm
+share/doc/postgresql/postgres/sql-lock.htm
+share/doc/postgresql/postgres/sql-move.htm
+share/doc/postgresql/postgres/sql-notify.htm
+share/doc/postgresql/postgres/sql-reset.htm
+share/doc/postgresql/postgres/sql-revoke.htm
+share/doc/postgresql/postgres/sql-rollback.htm
+share/doc/postgresql/postgres/sql-select.htm
+share/doc/postgresql/postgres/sql-selectinto.htm
+share/doc/postgresql/postgres/sql-set.htm
+share/doc/postgresql/postgres/sql-show.htm
+share/doc/postgresql/postgres/sql-unlisten.htm
+share/doc/postgresql/postgres/sql-update.htm
+share/doc/postgresql/postgres/sql-vacuum-1.htm
+share/doc/postgresql/postgres/sql.htm
+share/doc/postgresql/postgres/sql22234.htm
+share/doc/postgresql/postgres/sql22352.htm
+share/doc/postgresql/postgres/start.htm
+share/doc/postgresql/postgres/start22962.htm
+share/doc/postgresql/postgres/start22979.htm
+share/doc/postgresql/postgres/storage.htm
+share/doc/postgresql/postgres/syntax.htm
+share/doc/postgresql/postgres/syntax439.htm
+share/doc/postgresql/postgres/terminology.htm
+share/doc/postgresql/postgres/triggers.htm
+share/doc/postgresql/postgres/triggers15613.htm
+share/doc/postgresql/postgres/triggers15619.htm
+share/doc/postgresql/postgres/triggers15627.htm
+share/doc/postgresql/postgres/trouble.htm
+share/doc/postgresql/postgres/trouble13828.htm
+share/doc/postgresql/postgres/trouble13843.htm
+share/doc/postgresql/postgres/typeconv.htm
+share/doc/postgresql/postgres/typeconv2785.htm
+share/doc/postgresql/postgres/typeconv2848.htm
+share/doc/postgresql/postgres/typeconv2901.htm
+share/doc/postgresql/postgres/typeconv2921.htm
+share/doc/postgresql/postgres/utilities.htm
+share/doc/postgresql/postgres/xaggr.htm
+share/doc/postgresql/postgres/xfunc.htm
+share/doc/postgresql/postgres/xfunc14663.htm
+share/doc/postgresql/postgres/xindex.htm
+share/doc/postgresql/postgres/xoper.htm
+share/doc/postgresql/postgres/xplang.htm
+share/doc/postgresql/postgres/xplang16930.htm
+share/doc/postgresql/postgres/xplang17200.htm
+share/doc/postgresql/postgres/xtypes.htm
+share/doc/postgresql/postgres/y2k.htm
+share/doc/postgresql/programmer.ps.gz
+share/doc/postgresql/programmer/arch-pg.htm
+share/doc/postgresql/programmer/biblio.htm
+share/doc/postgresql/programmer/bki.htm
+share/doc/postgresql/programmer/catalogs.gif
+share/doc/postgresql/programmer/compiler.htm
+share/doc/postgresql/programmer/connections.gif
+share/doc/postgresql/programmer/copyright.htm
+share/doc/postgresql/programmer/cvs.htm
+share/doc/postgresql/programmer/dfunc.htm
+share/doc/postgresql/programmer/docguide.htm
+share/doc/postgresql/programmer/ecpg.htm
+share/doc/postgresql/programmer/extend.htm
+share/doc/postgresql/programmer/geqo.htm
+share/doc/postgresql/programmer/gist.htm
+share/doc/postgresql/programmer/index.html
+share/doc/postgresql/programmer/intro-pg.htm
+share/doc/postgresql/programmer/jdbc.htm
+share/doc/postgresql/programmer/largeobjects.htm
+share/doc/postgresql/programmer/libpq-chapter.htm
+share/doc/postgresql/programmer/libpq-envars.htm
+share/doc/postgresql/programmer/libpqplusplus.htm
+share/doc/postgresql/programmer/notation.htm
+share/doc/postgresql/programmer/odbc.htm
+share/doc/postgresql/programmer/overview.htm
+share/doc/postgresql/programmer/page.htm
+share/doc/postgresql/programmer/pg-options-dev.htm
+share/doc/postgresql/programmer/pgtcl-pgconndefaults.htm
+share/doc/postgresql/programmer/pgtcl-pgconnect.htm
+share/doc/postgresql/programmer/pgtcl-pgdisconnect.htm
+share/doc/postgresql/programmer/pgtcl-pgexec.htm
+share/doc/postgresql/programmer/pgtcl-pglisten.htm
+share/doc/postgresql/programmer/pgtcl-pgloclose.htm
+share/doc/postgresql/programmer/pgtcl-pglocreat.htm
+share/doc/postgresql/programmer/pgtcl-pgloexport.htm
+share/doc/postgresql/programmer/pgtcl-pgloimport.htm
+share/doc/postgresql/programmer/pgtcl-pglolseek.htm
+share/doc/postgresql/programmer/pgtcl-pgloopen.htm
+share/doc/postgresql/programmer/pgtcl-pgloread.htm
+share/doc/postgresql/programmer/pgtcl-pglotell.htm
+share/doc/postgresql/programmer/pgtcl-pglounlink.htm
+share/doc/postgresql/programmer/pgtcl-pglowrite.htm
+share/doc/postgresql/programmer/pgtcl-pgresult.htm
+share/doc/postgresql/programmer/pgtcl-pgselect.htm
+share/doc/postgresql/programmer/pgtcl.htm
+share/doc/postgresql/programmer/preface.htm
+share/doc/postgresql/programmer/programmer.htm
+share/doc/postgresql/programmer/programmer.html
+share/doc/postgresql/programmer/protocol.htm
+share/doc/postgresql/programmer/rules.htm
+share/doc/postgresql/programmer/signals.htm
+share/doc/postgresql/programmer/spi-spiconnect.htm
+share/doc/postgresql/programmer/spi-spicopytuple.htm
+share/doc/postgresql/programmer/spi-spiexec.htm
+share/doc/postgresql/programmer/spi-spiexecp.htm
+share/doc/postgresql/programmer/spi-spifinish.htm
+share/doc/postgresql/programmer/spi-spifname.htm
+share/doc/postgresql/programmer/spi-spifnumber.htm
+share/doc/postgresql/programmer/spi-spigetbinval.htm
+share/doc/postgresql/programmer/spi-spigetrelname.htm
+share/doc/postgresql/programmer/spi-spigettype.htm
+share/doc/postgresql/programmer/spi-spigettypeid.htm
+share/doc/postgresql/programmer/spi-spigetvalue.htm
+share/doc/postgresql/programmer/spi-spimodifytuple.htm
+share/doc/postgresql/programmer/spi-spipalloc.htm
+share/doc/postgresql/programmer/spi-spipfree.htm
+share/doc/postgresql/programmer/spi-spiprepare.htm
+share/doc/postgresql/programmer/spi-spirepalloc.htm
+share/doc/postgresql/programmer/spi-spisaveplan.htm
+share/doc/postgresql/programmer/spi.htm
+share/doc/postgresql/programmer/terminology.htm
+share/doc/postgresql/programmer/triggers.htm
+share/doc/postgresql/programmer/x1005.htm
+share/doc/postgresql/programmer/x1310.htm
+share/doc/postgresql/programmer/x1580.htm
+share/doc/postgresql/programmer/x1779.htm
+share/doc/postgresql/programmer/x1789.htm
+share/doc/postgresql/programmer/x1825.htm
+share/doc/postgresql/programmer/x1831.htm
+share/doc/postgresql/programmer/x1839.htm
+share/doc/postgresql/programmer/x2354.htm
+share/doc/postgresql/programmer/x276.htm
+share/doc/postgresql/programmer/x288.htm
+share/doc/postgresql/programmer/x3067.htm
+share/doc/postgresql/programmer/x3089.htm
+share/doc/postgresql/programmer/x3094.htm
+share/doc/postgresql/programmer/x3118.htm
+share/doc/postgresql/programmer/x3121.htm
+share/doc/postgresql/programmer/x3173.htm
+share/doc/postgresql/programmer/x3180.htm
+share/doc/postgresql/programmer/x3184.htm
+share/doc/postgresql/programmer/x3308.htm
+share/doc/postgresql/programmer/x3414.htm
+share/doc/postgresql/programmer/x3460.htm
+share/doc/postgresql/programmer/x3470.htm
+share/doc/postgresql/programmer/x3486.htm
+share/doc/postgresql/programmer/x3518.htm
+share/doc/postgresql/programmer/x3531.htm
+share/doc/postgresql/programmer/x3546.htm
+share/doc/postgresql/programmer/x3625.htm
+share/doc/postgresql/programmer/x3628.htm
+share/doc/postgresql/programmer/x3732.htm
+share/doc/postgresql/programmer/x3742.htm
+share/doc/postgresql/programmer/x3772.htm
+share/doc/postgresql/programmer/x3873.htm
+share/doc/postgresql/programmer/x3896.htm
+share/doc/postgresql/programmer/x3939.htm
+share/doc/postgresql/programmer/x4015.htm
+share/doc/postgresql/programmer/x4019.htm
+share/doc/postgresql/programmer/x414.htm
+share/doc/postgresql/programmer/x5078.htm
+share/doc/postgresql/programmer/x5096.htm
+share/doc/postgresql/programmer/x5238.htm
+share/doc/postgresql/programmer/x5248.htm
+share/doc/postgresql/programmer/x5268.htm
+share/doc/postgresql/programmer/x5273.htm
+share/doc/postgresql/programmer/x5571.htm
+share/doc/postgresql/programmer/x5609.htm
+share/doc/postgresql/programmer/x5777.htm
+share/doc/postgresql/programmer/x5799.htm
+share/doc/postgresql/programmer/x6034.htm
+share/doc/postgresql/programmer/x6047.htm
+share/doc/postgresql/programmer/x6054.htm
+share/doc/postgresql/programmer/x6062.htm
+share/doc/postgresql/programmer/x6080.htm
+share/doc/postgresql/programmer/x6117.htm
+share/doc/postgresql/programmer/x6148.htm
+share/doc/postgresql/programmer/x6152.htm
+share/doc/postgresql/programmer/x6156.htm
+share/doc/postgresql/programmer/x6175.htm
+share/doc/postgresql/programmer/x6205.htm
+share/doc/postgresql/programmer/x6263.htm
+share/doc/postgresql/programmer/x6288.htm
+share/doc/postgresql/programmer/x6416.htm
+share/doc/postgresql/programmer/x6472.htm
+share/doc/postgresql/programmer/x6526.htm
+share/doc/postgresql/programmer/x6663.htm
+share/doc/postgresql/programmer/x6686.htm
+share/doc/postgresql/programmer/x6724.htm
+share/doc/postgresql/programmer/x6839.htm
+share/doc/postgresql/programmer/x699.htm
+share/doc/postgresql/programmer/x6994.htm
+share/doc/postgresql/programmer/x7030.htm
+share/doc/postgresql/programmer/x7646.htm
+share/doc/postgresql/programmer/x7731.htm
+share/doc/postgresql/programmer/x7755.htm
+share/doc/postgresql/programmer/x7816.htm
+share/doc/postgresql/programmer/x7879.htm
+share/doc/postgresql/programmer/x7893.htm
+share/doc/postgresql/programmer/x7955.htm
+share/doc/postgresql/programmer/x8011.htm
+share/doc/postgresql/programmer/x8237.htm
+share/doc/postgresql/programmer/x8268.htm
+share/doc/postgresql/programmer/x860.htm
+share/doc/postgresql/programmer/x9484.htm
+share/doc/postgresql/programmer/x9504.htm
+share/doc/postgresql/programmer/x9551.htm
+share/doc/postgresql/programmer/x9831.htm
+share/doc/postgresql/programmer/x991.htm
+share/doc/postgresql/programmer/xaggr.htm
+share/doc/postgresql/programmer/xfunc.htm
+share/doc/postgresql/programmer/xindex.htm
+share/doc/postgresql/programmer/xoper.htm
+share/doc/postgresql/programmer/xplang.htm
+share/doc/postgresql/programmer/xtypes.htm
+share/doc/postgresql/programmer/y2k.htm
+share/doc/postgresql/tutorial.ps.gz
+share/doc/postgresql/tutorial/about.htm
+share/doc/postgresql/tutorial/advanced.htm
+share/doc/postgresql/tutorial/arch.htm
+share/doc/postgresql/tutorial/biblio.htm
+share/doc/postgresql/tutorial/clientserver.gif
+share/doc/postgresql/tutorial/copyright.htm
+share/doc/postgresql/tutorial/f17.htm
+share/doc/postgresql/tutorial/index.html
+share/doc/postgresql/tutorial/intro.htm
+share/doc/postgresql/tutorial/notation.htm
+share/doc/postgresql/tutorial/query.htm
+share/doc/postgresql/tutorial/sql-language.htm
+share/doc/postgresql/tutorial/sql.htm
+share/doc/postgresql/tutorial/start.htm
+share/doc/postgresql/tutorial/terminology.htm
+share/doc/postgresql/tutorial/tutorial.htm
+share/doc/postgresql/tutorial/tutorial.html
+share/doc/postgresql/tutorial/x1129.htm
+share/doc/postgresql/tutorial/x1146.htm
+share/doc/postgresql/tutorial/x1235.htm
+share/doc/postgresql/tutorial/x1251.htm
+share/doc/postgresql/tutorial/x1272.htm
+share/doc/postgresql/tutorial/x1281.htm
+share/doc/postgresql/tutorial/x1299.htm
+share/doc/postgresql/tutorial/x1306.htm
+share/doc/postgresql/tutorial/x1321.htm
+share/doc/postgresql/tutorial/x1325.htm
+share/doc/postgresql/tutorial/x1332.htm
+share/doc/postgresql/tutorial/x1381.htm
+share/doc/postgresql/tutorial/x1403.htm
+share/doc/postgresql/tutorial/x1423.htm
+share/doc/postgresql/tutorial/x159.htm
+share/doc/postgresql/tutorial/x401.htm
+share/doc/postgresql/tutorial/x519.htm
+share/doc/postgresql/tutorial/x56.htm
+share/doc/postgresql/tutorial/y2k.htm
+share/doc/postgresql/user.ps.gz
+share/doc/postgresql/user/about.htm
+share/doc/postgresql/user/app-createdb.htm
+share/doc/postgresql/user/app-createuser.htm
+share/doc/postgresql/user/app-destroydb.htm
+share/doc/postgresql/user/app-destroyuser.htm
+share/doc/postgresql/user/app-initdb.htm
+share/doc/postgresql/user/app-initlocation.htm
+share/doc/postgresql/user/app-pg-dump.htm
+share/doc/postgresql/user/app-pg-dumpall.htm
+share/doc/postgresql/user/app-pgaccess.htm
+share/doc/postgresql/user/app-pgadmin.htm
+share/doc/postgresql/user/app-postgres.htm
+share/doc/postgresql/user/app-postmaster.htm
+share/doc/postgresql/user/app-psql.htm
+share/doc/postgresql/user/app-vacuumdb.htm
+share/doc/postgresql/user/arrays.htm
+share/doc/postgresql/user/biblio.htm
+share/doc/postgresql/user/copyright.htm
+share/doc/postgresql/user/createtableas.htm
+share/doc/postgresql/user/datatype.htm
+share/doc/postgresql/user/datetime-appendix.htm
+share/doc/postgresql/user/environ.htm
+share/doc/postgresql/user/functions.htm
+share/doc/postgresql/user/index.html
+share/doc/postgresql/user/inherit.htm
+share/doc/postgresql/user/intro.htm
+share/doc/postgresql/user/keys.htm
+share/doc/postgresql/user/manage.htm
+share/doc/postgresql/user/mvcc.htm
+share/doc/postgresql/user/notation.htm
+share/doc/postgresql/user/operators.htm
+share/doc/postgresql/user/preface.htm
+share/doc/postgresql/user/sql-abort.htm
+share/doc/postgresql/user/sql-altertable.htm
+share/doc/postgresql/user/sql-alteruser.htm
+share/doc/postgresql/user/sql-beginwork.htm
+share/doc/postgresql/user/sql-close.htm
+share/doc/postgresql/user/sql-cluster.htm
+share/doc/postgresql/user/sql-commands.htm
+share/doc/postgresql/user/sql-commit.htm
+share/doc/postgresql/user/sql-copy.htm
+share/doc/postgresql/user/sql-createaggregate.htm
+share/doc/postgresql/user/sql-createdatabase.htm
+share/doc/postgresql/user/sql-createfunction.htm
+share/doc/postgresql/user/sql-createindex.htm
+share/doc/postgresql/user/sql-createlanguage.htm
+share/doc/postgresql/user/sql-createoperator.htm
+share/doc/postgresql/user/sql-createrule.htm
+share/doc/postgresql/user/sql-createsequence.htm
+share/doc/postgresql/user/sql-createtable.htm
+share/doc/postgresql/user/sql-createtrigger.htm
+share/doc/postgresql/user/sql-createtype.htm
+share/doc/postgresql/user/sql-createuser.htm
+share/doc/postgresql/user/sql-createview.htm
+share/doc/postgresql/user/sql-declare.htm
+share/doc/postgresql/user/sql-delete.htm
+share/doc/postgresql/user/sql-dropaggregate.htm
+share/doc/postgresql/user/sql-dropdatabase.htm
+share/doc/postgresql/user/sql-dropfunction.htm
+share/doc/postgresql/user/sql-dropindex.htm
+share/doc/postgresql/user/sql-droplanguage.htm
+share/doc/postgresql/user/sql-dropoperator.htm
+share/doc/postgresql/user/sql-droprule.htm
+share/doc/postgresql/user/sql-dropsequence.htm
+share/doc/postgresql/user/sql-droptable.htm
+share/doc/postgresql/user/sql-droptrigger.htm
+share/doc/postgresql/user/sql-droptype.htm
+share/doc/postgresql/user/sql-dropuser.htm
+share/doc/postgresql/user/sql-dropview.htm
+share/doc/postgresql/user/sql-explain.htm
+share/doc/postgresql/user/sql-fetch.htm
+share/doc/postgresql/user/sql-grant.htm
+share/doc/postgresql/user/sql-insert.htm
+share/doc/postgresql/user/sql-listen.htm
+share/doc/postgresql/user/sql-load.htm
+share/doc/postgresql/user/sql-lock.htm
+share/doc/postgresql/user/sql-move.htm
+share/doc/postgresql/user/sql-notify.htm
+share/doc/postgresql/user/sql-reset.htm
+share/doc/postgresql/user/sql-revoke.htm
+share/doc/postgresql/user/sql-rollback.htm
+share/doc/postgresql/user/sql-select.htm
+share/doc/postgresql/user/sql-selectinto.htm
+share/doc/postgresql/user/sql-set.htm
+share/doc/postgresql/user/sql-show.htm
+share/doc/postgresql/user/sql-unlisten.htm
+share/doc/postgresql/user/sql-update.htm
+share/doc/postgresql/user/sql-vacuum-1.htm
+share/doc/postgresql/user/storage.htm
+share/doc/postgresql/user/syntax.htm
+share/doc/postgresql/user/terminology.htm
+share/doc/postgresql/user/typeconv.htm
+share/doc/postgresql/user/user.htm
+share/doc/postgresql/user/user.html
+share/doc/postgresql/user/utilities.htm
+share/doc/postgresql/user/x12564.htm
+share/doc/postgresql/user/x1361.htm
+share/doc/postgresql/user/x1393.htm
+share/doc/postgresql/user/x1492.htm
+share/doc/postgresql/user/x159.htm
+share/doc/postgresql/user/x1697.htm
+share/doc/postgresql/user/x1768.htm
+share/doc/postgresql/user/x1838.htm
+share/doc/postgresql/user/x1948.htm
+share/doc/postgresql/user/x2007.htm
+share/doc/postgresql/user/x2061.htm
+share/doc/postgresql/user/x2164.htm
+share/doc/postgresql/user/x2202.htm
+share/doc/postgresql/user/x2345.htm
+share/doc/postgresql/user/x2430.htm
+share/doc/postgresql/user/x2648.htm
+share/doc/postgresql/user/x2766.htm
+share/doc/postgresql/user/x2829.htm
+share/doc/postgresql/user/x2882.htm
+share/doc/postgresql/user/x2902.htm
+share/doc/postgresql/user/x3039.htm
+share/doc/postgresql/user/x3091.htm
+share/doc/postgresql/user/x3103.htm
+share/doc/postgresql/user/x3116.htm
+share/doc/postgresql/user/x3193.htm
+share/doc/postgresql/user/x3214.htm
+share/doc/postgresql/user/x3286.htm
+share/doc/postgresql/user/x3310.htm
+share/doc/postgresql/user/x3351.htm
+share/doc/postgresql/user/x420.htm
+share/doc/postgresql/user/x56.htm
+share/doc/postgresql/user/x684.htm
+share/doc/postgresql/user/x710.htm
+share/doc/postgresql/user/x774.htm
+share/doc/postgresql/user/y2k.htm
+@dirrm share/doc/postgresql/user
+@dirrm share/doc/postgresql/tutorial
+@dirrm share/doc/postgresql/programmer
+@dirrm share/doc/postgresql/postgres
+@dirrm share/doc/postgresql/admin
+@dirrm share/doc/postgresql
diff --git a/databases/postgresql/pkg/PLIST.notcl b/databases/postgresql/pkg/PLIST.notcl
new file mode 100644
index 00000000000..d2ee5c26325
--- /dev/null
+++ b/databases/postgresql/pkg/PLIST.notcl
@@ -0,0 +1,195 @@
+@comment $NetBSD: PLIST.notcl,v 1.1 1999/09/19 04:24:56 jlam Exp $
+etc/rc.d/pgsql.sh
+${PGUSER}/.profile
+${PGUSER}/bin/cleardbdir
+${PGUSER}/bin/createdb
+${PGUSER}/bin/createlang
+${PGUSER}/bin/createuser
+${PGUSER}/bin/destroydb
+${PGUSER}/bin/destroylang
+${PGUSER}/bin/destroyuser
+${PGUSER}/bin/ecpg
+${PGUSER}/bin/initdb
+${PGUSER}/bin/initlocation
+${PGUSER}/bin/ipcclean
+${PGUSER}/bin/pg_dump
+${PGUSER}/bin/pg_dumpall
+${PGUSER}/bin/pg_id
+${PGUSER}/bin/pg_passwd
+${PGUSER}/bin/pg_upgrade
+${PGUSER}/bin/pg_version
+${PGUSER}/bin/postgres
+${PGUSER}/bin/postmaster
+${PGUSER}/bin/psql
+${PGUSER}/bin/vacuumdb
+${PGUSER}/data/PG_VERSION
+${PGUSER}/data/base/template1/PG_VERSION
+${PGUSER}/data/base/template1/pg_aggregate
+${PGUSER}/data/base/template1/pg_am
+${PGUSER}/data/base/template1/pg_amop
+${PGUSER}/data/base/template1/pg_amproc
+${PGUSER}/data/base/template1/pg_attrdef
+${PGUSER}/data/base/template1/pg_attrdef_adrelid_index
+${PGUSER}/data/base/template1/pg_attribute
+${PGUSER}/data/base/template1/pg_attribute_attrelid_index
+${PGUSER}/data/base/template1/pg_attribute_relid_attnam_index
+${PGUSER}/data/base/template1/pg_attribute_relid_attnum_index
+${PGUSER}/data/base/template1/pg_class
+${PGUSER}/data/base/template1/pg_class_oid_index
+${PGUSER}/data/base/template1/pg_class_relname_index
+${PGUSER}/data/base/template1/pg_description
+${PGUSER}/data/base/template1/pg_description_objoid_index
+${PGUSER}/data/base/template1/pg_index
+${PGUSER}/data/base/template1/pg_indexes
+${PGUSER}/data/base/template1/pg_inheritproc
+${PGUSER}/data/base/template1/pg_inherits
+${PGUSER}/data/base/template1/pg_ipl
+${PGUSER}/data/base/template1/pg_language
+${PGUSER}/data/base/template1/pg_listener
+${PGUSER}/data/base/template1/pg_opclass
+${PGUSER}/data/base/template1/pg_operator
+${PGUSER}/data/base/template1/pg_proc
+${PGUSER}/data/base/template1/pg_proc_oid_index
+${PGUSER}/data/base/template1/pg_proc_proname_narg_type_index
+${PGUSER}/data/base/template1/pg_proc_prosrc_index
+${PGUSER}/data/base/template1/pg_relcheck
+${PGUSER}/data/base/template1/pg_relcheck_rcrelid_index
+${PGUSER}/data/base/template1/pg_rewrite
+${PGUSER}/data/base/template1/pg_rules
+${PGUSER}/data/base/template1/pg_statistic
+${PGUSER}/data/base/template1/pg_tables
+${PGUSER}/data/base/template1/pg_trigger
+${PGUSER}/data/base/template1/pg_trigger_tgrelid_index
+${PGUSER}/data/base/template1/pg_type
+${PGUSER}/data/base/template1/pg_type_oid_index
+${PGUSER}/data/base/template1/pg_type_typname_index
+${PGUSER}/data/base/template1/pg_user
+${PGUSER}/data/base/template1/pg_views
+${PGUSER}/data/pg_database
+${PGUSER}/data/pg_geqo.sample
+${PGUSER}/data/pg_group
+${PGUSER}/data/pg_hba.conf
+${PGUSER}/data/pg_log
+${PGUSER}/data/pg_pwd
+${PGUSER}/data/pg_shadow
+${PGUSER}/data/pg_variable
+${PGUSER}/include/access/attnum.h
+${PGUSER}/include/c.h
+${PGUSER}/include/commands/trigger.h
+${PGUSER}/include/config.h
+${PGUSER}/include/ecpgerrno.h
+${PGUSER}/include/ecpglib.h
+${PGUSER}/include/ecpgtype.h
+${PGUSER}/include/executor/spi.h
+${PGUSER}/include/fmgr.h
+${PGUSER}/include/lib/dllist.h
+${PGUSER}/include/libpq++.h
+${PGUSER}/include/libpq++/pgconnection.h
+${PGUSER}/include/libpq++/pgcursordb.h
+${PGUSER}/include/libpq++/pgdatabase.h
+${PGUSER}/include/libpq++/pglobject.h
+${PGUSER}/include/libpq++/pgtransdb.h
+${PGUSER}/include/libpq-fe.h
+${PGUSER}/include/libpq-int.h
+${PGUSER}/include/libpq/libpq-fs.h
+${PGUSER}/include/libpq/pqcomm.h
+${PGUSER}/include/os.h
+${PGUSER}/include/port/bsd/.keep_me
+${PGUSER}/include/postgres.h
+${PGUSER}/include/postgres_ext.h
+${PGUSER}/include/sqlca.h
+${PGUSER}/include/utils/elog.h
+${PGUSER}/include/utils/geo_decls.h
+${PGUSER}/include/utils/mcxt.h
+${PGUSER}/include/utils/palloc.h
+${PGUSER}/lib/global1.bki.source
+${PGUSER}/lib/global1.description
+${PGUSER}/lib/libecpg.a
+${PGUSER}/lib/libecpg.so.3.0
+${PGUSER}/lib/libplpgsql.so.1.0
+${PGUSER}/lib/libpq++.a
+${PGUSER}/lib/libpq++.so.3.0
+${PGUSER}/lib/libpq.a
+${PGUSER}/lib/libpq.so.2.0
+${PGUSER}/lib/local1_template1.bki.source
+${PGUSER}/lib/local1_template1.description
+${PGUSER}/lib/plpgsql.so
+${PGUSER}/lib/pg_geqo.sample
+${PGUSER}/lib/pg_hba.conf.sample
+${PGUSER}/man/man1/cleardbdir.1
+${PGUSER}/man/man1/createdb.1
+${PGUSER}/man/man1/createuser.1
+${PGUSER}/man/man1/destroydb.1
+${PGUSER}/man/man1/destroyuser.1
+${PGUSER}/man/man1/ecpg.1
+${PGUSER}/man/man1/initdb.1
+${PGUSER}/man/man1/initlocation.1
+${PGUSER}/man/man1/ipcclean.1
+${PGUSER}/man/man1/pg_dump.1
+${PGUSER}/man/man1/pg_dumpall.1
+${PGUSER}/man/man1/pg_passwd.1
+${PGUSER}/man/man1/pg_upgrade.1
+${PGUSER}/man/man1/postgres.1
+${PGUSER}/man/man1/postmaster.1
+${PGUSER}/man/man1/psql.1
+${PGUSER}/man/man3/catalogs.3
+${PGUSER}/man/man3/libpq.3
+${PGUSER}/man/man5/pg_hba.conf.5
+${PGUSER}/man/manl/abort.l
+${PGUSER}/man/manl/alter_table.l
+${PGUSER}/man/manl/alter_user.l
+${PGUSER}/man/manl/begin.l
+${PGUSER}/man/manl/close.l
+${PGUSER}/man/manl/cluster.l
+${PGUSER}/man/manl/commit.l
+${PGUSER}/man/manl/copy.l
+${PGUSER}/man/manl/create_aggregate.l
+${PGUSER}/man/manl/create_database.l
+${PGUSER}/man/manl/create_function.l
+${PGUSER}/man/manl/create_index.l
+${PGUSER}/man/manl/create_language.l
+${PGUSER}/man/manl/create_operator.l
+${PGUSER}/man/manl/create_rule.l
+${PGUSER}/man/manl/create_sequence.l
+${PGUSER}/man/manl/create_table.l
+${PGUSER}/man/manl/create_trigger.l
+${PGUSER}/man/manl/create_type.l
+${PGUSER}/man/manl/create_user.l
+${PGUSER}/man/manl/create_version.l
+${PGUSER}/man/manl/create_view.l
+${PGUSER}/man/manl/declare.l
+${PGUSER}/man/manl/delete.l
+${PGUSER}/man/manl/drop.l
+${PGUSER}/man/manl/drop_aggregate.l
+${PGUSER}/man/manl/drop_database.l
+${PGUSER}/man/manl/drop_function.l
+${PGUSER}/man/manl/drop_index.l
+${PGUSER}/man/manl/drop_language.l
+${PGUSER}/man/manl/drop_operator.l
+${PGUSER}/man/manl/drop_rule.l
+${PGUSER}/man/manl/drop_sequence.l
+${PGUSER}/man/manl/drop_table.l
+${PGUSER}/man/manl/drop_trigger.l
+${PGUSER}/man/manl/drop_type.l
+${PGUSER}/man/manl/drop_user.l
+${PGUSER}/man/manl/drop_view.l
+${PGUSER}/man/manl/end.l
+${PGUSER}/man/manl/explain.l
+${PGUSER}/man/manl/fetch.l
+${PGUSER}/man/manl/grant.l
+${PGUSER}/man/manl/insert.l
+${PGUSER}/man/manl/listen.l
+${PGUSER}/man/manl/load.l
+${PGUSER}/man/manl/lock.l
+${PGUSER}/man/manl/move.l
+${PGUSER}/man/manl/notify.l
+${PGUSER}/man/manl/reset.l
+${PGUSER}/man/manl/revoke.l
+${PGUSER}/man/manl/rollback.l
+${PGUSER}/man/manl/select.l
+${PGUSER}/man/manl/set.l
+${PGUSER}/man/manl/show.l
+${PGUSER}/man/manl/sql.l
+${PGUSER}/man/manl/update.l
+${PGUSER}/man/manl/vacuum.l
+${PGUSER}/post-install-notes
diff --git a/databases/postgresql/pkg/PLIST.tcl b/databases/postgresql/pkg/PLIST.tcl
new file mode 100644
index 00000000000..033d6068740
--- /dev/null
+++ b/databases/postgresql/pkg/PLIST.tcl
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.tcl,v 1.1 1999/09/19 04:24:56 jlam Exp $
+${PGUSER}/bin/pgaccess
+${PGUSER}/bin/pgtclsh
+${PGUSER}/bin/pgtksh
+${PGUSER}/include/libpgtcl.h
+${PGUSER}/lib/libpgtcl.a
+${PGUSER}/lib/libpgtcl.so.2.0
+${PGUSER}/lib/pltcl.so
diff --git a/databases/postgresql/pkg/REQ b/databases/postgresql/pkg/REQ
index 4bc4d69fd61..9a84fb135d5 100644
--- a/databases/postgresql/pkg/REQ
+++ b/databases/postgresql/pkg/REQ
@@ -1,4 +1,6 @@
#!/bin/sh
+#
+# $NetBSD: REQ,v 1.2 1999/09/19 04:24:56 jlam Exp $
PGUSER=@PGUSER@
PGGROUP=@PGGROUP@