diff options
Diffstat (limited to 'databases/postgresql')
33 files changed, 551 insertions, 3939 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 58ec625afd5..f51e2bac5da 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,151 +1,21 @@ -# $NetBSD: Makefile,v 1.63 2001/03/25 11:29:37 wennmach Exp $ -# FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp -# +# $NetBSD: Makefile,v 1.64 2001/05/14 14:52:36 jlam Exp $ .include "../../databases/postgresql/Makefile.common" -COMMENT= Robust, next generation, object-relational DBMS +PKGNAME= postgresql-${PG_VERS} +PG_PKG_VERS= # empty +COMMENT= Robust, next generation, object-relational DBMS -# NetBSD libedit's readline emulation doesn't support enough features, yet. -DEPENDS+= readline-*:../../devel/readline +DEPENDS+= postgresql-client>=${PG_BASE_VERS}:../../postgresql-client +DEPENDS+= postgresql-server>=${PG_BASE_VERS}:../../postgresql-server +DEPENDS+= postgresql-docs>=${PG_BASE_VERS}:../../postgresql-docs -MAKEFILE= GNUmakefile +EXTRACT_ONLY= # empty +NO_CHECKSUM= # defined +NO_PATCH= # defined +NO_CONFIGURE= # defined +NO_BUILD= # defined -# Needs ELF clue, mips has no TAS implementation -NOT_FOR_PLATFORM= *-*-mips - -.include "../../mk/bsd.prefs.mk" - -# PGUSER username of the database administrator -# PGGROUP group of the database administrator -# PGHOME home directory of the database administrator and -# location of the databases -# -PGUSER?= pgsql -PGGROUP?= pgsql -PGHOME?= ${PREFIX}/${PGUSER} - -MESSAGE= ${FILESDIR}/post-install-notes -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -BUILD_DEFS= PGUSER PGROUP PGHOME -PLIST_SUBST= PGUSER=${PGUSER} -PLIST_SRC+= ${PKGDIR}/PLIST -PLIST_SRC+= ${PKGDIR}/PLIST.spi -PLIST_SRC+= ${PKGDIR}/PLIST.dirrm - -CONFIGURE_ARGS+= --without-perl --without-odbc --without-tcl -CONFIGURE_ARGS+= --with-includes="${LOCALBASE}/include" -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" - -.if ${OPSYS} == "NetBSD" -.if exists(/usr/sbin/user) -ADDUSER= /usr/sbin/useradd -ADDGROUP= /usr/sbin/groupadd -.else -DEPENDS+= user>=20000313:../../sysutils/user -ADDUSER= ${LOCALBASE}/sbin/useradd -ADDGROUP= ${LOCALBASE}/sbin/groupadd -.endif -.elif ${OPSYS} == "SunOS" -ADDUSER= useradd -ADDGROUP= groupadd -.endif - -# The following alpha-specific patch fixes problems in the 7.0.x release -# that will be fixed in a more complete way in the forthcoming 7.1 release. -# -.if ${MACHINE_ARCH} == "alpha" -post-patch: - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/postgresql-7.0.3-alpha.diff -.endif - -post-build: - ${SED} -e 's|@PATH@|${PATH}|g' \ - -e 's|@MANPATH@|${MANPATH}|g' \ - -e 's|@PREFIX@|${PREFIX}|g' \ - < ${FILESDIR}/profile.pgsql > ${WRKDIR}/profile.pgsql - ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ - -e "s|@PGUSER@|${PGUSER}|g" \ - -e "s|@PGHOME@|${PGHOME}|g" \ - -e "s|@SU@|${SU}|g" \ - < ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh - -pre-install: - @case "X${PGUSER}" in \ - Xbin|Xetc|Xinclude|Xinfo|Xlib|Xlibdata|Xlibexec|Xman|Xsbin|Xshare) \ - ${ECHO} "You have chosen PGUSER=${PGUSER} which will"; \ - ${ECHO} "cause trouble, because the postgres home directory"; \ - ${ECHO} "would be ${PGHOME}. Please"; \ - ${ECHO} "set PGUSER to something more reasonable"; \ - ${ECHO} "like pgsql."; \ - ${ECHO} ""; \ - ${FALSE}; \ - ;; \ - esac - - ${SED} -e 's|@PGUSER@|${PGUSER}|g' \ - -e "s,@PGGROUP@,${PGGROUP},g" \ - -e "s,@PGHOME@,${PGHOME},g" \ - -e "s,@CAT@,${CAT},g" \ - < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s,@PGUSER@,${PGUSER},g" \ - -e "s,@PGGROUP@,${PGGROUP},g" \ - -e "s,@PGHOME@,${PGHOME},g" \ - -e "s,@ADDUSER@,${ADDUSER},g" \ - -e "s,@ADDGROUP@,${ADDGROUP},g" \ - -e "s,@CAT@,${CAT},g" \ - -e "s,@CHGRP@,${CHGRP},g" \ - -e "s,@CHMOD@,${CHMOD},g" \ - -e "s,@CHOWN@,${CHOWN},g" \ - -e "s,@CP@,${CP},g" \ - -e "s,@GREP@,${GREP},g" \ - -e "s,@MKDIR@,${MKDIR},g" \ - -e "s,@RM@,${RM},g" \ - -e "s,@SU@,${SU},g" \ - -e "s,@TOUCH@,${TOUCH},g" \ - < ${PKGDIR}/INSTALL > ${INSTALL_FILE} - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - -post-install: - cd ${PREFIX}/include/pgsql; ${RMDIR} -p port/netbsd - - dirlist=`${GREP} "^@dirrm" ${PKGDIR}/PLIST.spi \ - | ${AWK} '{ print $$2 }'`; \ - for dir in $$dirlist; do \ - ${INSTALL_DATA_DIR} ${PREFIX}/$$dir; \ - done - filelist=`${GREP} "^include/pgsql/" ${PKGDIR}/PLIST.spi \ - | ${SED} "s,^include/pgsql/,,g"`; \ - cd ${WRKSRC}/include; for file in $$filelist; do \ - ${INSTALL_DATA} $$file ${PREFIX}/include/pgsql/$$file; \ - done - -.for PROG in ecpg pg_dump pg_encoding pg_id pg_passwd pg_version postgres psql - strip ${PREFIX}/bin/${PROG} -.endfor - ${INSTALL_DATA} ${WRKDIR}/profile.pgsql \ - ${PREFIX}/share/postgresql/profile.pgsql.sample - - ${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql - - ${CAT} ${FILESDIR}/exclude ${FILESDIR}/man.tcl ${FILESDIR}/man.tk \ - | ${SED} "s,^#.*,," \ - | ${GTAR} zxCXf ${PREFIX}/man - \ - ${WRKDIR}/${DISTNAME}/doc/man.tar.gz - - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postgresql - cd ${WRKDIR}/${DISTNAME}/doc; \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all - cd ${WRKDIR}/${DISTNAME}/doc; ${INSTALL_DATA} \ - FAQ FAQ_DEV README.Charsets README.fsync README.inet \ - README.locale README.mb README.mb.jp TODO \ - bug.template internals.ps \ - ${PREFIX}/share/doc/postgresql - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/postgresql - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/html/postgresql - - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +do-install: # empty .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index 57c21776f08..ca3246b2bc7 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,45 +1,43 @@ -# $NetBSD: Makefile.common,v 1.11 2001/05/04 01:05:19 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2001/05/14 14:52:36 jlam Exp $ # -# This file is included by the following packages: -# -# postgresql -# odbc-postgresql -# tcl-postgresql -# tk-postgresql - -DISTNAME= postgresql-${PG_VERS} -PG_VERS= 7.0.3 -WRKSRC= ${WRKDIR}/${DISTNAME}/src -CATEGORIES= databases -MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/v${PG_VERS}/ \ - ftp://ftp.de.postgresql.org/v${PG_VERS}/ \ - ftp://ch.postgresql.org/mirror/postgresql/pub/v${PG_VERS}/ \ - ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v${PG_VERS}/ \ - ftp://looking-glass.usask.ca/pub/postgresql/v${PG_VERS}/ \ - ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v${PG_VERS}/ \ - ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v${PG_VERS}/ +# This Makefile fragment is included by all PostgreSQL packages built from +# the main sources of the PostgreSQL distribution. + +DISTNAME= postgresql-${PG_DIST_VERS} +CATEGORIES+= databases +MASTER_SITES= http://www.postgresql.org/ftpsite/v${PG_DIST_VERS}/ \ + ftp://ftp.PostgreSQL.org/pub/v${PG_DIST_VERS}/ \ + ftp://ftp.de.postgresql.org/v${PG_DIST_VERS}/ \ + ftp://ch.postgresql.org/mirror/postgresql/pub/v${PG_DIST_VERS}/ \ + ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v${PG_DIST_VERS}/ \ + ftp://looking-glass.usask.ca/pub/postgresql/v${PG_DIST_VERS}/ \ + ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v${PG_DIST_VERS}/ \ + ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v${PG_DIST_VERS}/ MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.PostgreSQL.ORG/ +HOMEPAGE= http://www.postgresql.org/ -BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +DISTINFO_FILE= ${.CURDIR}/../../databases/postgresql/distinfo +COMMON_FILESDIR= ${.CURDIR}/../../databases/postgresql/files +PATCHDIR= ${.CURDIR}/../../databases/postgresql/patches -USE_GMAKE= # defined -GNU_CONFIGURE= # defined +# Version numbering scheme: # -# We don't USE_LIBTOOL for the shared libs since libtool doesn't seem to -# support inter-library dependencies across all platforms yet. +# PG_DIST_VERS version number on the postgresql distfile +# PG_BASE_VERS pkgsrc-mangled version number (convert pl -> .) +# PG_PKG_VERS pkgsrc revisions of postgresql (nbX, etc.) +# PG_VERS pkgsrc version number of package +# +PG_DIST_VERS= 7.1.1 +PG_BASE_VERS= ${PG_DIST_VERS} +PG_PKG_VERS?= # empty +PG_VERS= ${PG_BASE_VERS}${PG_PKG_VERS} -DISTINFO_FILE= ${.CURDIR}/../../databases/postgresql/distinfo -FILESDIR= ${.CURDIR}/../../databases/postgresql/files -PATCHDIR= ${.CURDIR}/../../databases/postgresql/patches +USE_GMAKE= # defined +GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" -CONFIGURE_ARGS+= --with-setproctitle -CONFIGURE_ARGS+= --enable-locale - # PG_MB_ENCODING may be set to any of: # # SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, @@ -53,11 +51,35 @@ CONFIGURE_ARGS+= --enable-multibyte=${PG_MB_ENCODING} CONFIGURE_ARGS+= --enable-multibyte # accept default .endif -# Pass CFLAGS from environment into the PostgreSQL build. -MAKE_ENV+= COPT="${CFLAGS}" +CONFIGURE_ARGS+= --disable-odbc +CONFIGURE_ARGS+= --without-java +CONFIGURE_ARGS+= --without-perl +CONFIGURE_ARGS+= --without-python +CONFIGURE_ARGS+= --without-tcl +CONFIGURE_ARGS+= --without-tk -post-extract: - ${CP} ${FILESDIR}/Makefile.custom ${WRKSRC} +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/pgsql +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/html/postgresql + +CONFIGURE_ARGS+= --disable-readline +CONFIGURE_ARGS+= --enable-locale +CONFIGURE_ARGS+= --enable-syslog +CONFIGURE_ARGS+= --with-CXX +CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" + +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= CUSTOM_COPT="${CFLAGS}" -pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf +WRKINCDIR= ${WRKDIR}/include +CPPFLAGS+= -I${WRKINCDIR} +CFLAGS+= -I${WRKINCDIR} + +post-extract: + ${MKDIR} -p ${WRKINCDIR} + ${RM} -f ${WRKSRC}/src/Makefile.custom + ${CP} -f ${COMMON_FILESDIR}/Makefile.custom \ + ${WRKSRC}/src/Makefile.custom + ${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile + ${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq \ + ${WRKSRC}/src/interfaces/libpq/GNUmakefile diff --git a/databases/postgresql/Makefile.getopt b/databases/postgresql/Makefile.getopt new file mode 100644 index 00000000000..1c45b7edda0 --- /dev/null +++ b/databases/postgresql/Makefile.getopt @@ -0,0 +1,21 @@ +# $NetBSD: Makefile.getopt,v 1.1 2001/05/14 14:52:36 jlam Exp $ +# +# This Makefile fragment is included by PostgreSQL packages built from the +# main sources of the PostgreSQL distribution that use getopt_long() +# functionality. + +.if exists(/usr/include/getopt.h) +GETOPT_H= /usr/include/getopt.h +.else +GETOPT_H= ${LOCALBASE}/include/getopt.h +DEPENDS+= libgetopt>=1.3:../../devel/libgetopt +LIBS+= -lgetopt +.endif + +# This target links the getopt header into ${WRKINCDIR}/include, which is +# searched first by the C preprocessor. +# +link-getopt-headers: + ${MKDIR} -p ${WRKINCDIR} + ${RM} -f ${WRKINCDIR}/getopt.h + ${LN} -sf ${GETOPT_H} ${WRKINCDIR} diff --git a/databases/postgresql/Makefile.readline b/databases/postgresql/Makefile.readline new file mode 100644 index 00000000000..5caab60387d --- /dev/null +++ b/databases/postgresql/Makefile.readline @@ -0,0 +1,31 @@ +# $NetBSD: Makefile.readline,v 1.1 2001/05/14 14:52:36 jlam Exp $ +# +# This Makefile fragment is included by PostgreSQL packages built from the +# main sources of the PostgreSQL distribution that use readline() +# functionality. + +CONFIGURE_ARGS+= --enable-readline + +.if exists(/usr/include/readline.h) +READLINE_H= /usr/include/readline.h +HISTORY_H= /usr/include/history.h +CONFIGURE_ENV+= pgac_cv_check_readline="-ledit -ltermcap" +.elif exists(/usr/include/readline/readline.h) +READLINE_H= /usr/include/readline/readline.h +HISTORY_H= /usr/include/readline/history.h +CONFIGURE_ENV+= pgac_cv_check_readline="-ledit -ltermcap" +.else +READLINE_H= ${LOCALBASE}/readline/readline.h +HISTORY_H= ${LOCALBASE}/readline/history.h +DEPENDS+= readline>=4.0:../../devel/readline +.endif + +# This target links the readline and history headers into +# ${WRKINCDIR}/include, which is searched first by the C preprocessor. +# +link-readline-headers: + ${MKDIR} -p ${WRKINCDIR}/readline + ${RM} -f ${WRKINCDIR}/readline/readline.h + ${RM} -f ${WRKINCDIR}/readline/history.h + ${LN} -sf ${READLINE_H} ${WRKINCDIR}/readline + ${LN} -sf ${HISTORY_H} ${WRKINCDIR}/readline diff --git a/databases/postgresql/Makefile.ssl b/databases/postgresql/Makefile.ssl new file mode 100644 index 00000000000..1d98eeafdd8 --- /dev/null +++ b/databases/postgresql/Makefile.ssl @@ -0,0 +1,8 @@ +# $NetBSD: Makefile.ssl,v 1.1 2001/05/14 14:52:36 jlam Exp $ +# +# This Makefile fragment *must* be included by PostgreSQL packages built from +# the main sources of the PostgreSQL distribution that use the PostgreSQL +# libraries. + +USE_SSL= # defined +CONFIGURE_ARGS+= --with-openssl=${SSLBASE} diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index 441659e3e39..9a8582fa79e 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,13 +1,15 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:11:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/14 14:52:36 jlam Exp $ -SHA1 (postgresql-7.0.3.tar.gz) = df653a2c1972e0908ea7c176a9c55131739ac6da -Size (postgresql-7.0.3.tar.gz) = 7222232 bytes -SHA1 (patch-ab) = 2d1f35c5c802047bce6d4f7da2b0c28444d615dd -SHA1 (patch-ac) = da25e46bcb56f9a8794a5f0491deb19769e982cf -SHA1 (patch-ad) = 3ae7578f407c0b684e1a87eb966506db90eded8b -SHA1 (patch-ae) = bcad38a57bc4d704250da34f6b29975a163891b6 -SHA1 (patch-af) = 8afb7496f5b6d6fb76024e80bb44adf19b6ba26e -SHA1 (patch-ag) = e5a81f74549d8d46f35e90abc221128392f3f46b -SHA1 (patch-ah) = bd183f1dc8d75e6e4886b2b1d5c8f256af982ede -SHA1 (patch-ai) = aa1d9b38ebdb2b523b36ececc7787e0b018c22fa -SHA1 (patch-aj) = 7ef395bf36d3246230aff825c18d118eba73b855 +SHA1 (postgresql-7.1.1.tar.gz) = f4870bd2e5e2000b5ba5dad7f57fdc62d6376b73 +Size (postgresql-7.1.1.tar.gz) = 8114002 bytes +SHA1 (patch-aa) = e3b4c556c2a389ae5a27d4ecfe3809652faf4c8f +SHA1 (patch-ab) = 13a0fa7296700deeb922bdd488ef8d7342a9f70f +SHA1 (patch-ac) = feb9ea73626e131ed9bdb926a36ba312de1d6890 +SHA1 (patch-ad) = 0c55c66003603c688d727ca7de8fb73fdfdc88ac +SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046 +SHA1 (patch-af) = 79f9153c463e6ea81bacc0ec8ba941b0e96e2745 +SHA1 (patch-ag) = 64279ce6b8677563e5b6c200fb22c46d5f964f42 +SHA1 (patch-ah) = bd89be830747ede444516f1abf44a0407164fe8d +SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2 +SHA1 (patch-aj) = ca947f3686958c55d61c8110e99283038279d308 +SHA1 (patch-ak) = a3a50e64b70a0829c0374b803e4a5c6a6ed9c83e diff --git a/databases/postgresql/files/GNUmakefile.libpq b/databases/postgresql/files/GNUmakefile.libpq new file mode 100644 index 00000000000..59c310b5aee --- /dev/null +++ b/databases/postgresql/files/GNUmakefile.libpq @@ -0,0 +1,20 @@ +# $NetBSD: GNUmakefile.libpq,v 1.1 2001/05/14 14:52:37 jlam Exp $ +# +# This GNUmakefile overrides the `all' target of $(libpq_srcdir)/Makefile +# to be empty if INSTALLED_LIBPQ is defined. This handles the submake +# targets sprinkled throughout the PostgreSQL Makefiles that execute +# +# @$(MAKE) -C $(libpq_builddir) all +# +# to ensure that the libpq libraries are built first. If INSTALLED_LIBPQ +# is defined, then have the `all' target simple return success. + +ifdef INSTALLED_LIBPQ +all: + @test -f libpq.a || touch libpq.a +endif + +%: force + @$(MAKE) -f Makefile $@ + +force: ; diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom index f33b59b6f7b..38f40956111 100644 --- a/databases/postgresql/files/Makefile.custom +++ b/databases/postgresql/files/Makefile.custom @@ -1,30 +1,15 @@ -# GNU Makefile to libtoolize PostgreSQL build. +# $NetBSD: Makefile.custom,v 1.5 2001/05/14 14:52:37 jlam Exp $ # # 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.4 2000/05/20 19:32:19 jlam Exp $ - -# Where the database templates are stored -# -TEMPLATEDIR= $(POSTGRESDIR)/share/postgresql - -# installation directory for documentation -PGDOCS= $(POSTGRESDIR)/share/doc/html/postgresql - -# Where the header files necessary to build frontend programs get installed. -HEADERDIR= $(POSTGRESDIR)/include/pgsql - -# Where the ODBC installation-wide configuration file gets installed. -ODBCINST= etc ifdef INSTALLED_LIBPQ -LIBPQDIR:= $(HEADERDIR) -LIBPQ:= -L$(LIBDIR) -lpq +libpq_srcdir = $(includedir) +libpq = -L$(libdir) -lpq endif ifdef INSTALLED_LIBPGTCL -LIBPGTCLDIR:= $(HEADERDIR) -LIBPGTCL:= -L$(LIBDIR) -lpgtcl +libpgtcl_srcdir = $(includedir) +libpgtcl = -L$(libdir) -lpgtcl endif diff --git a/databases/postgresql/files/exclude b/databases/postgresql/files/exclude deleted file mode 100644 index 54dea442922..00000000000 --- a/databases/postgresql/files/exclude +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: exclude,v 1.1 2000/05/20 19:32:20 jlam Exp $ -# -man1/pgaccess.1 -man1/pgadmin.1 diff --git a/databases/postgresql/files/man.tcl b/databases/postgresql/files/man.tcl deleted file mode 100644 index 33531307e7f..00000000000 --- a/databases/postgresql/files/man.tcl +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: man.tcl,v 1.1 2000/05/20 19:32:21 jlam Exp $ -# -man1/pgtclsh.1 diff --git a/databases/postgresql/files/man.tk b/databases/postgresql/files/man.tk deleted file mode 100644 index eb0ced3e863..00000000000 --- a/databases/postgresql/files/man.tk +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: man.tk,v 1.1 2000/05/20 19:32:22 jlam Exp $ -# -man1/pgtksh.1 diff --git a/databases/postgresql/files/odbcinst.ini b/databases/postgresql/files/odbcinst.ini deleted file mode 100644 index 0449a249dab..00000000000 --- a/databases/postgresql/files/odbcinst.ini +++ /dev/null @@ -1,19 +0,0 @@ -; $NetBSD: odbcinst.ini,v 1.1 2000/05/20 19:32:26 jlam Exp $ -; -; /etc/odbc.ini - site-wide ODBC configuration file - -[ODBC Data Sources] -PostgresDB = PostgreSQL database description - -[PostgresDB] -Driver = @PREFIX@/lib/libpsqlodbc.so -Database = DatabaseName -Servername = localhost -Port = 5432 -Username = username -Password = "pAsSwOrD" -Debug = 0 -CommLog = 1 - -[ODBC] -InstallDir = diff --git a/databases/postgresql/files/pgsql.sh b/databases/postgresql/files/pgsql.sh deleted file mode 100644 index d76a31e9513..00000000000 --- a/databases/postgresql/files/pgsql.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# $NetBSD: pgsql.sh,v 1.3 2001/03/25 11:29:37 wennmach Exp $ -# -# PostgreSQL database rc.d control script -# -# PROVIDE: pgsql -# REQUIRE: DAEMON -# KEYWORD: shutdown - -name="postgres" -ctl_command="@PREFIX@/bin/pg_ctl" -command="@PREFIX@/bin/postmaster" -command_args="-S -o -F" # start in silent mode and disable - # automatic fsync after each - # transaction -#command_args="-S -i -o -F" # as above, but also allows TCP/IP - # connections - -USER="@PGUSER@" -PGHOME="@PGHOME@" -SU="@SU@" - -cmd=${1:-start} - -if [ -x ${ctl_command} -a -x ${command} ] -then - case ${cmd} in - restart) - echo "Restarting ${name}." - echo "exec ${ctl_command} restart >> ${PGHOME}/errlog" \ - | ${SU} -l ${USER} - ;; - - start) - echo "Starting ${name}." - echo "exec ${ctl_command} \ - -p ${command} -o \"${command_args}\" start" \ - | ${SU} -l ${USER} - ;; - - stop) - echo "Stopping ${name}." - echo "exec ${ctl_command} stop >> ${PGHOME}/errlog" \ - | ${SU} -l ${USER} - ;; - - status) - echo "exec ${ctl_command} status" \ - | ${SU} -l ${USER} - ;; - - *) - echo 1>&2 "Usage: $0 [restart|start|stop|status]" - exit 1 - ;; - esac -fi diff --git a/databases/postgresql/files/post-install-notes b/databases/postgresql/files/post-install-notes deleted file mode 100644 index f2dbe83c806..00000000000 --- a/databases/postgresql/files/post-install-notes +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: post-install-notes,v 1.6 2000/03/18 17:43:16 jlam Exp $ - -PostgreSQL has a Web site at http://www.postgresql.org/ which carries details -on the latest release, upcoming features, and other information to make your -work or play with PostgreSQL more productive. - -Please check the following URL for a listing of the current user-support -mailing lists: - - http://www.postgresql.org -> Info Central -> Mailing Lists - -All of the mailing lists are currently archived and viewable at: - - http://www.postgresql.org -> Info Central -> Mailing Lists - -And, so that we have an idea of who is using what, please connect to the -following registration URL: - - http://www.postgresql.org -> Helping Us -> Survey/Register - - -Thank you for choosing PostgreSQL, the most advanced open source database -engine. diff --git a/databases/postgresql/files/postgresql-7.0.3-alpha.diff b/databases/postgresql/files/postgresql-7.0.3-alpha.diff deleted file mode 100644 index d57c5fd6f8d..00000000000 --- a/databases/postgresql/files/postgresql-7.0.3-alpha.diff +++ /dev/null @@ -1,2112 +0,0 @@ -$NetBSD: postgresql-7.0.3-alpha.diff,v 1.1 2001/02/13 02:39:32 jlam Exp $ - -This diff is derived by Berndt Josef Wulf <wulf@ping.net.au> from the patch -located at: - - http://www.rkirkpat.net/software/postgresql-7.0-alpha.patch.gz - -to patch cleanly into the pkgsrc PostgreSQL source tree, and fixes several -problems related to 64-bit integers. This patch will no longer be needed -for the forthcoming PostgreSQL 7.1 release. - ---- backend/access/hash/hashfunc.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/access/hash/hashfunc.c Mon Feb 12 21:28:48 2001 -@@ -22,15 +22,15 @@ - #include "access/hash.h" - - uint32 --hashint2(int16 key) -+hashint2(Datum key) - { -- return (uint32) ~key; -+ return (uint32) ~((int16)key); - } - - uint32 --hashint4(uint32 key) -+hashint4(Datum key) - { -- return ~key; -+ return ~((uint32)key); - } - - uint32 -@@ -172,12 +172,12 @@ - #define PRIME2 1048583 - - uint32 --hashchar(char key) -+hashchar(Datum key) - { - uint32 h; - - /* Convert char to integer */ -- h = (key - ' '); -+ h = ((char)key - ' '); - h %= PRIME2; - - return h; ---- backend/access/nbtree/nbtcompare.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/access/nbtree/nbtcompare.c Mon Feb 12 21:28:48 2001 -@@ -27,13 +27,13 @@ - #include "utils/builtins.h" - - int32 --btint2cmp(int16 a, int16 b) -+btint2cmp(Datum a, Datum b) - { -- return (int32) (a - b); -+ return (int32) ((int16)a - (int16)b); - } - - int32 --btint4cmp(int32 a, int32 b) -+btint4cmp(Datum a, Datum b) - { - if (a > b) - return 1; -@@ -55,15 +55,15 @@ - } - - int32 --btint24cmp(int16 a, int32 b) -+btint24cmp(Datum a, Datum b) - { -- return ((int32) a) - b; -+ return ((int16) a) - (int32)b; - } - - int32 --btint42cmp(int32 a, int16 b) -+btint42cmp(Datum a, Datum b) - { -- return a - ((int32) b); -+ return (int32)a - ((int16) b); - } - - int32 -@@ -118,8 +118,9 @@ - - - int32 --btabstimecmp(AbsoluteTime a, AbsoluteTime b) -+btabstimecmp(Datum da, Datum db) - { -+ AbsoluteTime a = da, b = db; - if (AbsoluteTimeIsBefore(a, b)) - return -1; - else if (AbsoluteTimeIsBefore(b, a)) -@@ -129,7 +130,7 @@ - } - - int32 --btcharcmp(char a, char b) -+btcharcmp(Datum a, Datum b) - { - return (int32) ((uint8) a - (uint8) b); - } ---- backend/utils/adt/char.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/char.c Mon Feb 12 21:28:48 2001 -@@ -35,7 +35,7 @@ - * charout - converts 'x' to "x" - */ - char * --charout(int32 ch) -+charout(Datum ch) - { - char *result = (char *) palloc(2); - -@@ -70,7 +70,7 @@ - * printable character... - */ - char * --cidout(int32 c) -+cidout(Datum c) - { - char *result; - CommandId c2; -@@ -87,69 +87,69 @@ - *****************************************************************************/ - - bool --chareq(int8 arg1, int8 arg2) -+chareq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int8)arg1 == (int8)arg2; - } - - bool --charne(int8 arg1, int8 arg2) -+charne(Datum arg1, Datum arg2) - { -- return arg1 != arg2; -+ return (int8)arg1 != (int8)arg2; - } - - bool --charlt(int8 arg1, int8 arg2) -+charlt(Datum arg1, Datum arg2) - { - return (uint8) arg1 < (uint8) arg2; - } - - bool --charle(int8 arg1, int8 arg2) -+charle(Datum arg1, Datum arg2) - { - return (uint8) arg1 <= (uint8) arg2; - } - - bool --chargt(int8 arg1, int8 arg2) -+chargt(Datum arg1, Datum arg2) - { - return (uint8) arg1 > (uint8) arg2; - } - - bool --charge(int8 arg1, int8 arg2) -+charge(Datum arg1, Datum arg2) - { - return (uint8) arg1 >= (uint8) arg2; - } - - int8 --charpl(int8 arg1, int8 arg2) -+charpl(Datum arg1, Datum arg2) - { -- return arg1 + arg2; -+ return (int8)arg1 + (int8)arg2; - } - - int8 --charmi(int8 arg1, int8 arg2) -+charmi(Datum arg1, Datum arg2) - { -- return arg1 - arg2; -+ return (int8)arg1 - (int8)arg2; - } - - int8 --charmul(int8 arg1, int8 arg2) -+charmul(Datum arg1, Datum arg2) - { -- return arg1 * arg2; -+ return (int8)arg1 * (int8)arg2; - } - - int8 --chardiv(int8 arg1, int8 arg2) -+chardiv(Datum arg1, Datum arg2) - { -- return arg1 / arg2; -+ return (int8)arg1 / (int8)arg2; - } - - bool --cideq(int8 arg1, int8 arg2) -+cideq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int8)arg1 == (int8)arg2; - } - - int8 -@@ -159,13 +159,13 @@ - } - - text * --char_text(int8 arg1) -+char_text(Datum arg1) - { - text *result; - - result = palloc(VARHDRSZ + 1); - VARSIZE(result) = VARHDRSZ + 1; -- *(VARDATA(result)) = arg1; -+ *(VARDATA(result)) = (int8)arg1; - - return result; - } ---- backend/utils/adt/float.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/float.c Mon Feb 12 21:28:48 2001 -@@ -138,7 +138,7 @@ - * until the distributions are updated. - * --djm 12/16/96 - */ --#if ( defined(linux) && defined(__alpha__) ) && !defined(UNSAFE_FLOATS) -+#if ( defined(linux) && defined(__alpha__) ) && !defined(UNSAFE_FLOATS) && 0 - #define UNSAFE_FLOATS - #endif - -@@ -864,9 +864,10 @@ - * i4tod - converts an int4 number to a float8 number - */ - float64 --i4tod(int32 num) -+i4tod(Datum n) - { - float64 result; -+ int32 num = (int32) n; - - result = (float64) palloc(sizeof(float64data)); - -@@ -879,9 +880,10 @@ - * i2tod - converts an int2 number to a float8 number - */ - float64 --i2tod(int16 num) -+i2tod(Datum n) - { - float64 result; -+ int16 num = (int16) n; - - result = (float64) palloc(sizeof(float64data)); - -@@ -932,9 +934,10 @@ - * i4tof - converts an int4 number to a float8 number - */ - float32 --i4tof(int32 num) -+i4tof(Datum n) - { - float32 result; -+ int32 num = (int32) n; - - result = (float32) palloc(sizeof(float32data)); - -@@ -947,9 +950,10 @@ - * i2tof - converts an int2 number to a float8 number - */ - float32 --i2tof(int16 num) -+i2tof(Datum n) - { - float32 result; -+ int16 num = (int16) n; - - result = (float32) palloc(sizeof(float32data)); - ---- backend/utils/adt/int.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/int.c Mon Feb 12 21:28:48 2001 -@@ -62,7 +62,7 @@ - * int2out - converts short to "num" - */ - char * --int2out(int16 sh) -+int2out(Datum sh) - { - char *result; - -@@ -227,12 +227,12 @@ - * int4out - converts int4 to "num" - */ - char * --int4out(int32 l) -+int4out(Datum l) - { - char *result; - - result = (char *) palloc(12); /* assumes sign, 10 digits, '\0' */ -- ltoa(l, result); -+ ltoa((int32)l, result); - return result; - } - -@@ -244,14 +244,16 @@ - */ - - int32 --i2toi4(int16 arg1) -+i2toi4(Datum arg1) - { - return (int32) arg1; - } - - int16 --i4toi2(int32 arg1) -+i4toi2(Datum arg) - { -+ int32 arg1 = (int32) arg; -+ - if (arg1 < SHRT_MIN) - elog(ERROR, "i4toi2: '%d' causes int2 underflow", arg1); - if (arg1 > SHRT_MAX) -@@ -261,7 +263,7 @@ - } - - text * --int2_text(int16 arg1) -+int2_text(Datum arg1) - { - text *result; - -@@ -305,7 +307,7 @@ - } /* text_int2() */ - - text * --int4_text(int32 arg1) -+int4_text(Datum arg1) - { - text *result; - -@@ -364,147 +366,147 @@ - * intge - returns 1 iff arg1 >= arg2 - */ - bool --int4eq(int32 arg1, int32 arg2) -+int4eq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int32)arg1 == (int32)arg2; - } - - bool --int4ne(int32 arg1, int32 arg2) -+int4ne(Datum arg1, Datum arg2) - { -- return arg1 != arg2; -+ return (int32)arg1 != (int32)arg2; - } - - bool --int4lt(int32 arg1, int32 arg2) -+int4lt(Datum arg1, Datum arg2) - { -- return arg1 < arg2; -+ return (int32)arg1 < (int32)arg2; - } - - bool --int4le(int32 arg1, int32 arg2) -+int4le(Datum arg1, Datum arg2) - { -- return arg1 <= arg2; -+ return (int32)arg1 <= (int32)arg2; - } - - bool --int4gt(int32 arg1, int32 arg2) -+int4gt(Datum arg1, Datum arg2) - { -- return arg1 > arg2; -+ return (int32)arg1 > (int32)arg2; - } - - bool --int4ge(int32 arg1, int32 arg2) -+int4ge(Datum arg1, Datum arg2) - { -- return arg1 >= arg2; -+ return (int32)arg1 >= (int32)arg2; - } - - bool --int2eq(int16 arg1, int16 arg2) -+int2eq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int16)arg1 == (int16)arg2; - } - - bool --int2ne(int16 arg1, int16 arg2) -+int2ne(Datum arg1, Datum arg2) - { -- return arg1 != arg2; -+ return (int16)arg1 != (int16)arg2; - } - - bool --int2lt(int16 arg1, int16 arg2) -+int2lt(Datum arg1, Datum arg2) - { -- return arg1 < arg2; -+ return (int16)arg1 < (int16)arg2; - } - - bool --int2le(int16 arg1, int16 arg2) -+int2le(Datum arg1, Datum arg2) - { -- return arg1 <= arg2; -+ return (int16)arg1 <= (int16)arg2; - } - - bool --int2gt(int16 arg1, int16 arg2) -+int2gt(Datum arg1, Datum arg2) - { -- return arg1 > arg2; -+ return (int16)arg1 > (int16)arg2; - } - - bool --int2ge(int16 arg1, int16 arg2) -+int2ge(Datum arg1, Datum arg2) - { -- return arg1 >= arg2; -+ return (int16)arg1 >= (int16)arg2; - } - - bool --int24eq(int32 arg1, int32 arg2) -+int24eq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int32)arg1 == (int32)arg2; - } - - bool --int24ne(int32 arg1, int32 arg2) -+int24ne(Datum arg1, Datum arg2) - { -- return arg1 != arg2; -+ return (int32)arg1 != (int32)arg2; - } - - bool --int24lt(int32 arg1, int32 arg2) -+int24lt(Datum arg1, Datum arg2) - { -- return arg1 < arg2; -+ return (int32)arg1 < (int32)arg2; - } - - bool --int24le(int32 arg1, int32 arg2) -+int24le(Datum arg1, Datum arg2) - { -- return arg1 <= arg2; -+ return (int32)arg1 <= (int32)arg2; - } - - bool --int24gt(int32 arg1, int32 arg2) -+int24gt(Datum arg1, Datum arg2) - { -- return arg1 > arg2; -+ return (int32)arg1 > (int32)arg2; - } - - bool --int24ge(int32 arg1, int32 arg2) -+int24ge(Datum arg1, Datum arg2) - { -- return arg1 >= arg2; -+ return (int32)arg1 >= (int32)arg2; - } - - bool --int42eq(int32 arg1, int32 arg2) -+int42eq(Datum arg1, Datum arg2) - { -- return arg1 == arg2; -+ return (int32)arg1 == (int32)arg2; - } - - bool --int42ne(int32 arg1, int32 arg2) -+int42ne(Datum arg1, Datum arg2) - { -- return arg1 != arg2; -+ return (int32)arg1 != (int32)arg2; - } - - bool --int42lt(int32 arg1, int32 arg2) -+int42lt(Datum arg1, Datum arg2) - { -- return arg1 < arg2; -+ return (int32)arg1 < (int32)arg2; - } - - bool --int42le(int32 arg1, int32 arg2) -+int42le(Datum arg1, Datum arg2) - { -- return arg1 <= arg2; -+ return (int32)arg1 <= (int32)arg2; - } - - bool --int42gt(int32 arg1, int32 arg2) -+int42gt(Datum arg1, Datum arg2) - { -- return arg1 > arg2; -+ return (int32)arg1 > (int32)arg2; - } - - bool --int42ge(int32 arg1, int32 arg2) -+int42ge(Datum arg1, Datum arg2) - { -- return arg1 >= arg2; -+ return (int32)arg1 >= (int32)arg2; - } - - /* -@@ -514,159 +516,160 @@ - * int[24]div - returns arg1 / arg2 - */ - int32 --int4um(int32 arg) -+int4um(Datum arg) - { -- return -arg; -+ return (int32)-arg; - } - - int32 --int4pl(int32 arg1, int32 arg2) -+int4pl(Datum arg1, Datum arg2) - { -- return arg1 + arg2; -+ return (int32)arg1 + (int32)arg2; - } - - int32 --int4mi(int32 arg1, int32 arg2) -+int4mi(Datum arg1, Datum arg2) - { -- return arg1 - arg2; -+ return (int32)arg1 - (int32)arg2; - } - - int32 --int4mul(int32 arg1, int32 arg2) -+int4mul(Datum arg1, Datum arg2) - { -- return arg1 * arg2; -+ return (int32)arg1 * (int32)arg2; - } - - int32 --int4div(int32 arg1, int32 arg2) -+int4div(Datum arg1, Datum arg2) - { -- return arg1 / arg2; -+ return (int32)arg1 / (int32)arg2; - } - - int32 --int4inc(int32 arg) -+int4inc(Datum arg) - { -- return arg + (int32) 1; -+ return (int32)++arg; - } - - int16 --int2um(int16 arg) -+int2um(Datum arg) - { -- return -arg; -+ return (int16)-arg; - } - - int16 --int2pl(int16 arg1, int16 arg2) -+int2pl(Datum arg1, Datum arg2) - { -- return arg1 + arg2; -+ return (int16)arg1 + (int16)arg2; - } - - int16 --int2mi(int16 arg1, int16 arg2) -+int2mi(Datum arg1, Datum arg2) - { -- return arg1 - arg2; -+ return (int16)arg1 - (int16)arg2; - } - - int16 --int2mul(int16 arg1, int16 arg2) -+int2mul(Datum arg1, Datum arg2) - { -- return arg1 * arg2; -+ return (int16)arg1 * (int16)arg2; - } - - int16 --int2div(int16 arg1, int16 arg2) -+int2div(Datum arg1, Datum arg2) - { -- return arg1 / arg2; -+ return (int16)arg1 / (int16)arg2; - } - - int16 --int2inc(int16 arg) -+int2inc(Datum arg) - { -- return arg + (int16) 1; -+ return (int16)++arg; - } - - int32 --int24pl(int32 arg1, int32 arg2) -+int24pl(Datum arg1, Datum arg2) - { -- return arg1 + arg2; -+ return (int32)arg1 + (int32)arg2; - } - - int32 --int24mi(int32 arg1, int32 arg2) -+int24mi(Datum arg1, Datum arg2) - { -- return arg1 - arg2; -+ return (int32)arg1 - (int32)arg2; - } - - int32 --int24mul(int32 arg1, int32 arg2) -+int24mul(Datum arg1, Datum arg2) - { -- return arg1 * arg2; -+ return (int32)arg1 * (int32)arg2; - } - - int32 --int24div(int32 arg1, int32 arg2) -+int24div(Datum arg1, Datum arg2) - { -- return arg1 / arg2; -+ return (int32)arg1 / (int32)arg2; - } - - int32 --int42pl(int32 arg1, int32 arg2) -+int42pl(Datum arg1, Datum arg2) - { -- return arg1 + arg2; -+ return (int32)arg1 + (int32)arg2; - } - - int32 --int42mi(int32 arg1, int32 arg2) -+int42mi(Datum arg1, Datum arg2) - { -- return arg1 - arg2; -+ return (int32)arg1 - (int32)arg2; - } - - int32 --int42mul(int32 arg1, int32 arg2) -+int42mul(Datum arg1, Datum arg2) - { -- return arg1 * arg2; -+ return (int32)arg1 * (int32)arg2; - } - - int32 --int42div(int32 arg1, int32 arg2) -+int42div(Datum arg1, Datum arg2) - { -- return arg1 / arg2; -+ return (int32)arg1 / (int32)arg2; - } - - /* - * int[24]mod - returns arg1 mod arg2 - */ - int32 --int4mod(int32 arg1, int32 arg2) -+int4mod(Datum arg1, Datum arg2) - { -- return arg1 % arg2; -+ return (int32)arg1 % (int32)arg2; - } - - int32 --int2mod(int16 arg1, int16 arg2) -+int2mod(Datum arg1, Datum arg2) - { -- return arg1 % arg2; -+ return (int16)arg1 % (int16)arg2; - } - - int32 --int24mod(int32 arg1, int32 arg2) -+int24mod(Datum arg1, Datum arg2) - { -- return arg1 % arg2; -+ return (int32)arg1 % (int32)arg2; - } - - int32 --int42mod(int32 arg1, int32 arg2) -+int42mod(Datum arg1, Datum arg2) - { -- return arg1 % arg2; -+ return (int32)arg1 % (int32)arg2; - } - - /* int[24]fac() - * Factorial - */ - int32 --int4fac(int32 arg1) -+int4fac(Datum arg) - { - int32 result; -+ int32 arg1 = (int32) arg; - - if (arg1 < 1) - result = 0; -@@ -677,9 +680,10 @@ - } - - int32 --int2fac(int16 arg1) -+int2fac(Datum arg) - { - int32 result; -+ int16 arg1 = (int16) arg; - - if (arg1 < 1) - result = 0; -@@ -693,37 +697,37 @@ - * Absolute value - */ - int32 --int4abs(int32 arg1) -+int4abs(Datum arg1) - { -- return ((arg1 < 0) ? -arg1 : arg1); -+ return ((arg1 < 0) ? -arg1: arg1); - } - - int16 --int2abs(int16 arg1) -+int2abs(Datum arg1) - { -- return ((arg1 < 0) ? -arg1 : arg1); -+ return ((arg1 < 0) ? -arg1: arg1); - } - - int16 --int2larger(int16 arg1, int16 arg2) -+int2larger(Datum arg1, Datum arg2) - { -- return (arg1 > arg2) ? arg1 : arg2; -+ return ((int16)arg1 > (int16)arg2) ? (int16)arg1 : (int16)arg2; - } - - int16 --int2smaller(int16 arg1, int16 arg2) -+int2smaller(Datum arg1, Datum arg2) - { -- return (arg1 < arg2) ? arg1 : arg2; -+ return ((int16)arg1 < (int16)arg2) ? (int16)arg1 : (int16)arg2; - } - - int32 --int4larger(int32 arg1, int32 arg2) -+int4larger(Datum arg1, Datum arg2) - { -- return (arg1 > arg2) ? arg1 : arg2; -+ return ((int32)arg1 > (int32)arg2) ? (int32)arg1 : (int32)arg2; - } - - int32 --int4smaller(int32 arg1, int32 arg2) -+int4smaller(Datum arg1, Datum arg2) - { -- return (arg1 < arg2) ? arg1 : arg2; -+ return ((int32)arg1 < (int32)arg2) ? (int32)arg1 : (int32)arg2; - } ---- backend/utils/adt/int8.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/int8.c Mon Feb 12 21:28:48 2001 -@@ -176,57 +176,57 @@ - * Is 64-bit val1 relop 32-bit val2? - */ - bool --int84eq(int64 *val1, int32 val2) -+int84eq(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 == val2; -+ return *val1 == (int32)val2; - } /* int84eq() */ - - bool --int84ne(int64 *val1, int32 val2) -+int84ne(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 != val2; -+ return *val1 != (int32)val2; - } /* int84ne() */ - - bool --int84lt(int64 *val1, int32 val2) -+int84lt(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 < val2; -+ return *val1 < (int32)val2; - } /* int84lt() */ - - bool --int84gt(int64 *val1, int32 val2) -+int84gt(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 > val2; -+ return *val1 > (int32)val2; - } /* int84gt() */ - - bool --int84le(int64 *val1, int32 val2) -+int84le(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 <= val2; -+ return *val1 <= (int32)val2; - } /* int84le() */ - - bool --int84ge(int64 *val1, int32 val2) -+int84ge(int64 *val1, Datum val2) - { - if (!val1) - return 0; - -- return *val1 >= val2; -+ return *val1 >= (int32)val2; - } /* int84ge() */ - - -@@ -234,57 +234,57 @@ - * Is 32-bit val1 relop 64-bit val2? - */ - bool --int48eq(int32 val1, int64 *val2) -+int48eq(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 == *val2; -+ return (int32)val1 == *val2; - } /* int48eq() */ - - bool --int48ne(int32 val1, int64 *val2) -+int48ne(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 != *val2; -+ return (int32)val1 != *val2; - } /* int48ne() */ - - bool --int48lt(int32 val1, int64 *val2) -+int48lt(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 < *val2; -+ return (int32)val1 < *val2; - } /* int48lt() */ - - bool --int48gt(int32 val1, int64 *val2) -+int48gt(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 > *val2; -+ return (int32)val1 > *val2; - } /* int48gt() */ - - bool --int48le(int32 val1, int64 *val2) -+int48le(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 <= *val2; -+ return (int32)val1 <= *val2; - } /* int48le() */ - - bool --int48ge(int32 val1, int64 *val2) -+int48ge(Datum val1, int64 *val2) - { - if (!val2) - return 0; - -- return val1 >= *val2; -+ return (int32)val1 >= *val2; - } /* int48ge() */ - - -@@ -444,106 +444,106 @@ - - - int64 * --int84pl(int64 *val1, int32 val2) -+int84pl(int64 *val1, Datum val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val1)) - return NULL; - -- *result = *val1 + (int64) val2; -+ *result = *val1 + (int32) val2; - - return result; - } /* int84pl() */ - - int64 * --int84mi(int64 *val1, int32 val2) -+int84mi(int64 *val1, Datum val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val1)) - return NULL; - -- *result = *val1 - (int64) val2; -+ *result = *val1 - (int32) val2; - - return result; - } /* int84mi() */ - - int64 * --int84mul(int64 *val1, int32 val2) -+int84mul(int64 *val1, Datum val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val1)) - return NULL; - -- *result = *val1 * (int64) val2; -+ *result = *val1 * (int32) val2; - - return result; - } /* int84mul() */ - - int64 * --int84div(int64 *val1, int32 val2) -+int84div(int64 *val1, Datum val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val1)) - return NULL; - -- *result = *val1 / (int64) val2; -+ *result = *val1 / (int32) val2; - - return result; - } /* int84div() */ - - - int64 * --int48pl(int32 val1, int64 *val2) -+int48pl(Datum val1, int64 *val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val2)) - return NULL; - -- *result = (int64) val1 + *val2; -+ *result = (int32) val1 + *val2; - - return result; - } /* int48pl() */ - - int64 * --int48mi(int32 val1, int64 *val2) -+int48mi(Datum val1, int64 *val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val2)) - return NULL; - -- *result = (int64) val1 - *val2; -+ *result = (int32) val1 - *val2; - - return result; - } /* int48mi() */ - - int64 * --int48mul(int32 val1, int64 *val2) -+int48mul(Datum val1, int64 *val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val2)) - return NULL; - -- *result = (int64) val1 **val2; -+ *result = (int32) val1 **val2; - - return result; - } /* int48mul() */ - - int64 * --int48div(int32 val1, int64 *val2) -+int48div(Datum val1, int64 *val2) - { - int64 *result = palloc(sizeof(int64)); - - if (!PointerIsValid(val2)) - return NULL; - -- *result = (int64) val1 / *val2; -+ *result = (int32) val1 / *val2; - - return result; - } /* int48div() */ -@@ -554,11 +554,11 @@ - *---------------------------------------------------------*/ - - int64 * --int48(int32 val) -+int48(Datum val) - { - int64 *result = palloc(sizeof(int64)); - -- *result = val; -+ *result = (int32)val; - - return result; - } /* int48() */ ---- backend/utils/adt/nabstime.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/nabstime.c Mon Feb 12 21:28:48 2001 -@@ -209,11 +209,11 @@ - - - void --abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn) -+abstime2tm(Datum time, int *tzp, struct tm * tm, char *tzn) - { - #ifdef USE_POSIX_TIME - struct tm *tx; -- -+ time_t t = (time_t) time; - #else /* ! USE_POSIX_TIME */ - struct timeb tb; /* the old V7-ism */ - -@@ -222,10 +222,10 @@ - - #ifdef USE_POSIX_TIME - if (tzp != NULL) -- tx = localtime((time_t *) &time); -+ tx = localtime( &t ); - else - { -- tx = gmtime((time_t *) &time); -+ tx = gmtime( &t ); - }; - #endif - -@@ -304,8 +304,8 @@ - static AbsoluteTime - tm2abstime(struct tm * tm, int tz) - { -- int day, -- sec; -+ int day; -+ AbsoluteTime sec; - - /* validate, before going out of range on some members */ - if (tm->tm_year < 1901 || tm->tm_year > 2038 -@@ -407,8 +407,9 @@ - * Given an AbsoluteTime return the English text version of the date - */ - char * --nabstimeout(AbsoluteTime time) -+nabstimeout(Datum t) - { -+ AbsoluteTime time = (AbsoluteTime) t; - char *result; - int tz; - double fsec = 0; -@@ -453,8 +454,10 @@ - * AbsoluteTimeIsBefore -- true iff time1 is after time2. - */ - bool --AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2) -+AbsoluteTimeIsBefore(Datum t1, Datum t2) - { -+ AbsoluteTime time1 = t1, time2 = t2; -+ - Assert(AbsoluteTimeIsValid(time1)); - Assert(AbsoluteTimeIsValid(time2)); - -@@ -469,8 +472,10 @@ - - #ifdef NOT_USED - bool --AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2) -+AbsoluteTimeIsAfter(Datum t1, Datum t2) - { -+ AbsoluteTime time1 = t1, time2 = t2; -+ - Assert(AbsoluteTimeIsValid(time1)); - Assert(AbsoluteTimeIsValid(time2)); - -@@ -488,8 +493,10 @@ - /* abstime_finite() - */ - bool --abstime_finite(AbsoluteTime abstime) -+abstime_finite(Datum d) - { -+ AbsoluteTime abstime = (AbsoluteTime) d; -+ - return ((abstime != INVALID_ABSTIME) - && (abstime != NOSTART_ABSTIME) && (abstime != NOEND_ABSTIME)); - } /* abstime_finite() */ -@@ -504,8 +511,10 @@ - * abstimege - returns 1, iff t1 greater than or equal to t2 - */ - bool --abstimeeq(AbsoluteTime t1, AbsoluteTime t2) -+abstimeeq(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -517,8 +526,10 @@ - } - - bool --abstimene(AbsoluteTime t1, AbsoluteTime t2) -+abstimene(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -530,8 +541,10 @@ - } - - bool --abstimelt(AbsoluteTime t1, AbsoluteTime t2) -+abstimelt(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -543,8 +556,10 @@ - } - - bool --abstimegt(AbsoluteTime t1, AbsoluteTime t2) -+abstimegt(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -556,8 +571,10 @@ - } - - bool --abstimele(AbsoluteTime t1, AbsoluteTime t2) -+abstimele(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -569,8 +586,10 @@ - } - - bool --abstimege(AbsoluteTime t1, AbsoluteTime t2) -+abstimege(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) - return FALSE; - if (t1 == CURRENT_ABSTIME) -@@ -640,8 +659,9 @@ - * Convert abstime to timestamp. - */ - Timestamp * --abstime_timestamp(AbsoluteTime abstime) -+abstime_timestamp(Datum d) - { -+ AbsoluteTime abstime = (AbsoluteTime)d; - Timestamp *result; - - if (!PointerIsValid(result = palloc(sizeof(Timestamp)))) -@@ -729,8 +749,9 @@ - * reltimeout - converts the internal format to a reltime string - */ - char * --reltimeout(RelativeTime time) -+reltimeout(Datum t) - { -+ RelativeTime time = (RelativeTime) t; - char *result; - struct tm tt, - *tm = &tt; -@@ -755,8 +776,10 @@ - - - static void --reltime2tm(RelativeTime time, struct tm * tm) -+reltime2tm(RelativeTime t, struct tm * tm) - { -+ RelativeTime time = (RelativeTime) t; -+ - TMODULO(time, tm->tm_year, 31536000); - TMODULO(time, tm->tm_mon, 2592000); - TMODULO(time, tm->tm_mday, 86400); -@@ -916,8 +939,9 @@ - - - Interval * --reltime_interval(RelativeTime reltime) -+reltime_interval(Datum d) - { -+ RelativeTime reltime = d; - Interval *result; - int year, - month; -@@ -947,8 +971,9 @@ - * mktinterval - creates a time interval with endpoints t1 and t2 - */ - TimeInterval --mktinterval(AbsoluteTime t1, AbsoluteTime t2) -+mktinterval(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; - AbsoluteTime tstart = ABSTIMEMIN(t1, t2), - tend = ABSTIMEMAX(t1, t2); - TimeInterval interval; -@@ -977,8 +1002,10 @@ - * timepl - returns the value of (abstime t1 + relime t2) - */ - AbsoluteTime --timepl(AbsoluteTime t1, RelativeTime t2) -+timepl(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1; -+ RelativeTime t2 = d2; - if (t1 == CURRENT_ABSTIME) - t1 = GetCurrentTransactionStartTime(); - -@@ -996,8 +1023,11 @@ - * timemi - returns the value of (abstime t1 - reltime t2) - */ - AbsoluteTime --timemi(AbsoluteTime t1, RelativeTime t2) -+timemi(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1; -+ RelativeTime t2 = d2; -+ - if (t1 == CURRENT_ABSTIME) - t1 = GetCurrentTransactionStartTime(); - -@@ -1015,8 +1045,10 @@ - * abstimemi - returns the value of (abstime t1 - abstime t2) - */ - static RelativeTime --abstimemi(AbsoluteTime t1, AbsoluteTime t2) -+abstimemi(Datum d1, Datum d2) - { -+ AbsoluteTime t1 = d1, t2 = d2; -+ - if (t1 == CURRENT_ABSTIME) - t1 = GetCurrentTransactionStartTime(); - if (t2 == CURRENT_ABSTIME) -@@ -1034,7 +1066,7 @@ - * intinterval - returns 1, iff absolute date is in the interval - */ - int --intinterval(AbsoluteTime t, TimeInterval interval) -+intinterval(Datum t, TimeInterval interval) - { - if (interval->status == T_INTERVAL_VALID && t != INVALID_ABSTIME) - return (abstimege(t, interval->data[0]) && -@@ -1048,6 +1080,7 @@ - RelativeTime - tintervalrel(TimeInterval interval) - { -+ - if (interval->status == T_INTERVAL_VALID) - return abstimemi(interval->data[1], interval->data[0]); - else -@@ -1078,51 +1111,57 @@ - * reltimege - returns 1, iff t1 greater than or equal to t2 - */ - bool --reltimeeq(RelativeTime t1, RelativeTime t2) -+reltimeeq(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 == t2; -+ return (RelativeTime)t1 == (RelativeTime)t2; - } - - bool --reltimene(RelativeTime t1, RelativeTime t2) -+reltimene(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 != t2; -+ return (RelativeTime)t1 != (RelativeTime)t2; - } - - bool --reltimelt(RelativeTime t1, RelativeTime t2) -+reltimelt(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 < t2; -+ return (RelativeTime)t1 < (RelativeTime)t2; - } - - bool --reltimegt(RelativeTime t1, RelativeTime t2) -+reltimegt(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 > t2; -+ return (RelativeTime)t1 > (RelativeTime)t2; - } - - bool --reltimele(RelativeTime t1, RelativeTime t2) -+reltimele(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 <= t2; -+ return (RelativeTime)t1 <= (RelativeTime)t2; - } - - bool --reltimege(RelativeTime t1, RelativeTime t2) -+reltimege(Datum t1, Datum t2) - { -- if (t1 == INVALID_RELTIME || t2 == INVALID_RELTIME) -+ if ((RelativeTime)t1 == INVALID_RELTIME -+ || (RelativeTime)t2 == INVALID_RELTIME) - return 0; -- return t1 >= t2; -+ return (RelativeTime)t1 >= (RelativeTime)t2; - } - - -@@ -1362,8 +1401,9 @@ - * reltime t - */ - bool --tintervalleneq(TimeInterval i, RelativeTime t) -+tintervalleneq(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) -@@ -1377,8 +1417,9 @@ - * to reltime t - */ - bool --tintervallenne(TimeInterval i, RelativeTime t) -+tintervallenne(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) -@@ -1392,8 +1433,9 @@ - * reltime t - */ - bool --tintervallenlt(TimeInterval i, RelativeTime t) -+tintervallenlt(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) -@@ -1407,8 +1449,9 @@ - * reltime t - */ - bool --tintervallengt(TimeInterval i, RelativeTime t) -+tintervallengt(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) -@@ -1422,8 +1465,9 @@ - * than reltime t - */ - bool --tintervallenle(TimeInterval i, RelativeTime t) -+tintervallenle(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) -@@ -1437,8 +1481,9 @@ - * equal than reltime t - */ - bool --tintervallenge(TimeInterval i, RelativeTime t) -+tintervallenge(TimeInterval i, Datum d) - { -+ RelativeTime t = d; - RelativeTime rt; - - if ((i->status == T_INTERVAL_INVAL) || (t == INVALID_RELTIME)) ---- backend/utils/adt/numeric.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/numeric.c Mon Feb 12 21:28:48 2001 -@@ -187,7 +187,7 @@ - * ---------- - */ - Numeric --numeric_in(char *str, int dummy, int32 typmod) -+numeric_in(char *str, int dummy, Datum typmod) - { - NumericVar value; - Numeric res; -@@ -217,7 +217,7 @@ - init_var(&value); - set_var_from_str(str, &value); - -- apply_typmod(&value, typmod); -+ apply_typmod(&value, (int32)typmod); - - res = make_result(&value); - free_var(&value); -@@ -1706,8 +1706,9 @@ - - - Numeric --int4_numeric(int32 val) -+int4_numeric(Datum v) - { -+ int32 val = v; - Numeric res; - NumericVar result; - char *tmp; ---- backend/utils/adt/oid.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/oid.c Mon Feb 12 21:28:48 2001 -@@ -185,17 +185,17 @@ - } - - bool --oideqint4(Oid arg1, int32 arg2) -+oideqint4(Oid arg1, Datum arg2) - { - /* oid is unsigned, but int4 is signed */ -- return arg2 >= 0 && arg1 == arg2; -+ return (int32)arg2 >= 0 && arg1 == (int32)arg2; - } - - bool --int4eqoid(int32 arg1, Oid arg2) -+int4eqoid(Datum arg1, Oid arg2) - { - /* oid is unsigned, but int4 is signed */ -- return arg1 >= 0 && arg1 == arg2; -+ return (int32)arg1 >= 0 && (int32)arg1 == arg2; - } - - text * ---- backend/utils/adt/varchar.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/varchar.c Mon Feb 12 21:28:48 2001 -@@ -62,8 +62,9 @@ - * because we pass typelem as the second argument for array_in.) - */ - char * --bpcharin(char *s, int dummy, int32 atttypmod) -+bpcharin(char *s, Datum dummy, Datum a) - { -+ int32 atttypmod = a; - char *result, - *r; - int len; -@@ -147,8 +148,9 @@ - * len is the length specified in () plus VARHDRSZ bytes. - */ - char * --bpchar(char *s, int32 len) -+bpchar(char *s, Datum l) - { -+ int32 len = l; - char *result, - *r; - int rlen, -@@ -219,9 +221,9 @@ - * len is the length specified in () plus VARHDRSZ bytes. - */ - ArrayType * --_bpchar(ArrayType *v, int32 len) -+_bpchar(ArrayType *v, Datum len) - { -- return array_map(v, BPCHAROID, bpchar, BPCHAROID, 1, len); -+ return array_map(v, BPCHAROID, bpchar, BPCHAROID, 1, (int32)len); - } - - -@@ -238,7 +240,7 @@ - * Convert char to bpchar(1). - */ - char * --char_bpchar(int32 c) -+char_bpchar(Datum c) - { - char *result; - -@@ -330,8 +332,9 @@ - * because we pass typelem as the second argument for array_in.) - */ - char * --varcharin(char *s, int dummy, int32 atttypmod) -+varcharin(char *s, int dummy, Datum a) - { -+ int32 atttypmod = a; - char *result; - int len; - -@@ -392,8 +395,9 @@ - * slen is the length specified in () plus VARHDRSZ bytes. - */ - char * --varchar(char *s, int32 slen) -+varchar(char *s, Datum ds) - { -+ int32 slen = ds; - char *result; - int len; - -@@ -430,9 +434,9 @@ - * len is the length specified in () plus VARHDRSZ bytes. - */ - ArrayType * --_varchar(ArrayType *v, int32 len) -+_varchar(ArrayType *v, Datum len) - { -- return array_map(v, VARCHAROID, varchar, VARCHAROID, 1, len); -+ return array_map(v, VARCHAROID, varchar, VARCHAROID, 1, (int32)len); - } - - ---- backend/utils/adt/varlena.c.orig Mon Feb 12 21:28:48 2001 -+++ backend/utils/adt/varlena.c Mon Feb 12 21:28:48 2001 -@@ -324,8 +324,9 @@ - * - Thomas Lockhart 1998-12-10 - */ - text * --text_substr(text *string, int32 m, int32 n) -+text_substr(text *string, Datum dm, Datum dn) - { -+ int32 m = dm, n = dn; - text *ret; - int len; - ---- include/access/hash.h.orig Mon Feb 12 21:28:43 2001 -+++ include/access/hash.h Mon Feb 12 21:28:43 2001 -@@ -263,15 +263,15 @@ - extern void hashdelete(Relation rel, ItemPointer tid); - - /* hashfunc.c */ --extern uint32 hashint2(int16 key); --extern uint32 hashint4(uint32 key); -+extern uint32 hashint2(Datum key); -+extern uint32 hashint4(Datum key); - extern uint32 hashint8(int64 *key); - extern uint32 hashfloat4(float32 keyp); - extern uint32 hashfloat8(float64 keyp); - extern uint32 hashoid(Oid key); - extern uint32 hashoidvector(Oid *key); - extern uint32 hashint2vector(int16 *key); --extern uint32 hashchar(char key); -+extern uint32 hashchar(Datum key); - extern uint32 hashtext(struct varlena * key); - extern uint32 hashname(NameData *n); - ---- include/utils/builtins.h.orig Mon Feb 12 21:28:43 2001 -+++ include/utils/builtins.h Mon Feb 12 21:28:43 2001 -@@ -55,95 +55,95 @@ - - /* char.c */ - extern int32 charin(char *ch); --extern char *charout(int32 ch); -+extern char *charout(Datum ch); - extern int32 cidin(char *s); --extern char *cidout(int32 c); --extern bool chareq(int8 arg1, int8 arg2); --extern bool charne(int8 arg1, int8 arg2); --extern bool charlt(int8 arg1, int8 arg2); --extern bool charle(int8 arg1, int8 arg2); --extern bool chargt(int8 arg1, int8 arg2); --extern bool charge(int8 arg1, int8 arg2); --extern int8 charpl(int8 arg1, int8 arg2); --extern int8 charmi(int8 arg1, int8 arg2); --extern int8 charmul(int8 arg1, int8 arg2); --extern int8 chardiv(int8 arg1, int8 arg2); --extern bool cideq(int8 arg1, int8 arg2); -+extern char *cidout(Datum c); -+extern bool chareq(Datum arg1, Datum arg2); -+extern bool charne(Datum arg1, Datum arg2); -+extern bool charlt(Datum arg1, Datum arg2); -+extern bool charle(Datum arg1, Datum arg2); -+extern bool chargt(Datum arg1, Datum arg2); -+extern bool charge(Datum arg1, Datum arg2); -+extern int8 charpl(Datum arg1, Datum arg2); -+extern int8 charmi(Datum arg1, Datum arg2); -+extern int8 charmul(Datum arg1, Datum arg2); -+extern int8 chardiv(Datum arg1, Datum arg2); -+extern bool cideq(Datum arg1, Datum arg2); - extern int8 text_char(text *arg1); --extern text *char_text(int8 arg1); -+extern text *char_text(Datum arg1); - - /* int.c */ - extern int32 int2in(char *num); --extern char *int2out(int16 sh); -+extern char *int2out(Datum sh); - extern int16 *int2vectorin(char *shs); - extern char *int2vectorout(int16 *shs); - extern bool int2vectoreq(int16 *arg1, int16 *arg2); - extern int32 *int44in(char *input_string); - extern char *int44out(int32 *an_array); - extern int32 int4in(char *num); --extern char *int4out(int32 l); --extern int32 i2toi4(int16 arg1); --extern int16 i4toi2(int32 arg1); --extern text *int2_text(int16 arg1); -+extern char *int4out(Datum l); -+extern int32 i2toi4(Datum arg1); -+extern int16 i4toi2(Datum arg1); -+extern text *int2_text(Datum arg1); - extern int16 text_int2(text *arg1); --extern text *int4_text(int32 arg1); -+extern text *int4_text(Datum arg1); - extern int32 text_int4(text *arg1); --extern bool int4eq(int32 arg1, int32 arg2); --extern bool int4ne(int32 arg1, int32 arg2); --extern bool int4lt(int32 arg1, int32 arg2); --extern bool int4le(int32 arg1, int32 arg2); --extern bool int4gt(int32 arg1, int32 arg2); --extern bool int4ge(int32 arg1, int32 arg2); --extern bool int2eq(int16 arg1, int16 arg2); --extern bool int2ne(int16 arg1, int16 arg2); --extern bool int2lt(int16 arg1, int16 arg2); --extern bool int2le(int16 arg1, int16 arg2); --extern bool int2gt(int16 arg1, int16 arg2); --extern bool int2ge(int16 arg1, int16 arg2); --extern bool int24eq(int32 arg1, int32 arg2); --extern bool int24ne(int32 arg1, int32 arg2); --extern bool int24lt(int32 arg1, int32 arg2); --extern bool int24le(int32 arg1, int32 arg2); --extern bool int24gt(int32 arg1, int32 arg2); --extern bool int24ge(int32 arg1, int32 arg2); --extern bool int42eq(int32 arg1, int32 arg2); --extern bool int42ne(int32 arg1, int32 arg2); --extern bool int42lt(int32 arg1, int32 arg2); --extern bool int42le(int32 arg1, int32 arg2); --extern bool int42gt(int32 arg1, int32 arg2); --extern bool int42ge(int32 arg1, int32 arg2); --extern int32 int4um(int32 arg); --extern int32 int4pl(int32 arg1, int32 arg2); --extern int32 int4mi(int32 arg1, int32 arg2); --extern int32 int4mul(int32 arg1, int32 arg2); --extern int32 int4div(int32 arg1, int32 arg2); --extern int32 int4abs(int32 arg); --extern int32 int4inc(int32 arg); --extern int16 int2um(int16 arg); --extern int16 int2pl(int16 arg1, int16 arg2); --extern int16 int2mi(int16 arg1, int16 arg2); --extern int16 int2mul(int16 arg1, int16 arg2); --extern int16 int2div(int16 arg1, int16 arg2); --extern int16 int2abs(int16 arg); --extern int16 int2inc(int16 arg); --extern int32 int24pl(int32 arg1, int32 arg2); --extern int32 int24mi(int32 arg1, int32 arg2); --extern int32 int24mul(int32 arg1, int32 arg2); --extern int32 int24div(int32 arg1, int32 arg2); --extern int32 int42pl(int32 arg1, int32 arg2); --extern int32 int42mi(int32 arg1, int32 arg2); --extern int32 int42mul(int32 arg1, int32 arg2); --extern int32 int42div(int32 arg1, int32 arg2); --extern int32 int4mod(int32 arg1, int32 arg2); --extern int32 int2mod(int16 arg1, int16 arg2); --extern int32 int24mod(int32 arg1, int32 arg2); --extern int32 int42mod(int32 arg1, int32 arg2); --extern int32 int4fac(int32 arg1); --extern int32 int2fac(int16 arg1); --extern int16 int2larger(int16 arg1, int16 arg2); --extern int16 int2smaller(int16 arg1, int16 arg2); --extern int32 int4larger(int32 arg1, int32 arg2); --extern int32 int4smaller(int32 arg1, int32 arg2); -+extern bool int4eq(Datum arg1, Datum arg2); -+extern bool int4ne(Datum arg1, Datum arg2); -+extern bool int4lt(Datum arg1, Datum arg2); -+extern bool int4le(Datum arg1, Datum arg2); -+extern bool int4gt(Datum arg1, Datum arg2); -+extern bool int4ge(Datum arg1, Datum arg2); -+extern bool int2eq(Datum arg1, Datum arg2); -+extern bool int2ne(Datum arg1, Datum arg2); -+extern bool int2lt(Datum arg1, Datum arg2); -+extern bool int2le(Datum arg1, Datum arg2); -+extern bool int2gt(Datum arg1, Datum arg2); -+extern bool int2ge(Datum arg1, Datum arg2); -+extern bool int24eq(Datum arg1, Datum arg2); -+extern bool int24ne(Datum arg1, Datum arg2); -+extern bool int24lt(Datum arg1, Datum arg2); -+extern bool int24le(Datum arg1, Datum arg2); -+extern bool int24gt(Datum arg1, Datum arg2); -+extern bool int24ge(Datum arg1, Datum arg2); -+extern bool int42eq(Datum arg1, Datum arg2); -+extern bool int42ne(Datum arg1, Datum arg2); -+extern bool int42lt(Datum arg1, Datum arg2); -+extern bool int42le(Datum arg1, Datum arg2); -+extern bool int42gt(Datum arg1, Datum arg2); -+extern bool int42ge(Datum arg1, Datum arg2); -+extern int32 int4um(Datum arg); -+extern int32 int4pl(Datum arg1, Datum arg2); -+extern int32 int4mi(Datum arg1, Datum arg2); -+extern int32 int4mul(Datum arg1, Datum arg2); -+extern int32 int4div(Datum arg1, Datum arg2); -+extern int32 int4abs(Datum arg); -+extern int32 int4inc(Datum arg); -+extern int16 int2um(Datum arg); -+extern int16 int2pl(Datum arg1, Datum arg2); -+extern int16 int2mi(Datum arg1, Datum arg2); -+extern int16 int2mul(Datum arg1, Datum arg2); -+extern int16 int2div(Datum arg1, Datum arg2); -+extern int16 int2abs(Datum arg); -+extern int16 int2inc(Datum arg); -+extern int32 int24pl(Datum arg1, Datum arg2); -+extern int32 int24mi(Datum arg1, Datum arg2); -+extern int32 int24mul(Datum arg1, Datum arg2); -+extern int32 int24div(Datum arg1, Datum arg2); -+extern int32 int42pl(Datum arg1, Datum arg2); -+extern int32 int42mi(Datum arg1, Datum arg2); -+extern int32 int42mul(Datum arg1, Datum arg2); -+extern int32 int42div(Datum arg1, Datum arg2); -+extern int32 int4mod(Datum arg1, Datum arg2); -+extern int32 int2mod(Datum arg1, Datum arg2); -+extern int32 int24mod(Datum arg1, Datum arg2); -+extern int32 int42mod(Datum arg1, Datum arg2); -+extern int32 int4fac(Datum arg1); -+extern int32 int2fac(Datum arg1); -+extern int16 int2larger(Datum arg1, Datum arg2); -+extern int16 int2smaller(Datum arg1, Datum arg2); -+extern int32 int4larger(Datum arg1, Datum arg2); -+extern int32 int4smaller(Datum arg1, Datum arg2); - - /* name.c */ - extern NameData *namein(const char *s); -@@ -177,17 +177,17 @@ - * Per-opclass comparison functions for new btrees. These are - * stored in pg_amproc and defined in nbtree/ - */ --extern int32 btint2cmp(int16 a, int16 b); --extern int32 btint4cmp(int32 a, int32 b); -+extern int32 btint2cmp(Datum a, Datum b); -+extern int32 btint4cmp(Datum a, Datum b); - extern int32 btint8cmp(int64 *a, int64 *b); --extern int32 btint24cmp(int16 a, int32 b); --extern int32 btint42cmp(int32 a, int16 b); -+extern int32 btint24cmp(Datum a, Datum b); -+extern int32 btint42cmp(Datum a, Datum b); - extern int32 btfloat4cmp(float32 a, float32 b); - extern int32 btfloat8cmp(float64 a, float64 b); - extern int32 btoidcmp(Oid a, Oid b); - extern int32 btoidvectorcmp(Oid *a, Oid *b); --extern int32 btabstimecmp(AbsoluteTime a, AbsoluteTime b); --extern int32 btcharcmp(char a, char b); -+extern int32 btabstimecmp(Datum a, Datum b); -+extern int32 btcharcmp(Datum a, Datum b); - extern int32 btnamecmp(NameData *a, NameData *b); - extern int32 bttextcmp(struct varlena * a, struct varlena * b); - extern int32 btboolcmp(bool a, bool b); -@@ -252,13 +252,13 @@ - extern bool float8gt(float64 arg1, float64 arg2); - extern bool float8ge(float64 arg1, float64 arg2); - extern float64 ftod(float32 num); --extern float64 i4tod(int32 num); --extern float64 i2tod(int16 num); -+extern float64 i4tod(Datum num); -+extern float64 i2tod(Datum num); - extern float32 dtof(float64 num); - extern int32 dtoi4(float64 num); - extern int16 dtoi2(float64 num); --extern float32 i4tof(int32 num); --extern float32 i2tof(int16 num); -+extern float32 i4tof(Datum num); -+extern float32 i2tof(Datum num); - extern int32 ftoi4(float32 num); - extern int16 ftoi2(float32 num); - extern float64 text_float8(text *str); -@@ -337,8 +337,8 @@ - extern bool oidvectorle(Oid *arg1, Oid *arg2); - extern bool oidvectorge(Oid *arg1, Oid *arg2); - extern bool oidvectorgt(Oid *arg1, Oid *arg2); --extern bool oideqint4(Oid arg1, int32 arg2); --extern bool int4eqoid(int32 arg1, Oid arg2); -+extern bool oideqint4(Oid arg1, Datum arg2); -+extern bool int4eqoid(Datum arg1, Oid arg2); - extern text *oid_text(Oid arg1); - extern Oid text_oid(text *arg1); - -@@ -461,11 +461,11 @@ - extern ItemPointer currtid_byrelname(const text *relName, ItemPointer); - - /* varchar.c */ --extern char *bpcharin(char *s, int dummy, int32 atttypmod); -+extern char *bpcharin(char *s, Datum dummy, Datum atttypmod); - extern char *bpcharout(char *s); --extern char *bpchar(char *s, int32 slen); --extern ArrayType *_bpchar(ArrayType *v, int32 slen); --extern char *char_bpchar(int32 c); -+extern char *bpchar(char *s, Datum slen); -+extern ArrayType *_bpchar(ArrayType *v, Datum slen); -+extern char *char_bpchar(Datum c); - extern int32 bpchar_char(char *s); - extern char *name_bpchar(NameData *s); - extern NameData *bpchar_name(char *s); -@@ -480,10 +480,10 @@ - extern int32 bpcharoctetlen(char *arg); - extern uint32 hashbpchar(struct varlena * key); - --extern char *varcharin(char *s, int dummy, int32 atttypmod); -+extern char *varcharin(char *s, int dummy, Datum atttypmod); - extern char *varcharout(char *s); --extern char *varchar(char *s, int32 slen); --extern ArrayType *_varchar(ArrayType *v, int32 slen); -+extern char *varchar(char *s, Datum slen); -+extern ArrayType *_varchar(ArrayType *v, Datum slen); - extern bool varchareq(char *arg1, char *arg2); - extern bool varcharne(char *arg1, char *arg2); - extern bool varcharlt(char *arg1, char *arg2); -@@ -511,7 +511,7 @@ - extern int32 textlen(text *arg); - extern int32 textoctetlen(text *arg); - extern int32 textpos(text *arg1, text *arg2); --extern text *text_substr(text *string, int32 m, int32 n); -+extern text *text_substr(text *string, Datum m, Datum n); - extern text *name_text(NameData *s); - extern NameData *text_name(text *s); - -@@ -590,7 +590,7 @@ - extern text *macaddr_manuf(macaddr *addr); - - /* numeric.c */ --extern Numeric numeric_in(char *str, int dummy, int32 typmod); -+extern Numeric numeric_in(char *str, int dummy, Datum typmod); - extern char *numeric_out(Numeric num); - extern Numeric numeric(Numeric num, int32 typmod); - extern Numeric numeric_abs(Numeric num); -@@ -621,7 +621,7 @@ - extern Numeric numeric_ln(Numeric num); - extern Numeric numeric_log(Numeric num1, Numeric num2); - extern Numeric numeric_power(Numeric num1, Numeric num2); --extern Numeric int4_numeric(int32 val); -+extern Numeric int4_numeric(Datum val); - extern int32 numeric_int4(Numeric num); - extern Numeric int8_numeric(int64 *val); - extern int64 *numeric_int8(Numeric num); ---- include/utils/int8.h.orig Mon Feb 12 21:28:43 2001 -+++ include/utils/int8.h Mon Feb 12 21:28:43 2001 -@@ -57,19 +57,19 @@ - extern bool int8le(int64 *val1, int64 *val2); - extern bool int8ge(int64 *val1, int64 *val2); - --extern bool int84eq(int64 *val1, int32 val2); --extern bool int84ne(int64 *val1, int32 val2); --extern bool int84lt(int64 *val1, int32 val2); --extern bool int84gt(int64 *val1, int32 val2); --extern bool int84le(int64 *val1, int32 val2); --extern bool int84ge(int64 *val1, int32 val2); -+extern bool int84eq(int64 *val1, Datum val2); -+extern bool int84ne(int64 *val1, Datum val2); -+extern bool int84lt(int64 *val1, Datum val2); -+extern bool int84gt(int64 *val1, Datum val2); -+extern bool int84le(int64 *val1, Datum val2); -+extern bool int84ge(int64 *val1, Datum val2); - --extern bool int48eq(int32 val1, int64 *val2); --extern bool int48ne(int32 val1, int64 *val2); --extern bool int48lt(int32 val1, int64 *val2); --extern bool int48gt(int32 val1, int64 *val2); --extern bool int48le(int32 val1, int64 *val2); --extern bool int48ge(int32 val1, int64 *val2); -+extern bool int48eq(Datum val1, int64 *val2); -+extern bool int48ne(Datum val1, int64 *val2); -+extern bool int48lt(Datum val1, int64 *val2); -+extern bool int48gt(Datum val1, int64 *val2); -+extern bool int48le(Datum val1, int64 *val2); -+extern bool int48ge(Datum val1, int64 *val2); - - extern int64 *int8um(int64 *val); - extern int64 *int8pl(int64 *val1, int64 *val2); -@@ -82,17 +82,17 @@ - extern int64 *int8larger(int64 *val1, int64 *val2); - extern int64 *int8smaller(int64 *val1, int64 *val2); - --extern int64 *int84pl(int64 *val1, int32 val2); --extern int64 *int84mi(int64 *val1, int32 val2); --extern int64 *int84mul(int64 *val1, int32 val2); --extern int64 *int84div(int64 *val1, int32 val2); -+extern int64 *int84pl(int64 *val1, Datum val2); -+extern int64 *int84mi(int64 *val1, Datum val2); -+extern int64 *int84mul(int64 *val1, Datum val2); -+extern int64 *int84div(int64 *val1, Datum val2); - --extern int64 *int48pl(int32 val1, int64 *val2); --extern int64 *int48mi(int32 val1, int64 *val2); --extern int64 *int48mul(int32 val1, int64 *val2); --extern int64 *int48div(int32 val1, int64 *val2); -+extern int64 *int48pl(Datum val1, int64 *val2); -+extern int64 *int48mi(Datum val1, int64 *val2); -+extern int64 *int48mul(Datum val1, int64 *val2); -+extern int64 *int48div(Datum val1, int64 *val2); - --extern int64 *int48(int32 val); -+extern int64 *int48(Datum val); - extern int32 int84(int64 *val); - - #ifdef NOT_USED ---- include/utils/nabstime.h.orig Mon Feb 12 21:28:43 2001 -+++ include/utils/nabstime.h Mon Feb 12 21:28:43 2001 -@@ -105,43 +105,43 @@ - * nabstime.c prototypes - */ - extern AbsoluteTime nabstimein(char *timestr); --extern char *nabstimeout(AbsoluteTime time); -+extern char *nabstimeout(Datum time); - --extern bool abstimeeq(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstimene(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstimelt(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstimegt(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstimele(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstimege(AbsoluteTime t1, AbsoluteTime t2); --extern bool abstime_finite(AbsoluteTime time); -+extern bool abstimeeq(Datum t1, Datum t2); -+extern bool abstimene(Datum t1, Datum t2); -+extern bool abstimelt(Datum t1, Datum t2); -+extern bool abstimegt(Datum t1, Datum t2); -+extern bool abstimele(Datum t1, Datum t2); -+extern bool abstimege(Datum t1, Datum t2); -+extern bool abstime_finite(Datum time); - - extern AbsoluteTime timestamp_abstime(Timestamp *timestamp); --extern Timestamp *abstime_timestamp(AbsoluteTime abstime); -+extern Timestamp *abstime_timestamp(Datum abstime); - --extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2); -+extern bool AbsoluteTimeIsBefore(Datum time1, Datum time2); - --extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn); -+extern void abstime2tm(Datum time, int *tzp, struct tm * tm, char *tzn); - - extern RelativeTime reltimein(char *timestring); --extern char *reltimeout(RelativeTime timevalue); -+extern char *reltimeout(Datum timevalue); - extern TimeInterval tintervalin(char *intervalstr); - extern char *tintervalout(TimeInterval interval); - extern RelativeTime interval_reltime(Interval *interval); --extern Interval *reltime_interval(RelativeTime reltime); --extern TimeInterval mktinterval(AbsoluteTime t1, AbsoluteTime t2); --extern AbsoluteTime timepl(AbsoluteTime t1, RelativeTime t2); --extern AbsoluteTime timemi(AbsoluteTime t1, RelativeTime t2); -+extern Interval *reltime_interval(Datum reltime); -+extern TimeInterval mktinterval(Datum t1, Datum t2); -+extern AbsoluteTime timepl(Datum t1, Datum t2); -+extern AbsoluteTime timemi(Datum t1, Datum t2); - - /* extern RelativeTime abstimemi(AbsoluteTime t1, AbsoluteTime t2); static*/ --extern int intinterval(AbsoluteTime t, TimeInterval interval); -+extern int intinterval(Datum t, TimeInterval interval); - extern RelativeTime tintervalrel(TimeInterval interval); - extern AbsoluteTime timenow(void); --extern bool reltimeeq(RelativeTime t1, RelativeTime t2); --extern bool reltimene(RelativeTime t1, RelativeTime t2); --extern bool reltimelt(RelativeTime t1, RelativeTime t2); --extern bool reltimegt(RelativeTime t1, RelativeTime t2); --extern bool reltimele(RelativeTime t1, RelativeTime t2); --extern bool reltimege(RelativeTime t1, RelativeTime t2); -+extern bool reltimeeq(Datum t1, Datum t2); -+extern bool reltimene(Datum t1, Datum t2); -+extern bool reltimelt(Datum t1, Datum t2); -+extern bool reltimegt(Datum t1, Datum t2); -+extern bool reltimele(Datum t1, Datum t2); -+extern bool reltimege(Datum t1, Datum t2); - extern bool tintervalsame(TimeInterval i1, TimeInterval i2); - extern bool tintervaleq(TimeInterval i1, TimeInterval i2); - extern bool tintervalne(TimeInterval i1, TimeInterval i2); -@@ -149,12 +149,12 @@ - extern bool tintervalgt(TimeInterval i1, TimeInterval i2); - extern bool tintervalle(TimeInterval i1, TimeInterval i2); - extern bool tintervalge(TimeInterval i1, TimeInterval i2); --extern bool tintervalleneq(TimeInterval i, RelativeTime t); --extern bool tintervallenne(TimeInterval i, RelativeTime t); --extern bool tintervallenlt(TimeInterval i, RelativeTime t); --extern bool tintervallengt(TimeInterval i, RelativeTime t); --extern bool tintervallenle(TimeInterval i, RelativeTime t); --extern bool tintervallenge(TimeInterval i, RelativeTime t); -+extern bool tintervalleneq(TimeInterval i, Datum t); -+extern bool tintervallenne(TimeInterval i, Datum t); -+extern bool tintervallenlt(TimeInterval i, Datum t); -+extern bool tintervallengt(TimeInterval i, Datum t); -+extern bool tintervallenle(TimeInterval i, Datum t); -+extern bool tintervallenge(TimeInterval i, Datum t); - extern bool tintervalct(TimeInterval i1, TimeInterval i2); - extern bool tintervalov(TimeInterval i1, TimeInterval i2); - extern AbsoluteTime tintervalstart(TimeInterval i); diff --git a/databases/postgresql/files/profile.pgsql b/databases/postgresql/files/profile.pgsql deleted file mode 100644 index 58a448e139b..00000000000 --- a/databases/postgresql/files/profile.pgsql +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: profile.pgsql,v 1.1 2000/03/18 17:43:16 jlam Exp $ -# -# profile - sets the enviroment for the postgresql superuser - -PATH=@PATH@ -MANPATH=@MANPATH@ -# -# note: PGDATA overrides the -D startup option -# -PGDATA=${HOME}/data -PGLIB=@PREFIX@/share/postgresql -DISPLAY=:0 - -export PATH MANPATH PGDATA PGLIB DISPLAY - -# if you want to make regression tests use this TZ -#TZ=PST8PDT; export TZ diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa new file mode 100644 index 00000000000..408707ae336 --- /dev/null +++ b/databases/postgresql/patches/patch-aa @@ -0,0 +1,50 @@ +$NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $ + +--- configure.in.orig Sat May 5 16:05:37 2001 ++++ configure.in +@@ -150,6 +150,15 @@ + + + # ++# Readline support ++# ++AC_MSG_CHECKING([whether to build with readline support]) ++PGAC_ARG_BOOL(enable, readline, yes, ++ [ --disable-readline disable readline support]) ++AC_MSG_RESULT([$enable_readline]) ++ ++ ++# + # Locale (--enable-locale) + # + AC_MSG_CHECKING([whether to build with locale support]) +@@ -401,6 +410,18 @@ + [AC_MSG_RESULT(no)]) + AC_SUBST(with_python) + ++# If python is enabled (above), then optionally byte-compile the modules. ++AC_MSG_CHECKING([whether to byte-compile Python modules]) ++if test "$with_python" = yes; then ++ PGAC_ARG_BOOL(with, python_compile, no, ++ [ --with-python-compile byte-compile modules if Python is enabled]) ++else ++ with_python_compile=no ++fi ++AC_MSG_RESULT([$with_python_compile]) ++AC_SUBST([with_python_compile]) ++ ++ + # + # Optionally build the Java/JDBC tools + # +@@ -649,8 +670,10 @@ + ## Libraries + ## + ++if test "$enable_readline" = yes; then + PGAC_CHECK_READLINE + AC_SEARCH_LIBS(using_history, history, [AC_DEFINE(HAVE_HISTORY_FUNCTIONS)]) ++fi + + if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" + then diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab index 1e05ae81158..b7d0a4a046b 100644 --- a/databases/postgresql/patches/patch-ab +++ b/databases/postgresql/patches/patch-ab @@ -1,13 +1,136 @@ -$NetBSD: patch-ab,v 1.10 2000/05/20 19:34:17 jlam Exp $ +$NetBSD: patch-ab,v 1.11 2001/05/14 14:52:38 jlam Exp $ ---- bin/pgtclsh/Makefile.orig Tue Mar 7 20:58:21 2000 -+++ bin/pgtclsh/Makefile Sat May 20 00:14:18 2000 -@@ -22,7 +22,7 @@ - include Makefile.tkdefs - endif +--- configure.orig Sat May 5 16:05:37 2001 ++++ configure +@@ -19,6 +19,8 @@ + ac_help="$ac_help + --with-libs=DIRS alternative spelling of --with-libraries" + ac_help="$ac_help ++ --disable-readline disable readline support" ++ac_help="$ac_help + --enable-locale enable locale support" + ac_help="$ac_help + --enable-recode enable character set recode support" +@@ -53,6 +55,8 @@ + ac_help="$ac_help + --with-python build Python interface module" + ac_help="$ac_help ++ --with-python-compile byte-compile modules if Python is enabled" ++ac_help="$ac_help + --with-java build JDBC interface and Java tools" + ac_help="$ac_help + --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" +@@ -811,10 +815,36 @@ --CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR) -+CFLAGS+= $(X_CFLAGS) -I$(LIBPQDIR) -I$(LIBPGTCLDIR) - ifdef KRBVERS - LDFLAGS+= $(KRBLIBS) + # ++# Readline support ++# ++echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6 ++echo "configure:822: checking whether to build with readline support" >&5 ++# Check whether --enable-readline was given ++if test x"${enable_readline+set}" = xset; then ++ case $enable_readline in ++ yes) ++ : ++ ;; ++ no) ++ : ++ ;; ++ *) ++ enableval=$enable_readline ++ { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; } ++ ;; ++ esac # $enable_readline ++else ++ enable_readline=yes ++ ++fi ++echo "$ac_t""$enable_readline" 1>&6 ++ ++ ++# + # Locale (--enable-locale) + # + echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 +-echo "configure:818: checking whether to build with locale support" >&5 ++echo "configure:848: checking whether to build with locale support" >&5 + # Check whether --enable-locale was given + if test x"${enable_locale+set}" = xset; then + case $enable_locale in +@@ -1905,11 +1935,40 @@ + fi + + ++# If python is enabled (above), then optionally byte-compile the modules. ++echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6 ++echo "configure:1941: checking whether to byte-compile Python modules" >&5 ++if test "$with_python" = yes; then ++ # Check whether --with-python_compile was given ++if test x"${with_python_compile+set}" = xset; then ++ case $with_python_compile in ++ yes) ++ : ++ ;; ++ no) ++ : ++ ;; ++ *) ++ withval=$with_python_compile ++ { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; } ++ ;; ++ esac # $with_python_compile ++else ++ with_python_compile=no ++ ++fi ++else ++ with_python_compile=no ++fi ++echo "$ac_t""$with_python_compile" 1>&6 ++ ++ ++ + # + # Optionally build the Java/JDBC tools + # + echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 +-echo "configure:1913: checking whether to build Java/JDBC tools" >&5 ++echo "configure:1972: checking whether to build Java/JDBC tools" >&5 + # Check whether --with-java was given + if test x"${with_java+set}" = xset; then + case $with_java in +@@ -3095,8 +3154,9 @@ + ## Libraries + ## + +-echo $ac_n "checking for readline""... $ac_c" 1>&6 +-echo "configure:3100: checking for readline" >&5 ++if test "$enable_readline" = yes; then ++echo $ac_n "checking for readline""... $ac_c" 1>&6 ++echo "configure:3160: checking for readline" >&5 + + if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3208,11 +3268,12 @@ + else : + + fi ++fi + + if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" + then + echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 +-echo "configure:3216: checking for main in -lbsd" >&5 ++echo "configure:3277: checking for main in -lbsd" >&5 + ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8103,6 +8164,7 @@ + s%@python_moduledir@%$python_moduledir%g + s%@python_extmakefile@%$python_extmakefile%g + s%@with_python@%$with_python%g ++s%@with_python_compile@%$with_python_compile%g + s%@ANT@%$ANT%g + s%@with_java@%$with_java%g + s%@with_krb4@%$with_krb4%g diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac index c5357f95d32..472864c350d 100644 --- a/databases/postgresql/patches/patch-ac +++ b/databases/postgresql/patches/patch-ac @@ -1,15 +1,33 @@ -$NetBSD: patch-ac,v 1.8 2000/07/14 04:44:13 jlam Exp $ +$NetBSD: patch-ac,v 1.9 2001/05/14 14:52:38 jlam Exp $ ---- configure.in.orig Wed May 24 18:43:59 2000 -+++ configure.in Mon Jul 10 22:20:00 2000 -@@ -675,10 +675,6 @@ - AC_SUBST(YFLAGS) - - AC_CHECK_LIB(sfio, main) --for curses in ncurses curses ; do -- AC_CHECK_LIB(${curses}, main, -- [LIBS="-l${curses} $LIBS"; break]) --done - AC_CHECK_LIB(termcap, main) - AC_CHECK_LIB(readline, main) - AC_CHECK_LIB(readline, using_history, AC_DEFINE(HAVE_HISTORY_IN_READLINE), +--- doc/Makefile.orig Sat Jan 6 21:03:22 2001 ++++ doc/Makefile +@@ -37,7 +37,7 @@ + + install: all installdirs + ifdef found_html +- gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir)/html && $(TAR) xf - ) ++ gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir) && $(TAR) xf - ) + endif + ifdef found_man + gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - ) +@@ -45,12 +45,17 @@ + + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html ++ifdef found_html ++ $(mkinstalldirs) $(DESTDIR)$(docdir) ++endif ++ifdef found_man ++ $(mkinstalldirs) $(DESTDIR)$(mandir) ++endif + + + uninstall: + ifdef found_html +- -rm -f $(addprefix $(DESTDIR)$(docdir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -)) ++ -rm -f $(addprefix $(DESTDIR)$(docdir)/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -)) + endif + ifdef found_man + -rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf -)) diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad index 3cdfe38aee5..902087cf339 100644 --- a/databases/postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ad @@ -1,13 +1,23 @@ -$NetBSD: patch-ad,v 1.9 2000/07/14 04:44:13 jlam Exp $ +$NetBSD: patch-ad,v 1.10 2001/05/14 14:52:38 jlam Exp $ ---- interfaces/ecpg/lib/Makefile.in.orig Wed May 17 02:03:13 2000 -+++ interfaces/ecpg/lib/Makefile.in Mon Jul 10 22:21:20 2000 -@@ -12,7 +12,7 @@ +--- src/Makefile.global.in.orig Fri Mar 16 16:50:39 2001 ++++ src/Makefile.global.in +@@ -110,6 +110,7 @@ + with_java = @with_java@ + with_perl = @with_perl@ + with_python = @with_python@ ++with_python_compile = @with_python_compile@ + with_tcl = @with_tcl@ + with_tk = @with_tk@ + enable_odbc = @enable_odbc@ +@@ -242,6 +243,10 @@ + libpq_srcdir = $(top_srcdir)/src/interfaces/libpq + libpq_builddir = $(top_builddir)/src/interfaces/libpq + libpq = -L$(libpq_builddir) -lpq ++ ++libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl ++libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl ++libpgtcl = -L$(libpgtcl_builddir) -lpgtcl - NAME= ecpg - SO_MAJOR_VERSION= 3 --SO_MINOR_VERSION= 1.1 -+SO_MINOR_VERSION= 1 - SRCDIR= @top_srcdir@ - include $(SRCDIR)/Makefile.global + ########################################################################## diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae index 90431794fb9..66a6216fdf3 100644 --- a/databases/postgresql/patches/patch-ae +++ b/databases/postgresql/patches/patch-ae @@ -1,30 +1,40 @@ -$NetBSD: patch-ae,v 1.12 2000/05/20 19:34:20 jlam Exp $ +$NetBSD: patch-ae,v 1.13 2001/05/14 14:52:38 jlam Exp $ ---- interfaces/odbc/psqlodbc.c.orig Mon Dec 28 20:49:57 1998 -+++ interfaces/odbc/psqlodbc.c Sat May 20 00:14:18 2000 -@@ -33,8 +33,14 @@ +--- src/bin/pgtclsh/Makefile.orig Fri Feb 23 13:12:17 2001 ++++ src/bin/pgtclsh/Makefile +@@ -22,19 +22,17 @@ + -include Makefile.tkdefs + endif - GLOBAL_VALUES globals; +-libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl +-libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl +-libpgtcl = -L$(libpgtcl_builddir) -lpgtcl +- + override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) --BOOL _init(void); --BOOL _fini(void); -+#ifdef linux -+# define STATIC -+#else -+# define STATIC static -+#endif -+ -+STATIC BOOL _init(void); -+STATIC BOOL _fini(void); - RETCODE SQL_API SQLDummyOrdinal(void); - #ifdef WIN32 -@@ -98,7 +104,7 @@ - #endif + # If we are here then Tcl is available + PROGRAMS = pgtclsh ++INSTALL_TARGET = install-tcl + + # Add Tk targets if Tk is available + ifeq ($(with_tk), yes) + PROGRAMS += pgtksh ++INSTALL_TARGET += install-tk + endif + + all: submake $(PROGRAMS) +@@ -49,8 +47,12 @@ + submake: + $(MAKE) -C $(libpgtcl_builddir) all - /* These two functions do shared library initialziation on UNIX, well at least -- * on Linux. I don't know about other systems. -+ * on Linux and some of the BSDs. I don't know about other systems. - */ - BOOL - _init(void) +-install: all installdirs ++install: $(INSTALL_TARGET) ++ ++install-tcl: installdirs pgtclsh + $(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh ++ ++install-tk: installdirs pgtksh + ifeq ($(with_tk), yes) + $(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh + endif diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af index 931be2684ff..b860340095a 100644 --- a/databases/postgresql/patches/patch-af +++ b/databases/postgresql/patches/patch-af @@ -1,25 +1,13 @@ -$NetBSD: patch-af,v 1.12 2000/09/03 09:51:19 wiz Exp $ ---- pl/tcl/Makefile.orig Mon May 22 22:12:44 2000 -+++ pl/tcl/Makefile Fri Sep 1 09:41:04 2000 -@@ -56,10 +56,11 @@ - endif +$NetBSD: patch-af,v 1.13 2001/05/14 14:52:38 jlam Exp $ + +--- src/interfaces/ecpg/lib/Makefile.orig Fri Feb 23 13:12:20 2001 ++++ src/interfaces/ecpg/lib/Makefile +@@ -14,7 +14,7 @@ - %$(TCL_SHLIB_SUFFIX): %.o -- $(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS) -+ $(TCL_SHLIB_LD) -o $@ $< -R${PREFIX}/lib -L${PREFIX}/lib -ltcl83 -lm + NAME= ecpg + SO_MAJOR_VERSION= 3 +-SO_MINOR_VERSION= 2.0 ++SO_MINOR_VERSION= 2 + override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) - CC = $(TCL_CC) -+LD = $(TCL_LD) - - # Since we are using Tcl's choice of C compiler, which might not be the - # same one selected for Postgres, do NOT use CFLAGS from Makefile.global. -@@ -70,7 +71,7 @@ - - CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS) - --CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES) -+CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend -I$(LIBPQDIR) $(PGSQL_INCLUDES) - - # - # Uncomment the following to enable the unknown command lookup diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag index 45bec02ad56..fc87f0fdcbc 100644 --- a/databases/postgresql/patches/patch-ag +++ b/databases/postgresql/patches/patch-ag @@ -1,20 +1,12 @@ -$NetBSD: patch-ag,v 1.7 2000/06/20 06:06:48 jlam Exp $ +$NetBSD: patch-ag,v 1.8 2001/05/14 14:52:38 jlam Exp $ ---- Makefile.shlib.orig Thu Mar 9 12:07:32 2000 -+++ Makefile.shlib Tue Jun 20 00:31:34 2000 -@@ -274,6 +274,7 @@ - install-shlib: $(shlib) - $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib) - ifneq ($(PORTNAME), win) -+ifdef ELF_SYSTEM - if [ "$(shlib)" != "lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ]; then \ - cd $(LIBDIR); \ - rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION); \ -@@ -284,6 +285,7 @@ - rm -f lib$(NAME)$(DLSUFFIX); \ - $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX); \ - fi -+endif - endif +--- src/interfaces/odbc/GNUmakefile.orig Sun Apr 1 15:17:32 2001 ++++ src/interfaces/odbc/GNUmakefile +@@ -44,7 +44,6 @@ + + install: all installdirs + for i in $(odbc_headers); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done +- $(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini + $(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql + $(MAKE) install-lib - # Rule to delete shared library during "make clean" diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah index 8114e9c0081..1c978077c20 100644 --- a/databases/postgresql/patches/patch-ah +++ b/databases/postgresql/patches/patch-ah @@ -1,20 +1,46 @@ -$NetBSD: patch-ah,v 1.7 2000/07/14 04:44:53 jlam Exp $ +$NetBSD: patch-ah,v 1.8 2001/05/14 14:52:38 jlam Exp $ ---- backend/main/main.c.orig Wed Jan 26 00:56:30 2000 -+++ backend/main/main.c Wed Jul 12 02:34:38 2000 -@@ -14,13 +14,14 @@ - */ - #include <unistd.h> +--- src/interfaces/python/GNUmakefile.orig Sun Apr 1 15:17:33 2001 ++++ src/interfaces/python/GNUmakefile +@@ -12,9 +12,22 @@ + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global --#if defined(__alpha__) && !defined(linux) -+#if defined(__alpha__) && !defined(linux) && !defined(__NetBSD__) - #include <sys/sysinfo.h> - #include "machine/hal_sysinfo.h" - #define ASSEMBLER - #include <sys/proc.h> - #undef ASSEMBLER - #endif -+#include <sys/param.h> +-all: Makefile pgmodule.c libpq-all ++PY_SCRIPTS = pg.py pgdb.py ++ifeq ($(with_python_compile), yes) ++PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo) ++else ++PY_COMPILED_SCRIPTS = ++endif ++ ++all: Makefile pgmodule.c libpq-all $(PY_COMPILED_SCRIPTS) + $(MAKE) -f Makefile - #include "postgres.h" - #ifdef USE_LOCALE ++%.pyc: %.py ++ $(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")" ++ ++%.pyo: %.py ++ $(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")" ++ + .PHONY: libpq-all + libpq-all: + $(MAKE) -C $(libpq_builddir) all +@@ -28,13 +41,16 @@ + Setup.in: Setup.in.raw + sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \ + -e 's,@libpq_builddir@,$(libpq_builddir),g' \ ++ -e 's,@libpq@,$(libpq),g' \ + -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \ + -e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \ + $< > $@ + + install: all + @echo "Installing Python module" +- @if ( $(INSTALL_DATA) pg.py $(python_moduledir) && \ ++ @if ( ( for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \ ++ $(INSTALL_DATA) $$i $(python_moduledir); \ ++ done ) && \ + $(MAKE) -f Makefile install ); then : ; else \ + echo "*****" ;\ + echo "* Skipping the installation of the Python interface module for lack"; \ diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai index 0e5055d4f85..e1687e7dd4f 100644 --- a/databases/postgresql/patches/patch-ai +++ b/databases/postgresql/patches/patch-ai @@ -1,58 +1,9 @@ -$NetBSD: patch-ai,v 1.7 2000/07/14 04:44:53 jlam Exp $ +$NetBSD: patch-ai,v 1.8 2001/05/14 14:52:38 jlam Exp $ ---- include/port/netbsd.h.orig Wed Apr 12 13:16:48 2000 -+++ include/port/netbsd.h Wed Jul 12 02:31:08 2000 -@@ -3,43 +3,48 @@ - #if defined(__i386__) - #define NEED_I386_TAS_ASM - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif +--- src/interfaces/python/Setup.in.raw.orig Sun Apr 1 15:17:33 2001 ++++ src/interfaces/python/Setup.in.raw +@@ -1,3 +1,3 @@ + *shared* - #if defined(__sparc__) - #define NEED_SPARC_TAS_ASM - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif - - #if defined(__vax__) - #define NEED_VAX_TAS_ASM - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif - - #if defined(__ns32k__) - #define NEED_NS32K_TAS_ASM - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif - - #if defined(__m68k__) - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif - - #if defined(__arm__) - #define HAS_TEST_AND_SET -+typedef unsigned char slock_t; - #endif - - #if defined(__mips__) - /* # undef HAS_TEST_AND_SET */ -+typedef unsigned char slock_t; - #endif - --#if defined(__powerpc__) -+#if defined(__alpha__) - #define HAS_TEST_AND_SET -+typedef unsigned long slock_t; - #endif - - #if defined(__powerpc__) -+#define HAS_TEST_AND_SET - typedef unsigned int slock_t; -- --#else --typedef unsigned char slock_t; -- - #endif +-_pg pgmodule.c -I@libpq_srcdir@ @INCLUDES@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@ ++_pg pgmodule.c -I@libpq_srcdir@ @INCLUDES@ @libpq@ @EXTRA_LIBS@ diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj index 9029a5fdeab..ddbbd3246c7 100644 --- a/databases/postgresql/patches/patch-aj +++ b/databases/postgresql/patches/patch-aj @@ -1,22 +1,15 @@ -$NetBSD: patch-aj,v 1.7 2000/07/14 04:44:54 jlam Exp $ +$NetBSD: patch-aj,v 1.8 2001/05/14 14:52:38 jlam Exp $ ---- include/storage/s_lock.h.orig Wed Apr 12 13:16:51 2000 -+++ include/storage/s_lock.h Wed Jul 12 02:40:53 2000 -@@ -262,7 +262,17 @@ - #define TAS(lock) tas(lock) - #define S_UNLOCK(lock) do { __asm__("mb"); *(lock) = 0; } while (0) +--- src/makefiles/Makefile.netbsd.orig Sat Jan 6 21:03:41 2001 ++++ src/makefiles/Makefile.netbsd +@@ -3,7 +3,9 @@ + ifdef ELF_SYSTEM + export_dynamic = -Wl,-E + rpath = -Wl,-R$(libdir) +-shlib_symbolic = -Wl,-Bsymbolic ++shlib_symbolic = -Wl,-Bsymbolic -lc ++else ++rpath = -R$(libdir) + endif -+#if defined(__GNUC__) -+/* -+ * GCC on the Alpha doesn't appear to handle inlining of assembly with -+ * %0 or %1 properly. This removes the inlining of the tas (test-and-set) -+ * function, which probably slows things down considerably, but correctness -+ * first! -+ */ -+static int -+#else - static __inline__ int -+#endif - tas(volatile slock_t *lock) - { - register slock_t _res; + DLSUFFIX = .so diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak new file mode 100644 index 00000000000..3811babd461 --- /dev/null +++ b/databases/postgresql/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.4 2001/05/14 14:52:38 jlam Exp $ + +--- src/pl/plperl/Makefile.PL.orig Sat Jun 10 14:02:12 2000 ++++ src/pl/plperl/Makefile.PL +@@ -9,7 +9,7 @@ + # to be position-independent, but that is hard to check for and + # seems pretty unlikely anyway.) + # +-if ($Config{'useshrplib'} ne 'true') { ++if ( ! -f $Config{archlibexp} . "/CORE/libperl." . $Config{so}) { + open(OUT, ">Makefile") or die "Can't write Makefile: $!\n"; + print OUT <<'EndOfMakefile'; + # Dummy Makefile for use when we can't build plperl +@@ -52,7 +52,7 @@ + + } + +-my $perllib = "-L$Config{archlibexp}/CORE -lperl"; ++my $perllib = "-L$Config{archlibexp}/CORE \${RPATH_LDFLAGS} -lperl"; + + WriteMakefile( 'NAME' => 'plperl', + dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , diff --git a/databases/postgresql/pkg/DEINSTALL b/databases/postgresql/pkg/DEINSTALL deleted file mode 100644 index 68d8f54d76a..00000000000 --- a/databases/postgresql/pkg/DEINSTALL +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.5 2001/03/25 11:29:37 wennmach Exp $ -# - -PKGNAME=$1 -STAGE=$2 - -USER="@PGUSER@" -GROUP="@PGGROUP@" -PGHOME="@PGHOME@" - -CAT="@CAT@" - - -case ${STAGE} in -DEINSTALL) - ;; - -POST-DEINSTALL) - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want -to remove: - - * the \`${USER}' user - - * the \`${GROUP}' group - - * the following directories: - - ${PGHOME} -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: $2" - exit 1 - ;; -esac -exit 0 diff --git a/databases/postgresql/pkg/DESCR b/databases/postgresql/pkg/DESCR index 0b8c21963a1..91037796043 100644 --- a/databases/postgresql/pkg/DESCR +++ b/databases/postgresql/pkg/DESCR @@ -4,19 +4,6 @@ PostgreSQL retains the powerful object-relational data model, rich data types and easy extensibility of Postgres, it replaces the PostQuel query language with an extended subset of SQL. -The original Postgres code was the effort of many graduate students, -undergraduate students, and staff programmers working under the direction of -Professor Michael Stonebraker at the University of California, Berkeley. In -1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query -language to SQL and created a new database system which came to known as -Postgres95. Many others contributed to the porting, testing, debugging and -enhancement of the Postgres95 code. As the code improved, and 1995 faded into -memory, PostgreSQL was born. - -PostgreSQL development is presently being performed by a team of Internet -developers who are now responsible for all current and future development. The -development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG). -Support is available from the PostgreSQL developer/user community through the -support mailing list (questions@PostgreSQL.ORG). - PostgreSQL is free and the complete source is available. + +This is the meta-package for the PostgreSQL database system. diff --git a/databases/postgresql/pkg/INSTALL b/databases/postgresql/pkg/INSTALL deleted file mode 100644 index bc1299a511b..00000000000 --- a/databases/postgresql/pkg/INSTALL +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.4 2001/03/25 11:29:37 wennmach Exp $ - -PKGNAME=$1 -STAGE=$2 - -USER=@PGUSER@ -GROUP=@PGGROUP@ -PGHOME=@PGHOME@ - -ADDUSER="@ADDUSER@" -ADDGROUP="@ADDGROUP@" -CAT="@CAT@" -CHGRP="@CHGRP@" -CHMOD="@CHMOD@" -CHOWN="@CHOWN@" -CP="@CP@" -GREP="@GREP@" -MKDIR="@MKDIR@" -RM="@RM@" -SU="@SU@" -TOUCH="@TOUCH@" - -case ${STAGE} in -PRE-INSTALL) - ${CAT} << EOF ------------------------------------------------------------- -Dump existing databases, before installing new db version !! ------------------------------------------------------------- -EOF - # Group... the default's shipped with NetBSD - # We need to check that ${GROUP} exists before adding the user. - # Do it with chgrp to be able to use NIS. - # - ${TOUCH} "/tmp/grouptest.$$" - ${CHGRP} ${GROUP} "/tmp/grouptest.$$" >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "Group '${GROUP}' already exists...proceeding." - else - echo "Creating '${GROUP}' group..." - ${ADDGROUP} ${GROUP} - echo "Done." - fi - ${RM} -f "/tmp/grouptest.$$" - - # Use `finger' to be able to use NIS. - # - finger ${USER} 2>&1 | ${GREP} -q "no such user" - if [ $? -eq 0 ] - then - echo "Creating '${USER}' user..." - ${ADDUSER} \ - -c "PostgreSQL database administrator" \ - -d ${PGHOME} \ - -g ${GROUP} \ - -s /bin/sh \ - ${USER} - # "useradd -d" in NetBSD-1.5 creates a home directory and populates - # it with dot files regardless if -m was given or not. This behaviour - # was changed in later versions. We delete the newly created .profile - # here so that the sample profile.pgsql gets installed in the - # POST-INSTALL stage. - ${RM} -f ${PGHOME}/.profile - echo "Done." - else - echo "User '${USER}' already exists...proceeding." - fi - ${MKDIR} ${PGHOME} - ${CHOWN} -R ${USER}:${GROUP} ${PGHOME} - ;; - -POST-INSTALL) - if [ ! -f ${PGHOME}/.profile ]; then - ${CP} ${PKG_PREFIX}/share/postgresql/profile.pgsql.sample \ - ${PGHOME}/.profile - ${CHOWN} ${USER} ${PGHOME}/.profile - ${CHMOD} 644 ${PGHOME}/.profile - fi - ${CAT} << EOF ------------------------------------------------------------------- -Initializing PostgreSQL Databases - this may take a few minutes... ------------------------------------------------------------------- -EOF - echo "${PKG_PREFIX}/bin/initdb --pglib=${PKG_PREFIX}/share/postgresql --pgdata=${PGHOME}/data" | ${SU} -l ${USER} - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST index 3748cb3f98e..a606598ba1d 100644 --- a/databases/postgresql/pkg/PLIST +++ b/databases/postgresql/pkg/PLIST @@ -1,1038 +1,2 @@ -@comment $NetBSD: PLIST,v 1.18 2001/03/25 11:29:38 wennmach Exp $ -bin/createdb -bin/createlang -bin/createuser -bin/dropdb -bin/droplang -bin/dropuser -bin/ecpg -bin/initdb -bin/initlocation -bin/ipcclean -bin/pg_ctl -bin/pg_dump -bin/pg_dumpall -bin/pg_encoding -bin/pg_id -bin/pg_passwd -bin/pg_upgrade -bin/pg_version -bin/postgres -bin/postmaster -bin/psql -bin/vacuumdb -etc/rc.d/pgsql -include/pgsql/access/attnum.h -include/pgsql/c.h -include/pgsql/commands/trigger.h -include/pgsql/config.h -include/pgsql/ecpgerrno.h -include/pgsql/ecpglib.h -include/pgsql/ecpgtype.h -include/pgsql/executor/spi.h -include/pgsql/fmgr.h -include/pgsql/lib/dllist.h -include/pgsql/libpgeasy.h -include/pgsql/libpq++.h -include/pgsql/libpq++/pgconnection.h -include/pgsql/libpq++/pgcursordb.h -include/pgsql/libpq++/pgdatabase.h -include/pgsql/libpq++/pglobject.h -include/pgsql/libpq++/pgtransdb.h -include/pgsql/libpq-fe.h -include/pgsql/libpq-int.h -include/pgsql/libpq/libpq-fs.h -include/pgsql/libpq/pqcomm.h -include/pgsql/os.h -include/pgsql/postgres.h -include/pgsql/postgres_ext.h -include/pgsql/pqexpbuffer.h -include/pgsql/sql3types.h -include/pgsql/sqlca.h -include/pgsql/utils/elog.h -include/pgsql/utils/geo_decls.h -include/pgsql/utils/mcxt.h -include/pgsql/utils/palloc.h -lib/libecpg.a -lib/libecpg.so -lib/libecpg.so.3 -lib/libecpg.so.3.1 -lib/libpgeasy.a -lib/libpgeasy.so -lib/libpgeasy.so.2 -lib/libpgeasy.so.2.1 -lib/libpq++.a -lib/libpq++.so -lib/libpq++.so.3 -lib/libpq++.so.3.1 -lib/libpq.a -lib/libpq.so -lib/libpq.so.2 -lib/libpq.so.2.1 -lib/plpgsql.so -man/man1/createdb.1 -man/man1/createlang.1 -man/man1/createuser.1 -man/man1/dropdb.1 -man/man1/droplang.1 -man/man1/dropuser.1 -man/man1/ecpg.1 -man/man1/initdb.1 -man/man1/initlocation.1 -man/man1/ipcclean.1 -man/man1/pg_ctl.1 -man/man1/pg_dump.1 -man/man1/pg_dumpall.1 -man/man1/pg_passwd.1 -man/man1/pg_upgrade.1 -man/man1/postgres.1 -man/man1/postmaster.1 -man/man1/psql.1 -man/man1/vacuumdb.1 -man/manl/abort.l -man/manl/alter_group.l -man/manl/alter_table.l -man/manl/alter_user.l -man/manl/begin.l -man/manl/close.l -man/manl/cluster.l -man/manl/comment.l -man/manl/commit.l -man/manl/copy.l -man/manl/create_aggregate.l -man/manl/create_constraint_trigger.l -man/manl/create_database.l -man/manl/create_function.l -man/manl/create_group.l -man/manl/create_index.l -man/manl/create_language.l -man/manl/create_operator.l -man/manl/create_rule.l -man/manl/create_sequence.l -man/manl/create_table_as.l -man/manl/create_table.l -man/manl/create_trigger.l -man/manl/create_type.l -man/manl/create_user.l -man/manl/create_view.l -man/manl/declare.l -man/manl/delete.l -man/manl/drop_aggregate.l -man/manl/drop_database.l -man/manl/drop_function.l -man/manl/drop_group.l -man/manl/drop_index.l -man/manl/drop_language.l -man/manl/drop_operator.l -man/manl/drop_rule.l -man/manl/drop_sequence.l -man/manl/drop_table.l -man/manl/drop_trigger.l -man/manl/drop_type.l -man/manl/drop_user.l -man/manl/drop_view.l -man/manl/end.l -man/manl/explain.l -man/manl/fetch.l -man/manl/grant.l -man/manl/insert.l -man/manl/listen.l -man/manl/load.l -man/manl/lock.l -man/manl/move.l -man/manl/notify.l -man/manl/reindex.l -man/manl/reset.l -man/manl/revoke.l -man/manl/rollback.l -man/manl/select_into.l -man/manl/select.l -man/manl/set.l -man/manl/show.l -man/manl/truncate.l -man/manl/unlisten.l -man/manl/update.l -man/manl/vacuum.l -share/doc/html/postgresql/admin/admin.htm -share/doc/html/postgresql/admin/admin.html -share/doc/html/postgresql/admin/biblio.htm -share/doc/html/postgresql/admin/c573.htm -share/doc/html/postgresql/admin/c573602.htm -share/doc/html/postgresql/admin/c573680.htm -share/doc/html/postgresql/admin/c573717.htm -share/doc/html/postgresql/admin/copyright.htm -share/doc/html/postgresql/admin/disk.htm -share/doc/html/postgresql/admin/index.html -share/doc/html/postgresql/admin/install-win32.htm -share/doc/html/postgresql/admin/install-win321073.htm -share/doc/html/postgresql/admin/install-win321082.htm -share/doc/html/postgresql/admin/install.htm -share/doc/html/postgresql/admin/install855.htm -share/doc/html/postgresql/admin/intro-ag.htm -share/doc/html/postgresql/admin/intro-ag162.htm -share/doc/html/postgresql/admin/layout.gif -share/doc/html/postgresql/admin/layout.htm -share/doc/html/postgresql/admin/manage-ag.htm -share/doc/html/postgresql/admin/manage-ag1604.htm -share/doc/html/postgresql/admin/manage-ag1646.htm -share/doc/html/postgresql/admin/manage-ag1655.htm -share/doc/html/postgresql/admin/newuser.htm -share/doc/html/postgresql/admin/notation.htm -share/doc/html/postgresql/admin/pg-options.htm -share/doc/html/postgresql/admin/ports.htm -share/doc/html/postgresql/admin/ports481.htm -share/doc/html/postgresql/admin/postmaster.htm -share/doc/html/postgresql/admin/preface.htm -share/doc/html/postgresql/admin/recovery.htm -share/doc/html/postgresql/admin/regress.htm -share/doc/html/postgresql/admin/regress1861.htm -share/doc/html/postgresql/admin/regress1895.htm -share/doc/html/postgresql/admin/regress1941.htm -share/doc/html/postgresql/admin/release.htm -share/doc/html/postgresql/admin/release2009.htm -share/doc/html/postgresql/admin/release2020.htm -share/doc/html/postgresql/admin/release2031.htm -share/doc/html/postgresql/admin/release2042.htm -share/doc/html/postgresql/admin/release2124.htm -share/doc/html/postgresql/admin/release2135.htm -share/doc/html/postgresql/admin/release2146.htm -share/doc/html/postgresql/admin/release2187.htm -share/doc/html/postgresql/admin/release2203.htm -share/doc/html/postgresql/admin/release2222.htm -share/doc/html/postgresql/admin/release2266.htm -share/doc/html/postgresql/admin/release2288.htm -share/doc/html/postgresql/admin/release2303.htm -share/doc/html/postgresql/admin/release2312.htm -share/doc/html/postgresql/admin/release2335.htm -share/doc/html/postgresql/admin/release2349.htm -share/doc/html/postgresql/admin/release2352.htm -share/doc/html/postgresql/admin/release2377.htm -share/doc/html/postgresql/admin/release2414.htm -share/doc/html/postgresql/admin/release2421.htm -share/doc/html/postgresql/admin/release2428.htm -share/doc/html/postgresql/admin/release2435.htm -share/doc/html/postgresql/admin/release2439.htm -share/doc/html/postgresql/admin/runtime.htm -share/doc/html/postgresql/admin/security.htm -share/doc/html/postgresql/admin/security1450.htm -share/doc/html/postgresql/admin/security1485.htm -share/doc/html/postgresql/admin/security1509.htm -share/doc/html/postgresql/admin/security1530.htm -share/doc/html/postgresql/admin/terminology.htm -share/doc/html/postgresql/admin/trouble.htm -share/doc/html/postgresql/admin/trouble1721.htm -share/doc/html/postgresql/admin/trouble1738.htm -share/doc/html/postgresql/admin/y2k.htm -share/doc/html/postgresql/postgres/about.htm -share/doc/html/postgresql/postgres/advanced.htm -share/doc/html/postgresql/postgres/advanced27923.htm -share/doc/html/postgresql/postgres/advanced27945.htm -share/doc/html/postgresql/postgres/app-createdb.htm -share/doc/html/postgresql/postgres/app-createlang.htm -share/doc/html/postgresql/postgres/app-createuser.htm -share/doc/html/postgresql/postgres/app-dropdb.htm -share/doc/html/postgresql/postgres/app-droplang.htm -share/doc/html/postgresql/postgres/app-dropuser.htm -share/doc/html/postgresql/postgres/app-ecpg.htm -share/doc/html/postgresql/postgres/app-initdb.htm -share/doc/html/postgresql/postgres/app-initlocation.htm -share/doc/html/postgresql/postgres/app-ipcclean.htm -share/doc/html/postgresql/postgres/app-pg-passwd.htm -share/doc/html/postgresql/postgres/app-pg-upgrade.htm -share/doc/html/postgresql/postgres/app-pgaccess.htm -share/doc/html/postgresql/postgres/app-pgadmin.htm -share/doc/html/postgresql/postgres/app-pgctl.htm -share/doc/html/postgresql/postgres/app-pgdump.htm -share/doc/html/postgresql/postgres/app-pgdumpall.htm -share/doc/html/postgresql/postgres/app-pgtclsh.htm -share/doc/html/postgresql/postgres/app-pgtksh.htm -share/doc/html/postgresql/postgres/app-postgres.htm -share/doc/html/postgresql/postgres/app-postmaster.htm -share/doc/html/postgresql/postgres/app-psql.htm -share/doc/html/postgresql/postgres/app-vacuumdb.htm -share/doc/html/postgresql/postgres/applications.htm -share/doc/html/postgresql/postgres/arch-pg.htm -share/doc/html/postgresql/postgres/arch.htm -share/doc/html/postgresql/postgres/arrays.htm -share/doc/html/postgresql/postgres/biblio.htm -share/doc/html/postgresql/postgres/bki.htm -share/doc/html/postgresql/postgres/bki26573.htm -share/doc/html/postgresql/postgres/bki26657.htm -share/doc/html/postgresql/postgres/bki26681.htm -share/doc/html/postgresql/postgres/bki26742.htm -share/doc/html/postgresql/postgres/c16883.htm -share/doc/html/postgresql/postgres/c1688316912.htm -share/doc/html/postgresql/postgres/c1688316990.htm -share/doc/html/postgresql/postgres/c1688317027.htm -share/doc/html/postgresql/postgres/c19986.htm -share/doc/html/postgresql/postgres/c21722.htm -share/doc/html/postgresql/postgres/c2172221764.htm -share/doc/html/postgresql/postgres/c2172221782.htm -share/doc/html/postgresql/postgres/c2172221924.htm -share/doc/html/postgresql/postgres/c2172221936.htm -share/doc/html/postgresql/postgres/c2172221956.htm -share/doc/html/postgresql/postgres/c2172221961.htm -share/doc/html/postgresql/postgres/c25129.htm -share/doc/html/postgresql/postgres/c4091.htm -share/doc/html/postgresql/postgres/c40914117.htm -share/doc/html/postgresql/postgres/c40914344.htm -share/doc/html/postgresql/postgres/c4362.htm -share/doc/html/postgresql/postgres/c43624375.htm -share/doc/html/postgresql/postgres/c4888.htm -share/doc/html/postgresql/postgres/c4933.htm -share/doc/html/postgresql/postgres/c49334943.htm -share/doc/html/postgresql/postgres/c49334947.htm -share/doc/html/postgresql/postgres/catalogs.gif -share/doc/html/postgresql/postgres/clientserver.gif -share/doc/html/postgresql/postgres/compiler.htm -share/doc/html/postgresql/postgres/connections.gif -share/doc/html/postgresql/postgres/copyright.htm -share/doc/html/postgresql/postgres/cvs.htm -share/doc/html/postgresql/postgres/cvs28436.htm -share/doc/html/postgresql/postgres/cvs28492.htm -share/doc/html/postgresql/postgres/datatype.htm -share/doc/html/postgresql/postgres/datatype1038.htm -share/doc/html/postgresql/postgres/datatype1070.htm -share/doc/html/postgresql/postgres/datatype1134.htm -share/doc/html/postgresql/postgres/datatype1649.htm -share/doc/html/postgresql/postgres/datatype1681.htm -share/doc/html/postgresql/postgres/datatype1920.htm -share/doc/html/postgresql/postgres/datetime-appendix.htm -share/doc/html/postgresql/postgres/datetime-appendix28356.htm -share/doc/html/postgresql/postgres/dfunc.htm -share/doc/html/postgresql/postgres/dfunc20136.htm -share/doc/html/postgresql/postgres/dfunc20146.htm -share/doc/html/postgresql/postgres/disk.htm -share/doc/html/postgresql/postgres/docguide.htm -share/doc/html/postgresql/postgres/docguide28718.htm -share/doc/html/postgresql/postgres/docguide28749.htm -share/doc/html/postgresql/postgres/docguide28840.htm -share/doc/html/postgresql/postgres/docguide28861.htm -share/doc/html/postgresql/postgres/docguide28887.htm -share/doc/html/postgresql/postgres/docguide29024.htm -share/doc/html/postgresql/postgres/docguide29362.htm -share/doc/html/postgresql/postgres/environ.htm -share/doc/html/postgresql/postgres/extend.htm -share/doc/html/postgresql/postgres/extend18852.htm -share/doc/html/postgresql/postgres/extend18864.htm -share/doc/html/postgresql/postgres/func-ref.htm -share/doc/html/postgresql/postgres/functions.htm -share/doc/html/postgresql/postgres/functions2593.htm -share/doc/html/postgresql/postgres/functions2733.htm -share/doc/html/postgresql/postgres/functions2876.htm -share/doc/html/postgresql/postgres/functions2976.htm -share/doc/html/postgresql/postgres/functions3443.htm -share/doc/html/postgresql/postgres/functions3641.htm -share/doc/html/postgresql/postgres/geqo-biblio.htm -share/doc/html/postgresql/postgres/geqo.htm -share/doc/html/postgresql/postgres/geqo25594.htm -share/doc/html/postgresql/postgres/geqo25617.htm -share/doc/html/postgresql/postgres/geqo25655.htm -share/doc/html/postgresql/postgres/gist.htm -share/doc/html/postgresql/postgres/index.html -share/doc/html/postgresql/postgres/indices.htm -share/doc/html/postgresql/postgres/inherit.htm -share/doc/html/postgresql/postgres/install-win32.htm -share/doc/html/postgresql/postgres/install-win3217383.htm -share/doc/html/postgresql/postgres/install-win3217392.htm -share/doc/html/postgresql/postgres/install.htm -share/doc/html/postgresql/postgres/install17165.htm -share/doc/html/postgresql/postgres/intro.htm -share/doc/html/postgresql/postgres/intro176.htm -share/doc/html/postgresql/postgres/intro304.htm -share/doc/html/postgresql/postgres/intro60.htm -share/doc/html/postgresql/postgres/jdbc.htm -share/doc/html/postgresql/postgres/jdbc24909.htm -share/doc/html/postgresql/postgres/jdbc24921.htm -share/doc/html/postgresql/postgres/jdbc24927.htm -share/doc/html/postgresql/postgres/jdbc24935.htm -share/doc/html/postgresql/postgres/jdbc24953.htm -share/doc/html/postgresql/postgres/jdbc24990.htm -share/doc/html/postgresql/postgres/jdbc25021.htm -share/doc/html/postgresql/postgres/jdbc25026.htm -share/doc/html/postgresql/postgres/jdbc25030.htm -share/doc/html/postgresql/postgres/jdbc25056.htm -share/doc/html/postgresql/postgres/jdbc25086.htm -share/doc/html/postgresql/postgres/largeobjects.htm -share/doc/html/postgresql/postgres/largeobjects21625.htm -share/doc/html/postgresql/postgres/largeobjects21628.htm -share/doc/html/postgresql/postgres/largeobjects21707.htm -share/doc/html/postgresql/postgres/largeobjects21714.htm -share/doc/html/postgresql/postgres/largeobjects21718.htm -share/doc/html/postgresql/postgres/layout.gif -share/doc/html/postgresql/postgres/layout.htm -share/doc/html/postgresql/postgres/libpq-chapter.htm -share/doc/html/postgresql/postgres/libpq-chapter22422.htm -share/doc/html/postgresql/postgres/libpq-chapter22577.htm -share/doc/html/postgresql/postgres/libpq-chapter22724.htm -share/doc/html/postgresql/postgres/libpq-chapter22736.htm -share/doc/html/postgresql/postgres/libpq-chapter22774.htm -share/doc/html/postgresql/postgres/libpq-chapter22844.htm -share/doc/html/postgresql/postgres/libpq-chapter22857.htm -share/doc/html/postgresql/postgres/libpq-chapter22942.htm -share/doc/html/postgresql/postgres/libpq-envars.htm -share/doc/html/postgresql/postgres/libpq-threading.htm -share/doc/html/postgresql/postgres/libpqplusplus.htm -share/doc/html/postgresql/postgres/libpqplusplus23034.htm -share/doc/html/postgresql/postgres/libpqplusplus23044.htm -share/doc/html/postgresql/postgres/libpqplusplus23074.htm -share/doc/html/postgresql/postgres/libpqplusplus23179.htm -share/doc/html/postgresql/postgres/libpqplusplus23202.htm -share/doc/html/postgresql/postgres/lisp.htm -share/doc/html/postgresql/postgres/manage-ag.htm -share/doc/html/postgresql/postgres/manage-ag17914.htm -share/doc/html/postgresql/postgres/manage-ag17956.htm -share/doc/html/postgresql/postgres/manage-ag17965.htm -share/doc/html/postgresql/postgres/manage.htm -share/doc/html/postgresql/postgres/manage4814.htm -share/doc/html/postgresql/postgres/manage4838.htm -share/doc/html/postgresql/postgres/manage4880.htm -share/doc/html/postgresql/postgres/mvcc.htm -share/doc/html/postgresql/postgres/mvcc4568.htm -share/doc/html/postgresql/postgres/mvcc4621.htm -share/doc/html/postgresql/postgres/mvcc4633.htm -share/doc/html/postgresql/postgres/mvcc4646.htm -share/doc/html/postgresql/postgres/mvcc4723.htm -share/doc/html/postgresql/postgres/mvcc4744.htm -share/doc/html/postgresql/postgres/newuser.htm -share/doc/html/postgresql/postgres/notation.htm -share/doc/html/postgresql/postgres/odbc.htm -share/doc/html/postgresql/postgres/odbc24433.htm -share/doc/html/postgresql/postgres/odbc24471.htm -share/doc/html/postgresql/postgres/odbc24644.htm -share/doc/html/postgresql/postgres/odbc24666.htm -share/doc/html/postgresql/postgres/operators.htm -share/doc/html/postgresql/postgres/operators2127.htm -share/doc/html/postgresql/postgres/operators2198.htm -share/doc/html/postgresql/postgres/operators2267.htm -share/doc/html/postgresql/postgres/operators2377.htm -share/doc/html/postgresql/postgres/operators2436.htm -share/doc/html/postgresql/postgres/operators2490.htm -share/doc/html/postgresql/postgres/overview.htm -share/doc/html/postgresql/postgres/overview25194.htm -share/doc/html/postgresql/postgres/overview25219.htm -share/doc/html/postgresql/postgres/overview25347.htm -share/doc/html/postgresql/postgres/overview25403.htm -share/doc/html/postgresql/postgres/overview25457.htm -share/doc/html/postgresql/postgres/page.htm -share/doc/html/postgresql/postgres/page26805.htm -share/doc/html/postgresql/postgres/page26819.htm -share/doc/html/postgresql/postgres/part-admin.htm -share/doc/html/postgresql/postgres/part-appendix.htm -share/doc/html/postgresql/postgres/part-developer.htm -share/doc/html/postgresql/postgres/part-interfaces.htm -share/doc/html/postgresql/postgres/part-programmer.htm -share/doc/html/postgresql/postgres/part-tutorial.htm -share/doc/html/postgresql/postgres/part-user.htm -share/doc/html/postgresql/postgres/partial-index.htm -share/doc/html/postgresql/postgres/pg-options-dev.htm -share/doc/html/postgresql/postgres/pg-options.htm -share/doc/html/postgresql/postgres/pgeasy-chapter.htm -share/doc/html/postgresql/postgres/pgtcl-pgconndefaults.htm -share/doc/html/postgresql/postgres/pgtcl-pgconnect.htm -share/doc/html/postgresql/postgres/pgtcl-pgdisconnect.htm -share/doc/html/postgresql/postgres/pgtcl-pgexec.htm -share/doc/html/postgresql/postgres/pgtcl-pglisten.htm -share/doc/html/postgresql/postgres/pgtcl-pgloclose.htm -share/doc/html/postgresql/postgres/pgtcl-pglocreat.htm -share/doc/html/postgresql/postgres/pgtcl-pgloexport.htm -share/doc/html/postgresql/postgres/pgtcl-pgloimport.htm -share/doc/html/postgresql/postgres/pgtcl-pglolseek.htm -share/doc/html/postgresql/postgres/pgtcl-pgloopen.htm -share/doc/html/postgresql/postgres/pgtcl-pgloread.htm -share/doc/html/postgresql/postgres/pgtcl-pglotell.htm -share/doc/html/postgresql/postgres/pgtcl-pglounlink.htm -share/doc/html/postgresql/postgres/pgtcl-pglowrite.htm -share/doc/html/postgresql/postgres/pgtcl-pgresult.htm -share/doc/html/postgresql/postgres/pgtcl-pgselect.htm -share/doc/html/postgresql/postgres/pgtcl.htm -share/doc/html/postgresql/postgres/pgtcl23317.htm -share/doc/html/postgresql/postgres/pgtcl23321.htm -share/doc/html/postgresql/postgres/pl-perl.htm -share/doc/html/postgresql/postgres/pl-perl4533.htm -share/doc/html/postgresql/postgres/pl-perl4542.htm -share/doc/html/postgresql/postgres/ports.htm -share/doc/html/postgresql/postgres/ports16791.htm -share/doc/html/postgresql/postgres/postgres.htm -share/doc/html/postgresql/postgres/postgres.html -share/doc/html/postgresql/postgres/postmaster.htm -share/doc/html/postgresql/postgres/preface.htm -share/doc/html/postgresql/postgres/protocol.htm -share/doc/html/postgresql/postgres/protocol25770.htm -share/doc/html/postgresql/postgres/protocol25925.htm -share/doc/html/postgresql/postgres/protocol25962.htm -share/doc/html/postgresql/postgres/query.htm -share/doc/html/postgresql/postgres/query27752.htm -share/doc/html/postgresql/postgres/query27768.htm -share/doc/html/postgresql/postgres/query27790.htm -share/doc/html/postgresql/postgres/query27799.htm -share/doc/html/postgresql/postgres/query27817.htm -share/doc/html/postgresql/postgres/query27825.htm -share/doc/html/postgresql/postgres/query27844.htm -share/doc/html/postgresql/postgres/query27849.htm -share/doc/html/postgresql/postgres/query27856.htm -share/doc/html/postgresql/postgres/recovery.htm -share/doc/html/postgresql/postgres/regress.htm -share/doc/html/postgresql/postgres/regress18171.htm -share/doc/html/postgresql/postgres/regress18205.htm -share/doc/html/postgresql/postgres/regress18251.htm -share/doc/html/postgresql/postgres/release.htm -share/doc/html/postgresql/postgres/release18319.htm -share/doc/html/postgresql/postgres/release18330.htm -share/doc/html/postgresql/postgres/release18341.htm -share/doc/html/postgresql/postgres/release18352.htm -share/doc/html/postgresql/postgres/release18434.htm -share/doc/html/postgresql/postgres/release18445.htm -share/doc/html/postgresql/postgres/release18456.htm -share/doc/html/postgresql/postgres/release18497.htm -share/doc/html/postgresql/postgres/release18513.htm -share/doc/html/postgresql/postgres/release18532.htm -share/doc/html/postgresql/postgres/release18576.htm -share/doc/html/postgresql/postgres/release18598.htm -share/doc/html/postgresql/postgres/release18613.htm -share/doc/html/postgresql/postgres/release18622.htm -share/doc/html/postgresql/postgres/release18645.htm -share/doc/html/postgresql/postgres/release18659.htm -share/doc/html/postgresql/postgres/release18662.htm -share/doc/html/postgresql/postgres/release18687.htm -share/doc/html/postgresql/postgres/release18724.htm -share/doc/html/postgresql/postgres/release18731.htm -share/doc/html/postgresql/postgres/release18738.htm -share/doc/html/postgresql/postgres/release18745.htm -share/doc/html/postgresql/postgres/release18749.htm -share/doc/html/postgresql/postgres/rules.htm -share/doc/html/postgresql/postgres/rules19478.htm -share/doc/html/postgresql/postgres/rules19639.htm -share/doc/html/postgresql/postgres/rules19770.htm -share/doc/html/postgresql/postgres/rules19784.htm -share/doc/html/postgresql/postgres/runtime.htm -share/doc/html/postgresql/postgres/security.htm -share/doc/html/postgresql/postgres/security17760.htm -share/doc/html/postgresql/postgres/security17795.htm -share/doc/html/postgresql/postgres/security17819.htm -share/doc/html/postgresql/postgres/security17840.htm -share/doc/html/postgresql/postgres/signals.htm -share/doc/html/postgresql/postgres/spi-spiconnect.htm -share/doc/html/postgresql/postgres/spi-spicopytuple.htm -share/doc/html/postgresql/postgres/spi-spiexec.htm -share/doc/html/postgresql/postgres/spi-spiexecp.htm -share/doc/html/postgresql/postgres/spi-spifinish.htm -share/doc/html/postgresql/postgres/spi-spifname.htm -share/doc/html/postgresql/postgres/spi-spifnumber.htm -share/doc/html/postgresql/postgres/spi-spigetbinval.htm -share/doc/html/postgresql/postgres/spi-spigetrelname.htm -share/doc/html/postgresql/postgres/spi-spigettype.htm -share/doc/html/postgresql/postgres/spi-spigettypeid.htm -share/doc/html/postgresql/postgres/spi-spigetvalue.htm -share/doc/html/postgresql/postgres/spi-spimodifytuple.htm -share/doc/html/postgresql/postgres/spi-spipalloc.htm -share/doc/html/postgresql/postgres/spi-spipfree.htm -share/doc/html/postgresql/postgres/spi-spiprepare.htm -share/doc/html/postgresql/postgres/spi-spirepalloc.htm -share/doc/html/postgresql/postgres/spi-spisaveplan.htm -share/doc/html/postgresql/postgres/spi.htm -share/doc/html/postgresql/postgres/spi20808.htm -share/doc/html/postgresql/postgres/spi21521.htm -share/doc/html/postgresql/postgres/spi21543.htm -share/doc/html/postgresql/postgres/spi21548.htm -share/doc/html/postgresql/postgres/sql-abort.htm -share/doc/html/postgresql/postgres/sql-altergroup.htm -share/doc/html/postgresql/postgres/sql-altertable.htm -share/doc/html/postgresql/postgres/sql-alteruser.htm -share/doc/html/postgresql/postgres/sql-begin.htm -share/doc/html/postgresql/postgres/sql-close.htm -share/doc/html/postgresql/postgres/sql-cluster.htm -share/doc/html/postgresql/postgres/sql-commands.htm -share/doc/html/postgresql/postgres/sql-comment.htm -share/doc/html/postgresql/postgres/sql-commit.htm -share/doc/html/postgresql/postgres/sql-copy.htm -share/doc/html/postgresql/postgres/sql-createaggregate.htm -share/doc/html/postgresql/postgres/sql-createconstraint.htm -share/doc/html/postgresql/postgres/sql-createdatabase.htm -share/doc/html/postgresql/postgres/sql-createfunction.htm -share/doc/html/postgresql/postgres/sql-creategroup.htm -share/doc/html/postgresql/postgres/sql-createindex.htm -share/doc/html/postgresql/postgres/sql-createlanguage.htm -share/doc/html/postgresql/postgres/sql-createoperator.htm -share/doc/html/postgresql/postgres/sql-createrule.htm -share/doc/html/postgresql/postgres/sql-createsequence.htm -share/doc/html/postgresql/postgres/sql-createtable.htm -share/doc/html/postgresql/postgres/sql-createtableas.htm -share/doc/html/postgresql/postgres/sql-createtrigger.htm -share/doc/html/postgresql/postgres/sql-createtype.htm -share/doc/html/postgresql/postgres/sql-createuser.htm -share/doc/html/postgresql/postgres/sql-createview.htm -share/doc/html/postgresql/postgres/sql-declare.htm -share/doc/html/postgresql/postgres/sql-delete.htm -share/doc/html/postgresql/postgres/sql-dropaggregate.htm -share/doc/html/postgresql/postgres/sql-dropdatabase.htm -share/doc/html/postgresql/postgres/sql-dropfunction.htm -share/doc/html/postgresql/postgres/sql-dropgroup.htm -share/doc/html/postgresql/postgres/sql-dropindex.htm -share/doc/html/postgresql/postgres/sql-droplanguage.htm -share/doc/html/postgresql/postgres/sql-dropoperator.htm -share/doc/html/postgresql/postgres/sql-droprule.htm -share/doc/html/postgresql/postgres/sql-dropsequence.htm -share/doc/html/postgresql/postgres/sql-droptable.htm -share/doc/html/postgresql/postgres/sql-droptrigger.htm -share/doc/html/postgresql/postgres/sql-droptype.htm -share/doc/html/postgresql/postgres/sql-dropuser.htm -share/doc/html/postgresql/postgres/sql-dropview.htm -share/doc/html/postgresql/postgres/sql-end.htm -share/doc/html/postgresql/postgres/sql-explain.htm -share/doc/html/postgresql/postgres/sql-fetch.htm -share/doc/html/postgresql/postgres/sql-grant.htm -share/doc/html/postgresql/postgres/sql-insert.htm -share/doc/html/postgresql/postgres/sql-language.htm -share/doc/html/postgresql/postgres/sql-listen.htm -share/doc/html/postgresql/postgres/sql-load.htm -share/doc/html/postgresql/postgres/sql-lock.htm -share/doc/html/postgresql/postgres/sql-move.htm -share/doc/html/postgresql/postgres/sql-notify.htm -share/doc/html/postgresql/postgres/sql-reindex.htm -share/doc/html/postgresql/postgres/sql-reset.htm -share/doc/html/postgresql/postgres/sql-revoke.htm -share/doc/html/postgresql/postgres/sql-rollback.htm -share/doc/html/postgresql/postgres/sql-select.htm -share/doc/html/postgresql/postgres/sql-selectinto.htm -share/doc/html/postgresql/postgres/sql-set.htm -share/doc/html/postgresql/postgres/sql-show.htm -share/doc/html/postgresql/postgres/sql-truncate.htm -share/doc/html/postgresql/postgres/sql-unlisten.htm -share/doc/html/postgresql/postgres/sql-update.htm -share/doc/html/postgresql/postgres/sql-vacuum.htm -share/doc/html/postgresql/postgres/sql.htm -share/doc/html/postgresql/postgres/sql26902.htm -share/doc/html/postgresql/postgres/sql27020.htm -share/doc/html/postgresql/postgres/start.htm -share/doc/html/postgresql/postgres/start27628.htm -share/doc/html/postgresql/postgres/start27650.htm -share/doc/html/postgresql/postgres/storage.htm -share/doc/html/postgresql/postgres/syntax.htm -share/doc/html/postgresql/postgres/syntax519.htm -share/doc/html/postgresql/postgres/syntax525.htm -share/doc/html/postgresql/postgres/syntax543.htm -share/doc/html/postgresql/postgres/syntax608.htm -share/doc/html/postgresql/postgres/syntax653.htm -share/doc/html/postgresql/postgres/syntax658.htm -share/doc/html/postgresql/postgres/terminology.htm -share/doc/html/postgresql/postgres/triggers.htm -share/doc/html/postgresql/postgres/triggers20224.htm -share/doc/html/postgresql/postgres/triggers20281.htm -share/doc/html/postgresql/postgres/triggers20290.htm -share/doc/html/postgresql/postgres/trouble.htm -share/doc/html/postgresql/postgres/trouble18031.htm -share/doc/html/postgresql/postgres/trouble18048.htm -share/doc/html/postgresql/postgres/typeconv.htm -share/doc/html/postgresql/postgres/typeconv3759.htm -share/doc/html/postgresql/postgres/typeconv3822.htm -share/doc/html/postgresql/postgres/typeconv3875.htm -share/doc/html/postgresql/postgres/typeconv3895.htm -share/doc/html/postgresql/postgres/utilities.htm -share/doc/html/postgresql/postgres/xaggr.htm -share/doc/html/postgresql/postgres/xfunc.htm -share/doc/html/postgresql/postgres/xfunc19011.htm -share/doc/html/postgresql/postgres/xfunc19017.htm -share/doc/html/postgresql/postgres/xfunc19022.htm -share/doc/html/postgresql/postgres/xfunc19254.htm -share/doc/html/postgresql/postgres/xindex.htm -share/doc/html/postgresql/postgres/xoper.htm -share/doc/html/postgresql/postgres/xplang.htm -share/doc/html/postgresql/postgres/xtypes.htm -share/doc/html/postgresql/postgres/y2k.htm -share/doc/html/postgresql/programmer/arch-pg.htm -share/doc/html/postgresql/programmer/biblio.htm -share/doc/html/postgresql/programmer/bki.htm -share/doc/html/postgresql/programmer/bki8058.htm -share/doc/html/postgresql/programmer/bki8142.htm -share/doc/html/postgresql/programmer/bki8166.htm -share/doc/html/postgresql/programmer/bki8227.htm -share/doc/html/postgresql/programmer/c1486.htm -share/doc/html/postgresql/programmer/c5391.htm -share/doc/html/postgresql/programmer/c53915433.htm -share/doc/html/postgresql/programmer/c53915451.htm -share/doc/html/postgresql/programmer/c53915593.htm -share/doc/html/postgresql/programmer/c53915605.htm -share/doc/html/postgresql/programmer/c53915625.htm -share/doc/html/postgresql/programmer/c53915630.htm -share/doc/html/postgresql/programmer/c6614.htm -share/doc/html/postgresql/programmer/catalogs.gif -share/doc/html/postgresql/programmer/compiler.htm -share/doc/html/postgresql/programmer/connections.gif -share/doc/html/postgresql/programmer/copyright.htm -share/doc/html/postgresql/programmer/cvs.htm -share/doc/html/postgresql/programmer/cvs8365.htm -share/doc/html/postgresql/programmer/cvs8421.htm -share/doc/html/postgresql/programmer/dfunc.htm -share/doc/html/postgresql/programmer/dfunc1679.htm -share/doc/html/postgresql/programmer/dfunc1689.htm -share/doc/html/postgresql/programmer/docguide.htm -share/doc/html/postgresql/programmer/docguide8647.htm -share/doc/html/postgresql/programmer/docguide8678.htm -share/doc/html/postgresql/programmer/docguide8769.htm -share/doc/html/postgresql/programmer/docguide8790.htm -share/doc/html/postgresql/programmer/docguide8816.htm -share/doc/html/postgresql/programmer/docguide8953.htm -share/doc/html/postgresql/programmer/docguide9291.htm -share/doc/html/postgresql/programmer/extend.htm -share/doc/html/postgresql/programmer/extend352.htm -share/doc/html/postgresql/programmer/extend364.htm -share/doc/html/postgresql/programmer/geqo-biblio.htm -share/doc/html/postgresql/programmer/geqo.htm -share/doc/html/postgresql/programmer/geqo7079.htm -share/doc/html/postgresql/programmer/geqo7102.htm -share/doc/html/postgresql/programmer/geqo7140.htm -share/doc/html/postgresql/programmer/gist.htm -share/doc/html/postgresql/programmer/index.html -share/doc/html/postgresql/programmer/intro-pg.htm -share/doc/html/postgresql/programmer/intro-pg167.htm -share/doc/html/postgresql/programmer/jdbc.htm -share/doc/html/postgresql/programmer/jdbc6398.htm -share/doc/html/postgresql/programmer/jdbc6410.htm -share/doc/html/postgresql/programmer/jdbc6416.htm -share/doc/html/postgresql/programmer/jdbc6424.htm -share/doc/html/postgresql/programmer/jdbc6442.htm -share/doc/html/postgresql/programmer/jdbc6479.htm -share/doc/html/postgresql/programmer/jdbc6510.htm -share/doc/html/postgresql/programmer/jdbc6515.htm -share/doc/html/postgresql/programmer/jdbc6519.htm -share/doc/html/postgresql/programmer/jdbc6545.htm -share/doc/html/postgresql/programmer/jdbc6575.htm -share/doc/html/postgresql/programmer/largeobjects.htm -share/doc/html/postgresql/programmer/largeobjects3114.htm -share/doc/html/postgresql/programmer/largeobjects3117.htm -share/doc/html/postgresql/programmer/largeobjects3196.htm -share/doc/html/postgresql/programmer/largeobjects3203.htm -share/doc/html/postgresql/programmer/largeobjects3207.htm -share/doc/html/postgresql/programmer/libpq-chapter.htm -share/doc/html/postgresql/programmer/libpq-chapter3419.htm -share/doc/html/postgresql/programmer/libpq-chapter3574.htm -share/doc/html/postgresql/programmer/libpq-chapter3721.htm -share/doc/html/postgresql/programmer/libpq-chapter3733.htm -share/doc/html/postgresql/programmer/libpq-chapter3771.htm -share/doc/html/postgresql/programmer/libpq-chapter3841.htm -share/doc/html/postgresql/programmer/libpq-chapter3854.htm -share/doc/html/postgresql/programmer/libpq-chapter3939.htm -share/doc/html/postgresql/programmer/libpq-envars.htm -share/doc/html/postgresql/programmer/libpq-threading.htm -share/doc/html/postgresql/programmer/libpqplusplus.htm -share/doc/html/postgresql/programmer/libpqplusplus4031.htm -share/doc/html/postgresql/programmer/libpqplusplus4041.htm -share/doc/html/postgresql/programmer/libpqplusplus4071.htm -share/doc/html/postgresql/programmer/libpqplusplus4176.htm -share/doc/html/postgresql/programmer/libpqplusplus4199.htm -share/doc/html/postgresql/programmer/lisp.htm -share/doc/html/postgresql/programmer/notation.htm -share/doc/html/postgresql/programmer/odbc.htm -share/doc/html/postgresql/programmer/odbc5922.htm -share/doc/html/postgresql/programmer/odbc5960.htm -share/doc/html/postgresql/programmer/odbc6133.htm -share/doc/html/postgresql/programmer/odbc6155.htm -share/doc/html/postgresql/programmer/overview.htm -share/doc/html/postgresql/programmer/overview6679.htm -share/doc/html/postgresql/programmer/overview6704.htm -share/doc/html/postgresql/programmer/overview6832.htm -share/doc/html/postgresql/programmer/overview6888.htm -share/doc/html/postgresql/programmer/overview6942.htm -share/doc/html/postgresql/programmer/page.htm -share/doc/html/postgresql/programmer/page8290.htm -share/doc/html/postgresql/programmer/page8304.htm -share/doc/html/postgresql/programmer/pg-options-dev.htm -share/doc/html/postgresql/programmer/pgeasy-chapter.htm -share/doc/html/postgresql/programmer/pgtcl-pgconndefaults.htm -share/doc/html/postgresql/programmer/pgtcl-pgconnect.htm -share/doc/html/postgresql/programmer/pgtcl-pgdisconnect.htm -share/doc/html/postgresql/programmer/pgtcl-pgexec.htm -share/doc/html/postgresql/programmer/pgtcl-pglisten.htm -share/doc/html/postgresql/programmer/pgtcl-pgloclose.htm -share/doc/html/postgresql/programmer/pgtcl-pglocreat.htm -share/doc/html/postgresql/programmer/pgtcl-pgloexport.htm -share/doc/html/postgresql/programmer/pgtcl-pgloimport.htm -share/doc/html/postgresql/programmer/pgtcl-pglolseek.htm -share/doc/html/postgresql/programmer/pgtcl-pgloopen.htm -share/doc/html/postgresql/programmer/pgtcl-pgloread.htm -share/doc/html/postgresql/programmer/pgtcl-pglotell.htm -share/doc/html/postgresql/programmer/pgtcl-pglounlink.htm -share/doc/html/postgresql/programmer/pgtcl-pglowrite.htm -share/doc/html/postgresql/programmer/pgtcl-pgresult.htm -share/doc/html/postgresql/programmer/pgtcl-pgselect.htm -share/doc/html/postgresql/programmer/pgtcl.htm -share/doc/html/postgresql/programmer/pgtcl4314.htm -share/doc/html/postgresql/programmer/pgtcl4318.htm -share/doc/html/postgresql/programmer/preface.htm -share/doc/html/postgresql/programmer/programmer.htm -share/doc/html/postgresql/programmer/programmer.html -share/doc/html/postgresql/programmer/protocol.htm -share/doc/html/postgresql/programmer/protocol7255.htm -share/doc/html/postgresql/programmer/protocol7410.htm -share/doc/html/postgresql/programmer/protocol7447.htm -share/doc/html/postgresql/programmer/rules.htm -share/doc/html/postgresql/programmer/rules1139.htm -share/doc/html/postgresql/programmer/rules1270.htm -share/doc/html/postgresql/programmer/rules1284.htm -share/doc/html/postgresql/programmer/rules978.htm -share/doc/html/postgresql/programmer/signals.htm -share/doc/html/postgresql/programmer/spi-spiconnect.htm -share/doc/html/postgresql/programmer/spi-spicopytuple.htm -share/doc/html/postgresql/programmer/spi-spiexec.htm -share/doc/html/postgresql/programmer/spi-spiexecp.htm -share/doc/html/postgresql/programmer/spi-spifinish.htm -share/doc/html/postgresql/programmer/spi-spifname.htm -share/doc/html/postgresql/programmer/spi-spifnumber.htm -share/doc/html/postgresql/programmer/spi-spigetbinval.htm -share/doc/html/postgresql/programmer/spi-spigetrelname.htm -share/doc/html/postgresql/programmer/spi-spigettype.htm -share/doc/html/postgresql/programmer/spi-spigettypeid.htm -share/doc/html/postgresql/programmer/spi-spigetvalue.htm -share/doc/html/postgresql/programmer/spi-spimodifytuple.htm -share/doc/html/postgresql/programmer/spi-spipalloc.htm -share/doc/html/postgresql/programmer/spi-spipfree.htm -share/doc/html/postgresql/programmer/spi-spiprepare.htm -share/doc/html/postgresql/programmer/spi-spirepalloc.htm -share/doc/html/postgresql/programmer/spi-spisaveplan.htm -share/doc/html/postgresql/programmer/spi.htm -share/doc/html/postgresql/programmer/spi2351.htm -share/doc/html/postgresql/programmer/spi3064.htm -share/doc/html/postgresql/programmer/spi3086.htm -share/doc/html/postgresql/programmer/spi3091.htm -share/doc/html/postgresql/programmer/terminology.htm -share/doc/html/postgresql/programmer/triggers.htm -share/doc/html/postgresql/programmer/triggers1767.htm -share/doc/html/postgresql/programmer/triggers1824.htm -share/doc/html/postgresql/programmer/triggers1833.htm -share/doc/html/postgresql/programmer/xaggr.htm -share/doc/html/postgresql/programmer/xfunc.htm -share/doc/html/postgresql/programmer/xfunc511.htm -share/doc/html/postgresql/programmer/xfunc517.htm -share/doc/html/postgresql/programmer/xfunc522.htm -share/doc/html/postgresql/programmer/xfunc754.htm -share/doc/html/postgresql/programmer/xindex.htm -share/doc/html/postgresql/programmer/xoper.htm -share/doc/html/postgresql/programmer/xplang.htm -share/doc/html/postgresql/programmer/xtypes.htm -share/doc/html/postgresql/programmer/y2k.htm -share/doc/html/postgresql/tutorial/about.htm -share/doc/html/postgresql/tutorial/advanced.htm -share/doc/html/postgresql/tutorial/advanced1511.htm -share/doc/html/postgresql/tutorial/advanced1533.htm -share/doc/html/postgresql/tutorial/arch.htm -share/doc/html/postgresql/tutorial/biblio.htm -share/doc/html/postgresql/tutorial/clientserver.gif -share/doc/html/postgresql/tutorial/copyright.htm -share/doc/html/postgresql/tutorial/f17.htm -share/doc/html/postgresql/tutorial/index.html -share/doc/html/postgresql/tutorial/intro.htm -share/doc/html/postgresql/tutorial/intro172.htm -share/doc/html/postgresql/tutorial/intro300.htm -share/doc/html/postgresql/tutorial/intro56.htm -share/doc/html/postgresql/tutorial/notation.htm -share/doc/html/postgresql/tutorial/query.htm -share/doc/html/postgresql/tutorial/query1340.htm -share/doc/html/postgresql/tutorial/query1356.htm -share/doc/html/postgresql/tutorial/query1378.htm -share/doc/html/postgresql/tutorial/query1387.htm -share/doc/html/postgresql/tutorial/query1405.htm -share/doc/html/postgresql/tutorial/query1413.htm -share/doc/html/postgresql/tutorial/query1432.htm -share/doc/html/postgresql/tutorial/query1437.htm -share/doc/html/postgresql/tutorial/query1444.htm -share/doc/html/postgresql/tutorial/sql-language.htm -share/doc/html/postgresql/tutorial/sql.htm -share/doc/html/postgresql/tutorial/sql490.htm -share/doc/html/postgresql/tutorial/sql608.htm -share/doc/html/postgresql/tutorial/start.htm -share/doc/html/postgresql/tutorial/start1216.htm -share/doc/html/postgresql/tutorial/start1238.htm -share/doc/html/postgresql/tutorial/terminology.htm -share/doc/html/postgresql/tutorial/tutorial.htm -share/doc/html/postgresql/tutorial/tutorial.html -share/doc/html/postgresql/tutorial/y2k.htm -share/doc/html/postgresql/user/about.htm -share/doc/html/postgresql/user/app-createdb.htm -share/doc/html/postgresql/user/app-createlang.htm -share/doc/html/postgresql/user/app-createuser.htm -share/doc/html/postgresql/user/app-dropdb.htm -share/doc/html/postgresql/user/app-droplang.htm -share/doc/html/postgresql/user/app-dropuser.htm -share/doc/html/postgresql/user/app-ecpg.htm -share/doc/html/postgresql/user/app-initdb.htm -share/doc/html/postgresql/user/app-initlocation.htm -share/doc/html/postgresql/user/app-ipcclean.htm -share/doc/html/postgresql/user/app-pg-passwd.htm -share/doc/html/postgresql/user/app-pg-upgrade.htm -share/doc/html/postgresql/user/app-pgaccess.htm -share/doc/html/postgresql/user/app-pgadmin.htm -share/doc/html/postgresql/user/app-pgctl.htm -share/doc/html/postgresql/user/app-pgdump.htm -share/doc/html/postgresql/user/app-pgdumpall.htm -share/doc/html/postgresql/user/app-pgtclsh.htm -share/doc/html/postgresql/user/app-pgtksh.htm -share/doc/html/postgresql/user/app-postgres.htm -share/doc/html/postgresql/user/app-postmaster.htm -share/doc/html/postgresql/user/app-psql.htm -share/doc/html/postgresql/user/app-vacuumdb.htm -share/doc/html/postgresql/user/applications.htm -share/doc/html/postgresql/user/arrays.htm -share/doc/html/postgresql/user/biblio.htm -share/doc/html/postgresql/user/c4087.htm -share/doc/html/postgresql/user/c40874113.htm -share/doc/html/postgresql/user/c40874340.htm -share/doc/html/postgresql/user/c4358.htm -share/doc/html/postgresql/user/c43584371.htm -share/doc/html/postgresql/user/c4884.htm -share/doc/html/postgresql/user/c4929.htm -share/doc/html/postgresql/user/c49294939.htm -share/doc/html/postgresql/user/c49294943.htm -share/doc/html/postgresql/user/copyright.htm -share/doc/html/postgresql/user/datatype.htm -share/doc/html/postgresql/user/datatype1034.htm -share/doc/html/postgresql/user/datatype1066.htm -share/doc/html/postgresql/user/datatype1130.htm -share/doc/html/postgresql/user/datatype1645.htm -share/doc/html/postgresql/user/datatype1677.htm -share/doc/html/postgresql/user/datatype1916.htm -share/doc/html/postgresql/user/datetime-appendix.htm -share/doc/html/postgresql/user/datetime-appendix16981.htm -share/doc/html/postgresql/user/environ.htm -share/doc/html/postgresql/user/functions.htm -share/doc/html/postgresql/user/functions2589.htm -share/doc/html/postgresql/user/functions2729.htm -share/doc/html/postgresql/user/functions2872.htm -share/doc/html/postgresql/user/functions2972.htm -share/doc/html/postgresql/user/functions3439.htm -share/doc/html/postgresql/user/functions3637.htm -share/doc/html/postgresql/user/index.html -share/doc/html/postgresql/user/indices.htm -share/doc/html/postgresql/user/inherit.htm -share/doc/html/postgresql/user/intro.htm -share/doc/html/postgresql/user/intro172.htm -share/doc/html/postgresql/user/intro300.htm -share/doc/html/postgresql/user/intro56.htm -share/doc/html/postgresql/user/manage.htm -share/doc/html/postgresql/user/manage4810.htm -share/doc/html/postgresql/user/manage4834.htm -share/doc/html/postgresql/user/manage4876.htm -share/doc/html/postgresql/user/mvcc.htm -share/doc/html/postgresql/user/mvcc4564.htm -share/doc/html/postgresql/user/mvcc4617.htm -share/doc/html/postgresql/user/mvcc4629.htm -share/doc/html/postgresql/user/mvcc4642.htm -share/doc/html/postgresql/user/mvcc4719.htm -share/doc/html/postgresql/user/mvcc4740.htm -share/doc/html/postgresql/user/notation.htm -share/doc/html/postgresql/user/operators.htm -share/doc/html/postgresql/user/operators2123.htm -share/doc/html/postgresql/user/operators2194.htm -share/doc/html/postgresql/user/operators2263.htm -share/doc/html/postgresql/user/operators2373.htm -share/doc/html/postgresql/user/operators2432.htm -share/doc/html/postgresql/user/operators2486.htm -share/doc/html/postgresql/user/partial-index.htm -share/doc/html/postgresql/user/pl-perl.htm -share/doc/html/postgresql/user/pl-perl4529.htm -share/doc/html/postgresql/user/pl-perl4538.htm -share/doc/html/postgresql/user/preface.htm -share/doc/html/postgresql/user/sql-abort.htm -share/doc/html/postgresql/user/sql-altergroup.htm -share/doc/html/postgresql/user/sql-altertable.htm -share/doc/html/postgresql/user/sql-alteruser.htm -share/doc/html/postgresql/user/sql-begin.htm -share/doc/html/postgresql/user/sql-close.htm -share/doc/html/postgresql/user/sql-cluster.htm -share/doc/html/postgresql/user/sql-commands.htm -share/doc/html/postgresql/user/sql-comment.htm -share/doc/html/postgresql/user/sql-commit.htm -share/doc/html/postgresql/user/sql-copy.htm -share/doc/html/postgresql/user/sql-createaggregate.htm -share/doc/html/postgresql/user/sql-createconstraint.htm -share/doc/html/postgresql/user/sql-createdatabase.htm -share/doc/html/postgresql/user/sql-createfunction.htm -share/doc/html/postgresql/user/sql-creategroup.htm -share/doc/html/postgresql/user/sql-createindex.htm -share/doc/html/postgresql/user/sql-createlanguage.htm -share/doc/html/postgresql/user/sql-createoperator.htm -share/doc/html/postgresql/user/sql-createrule.htm -share/doc/html/postgresql/user/sql-createsequence.htm -share/doc/html/postgresql/user/sql-createtable.htm -share/doc/html/postgresql/user/sql-createtableas.htm -share/doc/html/postgresql/user/sql-createtrigger.htm -share/doc/html/postgresql/user/sql-createtype.htm -share/doc/html/postgresql/user/sql-createuser.htm -share/doc/html/postgresql/user/sql-createview.htm -share/doc/html/postgresql/user/sql-declare.htm -share/doc/html/postgresql/user/sql-delete.htm -share/doc/html/postgresql/user/sql-dropaggregate.htm -share/doc/html/postgresql/user/sql-dropdatabase.htm -share/doc/html/postgresql/user/sql-dropfunction.htm -share/doc/html/postgresql/user/sql-dropgroup.htm -share/doc/html/postgresql/user/sql-dropindex.htm -share/doc/html/postgresql/user/sql-droplanguage.htm -share/doc/html/postgresql/user/sql-dropoperator.htm -share/doc/html/postgresql/user/sql-droprule.htm -share/doc/html/postgresql/user/sql-dropsequence.htm -share/doc/html/postgresql/user/sql-droptable.htm -share/doc/html/postgresql/user/sql-droptrigger.htm -share/doc/html/postgresql/user/sql-droptype.htm -share/doc/html/postgresql/user/sql-dropuser.htm -share/doc/html/postgresql/user/sql-dropview.htm -share/doc/html/postgresql/user/sql-end.htm -share/doc/html/postgresql/user/sql-explain.htm -share/doc/html/postgresql/user/sql-fetch.htm -share/doc/html/postgresql/user/sql-grant.htm -share/doc/html/postgresql/user/sql-insert.htm -share/doc/html/postgresql/user/sql-listen.htm -share/doc/html/postgresql/user/sql-load.htm -share/doc/html/postgresql/user/sql-lock.htm -share/doc/html/postgresql/user/sql-move.htm -share/doc/html/postgresql/user/sql-notify.htm -share/doc/html/postgresql/user/sql-reindex.htm -share/doc/html/postgresql/user/sql-reset.htm -share/doc/html/postgresql/user/sql-revoke.htm -share/doc/html/postgresql/user/sql-rollback.htm -share/doc/html/postgresql/user/sql-select.htm -share/doc/html/postgresql/user/sql-selectinto.htm -share/doc/html/postgresql/user/sql-set.htm -share/doc/html/postgresql/user/sql-show.htm -share/doc/html/postgresql/user/sql-truncate.htm -share/doc/html/postgresql/user/sql-unlisten.htm -share/doc/html/postgresql/user/sql-update.htm -share/doc/html/postgresql/user/sql-vacuum.htm -share/doc/html/postgresql/user/storage.htm -share/doc/html/postgresql/user/syntax.htm -share/doc/html/postgresql/user/syntax515.htm -share/doc/html/postgresql/user/syntax521.htm -share/doc/html/postgresql/user/syntax539.htm -share/doc/html/postgresql/user/syntax604.htm -share/doc/html/postgresql/user/syntax649.htm -share/doc/html/postgresql/user/syntax654.htm -share/doc/html/postgresql/user/terminology.htm -share/doc/html/postgresql/user/typeconv.htm -share/doc/html/postgresql/user/typeconv3755.htm -share/doc/html/postgresql/user/typeconv3818.htm -share/doc/html/postgresql/user/typeconv3871.htm -share/doc/html/postgresql/user/typeconv3891.htm -share/doc/html/postgresql/user/user.htm -share/doc/html/postgresql/user/user.html -share/doc/html/postgresql/user/utilities.htm -share/doc/html/postgresql/user/y2k.htm -share/doc/postgresql/FAQ -share/doc/postgresql/FAQ_DEV -share/doc/postgresql/README.Charsets -share/doc/postgresql/README.fsync -share/doc/postgresql/README.inet -share/doc/postgresql/README.locale -share/doc/postgresql/README.mb -share/doc/postgresql/README.mb.jp -share/doc/postgresql/TODO -share/doc/postgresql/bug.template -share/doc/postgresql/internals.ps -share/postgresql/global1.bki.source -share/postgresql/global1.description -share/postgresql/local1_template1.bki.source -share/postgresql/local1_template1.description -share/postgresql/pg_geqo.sample -share/postgresql/pg_hba.conf.sample -share/postgresql/pg_ident.conf.sample -share/postgresql/pg_options.sample -share/postgresql/postmaster.opts.default.sample -share/postgresql/profile.pgsql.sample +@comment $NetBSD: PLIST,v 1.19 2001/05/14 14:52:39 jlam Exp $ +@comment this plist intentionally left empty diff --git a/databases/postgresql/pkg/PLIST.dirrm b/databases/postgresql/pkg/PLIST.dirrm deleted file mode 100644 index cf16f6c57fc..00000000000 --- a/databases/postgresql/pkg/PLIST.dirrm +++ /dev/null @@ -1,17 +0,0 @@ -@comment $NetBSD: PLIST.dirrm,v 1.3 2000/07/15 01:23:57 jlam Exp $ -@dirrm share/postgresql -@dirrm share/doc/postgresql -@dirrm share/doc/html/postgresql/user -@dirrm share/doc/html/postgresql/tutorial -@dirrm share/doc/html/postgresql/programmer -@dirrm share/doc/html/postgresql/postgres -@dirrm share/doc/html/postgresql/admin -@dirrm share/doc/html/postgresql -@dirrm include/pgsql/utils -@dirrm include/pgsql/libpq -@dirrm include/pgsql/libpq++ -@dirrm include/pgsql/lib -@dirrm include/pgsql/executor -@dirrm include/pgsql/commands -@dirrm include/pgsql/access -@dirrm include/pgsql diff --git a/databases/postgresql/pkg/PLIST.spi b/databases/postgresql/pkg/PLIST.spi deleted file mode 100644 index 0a6d42dcefc..00000000000 --- a/databases/postgresql/pkg/PLIST.spi +++ /dev/null @@ -1,89 +0,0 @@ -@comment $NetBSD: PLIST.spi,v 1.1 2000/07/15 01:23:58 jlam Exp $ -include/pgsql/access/funcindex.h -include/pgsql/access/heapam.h -include/pgsql/access/htup.h -include/pgsql/access/ibit.h -include/pgsql/access/itup.h -include/pgsql/access/relscan.h -include/pgsql/access/sdir.h -include/pgsql/access/skey.h -include/pgsql/access/strat.h -include/pgsql/access/transam.h -include/pgsql/access/tupdesc.h -include/pgsql/access/tupmacs.h -include/pgsql/access/xact.h -include/pgsql/catalog/catname.h -include/pgsql/catalog/pg_am.h -include/pgsql/catalog/pg_attribute.h -include/pgsql/catalog/pg_class.h -include/pgsql/catalog/pg_index.h -include/pgsql/catalog/pg_language.h -include/pgsql/catalog/pg_proc.h -include/pgsql/catalog/pg_type.h -include/pgsql/executor/execdefs.h -include/pgsql/executor/execdesc.h -include/pgsql/executor/executor.h -include/pgsql/executor/hashjoin.h -include/pgsql/executor/tuptable.h -include/pgsql/lib/fstack.h -include/pgsql/nodes/execnodes.h -include/pgsql/nodes/memnodes.h -include/pgsql/nodes/nodes.h -include/pgsql/nodes/params.h -include/pgsql/nodes/parsenodes.h -include/pgsql/nodes/pg_list.h -include/pgsql/nodes/plannodes.h -include/pgsql/nodes/primnodes.h -include/pgsql/nodes/relation.h -include/pgsql/parser/parse_node.h -include/pgsql/parser/parse_type.h -include/pgsql/rewrite/prs2lock.h -include/pgsql/storage/block.h -include/pgsql/storage/buf.h -include/pgsql/storage/buf_internals.h -include/pgsql/storage/buffile.h -include/pgsql/storage/bufmgr.h -include/pgsql/storage/bufpage.h -include/pgsql/storage/fd.h -include/pgsql/storage/ipc.h -include/pgsql/storage/item.h -include/pgsql/storage/itemid.h -include/pgsql/storage/itemptr.h -include/pgsql/storage/lmgr.h -include/pgsql/storage/lock.h -include/pgsql/storage/off.h -include/pgsql/storage/page.h -include/pgsql/storage/shmem.h -include/pgsql/storage/sinval.h -include/pgsql/storage/sinvaladt.h -include/pgsql/storage/spin.h -include/pgsql/tcop/dest.h -include/pgsql/tcop/pquery.h -include/pgsql/tcop/tcopprot.h -include/pgsql/tcop/utility.h -include/pgsql/utils/array.h -include/pgsql/utils/builtins.h -include/pgsql/utils/date.h -include/pgsql/utils/datetime.h -include/pgsql/utils/datum.h -include/pgsql/utils/fcache.h -include/pgsql/utils/hsearch.h -include/pgsql/utils/inet.h -include/pgsql/utils/int8.h -include/pgsql/utils/lztext.h -include/pgsql/utils/memutils.h -include/pgsql/utils/nabstime.h -include/pgsql/utils/numeric.h -include/pgsql/utils/pg_lzcompress.h -include/pgsql/utils/portal.h -include/pgsql/utils/rel.h -include/pgsql/utils/syscache.h -include/pgsql/utils/timestamp.h -include/pgsql/utils/tqual.h -include/pgsql/utils/varbit.h -@dirrm include/pgsql/tcop -@dirrm include/pgsql/storage -@dirrm include/pgsql/rewrite -@dirrm include/pgsql/parser -@dirrm include/pgsql/nodes -@dirrm include/pgsql/catalog |