From 62e1bb44328db7be12796334d8be63e24d48df05 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Sat, 4 Jan 2003 01:10:15 +0000 Subject: Update PostgreSQL to 7.3.1[1]. Fixes builds for spac64. Many speed, security, and feature additions. Reduce diffs between postgresql-devel port. Re-initdb required when upgrading from previous release. See release notes for details. Schemas added are system catalogs updated. ::braces for impact:: http://developer.postgresql.org/docs/postgres/release.html#RELEASE-7-3-1 PR: ports/46701 Submitted by: girgen@pingpong.net --- databases/postgresql92-server/Makefile | 168 +++++--- databases/postgresql92-server/distinfo | 6 +- databases/postgresql92-server/files/502.pgsql | 16 +- databases/postgresql92-server/files/dot.profile.in | 7 + databases/postgresql92-server/files/patch-aj | 118 ----- .../files/patch-src::include::port::freebsd.h | 10 + databases/postgresql92-server/files/pgsql.sh.tmpl | 25 +- .../postgresql92-server/files/post-install-notes | 2 +- databases/postgresql92-server/pkg-install | 31 +- databases/postgresql92-server/pkg-message | 2 +- databases/postgresql92-server/pkg-message.client | 2 +- databases/postgresql92-server/pkg-plist | 473 ++++++++++++++++++--- .../scripts/configure.postgresql | 167 -------- 13 files changed, 597 insertions(+), 430 deletions(-) delete mode 100644 databases/postgresql92-server/files/patch-aj create mode 100644 databases/postgresql92-server/files/patch-src::include::port::freebsd.h delete mode 100644 databases/postgresql92-server/scripts/configure.postgresql (limited to 'databases/postgresql92-server') diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 1ed2acfdfc72..118195daa744 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -6,27 +6,32 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.2.3 +PORTVERSION?= 7.3.1 CATEGORIES?= databases -MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ +MASTER_SITES= ftp://ftp3.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ + ftp://ftp5.us.postgresql.org/pub/PostgreSQL/%SUBDIR%/ \ + ftp://ftp10.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ + ftp://ftp13.us.postgresql.org/mirror/postresql/%SUBDIR%/ \ + ftp://ftp8.us.postgresql.org/pub/pgsql/%SUBDIR%/ \ + ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/%SUBDIR%/ \ ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \ ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.chg.ru/pub/databases/postgresql/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/ \ - ftp://ftp2.ch.postgresql.org/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/%SUBDIR%/ \ - ftp://ftp.us.postgresql.org/%SUBDIR%/ + ftp://ftp.us.postgresql.org/%SUBDIR%/ \ + ftp://ftp.postgresql.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= source/v${PORTVERSION} DISTFILES= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} + postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} \ + postgresql-test-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@pingpong.net WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION} DIST_SUBDIR= postgresql -USE_SUBMAKE= yes USE_GMAKE= YES GNU_CONFIGURE= YES @@ -35,41 +40,100 @@ GNU_CONFIGURE= YES MD5_FILE= ${.CURDIR}/../postgresql7/distinfo .else +## POSTGRESQL_SUBPORTS stops here ## The rest of this file is for normal base installation INSTALLS_SHLIB= YES -CONFIGURE_ARGS= --enable-locale --enable-syslog --with-CXX \ - --docdir=${PREFIX}/share/doc --with-libdir=${LOCALBASE}/lib \ +CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include .if !defined(WITHOUT_GNUGETOPT) -LDFLAGS+= -L${LOCALBASE}/lib -lgnugetopt -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt .endif -# if you want localized messages, make -DWITH_GETTEXT -# WARNING: this seems to require relinking binaries depending on -# libpq.so, including for example mod_php and tcl. -.if defined(WITH_GETTEXT) +.if !defined(WITHOUT_GETTEXT) CONFIGURE_ARGS+=--enable-nls -CONFIGURE_ENV+= "LIBS=-lintl" -LDFLAGS+= -L${LOCALBASE}/lib -lintl LIB_DEPENDS+= intl.4:${PORTSDIR}/devel/gettext PLIST_SUB+= GETTEXT="" .else +CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= GETTEXT="@comment " .endif +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS+= -O3 -funroll-loops +.endif + +.if defined(WITH_DEBUG) && defined(WITH_STRIPBIN) + @${ECHO} "WITH_DEBUG and WITH_STRIPBIN are mutually exclusive tunables." + @${ECHO} "Please choose one or the other." + @exit ${FALSE} +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + +.if defined(WITH_STRIPBIN) +INSTALL_TARGET= install-strip +.endif + .if !defined(WITHOUT_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}" .endif +.if defined(WITHOUT_SERVER) +PKGMESSAGE= ${PKGDIR}/pkg-message.client +PLIST_SUB+= SERVER="@comment " +PKGNAMESUFFIX= -client +.else +SERVERBINARIES+= postgres +PLIST_SUB+= SERVER="" +INSTALL_TARGET= install install-all-headers +.endif + +.if defined(WITH_MIT_KRB5) && defined(WITH_HEIMDAL_KRB5) + @${ECHO} "WITH_MIT_KRB5 and WITH_HEIMDAL_KRB5 are mutually exclusive." + @${ECHO} "Please choose one or the other." + @exit 1 +.endif + +.if defined(WITH_MIT_KRB5) +KRB5CONF= ${LOCALBASE}/bin/krb5-config +.if !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in your local base, please verify that" + @${ECHO} "security/krb5 is installed or undefine the WITH_MIT_KRB5 tunable." + @exit 1 +.endif +WITH_KRB5= yes +.endif + +.if defined(WITH_HEIMDAL_KRB5) +KRB5CONF= /usr/bin/krb5-config +.if !exists(${KRB5CONFIG}) + @${ECHO} "Unable to find krb5-config in the base system. Undefine" + @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" + @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." + @exit 1 +.endif +LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 +WITH_KRB5= yes +.endif + +.if defined(WITH_KRB5) +CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`" +LDFLAGS+= `${KRB5CONF} --libs krb5` +.endif + +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS+= -O3 -funroll-loops +.endif + MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ - pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_passwd.1 pg_restore.1 \ - pgaccess.1 pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \ + pg_ctl.1 pg_dump.1 pg_dumpall.1 pg_restore.1 \ + pgtclsh.1 pgtksh.1 postgres.1 postmaster.1 psql.1 \ vacuumdb.1 MAN7= abort.7 alter_group.7 alter_table.7 alter_user.7 analyze.7 \ begin.7 checkpoint.7 close.7 cluster.7 comment.7 commit.7 copy.7 \ @@ -90,52 +154,45 @@ MAN7= abort.7 alter_group.7 alter_table.7 alter_user.7 analyze.7 \ set_session_authorization.7 \ truncate.7 unlisten.7 update.7 vacuum.7 -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - WRKDIR="${WRKDIR}" \ - FILESDIR="${FILESDIR}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - DISTNAME="${DISTNAME}" - -# We must .include here because we need the Makefile.inc @ pre-install -# to determine the correct plist. -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif +pre-everything:: + @${SH} ${PKGDIR}/pkg-install ${PORTNAME} BACKUPWARNING + @${ECHO} "" + @${ECHO} "${PORTNAME} has several tunables that can be used to configure PostgreSQL:" + @${ECHO} "" + @${ECHO} " WITHOUT_GNUGETOPT Don't install GNU getopt (will" + @${ECHO} " still be used if already installed)" + @${ECHO} " WITHOUT_GETTEXT Skips building with support for" + @${ECHO} " internationalized error messages" + @${ECHO} " WITHOUT_SERVER Installs the headers and libraries for" + @${ECHO} " PostgreSQL clients" + @${ECHO} " WITHOUT_SSL Builds without OpenSSL support" + @${ECHO} " WITH_MIT_KRB5 Builds with MIT's kerberos support" + @${ECHO} " WITH_HEIMDAL_KRB5 Builds with Heimdal's kerberos support" + @${ECHO} " WITH_OPTIMIZED_CFLAGS Builds with compiler optimizations (-O3)" + @${ECHO} " WITH_DEBUG Builds with debugging symbols" + @${ECHO} " WITH_STRIPBIN Installs stripped binaries" + @${ECHO} "" .if defined(WITHOUT_SERVER) -PKGMESSAGE= ${PKGDIR}/pkg-message.client -PLIST_SUB+= SERVER="@comment " -.else -PLIST_SUB+= SERVER="" -.endif - -.if defined(WITHOUT_MULTIBYTE) -PLIST_SUB+= MULTIBYTE="@comment " +do-install: + @ cd ${WRKSRC}; \ + ${GMAKE} -C src/bin ${INSTALL_TARGET} ;\ + ${GMAKE} -C src/include ${INSTALL_TARGET} ;\ + ${GMAKE} -C src/interfaces ${INSTALL_TARGET} ;\ + ${GMAKE} -C doc ${INSTALL_TARGET} .else -PLIST_SUB+= MULTIBYTE="" -CONFIGURE_ARGS+=--enable-multibyte=${MULTIBYTE_ENCODING} -.endif - -pre-everything:: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - pre-install: -.if !defined(WITHOUT_SERVER) @ ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .endif -post-build: - @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/odbc odbc-drop.sql - post-install: @ ${MKDIR} ${PREFIX}/share/postgresql ;\ ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\ ${SED} "s|/usr/local|${PREFIX}|g" |\ tee ${PREFIX}/share/postgresql/post-install-notes .if !defined(DEBUG_FLAGS) -.for file in ecpg pg_dump pg_id pg_passwd pg_restore psql +.for file in ecpg pg_dump pg_id pg_restore psql ${SERVERBINARIES} @ strip ${PREFIX}/bin/${file} .endfor .endif @@ -159,19 +216,8 @@ post-install: ${INSTALL_DATA} ${PREFIX}/share/postgresql/post-install-notes ~pgsql/. ;\ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\ ${INSTALL_DATA} ${FILESDIR}/502.pgsql \ - ${WRKSRC}/src/interfaces/odbc/odbc.sql \ - ${WRKSRC}/src/interfaces/odbc/odbc-drop.sql \ ${PREFIX}/share/postgresql -.else -do-install: - @ cd ${WRKSRC}; \ - ${GMAKE} -C src/bin install ;\ - ${GMAKE} -C src/include install ;\ - ${GMAKE} -C src/interfaces install .endif -post-clean: - @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - .include .endif diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo index 1599cc4ea726..4b5235d47bd1 100644 --- a/databases/postgresql92-server/distinfo +++ b/databases/postgresql92-server/distinfo @@ -1,3 +1,3 @@ -MD5 (postgresql/postgresql-base-7.2.3.tar.gz) = 246eba52490f1defd5a8592d871e4201 -MD5 (postgresql/postgresql-opt-7.2.3.tar.gz) = e3f9dbd600ad236021a1ce107ea7b8a7 -MD5 (postgresql/postgresql-docs-7.2.3.tar.gz) = 2640f7f81056cc384afb5bf8b746f4fe +MD5 (postgresql/postgresql-base-7.3.1.tar.gz) = d31f4be7ada55e4914d1a9134e4441c7 +MD5 (postgresql/postgresql-opt-7.3.1.tar.gz) = 65e3db9df55b71b504a2f385da231de8 +MD5 (postgresql/postgresql-docs-7.3.1.tar.gz) = 42384cb2ded505243878231acb779bd6 diff --git a/databases/postgresql92-server/files/502.pgsql b/databases/postgresql92-server/files/502.pgsql index c372163f7407..84cdb9b5ad45 100644 --- a/databases/postgresql92-server/files/502.pgsql +++ b/databases/postgresql92-server/files/502.pgsql @@ -6,7 +6,7 @@ # Put this in /usr/local/etc/periodic/daily, and it will be run # every night # -# Written by Palle Girgensohn +# Written by Palle Girgensohn # # In public domain, do what you like with it, # and use it at your own risk... :) @@ -34,9 +34,13 @@ PGDUMP_ARGS=${PGDUMP_ARGS:-"-b -F c"} # The directory where the backups will reside. # ${HOME} is pgsql's home directory -# PGBACKUPDIR=${PGBACKUPDIR:-${HOME}/backups} +# If you want to keep a history of database backups, set +# PGBACKUP_SAVE_DAYS in ~pgsql/.profile to the number of days. This is +# used as "find ... -mtime +${PGBACKUP_SAVE_DAYS} -delete", see below +PGBACKUP_SAVE_DAYS=${PGBACKUP_SAVE_DAYS:-7} + # PGBACKUPDIR must be writeable by user pgsql # ~pgsql is just that under normal circumstances, # but this might not be where you want the backups... @@ -53,11 +57,12 @@ echo "PostgreSQL maintenance" umask 077 dbnames=`psql -q -t -A -d template1 -c "SELECT datname FROM pg_database WHERE datname != 'template0'"` rc=$? -file=${PGBACKUPDIR}/pgglobals_`date "+%Y%m%d"` +now=`date "+%Y-%m-%dT%H:%M:%S"` +file=${PGBACKUPDIR}/pgglobals_${now} pg_dumpall -g | gzip -9 > ${file}.gz for db in ${dbnames}; do echo -n " $db" - file=${PGBACKUPDIR}/pgdump_${db}_`date "+%Y%m%d"` + file=${PGBACKUPDIR}/pgdump_${db}_${now} pg_dump ${PGDUMP_ARGS} -f ${file} ${db} [ $? -gt 0 ] && rc=3 done @@ -78,6 +83,7 @@ then fi # cleaning up old data -find ${PGBACKUPDIR} -name 'pgdump_*' -a -atime +7 -delete +find ${PGBACKUPDIR} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + -a -mtime +${PGBACKUP_SAVE_DAYS} -delete exit $rc diff --git a/databases/postgresql92-server/files/dot.profile.in b/databases/postgresql92-server/files/dot.profile.in index 96344d533921..6da911dfa6fa 100644 --- a/databases/postgresql92-server/files/dot.profile.in +++ b/databases/postgresql92-server/files/dot.profile.in @@ -8,6 +8,13 @@ PGDATA=${HOME}/data export PATH PGLIB PGDATA +# if you use the periodic script from share/postgresql/502.pgsql, you +# can set these +#PGDUMP_ARGS="-b -F c" +#PGBACKUPDIR=${HOME}/backups +#PGBACKUP_SAVE_DAYS=7 +#export PGBACKUPDIR PGDUMP_ARGS PGBACKUP_SAVE_DAYS + #You might want to set some locale stuff here #PGDATESTYLE=ISO #LC_ALL=sv_SE.ISO_8859-1 diff --git a/databases/postgresql92-server/files/patch-aj b/databases/postgresql92-server/files/patch-aj deleted file mode 100644 index 94c0d6d79991..000000000000 --- a/databases/postgresql92-server/files/patch-aj +++ /dev/null @@ -1,118 +0,0 @@ ---- src/bin/pg_passwd/pg_passwd.c.orig Sat Mar 24 01:54:55 2001 -+++ src/bin/pg_passwd/pg_passwd.c Wed Apr 18 04:54:14 2001 -@@ -7,6 +7,12 @@ - #include - #include - #include -+ -+#if defined(__FreeBSD__) -+#include /* defines _PASSWORD_LEN, max # of characters in a password */ -+#include /* gettimeofday for password salt */ -+#endif -+ - #define issaltchar(c) (isalnum((unsigned char) (c)) || (c) == '.' || (c) == '/') - - #ifdef HAVE_TERMIOS_H -@@ -23,18 +29,31 @@ - * We assume that the output of crypt(3) is always 13 characters, - * and that at most 8 characters can usefully be sent to it. - * -+ * For FreeBSD, take these values from /usr/include/pwd.h - * Postgres usernames are assumed to be less than NAMEDATALEN chars long. - */ -+#if defined(__FreeBSD__) -+#define CLEAR_PASSWD_LEN _PASSWORD_LEN -+#define CRYPTED_PASSWD_LEN _PASSWORD_LEN /* max length, not containing NULL */ -+#define SALT_LEN 10 -+#else - #define CLEAR_PASSWD_LEN 8 /* not including null */ - #define CRYPTED_PASSWD_LEN 13 /* not including null */ -+#define SALT_LEN 3 -+#endif -+ -+static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ -+ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -+ - - const char *progname; - - static void usage(void); -+static void to64(char *s, long v, int n); - static void read_pwd_file(char *filename); - static void write_pwd_file(char *filename, char *bkname); - static void encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1], -- char salt[3], -+ char salt[SALT_LEN], - char passwd[CRYPTED_PASSWD_LEN + 1]); - static void prompt_for_username(char *username); - static void prompt_for_password(char *prompt, char *password); -@@ -47,6 +66,15 @@ - printf("Report bugs to .\n"); - } - -+static void -+to64(char *s, long v, int n) -+{ -+ while (--n >= 0) { -+ *s++ = itoa64[v&0x3f]; -+ v >>= 6; -+ } -+} -+ - typedef struct - { - char *uname; -@@ -154,7 +182,7 @@ - if (q != NULL) - *(q++) = '\0'; - -- if (strlen(p) != CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0) -+ if (strlen(p) > CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0) - { - fprintf(stderr, "%s:%d: warning: invalid password length\n", - filename, npwds + 1); -@@ -221,15 +249,25 @@ - - static void - encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1], -- char salt[3], -+ char salt[SALT_LEN], - char passwd[CRYPTED_PASSWD_LEN + 1]) - { -+#if !defined(__FreeBSD__) - int n; -- -+#endif - /* select a salt, if not already given */ - if (salt[0] == '\0') - { -+#if defined(__FreeBSD__) -+ struct timeval tv; -+ srandomdev(); -+ gettimeofday(&tv,0); -+ to64(&salt[0], random(), 3); -+ to64(&salt[3], tv.tv_usec, 3); -+ to64(&salt[6], tv.tv_sec, 2); -+ salt[8] = '\0'; - srand(time(NULL)); -+#else - do - { - n = rand() % 256; -@@ -241,6 +279,7 @@ - } while (!issaltchar(n)); - salt[1] = n; - salt[2] = '\0'; -+#endif - } - - /* get encrypted password */ -@@ -335,7 +374,7 @@ - char *filename; - char bkname[MAXPGPATH]; - char username[NAMEDATALEN]; -- char salt[3]; -+ char salt[SALT_LEN]; - char key[CLEAR_PASSWD_LEN + 1], - key2[CLEAR_PASSWD_LEN + 1]; - char e_passwd[CRYPTED_PASSWD_LEN + 1]; diff --git a/databases/postgresql92-server/files/patch-src::include::port::freebsd.h b/databases/postgresql92-server/files/patch-src::include::port::freebsd.h new file mode 100644 index 000000000000..01891af61d0e --- /dev/null +++ b/databases/postgresql92-server/files/patch-src::include::port::freebsd.h @@ -0,0 +1,10 @@ +--- src/include/port/freebsd.h.orig Wed Jan 1 16:43:31 2003 ++++ src/include/port/freebsd.h Wed Jan 1 16:43:39 2003 +@@ -7,6 +7,7 @@ + #if defined(__sparc__) + #define NEED_SPARC_TAS_ASM + #define HAS_TEST_AND_SET ++typedef unsigned char slock_t; + #endif + + #if defined(__alpha__) diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl index d67d9b642f1b..98311c868ac3 100644 --- a/databases/postgresql92-server/files/pgsql.sh.tmpl +++ b/databases/postgresql92-server/files/pgsql.sh.tmpl @@ -3,38 +3,47 @@ # $FreeBSD$ # # For postmaster startup options, edit $PGDATA/postgresql.conf +# +# Note that PGDATA is set in ~pgsql/.profile, don't try to manipulate it here! +# PREFIX=%%PREFIX%% PGBIN=${PREFIX}/bin +logfile=/var/log/pgsql case $1 in start) - [ -d ${PREFIX}/lib ] && /sbin/ldconfig -m ${PREFIX}/lib - touch /var/log/pgsql - chmod 600 /var/log/pgsql - chown pgsql:pgsql /var/log/pgsql + touch ${logfile} + chmod 600 ${logfile} + chown pgsql:pgsql ${logfile} [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - '[ -d ${PGDATA} ] && exec %%PREFIX%%/bin/pg_ctl start -s -w -l /var/log/pgsql' + "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w -l ${logfile}" echo -n ' pgsql' } ;; stop) [ -x ${PGBIN}/pg_ctl ] && { - su -l pgsql -c 'exec %%PREFIX%%/bin/pg_ctl stop -s -m fast' + su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast" echo -n ' pgsql' } ;; +restart) + [ -x ${PGBIN}/pg_ctl ] && { + exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast" + } + ;; + status) [ -x ${PGBIN}/pg_ctl ] && { - exec su -l pgsql -c 'exec %%PREFIX%%/bin/pg_ctl status' + exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl status" } ;; *) - echo "usage: `basename $0` {start|stop|status}" >&2 + echo "usage: `basename $0` {start|stop|restart|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql92-server/files/post-install-notes b/databases/postgresql92-server/files/post-install-notes index cdf343002074..037eec446deb 100644 --- a/databases/postgresql92-server/files/post-install-notes +++ b/databases/postgresql92-server/files/post-install-notes @@ -22,7 +22,7 @@ ruby-postgres, py-PyGreSQL For client access to PostgreSQL databases using the ruby & python languages. -postgresql-plperl, postgresql-pltcl & postgresql-plruby +p5-postgresql-plperl, postgresql-pltcl & postgresql-plruby For using perl5, tcl & ruby as procedural languages. etc etc... diff --git a/databases/postgresql92-server/pkg-install b/databases/postgresql92-server/pkg-install index ffcd42a5796c..a4bde386e5c5 100644 --- a/databases/postgresql92-server/pkg-install +++ b/databases/postgresql92-server/pkg-install @@ -6,20 +6,24 @@ PATH=/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/pgsql -case $2 in -PRE-INSTALL) +backupwarning() { echo " -=========== BACKUP YOUR DATA! ============= -As always, backup your data before -upgrading. If the upgrade leads to a higher -minor revision (e.g. 7.1.x -> 7.2), a dump -and restore of all databases is -required. This is *NOT* done by the port! - -Press ctrl-C *now* if you need to pg_dump. -=========================================== + =========== BACKUP YOUR DATA! ============= + As always, backup your data before + upgrading. If the upgrade leads to a higher + minor revision (e.g. 7.2.x -> 7.3), a dump + and restore of all databases is + required. This is *NOT* done by the port! + + Press ctrl-C *now* if you need to pg_dump. + =========================================== " - sleep 3 + sleep 5 +} + +case $2 in +PRE-INSTALL) + backupwarning USER=pgsql GROUP=${USER} UID=70 @@ -55,4 +59,7 @@ Press ctrl-C *now* if you need to pg_dump. fi ;; +BACKUPWARNING) + backupwarning + ;; esac diff --git a/databases/postgresql92-server/pkg-message b/databases/postgresql92-server/pkg-message index 5138a7841bee..8e08644cb473 100644 --- a/databases/postgresql92-server/pkg-message +++ b/databases/postgresql92-server/pkg-message @@ -10,7 +10,7 @@ installs into: /usr/local/include (NOTE! Changed again in 7.2, since PostgreSQL handles standard install nowadays) -You *must* move away your old installation from users' and +You *must* move away your pre-7.1 installation from users' and ldconfig(8)'s PATHs. The pgsql user's home dir is /usr/local/pgsql by default, but can be diff --git a/databases/postgresql92-server/pkg-message.client b/databases/postgresql92-server/pkg-message.client index 48646e8c9901..720193b9d17c 100644 --- a/databases/postgresql92-server/pkg-message.client +++ b/databases/postgresql92-server/pkg-message.client @@ -10,7 +10,7 @@ installs into: /usr/local/include (NOTE! Changed again in 7.2, since PostgreSQL handles standard install nowadays) -You *must* move away your old installation from users' and +You *must* move away your pre-7.2 installation from users' and ldconfig(8)'s PATHs. ====================================================================== diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist index a103c3faf3da..45d3fa08c02e 100644 --- a/databases/postgresql92-server/pkg-plist +++ b/databases/postgresql92-server/pkg-plist @@ -1,25 +1,27 @@ -%%SERVER%%bin/postmaster -%%SERVER%%bin/postgres +bin/clusterdb +bin/createdb +bin/createlang +bin/createuser +bin/dropdb +bin/droplang +bin/dropuser bin/ecpg bin/initdb bin/initlocation bin/ipcclean +bin/pg_config +bin/pg_controldata bin/pg_ctl bin/pg_dump -bin/pg_restore bin/pg_dumpall +bin/pg_encoding bin/pg_id -bin/pg_passwd +bin/pg_resetxlog +bin/pg_restore +%%SERVER%%bin/postmaster +%%SERVER%%bin/postgres bin/psql -bin/createdb -bin/dropdb -bin/createuser -bin/dropuser -bin/droplang bin/vacuumdb -bin/createlang -bin/pg_config -%%MULTIBYTE%%bin/pg_encoding include/libpq/libpq-fs.h @dirrm include/libpq include/postgresql/internal/libpq/pqcomm.h @@ -27,81 +29,111 @@ include/postgresql/internal/libpq/pqcomm.h include/postgresql/internal/lib/dllist.h @dirrm include/postgresql/internal/lib include/postgresql/internal/c.h -include/postgresql/internal/postgres_fe.h include/postgresql/internal/libpq-int.h +include/postgresql/internal/postgres_fe.h include/postgresql/internal/pqexpbuffer.h @dirrm include/postgresql/internal -@dirrm include/postgresql -include/libpq++/pgconnection.h -include/libpq++/pgdatabase.h -include/libpq++/pgtransdb.h -include/libpq++/pgcursordb.h -include/libpq++/pglobject.h -@dirrm include/libpq++ -include/postgres_ext.h -include/pg_config.h -include/pg_config_os.h -include/libpq-fe.h include/ecpgerrno.h include/ecpglib.h include/ecpgtype.h -include/sqlca.h +include/libpq-fe.h +include/pg_config.h +include/pg_config_os.h +include/postgres_ext.h include/sql3types.h -include/libpgeasy.h -include/libpq++.h -lib/libpq.so -lib/libpq.a -lib/libpq.so.2 -lib/libecpg.so +include/sqlca.h lib/libecpg.a +lib/libecpg.so lib/libecpg.so.3 -lib/libpgeasy.so -lib/libpgeasy.a -lib/libpgeasy.so.2 -lib/libpq++.so -lib/libpq++.a -lib/libpq++.so.4 +lib/libpq.a +lib/libpq.so +lib/libpq.so.3 +%%SERVER%%lib/postgresql/ascii_and_mic.so +%%SERVER%%lib/postgresql/cyrillic_and_mic.so +%%SERVER%%lib/postgresql/euc_cn_and_mic.so +%%SERVER%%lib/postgresql/euc_jp_and_sjis.so +%%SERVER%%lib/postgresql/euc_kr_and_mic.so +%%SERVER%%lib/postgresql/euc_tw_and_big5.so +%%SERVER%%lib/postgresql/latin2_and_win1250.so +%%SERVER%%lib/postgresql/latin_and_mic.so +%%SERVER%%lib/postgresql/utf8_and_ascii.so +%%SERVER%%lib/postgresql/utf8_and_big5.so +%%SERVER%%lib/postgresql/utf8_and_cyrillic.so +%%SERVER%%lib/postgresql/utf8_and_euc_cn.so +%%SERVER%%lib/postgresql/utf8_and_euc_jp.so +%%SERVER%%lib/postgresql/utf8_and_euc_kr.so +%%SERVER%%lib/postgresql/utf8_and_euc_tw.so +%%SERVER%%lib/postgresql/utf8_and_gb18030.so +%%SERVER%%lib/postgresql/utf8_and_gbk.so +%%SERVER%%lib/postgresql/utf8_and_iso8859.so +%%SERVER%%lib/postgresql/utf8_and_iso8859_1.so +%%SERVER%%lib/postgresql/utf8_and_johab.so +%%SERVER%%lib/postgresql/utf8_and_sjis.so +%%SERVER%%lib/postgresql/utf8_and_tcvn.so +%%SERVER%%lib/postgresql/utf8_and_uhc.so +%%SERVER%%lib/postgresql/utf8_and_win1250.so +%%SERVER%%lib/postgresql/utf8_and_win1256.so +%%SERVER%%lib/postgresql/utf8_and_win874.so %%SERVER%%lib/postgresql/plpgsql.so @unexec rmdir %D/lib/postgresql 2>/dev/null || true %%SERVER%%share/postgresql/502.pgsql -%%SERVER%%share/postgresql/odbc.sql -%%SERVER%%share/postgresql/odbc-drop.sql %%SERVER%%share/postgresql/postgres.bki %%SERVER%%share/postgresql/postgres.description %%SERVER%%share/postgresql/pg_hba.conf.sample %%SERVER%%share/postgresql/pg_ident.conf.sample %%SERVER%%share/postgresql/postgresql.conf.sample +%%SERVER%%share/postgresql/conversion_create.sql share/postgresql/post-install-notes @unexec rmdir %D/share/postgresql 2>/dev/null || true -%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo +%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo +%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo -%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo +%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo +%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo +%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo +%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo +%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo +%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo +%%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo +%%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo -%%GETTEXT%%@unexec rmdir share/locale/*/LC_MESSAGES 2>/dev/null || true -%%GETTEXT%%@unexec rmdir share/locale/* 2>/dev/null || true -%%GETTEXT%%@unexec rmdir share/locale 2>/dev/null || true +%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true +%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true +%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true %%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi %%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi %%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist @@ -118,3 +150,338 @@ share/postgresql/post-install-notes %%SERVER%%@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." %%SERVER%%@unexec rmdir %D/share/postgresql 2>/dev/null || true %%SERVER%%etc/rc.d/010.pgsql.sh +%%SERVER%%include/postgresql/server/access/attnum.h +%%SERVER%%include/postgresql/server/access/clog.h +%%SERVER%%include/postgresql/server/access/genam.h +%%SERVER%%include/postgresql/server/access/gist.h +%%SERVER%%include/postgresql/server/access/gistscan.h +%%SERVER%%include/postgresql/server/access/hash.h +%%SERVER%%include/postgresql/server/access/heapam.h +%%SERVER%%include/postgresql/server/access/hio.h +%%SERVER%%include/postgresql/server/access/htup.h +%%SERVER%%include/postgresql/server/access/ibit.h +%%SERVER%%include/postgresql/server/access/iqual.h +%%SERVER%%include/postgresql/server/access/istrat.h +%%SERVER%%include/postgresql/server/access/itup.h +%%SERVER%%include/postgresql/server/access/nbtree.h +%%SERVER%%include/postgresql/server/access/printtup.h +%%SERVER%%include/postgresql/server/access/relscan.h +%%SERVER%%include/postgresql/server/access/rmgr.h +%%SERVER%%include/postgresql/server/access/rtree.h +%%SERVER%%include/postgresql/server/access/rtscan.h +%%SERVER%%include/postgresql/server/access/sdir.h +%%SERVER%%include/postgresql/server/access/skey.h +%%SERVER%%include/postgresql/server/access/strat.h +%%SERVER%%include/postgresql/server/access/transam.h +%%SERVER%%include/postgresql/server/access/tupdesc.h +%%SERVER%%include/postgresql/server/access/tupmacs.h +%%SERVER%%include/postgresql/server/access/valid.h +%%SERVER%%include/postgresql/server/access/tuptoaster.h +%%SERVER%%include/postgresql/server/access/xact.h +%%SERVER%%include/postgresql/server/access/xlog.h +%%SERVER%%include/postgresql/server/access/xlogdefs.h +%%SERVER%%include/postgresql/server/access/xlogutils.h +%%SERVER%%include/postgresql/server/bootstrap/bootstrap.h +%%SERVER%%include/postgresql/server/catalog/catalog.h +%%SERVER%%include/postgresql/server/catalog/catname.h +%%SERVER%%include/postgresql/server/catalog/catversion.h +%%SERVER%%include/postgresql/server/catalog/dependency.h +%%SERVER%%include/postgresql/server/catalog/heap.h +%%SERVER%%include/postgresql/server/catalog/index.h +%%SERVER%%include/postgresql/server/catalog/indexing.h +%%SERVER%%include/postgresql/server/catalog/namespace.h +%%SERVER%%include/postgresql/server/catalog/pg_aggregate.h +%%SERVER%%include/postgresql/server/catalog/pg_am.h +%%SERVER%%include/postgresql/server/catalog/pg_amop.h +%%SERVER%%include/postgresql/server/catalog/pg_amproc.h +%%SERVER%%include/postgresql/server/catalog/pg_attrdef.h +%%SERVER%%include/postgresql/server/catalog/pg_attribute.h +%%SERVER%%include/postgresql/server/catalog/pg_cast.h +%%SERVER%%include/postgresql/server/catalog/pg_class.h +%%SERVER%%include/postgresql/server/catalog/pg_constraint.h +%%SERVER%%include/postgresql/server/catalog/pg_control.h +%%SERVER%%include/postgresql/server/catalog/pg_conversion.h +%%SERVER%%include/postgresql/server/catalog/pg_database.h +%%SERVER%%include/postgresql/server/catalog/pg_depend.h +%%SERVER%%include/postgresql/server/catalog/pg_group.h +%%SERVER%%include/postgresql/server/catalog/pg_description.h +%%SERVER%%include/postgresql/server/catalog/pg_index.h +%%SERVER%%include/postgresql/server/catalog/pg_inherits.h +%%SERVER%%include/postgresql/server/catalog/pg_language.h +%%SERVER%%include/postgresql/server/catalog/pg_largeobject.h +%%SERVER%%include/postgresql/server/catalog/pg_listener.h +%%SERVER%%include/postgresql/server/catalog/pg_namespace.h +%%SERVER%%include/postgresql/server/catalog/pg_opclass.h +%%SERVER%%include/postgresql/server/catalog/pg_operator.h +%%SERVER%%include/postgresql/server/catalog/pg_proc.h +%%SERVER%%include/postgresql/server/catalog/pg_rewrite.h +%%SERVER%%include/postgresql/server/catalog/pg_shadow.h +%%SERVER%%include/postgresql/server/catalog/pg_statistic.h +%%SERVER%%include/postgresql/server/catalog/pg_trigger.h +%%SERVER%%include/postgresql/server/catalog/pg_type.h +%%SERVER%%include/postgresql/server/catalog/pg_version.h +%%SERVER%%include/postgresql/server/commands/async.h +%%SERVER%%include/postgresql/server/commands/cluster.h +%%SERVER%%include/postgresql/server/commands/comment.h +%%SERVER%%include/postgresql/server/commands/conversioncmds.h +%%SERVER%%include/postgresql/server/commands/copy.h +%%SERVER%%include/postgresql/server/commands/dbcommands.h +%%SERVER%%include/postgresql/server/commands/defrem.h +%%SERVER%%include/postgresql/server/commands/explain.h +%%SERVER%%include/postgresql/server/commands/lockcmds.h +%%SERVER%%include/postgresql/server/commands/portalcmds.h +%%SERVER%%include/postgresql/server/commands/prepare.h +%%SERVER%%include/postgresql/server/commands/proclang.h +%%SERVER%%include/postgresql/server/commands/schemacmds.h +%%SERVER%%include/postgresql/server/commands/sequence.h +%%SERVER%%include/postgresql/server/commands/tablecmds.h +%%SERVER%%include/postgresql/server/commands/trigger.h +%%SERVER%%include/postgresql/server/commands/user.h +%%SERVER%%include/postgresql/server/commands/vacuum.h +%%SERVER%%include/postgresql/server/commands/variable.h +%%SERVER%%include/postgresql/server/commands/version.h +%%SERVER%%include/postgresql/server/commands/view.h +%%SERVER%%include/postgresql/server/executor/execdebug.h +%%SERVER%%include/postgresql/server/executor/execdefs.h +%%SERVER%%include/postgresql/server/executor/execdesc.h +%%SERVER%%include/postgresql/server/executor/executor.h +%%SERVER%%include/postgresql/server/executor/functions.h +%%SERVER%%include/postgresql/server/executor/hashjoin.h +%%SERVER%%include/postgresql/server/executor/instrument.h +%%SERVER%%include/postgresql/server/executor/nodeAgg.h +%%SERVER%%include/postgresql/server/executor/nodeAppend.h +%%SERVER%%include/postgresql/server/executor/nodeFunctionscan.h +%%SERVER%%include/postgresql/server/executor/nodeGroup.h +%%SERVER%%include/postgresql/server/executor/nodeHash.h +%%SERVER%%include/postgresql/server/executor/nodeHashjoin.h +%%SERVER%%include/postgresql/server/executor/nodeIndexscan.h +%%SERVER%%include/postgresql/server/executor/nodeLimit.h +%%SERVER%%include/postgresql/server/executor/nodeMaterial.h +%%SERVER%%include/postgresql/server/executor/nodeMergejoin.h +%%SERVER%%include/postgresql/server/executor/nodeNestloop.h +%%SERVER%%include/postgresql/server/executor/nodeResult.h +%%SERVER%%include/postgresql/server/executor/nodeSeqscan.h +%%SERVER%%include/postgresql/server/executor/nodeSetOp.h +%%SERVER%%include/postgresql/server/executor/nodeSort.h +%%SERVER%%include/postgresql/server/executor/nodeSubplan.h +%%SERVER%%include/postgresql/server/executor/nodeSubqueryscan.h +%%SERVER%%include/postgresql/server/executor/nodeTidscan.h +%%SERVER%%include/postgresql/server/executor/nodeUnique.h +%%SERVER%%include/postgresql/server/executor/spi.h +%%SERVER%%include/postgresql/server/executor/spi_priv.h +%%SERVER%%include/postgresql/server/executor/tuptable.h +%%SERVER%%include/postgresql/server/lib/dllist.h +%%SERVER%%include/postgresql/server/lib/lispsort.h +%%SERVER%%include/postgresql/server/lib/stringinfo.h +%%SERVER%%include/postgresql/server/libpq/auth.h +%%SERVER%%include/postgresql/server/libpq/be-fsstubs.h +%%SERVER%%include/postgresql/server/libpq/crypt.h +%%SERVER%%include/postgresql/server/libpq/hba.h +%%SERVER%%include/postgresql/server/libpq/libpq-be.h +%%SERVER%%include/postgresql/server/libpq/libpq-fs.h +%%SERVER%%include/postgresql/server/libpq/libpq.h +%%SERVER%%include/postgresql/server/libpq/password.h +%%SERVER%%include/postgresql/server/libpq/pqcomm.h +%%SERVER%%include/postgresql/server/libpq/pqformat.h +%%SERVER%%include/postgresql/server/libpq/pqsignal.h +%%SERVER%%include/postgresql/server/mb/pg_wchar.h +%%SERVER%%include/postgresql/server/nodes/execnodes.h +%%SERVER%%include/postgresql/server/nodes/makefuncs.h +%%SERVER%%include/postgresql/server/nodes/memnodes.h +%%SERVER%%include/postgresql/server/nodes/nodeFuncs.h +%%SERVER%%include/postgresql/server/nodes/nodes.h +%%SERVER%%include/postgresql/server/nodes/params.h +%%SERVER%%include/postgresql/server/nodes/parsenodes.h +%%SERVER%%include/postgresql/server/nodes/pg_list.h +%%SERVER%%include/postgresql/server/nodes/plannodes.h +%%SERVER%%include/postgresql/server/nodes/primnodes.h +%%SERVER%%include/postgresql/server/nodes/print.h +%%SERVER%%include/postgresql/server/nodes/readfuncs.h +%%SERVER%%include/postgresql/server/nodes/relation.h +%%SERVER%%include/postgresql/server/optimizer/clauses.h +%%SERVER%%include/postgresql/server/optimizer/cost.h +%%SERVER%%include/postgresql/server/optimizer/geqo.h +%%SERVER%%include/postgresql/server/optimizer/geqo_copy.h +%%SERVER%%include/postgresql/server/optimizer/geqo_gene.h +%%SERVER%%include/postgresql/server/optimizer/geqo_misc.h +%%SERVER%%include/postgresql/server/optimizer/geqo_mutation.h +%%SERVER%%include/postgresql/server/optimizer/geqo_pool.h +%%SERVER%%include/postgresql/server/optimizer/geqo_random.h +%%SERVER%%include/postgresql/server/optimizer/geqo_recombination.h +%%SERVER%%include/postgresql/server/optimizer/geqo_selection.h +%%SERVER%%include/postgresql/server/optimizer/joininfo.h +%%SERVER%%include/postgresql/server/optimizer/pathnode.h +%%SERVER%%include/postgresql/server/optimizer/paths.h +%%SERVER%%include/postgresql/server/optimizer/plancat.h +%%SERVER%%include/postgresql/server/optimizer/planmain.h +%%SERVER%%include/postgresql/server/optimizer/planner.h +%%SERVER%%include/postgresql/server/optimizer/prep.h +%%SERVER%%include/postgresql/server/optimizer/restrictinfo.h +%%SERVER%%include/postgresql/server/optimizer/subselect.h +%%SERVER%%include/postgresql/server/optimizer/tlist.h +%%SERVER%%include/postgresql/server/optimizer/var.h +%%SERVER%%include/postgresql/server/parser/analyze.h +%%SERVER%%include/postgresql/server/parser/gramparse.h +%%SERVER%%include/postgresql/server/parser/keywords.h +%%SERVER%%include/postgresql/server/parser/parse.h +%%SERVER%%include/postgresql/server/parser/parse_agg.h +%%SERVER%%include/postgresql/server/parser/parse_clause.h +%%SERVER%%include/postgresql/server/parser/parse_coerce.h +%%SERVER%%include/postgresql/server/parser/parse_expr.h +%%SERVER%%include/postgresql/server/parser/parse_func.h +%%SERVER%%include/postgresql/server/parser/parse_node.h +%%SERVER%%include/postgresql/server/parser/parse_oper.h +%%SERVER%%include/postgresql/server/parser/parse_relation.h +%%SERVER%%include/postgresql/server/parser/parse_target.h +%%SERVER%%include/postgresql/server/parser/parse_type.h +%%SERVER%%include/postgresql/server/parser/parser.h +%%SERVER%%include/postgresql/server/parser/parsetree.h +%%SERVER%%include/postgresql/server/parser/scansup.h +%%SERVER%%include/postgresql/server/port/aix.h +%%SERVER%%include/postgresql/server/port/beos.h +%%SERVER%%include/postgresql/server/port/bsdi.h +%%SERVER%%include/postgresql/server/port/darwin.h +%%SERVER%%include/postgresql/server/port/dgux.h +%%SERVER%%include/postgresql/server/port/freebsd.h +%%SERVER%%include/postgresql/server/port/hpux.h +%%SERVER%%include/postgresql/server/port/irix5.h +%%SERVER%%include/postgresql/server/port/linux.h +%%SERVER%%include/postgresql/server/port/netbsd.h +%%SERVER%%include/postgresql/server/port/nextstep.h +%%SERVER%%include/postgresql/server/port/openbsd.h +%%SERVER%%include/postgresql/server/port/osf.h +%%SERVER%%include/postgresql/server/port/qnx4.h +%%SERVER%%include/postgresql/server/port/sco.h +%%SERVER%%include/postgresql/server/port/solaris.h +%%SERVER%%include/postgresql/server/port/sunos4.h +%%SERVER%%include/postgresql/server/port/svr4.h +%%SERVER%%include/postgresql/server/port/ultrix4.h +%%SERVER%%include/postgresql/server/port/univel.h +%%SERVER%%include/postgresql/server/port/unixware.h +%%SERVER%%include/postgresql/server/port/win.h +%%SERVER%%include/postgresql/server/port/win32.h +%%SERVER%%include/postgresql/server/regex/cclass.h +%%SERVER%%include/postgresql/server/regex/cname.h +%%SERVER%%include/postgresql/server/regex/regex.h +%%SERVER%%include/postgresql/server/regex/regex2.h +%%SERVER%%include/postgresql/server/regex/utils.h +%%SERVER%%include/postgresql/server/rewrite/prs2lock.h +%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h +%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h +%%SERVER%%include/postgresql/server/rewrite/rewriteManip.h +%%SERVER%%include/postgresql/server/rewrite/rewriteRemove.h +%%SERVER%%include/postgresql/server/rewrite/rewriteSupport.h +%%SERVER%%include/postgresql/server/storage/backendid.h +%%SERVER%%include/postgresql/server/storage/block.h +%%SERVER%%include/postgresql/server/storage/buf.h +%%SERVER%%include/postgresql/server/storage/buf_internals.h +%%SERVER%%include/postgresql/server/storage/buffile.h +%%SERVER%%include/postgresql/server/storage/bufmgr.h +%%SERVER%%include/postgresql/server/storage/bufpage.h +%%SERVER%%include/postgresql/server/storage/fd.h +%%SERVER%%include/postgresql/server/storage/freespace.h +%%SERVER%%include/postgresql/server/storage/ipc.h +%%SERVER%%include/postgresql/server/storage/item.h +%%SERVER%%include/postgresql/server/storage/itemid.h +%%SERVER%%include/postgresql/server/storage/itempos.h +%%SERVER%%include/postgresql/server/storage/itemptr.h +%%SERVER%%include/postgresql/server/storage/large_object.h +%%SERVER%%include/postgresql/server/storage/lmgr.h +%%SERVER%%include/postgresql/server/storage/lock.h +%%SERVER%%include/postgresql/server/storage/lwlock.h +%%SERVER%%include/postgresql/server/storage/off.h +%%SERVER%%include/postgresql/server/storage/page.h +%%SERVER%%include/postgresql/server/storage/pg_sema.h +%%SERVER%%include/postgresql/server/storage/pg_shmem.h +%%SERVER%%include/postgresql/server/storage/pmsignal.h +%%SERVER%%include/postgresql/server/storage/pos.h +%%SERVER%%include/postgresql/server/storage/proc.h +%%SERVER%%include/postgresql/server/storage/relfilenode.h +%%SERVER%%include/postgresql/server/storage/s_lock.h +%%SERVER%%include/postgresql/server/storage/shmem.h +%%SERVER%%include/postgresql/server/storage/sinval.h +%%SERVER%%include/postgresql/server/storage/sinvaladt.h +%%SERVER%%include/postgresql/server/storage/smgr.h +%%SERVER%%include/postgresql/server/storage/spin.h +%%SERVER%%include/postgresql/server/tcop/dest.h +%%SERVER%%include/postgresql/server/tcop/fastpath.h +%%SERVER%%include/postgresql/server/tcop/pquery.h +%%SERVER%%include/postgresql/server/tcop/tcopdebug.h +%%SERVER%%include/postgresql/server/tcop/tcopprot.h +%%SERVER%%include/postgresql/server/tcop/utility.h +%%SERVER%%include/postgresql/server/utils/acl.h +%%SERVER%%include/postgresql/server/utils/array.h +%%SERVER%%include/postgresql/server/utils/ascii.h +%%SERVER%%include/postgresql/server/utils/bit.h +%%SERVER%%include/postgresql/server/utils/builtins.h +%%SERVER%%include/postgresql/server/utils/cash.h +%%SERVER%%include/postgresql/server/utils/catcache.h +%%SERVER%%include/postgresql/server/utils/date.h +%%SERVER%%include/postgresql/server/utils/datetime.h +%%SERVER%%include/postgresql/server/utils/datum.h +%%SERVER%%include/postgresql/server/utils/dynahash.h +%%SERVER%%include/postgresql/server/utils/dynamic_loader.h +%%SERVER%%include/postgresql/server/utils/elog.h +%%SERVER%%include/postgresql/server/utils/fcache.h +%%SERVER%%include/postgresql/server/utils/fmgroids.h +%%SERVER%%include/postgresql/server/utils/fmgrtab.h +%%SERVER%%include/postgresql/server/utils/formatting.h +%%SERVER%%include/postgresql/server/utils/geo_decls.h +%%SERVER%%include/postgresql/server/utils/guc.h +%%SERVER%%include/postgresql/server/utils/hsearch.h +%%SERVER%%include/postgresql/server/utils/inet.h +%%SERVER%%include/postgresql/server/utils/int8.h +%%SERVER%%include/postgresql/server/utils/inval.h +%%SERVER%%include/postgresql/server/utils/logtape.h +%%SERVER%%include/postgresql/server/utils/lsyscache.h +%%SERVER%%include/postgresql/server/utils/memutils.h +%%SERVER%%include/postgresql/server/utils/nabstime.h +%%SERVER%%include/postgresql/server/utils/numeric.h +%%SERVER%%include/postgresql/server/utils/palloc.h +%%SERVER%%include/postgresql/server/utils/pg_crc.h +%%SERVER%%include/postgresql/server/utils/pg_locale.h +%%SERVER%%include/postgresql/server/utils/pg_lzcompress.h +%%SERVER%%include/postgresql/server/utils/portal.h +%%SERVER%%include/postgresql/server/utils/ps_status.h +%%SERVER%%include/postgresql/server/utils/rel.h +%%SERVER%%include/postgresql/server/utils/relcache.h +%%SERVER%%include/postgresql/server/utils/selfuncs.h +%%SERVER%%include/postgresql/server/utils/sets.h +%%SERVER%%include/postgresql/server/utils/syscache.h +%%SERVER%%include/postgresql/server/utils/timestamp.h +%%SERVER%%include/postgresql/server/utils/tqual.h +%%SERVER%%include/postgresql/server/utils/tuplesort.h +%%SERVER%%include/postgresql/server/utils/tuplestore.h +%%SERVER%%include/postgresql/server/utils/varbit.h +%%SERVER%%include/postgresql/server/pg_config.h +%%SERVER%%include/postgresql/server/pg_config_os.h +%%SERVER%%include/postgresql/server/c.h +%%SERVER%%include/postgresql/server/dynloader.h +%%SERVER%%include/postgresql/server/fmgr.h +%%SERVER%%include/postgresql/server/funcapi.h +%%SERVER%%include/postgresql/server/miscadmin.h +%%SERVER%%include/postgresql/server/pgstat.h +%%SERVER%%include/postgresql/server/postgres.h +%%SERVER%%include/postgresql/server/postgres_ext.h +%%SERVER%%include/postgresql/server/postgres_fe.h +%%SERVER%%include/postgresql/server/rusagestub.h +%%SERVER%%include/postgresql/server/strdup.h +%%SERVER%%@dirrm include/postgresql/server/access +%%SERVER%%@dirrm include/postgresql/server/bootstrap +%%SERVER%%@dirrm include/postgresql/server/catalog +%%SERVER%%@dirrm include/postgresql/server/commands +%%SERVER%%@dirrm include/postgresql/server/executor +%%SERVER%%@dirrm include/postgresql/server/lib +%%SERVER%%@dirrm include/postgresql/server/libpq +%%SERVER%%@dirrm include/postgresql/server/mb +%%SERVER%%@dirrm include/postgresql/server/nodes +%%SERVER%%@dirrm include/postgresql/server/optimizer +%%SERVER%%@dirrm include/postgresql/server/parser +%%SERVER%%@dirrm include/postgresql/server/port +%%SERVER%%@dirrm include/postgresql/server/regex +%%SERVER%%@dirrm include/postgresql/server/rewrite +%%SERVER%%@dirrm include/postgresql/server/storage +%%SERVER%%@dirrm include/postgresql/server/tcop +%%SERVER%%@dirrm include/postgresql/server/utils +%%SERVER%%@dirrm include/postgresql/server +@dirrm include/postgresql diff --git a/databases/postgresql92-server/scripts/configure.postgresql b/databases/postgresql92-server/scripts/configure.postgresql deleted file mode 100644 index 3a4896dd4e93..000000000000 --- a/databases/postgresql92-server/scripts/configure.postgresql +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/sh -# -*- tab-width: 4; -*- -# ex:ts=4 -# -# $FreeBSD$ -# -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -if [ ! "${BATCH}" ]; then - dialog --title "Backup your data NOW" \ - --yesno "As always, backup your data before -upgrading. If the upgrade leads to a higher -minor revision (e.g. 7.1.x -> 7.2, a dump -and restore of all databases is -required. This is *NOT* done by the port! - -Select 'Yes' to continue the installation." -1 -1 - if [ $? -eq 1 ] ; then exit 1; fi -fi - -if [ "${BATCH}" ]; then - set \"MultiByte\" \"KRB5\" -else - /usr/bin/dialog --title "configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 3 \ -MultiByte "Multibyte for Multilingualism" ON \ -KRB5 "Kerberos 5 (only if it exists)" ON \ -CLIENT "PostgreSQL client only, no server" OFF \ -2> /tmp/checklist.tmp.$$ - - retval=$? - - if [ -s /tmp/checklist.tmp.$$ ]; then - set `cat /tmp/checklist.tmp.$$` - fi - rm -f /tmp/checklist.tmp.$$ - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -while [ "$1" ]; do - case $1 in - \"MultiByte\") - MULTIBYTE=1 - ;; - \"KRB5\") - KRB5=1 - ;; - \"CLIENT\") - CLIENT=1 - ;; - \"nothing\"|true) - ;; - *) - echo "Invalid option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -exec > /dev/stderr - -# if multibyte, determine default charset -echo "# Multibyte" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -if [ ! "${MULTIBYTE}" ]; then - echo "WITHOUT_MULTIBYTE=YES" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -else - if [ "${BATCH}" ]; then - set "SQL_ASCII" - else - /usr/bin/dialog --title "Default encoding system" --clear \ - --radiolist "\n\ -Please select the default encoding:" -1 -1 16 \ -SQL_ASCII "SQL_ASCII - ASCII" ON \ -EUC_JP "Japanese EUC" OFF \ -EUC_CN "Chinese EUC" OFF \ -EUC_KR "Korean EUC" OFF \ -EUC_TW "Taiwan EUC" OFF \ -UNICODE "Unicode (UTF-8)" OFF \ -MULE_INTERNAL "Mule internal code" OFF \ -LATIN1 "ISO 8859-1" OFF \ -LATIN2 "ISO 8859-2" OFF \ -LATIN3 "ISO 8859-3" OFF \ -LATIN4 "ISO 8859-4" OFF \ -LATIN5 "ISO 8859-9" OFF \ -LATIN6 "ISO 8859-10" OFF \ -LATIN7 "ISO 8859-13" OFF \ -LATIN8 "ISO 8859-14" OFF \ -LATIN9 "ISO 8859-15" OFF \ -LATIN10 "ISO 8859-16" OFF \ -ISO-8859-5 "ECMA-113 Latin/Cyrillic" OFF \ -ISO-8859-6 "ECMA-114 Latin/Arabic" OFF \ -ISO-8859-7 "ECMA-118 Latin/Greek" OFF \ -ISO-8859-8 "ECMA-121 Latin/Hebrew" OFF \ -KOI8 "KOI8-R(U)" OFF \ -WIN "Windows CP1251" OFF \ -ALT "Windows CP866" OFF \ -2> /tmp/checklist.tmp.$$ - - retval=$? - - if [ -s /tmp/checklist.tmp.$$ ]; then - set `cat /tmp/checklist.tmp.$$` - fi - rm -f /tmp/checklist.tmp.$$ - if [ $retval = 1 ]; then - echo "Cancel pressed." - rm ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - fi - - echo "MULTIBYTE_ENCODING=$1" \ - >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi - -if [ "${KRB5}" ]; then - if [ -r "/usr/bin/krb5-config" ]; then - echo " ########################################################################" - echo " ### PostgreSQL does not build with Hiemdal kerberos. Edit ###" - echo " ### /etc/make.conf and turn the knob MAKE_KERBEROS5 off and make ###" - echo " ### world (or remove all traces of Hiemdal from your system by: ###" - echo " ### rm -f /usr/bin/krb5-config /usr/lib/libkrb5.* /usr/include/krb5* ###" - echo " ########################################################################" - KRB5="" - else - KRB5CONF="`which krb5-config`" - if [ "$KRB5CONF" ]; then - cat <<-EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - .if exists($KRB5CONF) - LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 - CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`" - CFLAGS+= "'`${KRB5CONF} --cflags krb5`'" - LDFLAGS+= "'`${KRB5CONF} --libs krb5`'" - .endif - EOF - else - echo " ########################################################" - echo " ### Unable to find krb5-config in your path. ###" - echo " ### Please correct and build PostgreSQL again if you ###" - echo " ### want PostgreSQL to be compiled with kerberos ###" - echo " ### support (ports/security/krb5). ###" - echo " ########################################################" - fi - fi -fi - -if [ ${CLIENT} ]; then - echo "WITHOUT_SERVER=yes" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -fi -- cgit v1.2.3