aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/p5-postgresql-plperl/Makefile17
-rw-r--r--databases/postgresql-contrib/Makefile20
-rw-r--r--databases/postgresql-contrib/pkg-plist11
-rw-r--r--databases/postgresql-devel-server/Makefile29
-rw-r--r--databases/postgresql-devel-server/distinfo8
-rw-r--r--databases/postgresql-devel-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql-devel-server/files/pkg-message.server4
-rw-r--r--databases/postgresql-devel-server/pkg-install2
-rw-r--r--databases/postgresql-devel-server/pkg-plist134
-rw-r--r--databases/postgresql-docs/Makefile31
-rw-r--r--databases/postgresql-jdbc/Makefile15
-rw-r--r--databases/postgresql-jdbc/files/patch-aa19
-rw-r--r--databases/postgresql-libpq++/pkg-descr2
-rw-r--r--databases/postgresql-libpqxx/Makefile2
-rw-r--r--databases/postgresql-libpqxx/distinfo2
-rw-r--r--databases/postgresql-libpqxx/pkg-plist47
-rw-r--r--databases/postgresql-libpqxx3/Makefile2
-rw-r--r--databases/postgresql-libpqxx3/distinfo2
-rw-r--r--databases/postgresql-libpqxx3/pkg-plist47
-rw-r--r--databases/postgresql-libpqxx30/Makefile2
-rw-r--r--databases/postgresql-libpqxx30/distinfo2
-rw-r--r--databases/postgresql-libpqxx30/pkg-plist47
-rw-r--r--databases/postgresql-pltcl/Makefile22
-rw-r--r--databases/postgresql-tcltk/Makefile30
-rw-r--r--databases/postgresql-tcltk/files/patch-libpgtcl18
-rw-r--r--databases/postgresql7/Makefile29
-rw-r--r--databases/postgresql7/distinfo8
-rw-r--r--databases/postgresql7/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql7/files/pkg-message.server4
-rw-r--r--databases/postgresql7/pkg-install2
-rw-r--r--databases/postgresql7/pkg-plist134
-rw-r--r--databases/postgresql74-server/Makefile29
-rw-r--r--databases/postgresql74-server/distinfo8
-rw-r--r--databases/postgresql74-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql74-server/files/pkg-message.server4
-rw-r--r--databases/postgresql74-server/pkg-install2
-rw-r--r--databases/postgresql74-server/pkg-plist134
-rw-r--r--databases/postgresql80-server/Makefile29
-rw-r--r--databases/postgresql80-server/distinfo8
-rw-r--r--databases/postgresql80-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql80-server/files/pkg-message.server4
-rw-r--r--databases/postgresql80-server/pkg-install2
-rw-r--r--databases/postgresql80-server/pkg-plist134
-rw-r--r--databases/postgresql81-server/Makefile29
-rw-r--r--databases/postgresql81-server/distinfo8
-rw-r--r--databases/postgresql81-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql81-server/files/pkg-message.server4
-rw-r--r--databases/postgresql81-server/pkg-install2
-rw-r--r--databases/postgresql81-server/pkg-plist134
-rw-r--r--databases/postgresql82-server/Makefile29
-rw-r--r--databases/postgresql82-server/distinfo8
-rw-r--r--databases/postgresql82-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql82-server/files/pkg-message.server4
-rw-r--r--databases/postgresql82-server/pkg-install2
-rw-r--r--databases/postgresql82-server/pkg-plist134
-rw-r--r--databases/postgresql83-server/Makefile29
-rw-r--r--databases/postgresql83-server/distinfo8
-rw-r--r--databases/postgresql83-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql83-server/files/pkg-message.server4
-rw-r--r--databases/postgresql83-server/pkg-install2
-rw-r--r--databases/postgresql83-server/pkg-plist134
-rw-r--r--databases/postgresql84-server/Makefile29
-rw-r--r--databases/postgresql84-server/distinfo8
-rw-r--r--databases/postgresql84-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql84-server/files/pkg-message.server4
-rw-r--r--databases/postgresql84-server/pkg-install2
-rw-r--r--databases/postgresql84-server/pkg-plist134
-rw-r--r--databases/postgresql90-server/Makefile29
-rw-r--r--databases/postgresql90-server/distinfo8
-rw-r--r--databases/postgresql90-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql90-server/files/pkg-message.server4
-rw-r--r--databases/postgresql90-server/pkg-install2
-rw-r--r--databases/postgresql90-server/pkg-plist134
-rw-r--r--databases/postgresql91-server/Makefile29
-rw-r--r--databases/postgresql91-server/distinfo8
-rw-r--r--databases/postgresql91-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql91-server/files/pkg-message.server4
-rw-r--r--databases/postgresql91-server/pkg-install2
-rw-r--r--databases/postgresql91-server/pkg-plist134
-rw-r--r--databases/postgresql92-server/Makefile29
-rw-r--r--databases/postgresql92-server/distinfo8
-rw-r--r--databases/postgresql92-server/files/pgsql.sh.tmpl20
-rw-r--r--databases/postgresql92-server/files/pkg-message.server4
-rw-r--r--databases/postgresql92-server/pkg-install2
-rw-r--r--databases/postgresql92-server/pkg-plist134
85 files changed, 1742 insertions, 763 deletions
diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile
index 2bed2b63cdb6..69f0f35ee9fe 100644
--- a/databases/p5-postgresql-plperl/Makefile
+++ b/databases/p5-postgresql-plperl/Makefile
@@ -4,29 +4,22 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 1
+PORTREVISION= 0
CATEGORIES= databases perl5
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
PKGNAMEPREFIX= p5-
PKGNAMESUFFIX= -plperl
-DISTFILES!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= A module for using Perl5 to write SQL functions
-RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT}
+POSTGRESQL_PORT?= databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include "../../${POSTGRESQL_PORT}/Makefile"
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
+RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT}
-USE_GMAKE= yes
USE_PERL5= yes
-GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl
MAKE_ARGS+= -C src/pl/plperl
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile
index 94ad42a8dcbe..c42b1560358e 100644
--- a/databases/postgresql-contrib/Makefile
+++ b/databases/postgresql-contrib/Makefile
@@ -4,29 +4,22 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 1
+PORTREVISION= 0
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
PKGNAMESUFFIX= -contrib
-DISTFILES!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= pq:${PORTSDIR}/${POSTGRESQL_PORT}
-USE_BISON= YES
-INSTALLS_SHLIB= yes
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
+POSTGRESQL_PORT?= databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
+INSTALLS_SHLIB= yes
+USE_BISON= yes
CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include \
@@ -36,6 +29,7 @@ MAKE_ARGS= -C contrib
pre-build:
cd ${WRKSRC}/src/backend ;\
${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+ cd ${WRKSRC}/src/port; ${GMAKE}
post-install:
@ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\
diff --git a/databases/postgresql-contrib/pkg-plist b/databases/postgresql-contrib/pkg-plist
index 869740043f88..d3af90cf4a59 100644
--- a/databases/postgresql-contrib/pkg-plist
+++ b/databases/postgresql-contrib/pkg-plist
@@ -16,13 +16,13 @@ bin/fti.pl
bin/ipc_check
bin/make_oidjoins_check
bin/oid2name
+bin/pg_autovacuum
bin/pg_dumplo
bin/pg_logger
bin/pgbench
bin/reindexdb
bin/vacuumlo
lib/postgresql/_int.so
-lib/postgresql/array_iterator.so
lib/postgresql/autoinc.so
lib/postgresql/btree_gist.so
lib/postgresql/chkpass.so
@@ -51,10 +51,10 @@ lib/postgresql/string_io.so
lib/postgresql/tablefunc.so
lib/postgresql/timetravel.so
lib/postgresql/tsearch.so
+lib/postgresql/tsearch2.so
lib/postgresql/user_locks.so
%%DOCSDIR%%/contrib/README
%%DOCSDIR%%/contrib/README.apachelog
-%%DOCSDIR%%/contrib/README.array_iterator
%%DOCSDIR%%/contrib/README.btree_gist
%%DOCSDIR%%/contrib/README.chkpass
%%DOCSDIR%%/contrib/README.cube
@@ -75,6 +75,7 @@ lib/postgresql/user_locks.so
%%DOCSDIR%%/contrib/README.misc_utils
%%DOCSDIR%%/contrib/README.noup
%%DOCSDIR%%/contrib/README.oid2name
+%%DOCSDIR%%/contrib/README.pg_autovacuum
%%DOCSDIR%%/contrib/README.pg_dumplo
%%DOCSDIR%%/contrib/README.pg_logger
%%DOCSDIR%%/contrib/README.pgbench
@@ -91,6 +92,7 @@ lib/postgresql/user_locks.so
%%DOCSDIR%%/contrib/README.string_io
%%DOCSDIR%%/contrib/README.tablefunc
%%DOCSDIR%%/contrib/README.tsearch
+%%DOCSDIR%%/contrib/README.tsearch2
%%DOCSDIR%%/contrib/README.user_locks
%%DOCSDIR%%/contrib/README.vacuumlo
%%DOCSDIR%%/contrib/autoinc.example
@@ -100,7 +102,6 @@ lib/postgresql/user_locks.so
%%DOCSDIR%%/contrib/timetravel.example
share/postgresql/contrib/RServ.pm
share/postgresql/contrib/_int.sql
-share/postgresql/contrib/array_iterator.sql
share/postgresql/contrib/autoinc.sql
share/postgresql/contrib/btree_gist.sql
share/postgresql/contrib/chkpass.sql
@@ -108,6 +109,7 @@ share/postgresql/contrib/cube.sql
share/postgresql/contrib/dblink.sql
share/postgresql/contrib/dbsize.sql
share/postgresql/contrib/earthdistance.sql
+share/postgresql/contrib/english.stop
share/postgresql/contrib/fti.sql
share/postgresql/contrib/fuzzystrmatch.sql
share/postgresql/contrib/insert_username.sql
@@ -125,12 +127,15 @@ share/postgresql/contrib/pgcrypto.sql
share/postgresql/contrib/pgstattuple.sql
share/postgresql/contrib/refint.sql
share/postgresql/contrib/rtree_gist.sql
+share/postgresql/contrib/russian.stop
share/postgresql/contrib/seg.sql
share/postgresql/contrib/slave.sql
share/postgresql/contrib/string_io.sql
share/postgresql/contrib/tablefunc.sql
share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch.sql
+share/postgresql/contrib/tsearch2.sql
+share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql-devel-server/files/pgsql.sh.tmpl b/databases/postgresql-devel-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql-devel-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql-devel-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql-devel-server/files/pkg-message.server b/databases/postgresql-devel-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql-devel-server/files/pkg-message.server
+++ b/databases/postgresql-devel-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql-devel-server/pkg-install b/databases/postgresql-devel-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql-devel-server/pkg-install
+++ b/databases/postgresql-devel-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql-devel-server/pkg-plist
+++ b/databases/postgresql-devel-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 0f6a640c6f44..9f27a383e5db 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -4,37 +4,32 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 0
-CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
+PORTREVISION= 0
PKGNAMESUFFIX= -docs
-DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= The PostgreSQL documentation set
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
+POSTGRESQL_SUBPORT= YES
+POSTGRESQL_PORT?= databases/postgresql7
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.undef USE_GMAKE
+.undef GNU_CONFIGURE
NO_BUILD= YES
do-install:
@ $(MKDIR) ${DOCSDIR}/html; \
${GZIP_CMD} -dc ${WRKSRC}/doc/postgres.tar.gz | \
- ( cd $(DOCSDIR)/html && $(TAR) xf - )
+ ( cd ${DOCSDIR}/html && $(TAR) xf - )
post-install:
@ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} -v /$$ | \
- ${XARGS} printf "share/doc/postgresql/html/%s\n" >> ${TMPPLIST} ;\
- for dir in `$(TAR) ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$` ; do \
- ${ECHO} @dirrm $$dir >> ${TMPPLIST} ;\
- done ;\
- ${ECHO} @dirrm share/doc/postgresql/html >> ${TMPPLIST} ;\
- ${ECHO} @dirrm share/doc/postgresql >> ${TMPPLIST} ;\
- ${ECHO} '@unexec rmdir %D/share/postgresql 2> /dev/null || true' >> ${TMPPLIST}
+ ${SED} "s,^,${DOCSDIR:S,^${PREFIX}/,,}/html/," >> ${TMPPLIST} ;\
+ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
+ ${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
+ ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
+ ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index a26e4d01eead..04997e9dcb94 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -4,27 +4,20 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 0
+PORTREVISION= 0
CATEGORIES= databases java
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
PKGNAMESUFFIX= -jdbc
-DISTFILES!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= The Java JDBC implementation for PostgreSQL
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
+POSTGRESQL_PORT?= databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-java
USE_JAVA= 1.1+
diff --git a/databases/postgresql-jdbc/files/patch-aa b/databases/postgresql-jdbc/files/patch-aa
index 44a6e7960a2c..5c186c265977 100644
--- a/databases/postgresql-jdbc/files/patch-aa
+++ b/databases/postgresql-jdbc/files/patch-aa
@@ -1,11 +1,14 @@
---- src/interfaces/jdbc/build.xml.orig Fri Mar 28 09:55:21 2003
-+++ src/interfaces/jdbc/build.xml Fri Mar 28 09:57:29 2003
-@@ -101,7 +101,7 @@
+--- src/interfaces/jdbc/build.xml.orig Mon Aug 25 00:10:09 2003
++++ src/interfaces/jdbc/build.xml Tue Nov 18 03:37:21 2003
+@@ -110,10 +110,7 @@
- <!-- This is the core of the driver. It is common for all three versions. -->
<target name="compile" depends="prepare,check_versions,driver">
-- <javac srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-+ <javac includeAntRuntime="no" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
- <include name="${package}/**" />
- <exclude name="${package}/jdbc1/**" unless="jdbc1"/>
+- <available classname="org.postgresql.Driver" property="old.driver.present" />
+- <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
+-
+- <javac classpath="{$srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
++ <javac includeAntRuntime="no" classpath="{$srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
+ <!-- This is the core of the driver. It is common for all three versions. -->
+ <include name="${package}/*.java" />
+ <include name="${package}/core/**" />
diff --git a/databases/postgresql-libpq++/pkg-descr b/databases/postgresql-libpq++/pkg-descr
index 8e2cca40fe33..be6e6b312378 100644
--- a/databases/postgresql-libpq++/pkg-descr
+++ b/databases/postgresql-libpq++/pkg-descr
@@ -1,5 +1,5 @@
This is the C++ interface that has been shipped as part of PostgreSQL for
many releases. There is a newer C++ interface called libpqxx, which is
-in a separate port, postgresq-pgcxx.
+in a separate port, postgresql-libpqxx.
WWW: http://gborg.postgresql.org/project/libpqpp/
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 1625d3adb076..ce5382f01774 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libpqxx
-PORTVERSION= 1.5.1
+PORTVERSION= 2.1.1
CATEGORIES= databases
MASTER_SITES= ftp://gborg.postgresql.org/pub/libpqxx/stable/
PKGNAMEPREFIX= postgresql-
diff --git a/databases/postgresql-libpqxx/distinfo b/databases/postgresql-libpqxx/distinfo
index 7afeb34cdf8b..32892d3c31ea 100644
--- a/databases/postgresql-libpqxx/distinfo
+++ b/databases/postgresql-libpqxx/distinfo
@@ -1 +1 @@
-MD5 (postgresql/libpqxx-1.5.1.tar.gz) = 3c0f2b5a89ece20e7a84808c594dd7aa
+MD5 (postgresql/libpqxx-2.1.1.tar.gz) = 570a04c4758fead88ac555e7bc90f88b
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index c4fd72b9ae57..3cf76a7ee609 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -1,22 +1,69 @@
+include/pqxx/pqxx
include/pqxx/all.h
+include/pqxx/binarystring
+include/pqxx/binarystring.hxx
include/pqxx/cachedresult.h
include/pqxx/compiler.h
include/pqxx/config.h
+include/pqxx/connection
+include/pqxx/connection.hxx
include/pqxx/connection.h
+include/pqxx/connection_base
+include/pqxx/connection_base.hxx
+include/pqxx/connection_base.h
+include/pqxx/connectionitf.h
include/pqxx/cursor.h
+include/pqxx/dbtransaction
+include/pqxx/dbtransaction.hxx
+include/pqxx/dbtransaction.h
+include/pqxx/except
+include/pqxx/except.hxx
+include/pqxx/except.h
+include/pqxx/isolation
+include/pqxx/isolation.hxx
+include/pqxx/isolation.h
+include/pqxx/largeobject
+include/pqxx/largeobject.hxx
+include/pqxx/largeobject.h
+include/pqxx/libcompiler.h
+include/pqxx/libconfig.h
+include/pqxx/nontransaction
+include/pqxx/nontransaction.hxx
include/pqxx/nontransaction.h
+include/pqxx/result
+include/pqxx/result.hxx
include/pqxx/result.h
+include/pqxx/robusttransaction
+include/pqxx/robusttransaction.hxx
include/pqxx/robusttransaction.h
+include/pqxx/tablereader
+include/pqxx/tablereader.hxx
include/pqxx/tablereader.h
+include/pqxx/tablestream
+include/pqxx/tablestream.hxx
include/pqxx/tablestream.h
+include/pqxx/tablewriter
+include/pqxx/tablewriter.hxx
include/pqxx/tablewriter.h
+include/pqxx/transaction
+include/pqxx/transaction.hxx
include/pqxx/transaction.h
+include/pqxx/transaction_base
+include/pqxx/transaction_base.hxx
+include/pqxx/transaction_base.h
include/pqxx/transactionitf.h
+include/pqxx/transactor
+include/pqxx/transactor.hxx
include/pqxx/transactor.h
+include/pqxx/trigger
+include/pqxx/trigger.hxx
include/pqxx/trigger.h
+include/pqxx/util
+include/pqxx/util.hxx
include/pqxx/util.h
lib/libpqxx.a
lib/libpqxx.la
lib/libpqxx.so
lib/libpqxx.so.0
+lib/pkgconfig/libpqxx.pc
@dirrm include/pqxx
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 1625d3adb076..ce5382f01774 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libpqxx
-PORTVERSION= 1.5.1
+PORTVERSION= 2.1.1
CATEGORIES= databases
MASTER_SITES= ftp://gborg.postgresql.org/pub/libpqxx/stable/
PKGNAMEPREFIX= postgresql-
diff --git a/databases/postgresql-libpqxx3/distinfo b/databases/postgresql-libpqxx3/distinfo
index 7afeb34cdf8b..32892d3c31ea 100644
--- a/databases/postgresql-libpqxx3/distinfo
+++ b/databases/postgresql-libpqxx3/distinfo
@@ -1 +1 @@
-MD5 (postgresql/libpqxx-1.5.1.tar.gz) = 3c0f2b5a89ece20e7a84808c594dd7aa
+MD5 (postgresql/libpqxx-2.1.1.tar.gz) = 570a04c4758fead88ac555e7bc90f88b
diff --git a/databases/postgresql-libpqxx3/pkg-plist b/databases/postgresql-libpqxx3/pkg-plist
index c4fd72b9ae57..3cf76a7ee609 100644
--- a/databases/postgresql-libpqxx3/pkg-plist
+++ b/databases/postgresql-libpqxx3/pkg-plist
@@ -1,22 +1,69 @@
+include/pqxx/pqxx
include/pqxx/all.h
+include/pqxx/binarystring
+include/pqxx/binarystring.hxx
include/pqxx/cachedresult.h
include/pqxx/compiler.h
include/pqxx/config.h
+include/pqxx/connection
+include/pqxx/connection.hxx
include/pqxx/connection.h
+include/pqxx/connection_base
+include/pqxx/connection_base.hxx
+include/pqxx/connection_base.h
+include/pqxx/connectionitf.h
include/pqxx/cursor.h
+include/pqxx/dbtransaction
+include/pqxx/dbtransaction.hxx
+include/pqxx/dbtransaction.h
+include/pqxx/except
+include/pqxx/except.hxx
+include/pqxx/except.h
+include/pqxx/isolation
+include/pqxx/isolation.hxx
+include/pqxx/isolation.h
+include/pqxx/largeobject
+include/pqxx/largeobject.hxx
+include/pqxx/largeobject.h
+include/pqxx/libcompiler.h
+include/pqxx/libconfig.h
+include/pqxx/nontransaction
+include/pqxx/nontransaction.hxx
include/pqxx/nontransaction.h
+include/pqxx/result
+include/pqxx/result.hxx
include/pqxx/result.h
+include/pqxx/robusttransaction
+include/pqxx/robusttransaction.hxx
include/pqxx/robusttransaction.h
+include/pqxx/tablereader
+include/pqxx/tablereader.hxx
include/pqxx/tablereader.h
+include/pqxx/tablestream
+include/pqxx/tablestream.hxx
include/pqxx/tablestream.h
+include/pqxx/tablewriter
+include/pqxx/tablewriter.hxx
include/pqxx/tablewriter.h
+include/pqxx/transaction
+include/pqxx/transaction.hxx
include/pqxx/transaction.h
+include/pqxx/transaction_base
+include/pqxx/transaction_base.hxx
+include/pqxx/transaction_base.h
include/pqxx/transactionitf.h
+include/pqxx/transactor
+include/pqxx/transactor.hxx
include/pqxx/transactor.h
+include/pqxx/trigger
+include/pqxx/trigger.hxx
include/pqxx/trigger.h
+include/pqxx/util
+include/pqxx/util.hxx
include/pqxx/util.h
lib/libpqxx.a
lib/libpqxx.la
lib/libpqxx.so
lib/libpqxx.so.0
+lib/pkgconfig/libpqxx.pc
@dirrm include/pqxx
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index 1625d3adb076..ce5382f01774 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libpqxx
-PORTVERSION= 1.5.1
+PORTVERSION= 2.1.1
CATEGORIES= databases
MASTER_SITES= ftp://gborg.postgresql.org/pub/libpqxx/stable/
PKGNAMEPREFIX= postgresql-
diff --git a/databases/postgresql-libpqxx30/distinfo b/databases/postgresql-libpqxx30/distinfo
index 7afeb34cdf8b..32892d3c31ea 100644
--- a/databases/postgresql-libpqxx30/distinfo
+++ b/databases/postgresql-libpqxx30/distinfo
@@ -1 +1 @@
-MD5 (postgresql/libpqxx-1.5.1.tar.gz) = 3c0f2b5a89ece20e7a84808c594dd7aa
+MD5 (postgresql/libpqxx-2.1.1.tar.gz) = 570a04c4758fead88ac555e7bc90f88b
diff --git a/databases/postgresql-libpqxx30/pkg-plist b/databases/postgresql-libpqxx30/pkg-plist
index c4fd72b9ae57..3cf76a7ee609 100644
--- a/databases/postgresql-libpqxx30/pkg-plist
+++ b/databases/postgresql-libpqxx30/pkg-plist
@@ -1,22 +1,69 @@
+include/pqxx/pqxx
include/pqxx/all.h
+include/pqxx/binarystring
+include/pqxx/binarystring.hxx
include/pqxx/cachedresult.h
include/pqxx/compiler.h
include/pqxx/config.h
+include/pqxx/connection
+include/pqxx/connection.hxx
include/pqxx/connection.h
+include/pqxx/connection_base
+include/pqxx/connection_base.hxx
+include/pqxx/connection_base.h
+include/pqxx/connectionitf.h
include/pqxx/cursor.h
+include/pqxx/dbtransaction
+include/pqxx/dbtransaction.hxx
+include/pqxx/dbtransaction.h
+include/pqxx/except
+include/pqxx/except.hxx
+include/pqxx/except.h
+include/pqxx/isolation
+include/pqxx/isolation.hxx
+include/pqxx/isolation.h
+include/pqxx/largeobject
+include/pqxx/largeobject.hxx
+include/pqxx/largeobject.h
+include/pqxx/libcompiler.h
+include/pqxx/libconfig.h
+include/pqxx/nontransaction
+include/pqxx/nontransaction.hxx
include/pqxx/nontransaction.h
+include/pqxx/result
+include/pqxx/result.hxx
include/pqxx/result.h
+include/pqxx/robusttransaction
+include/pqxx/robusttransaction.hxx
include/pqxx/robusttransaction.h
+include/pqxx/tablereader
+include/pqxx/tablereader.hxx
include/pqxx/tablereader.h
+include/pqxx/tablestream
+include/pqxx/tablestream.hxx
include/pqxx/tablestream.h
+include/pqxx/tablewriter
+include/pqxx/tablewriter.hxx
include/pqxx/tablewriter.h
+include/pqxx/transaction
+include/pqxx/transaction.hxx
include/pqxx/transaction.h
+include/pqxx/transaction_base
+include/pqxx/transaction_base.hxx
+include/pqxx/transaction_base.h
include/pqxx/transactionitf.h
+include/pqxx/transactor
+include/pqxx/transactor.hxx
include/pqxx/transactor.h
+include/pqxx/trigger
+include/pqxx/trigger.hxx
include/pqxx/trigger.h
+include/pqxx/util
+include/pqxx/util.hxx
include/pqxx/util.h
lib/libpqxx.a
lib/libpqxx.la
lib/libpqxx.so
lib/libpqxx.so.0
+lib/pkgconfig/libpqxx.pc
@dirrm include/pqxx
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 8a405a5fdda3..dad6b501987e 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -4,31 +4,23 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 0
-CATEGORIES= databases tcl83
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
+PORTREVISION= 0
+CATEGORIES= databases tcl${TCLVERSION:S/.//}
PKGNAMESUFFIX= -pltcl
-DISTFILES!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= A module for using Tcl to write SQL functions
+POSTGRESQL_PORT?= databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include "../../${POSTGRESQL_PORT}/Makefile"
+
LIB_DEPENDS= tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//}
RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT}
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
-TCLVERSION?= 8.3
+TCLVERSION?= 8.4
CONFIGURE_ARGS= --with-tcl --without-tk \
--with-tclconfig="${TCLCONFIG}" \
--with-includes="${TCL_INCDIR}"
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 38d1e28b7d5c..84f960fc845e 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -4,31 +4,23 @@
#
# $FreeBSD$
#
-POSTGRESQL_PORT?= databases/postgresql7
-PORTNAME= postgresql
-PORTVERSION!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
-PORTREVISION?= 0
-CATEGORIES= databases tcl83 tk83
-MASTER_SITES= ${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
+PORTREVISION= 0
+CATEGORIES= databases tcl${TCLVERSION:S/.//}
PKGNAMESUFFIX= -tcltk
-DISTFILES!= cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
-DIST_SUBDIR= postgresql
MAINTAINER= girgen@pingpong.net
COMMENT= An TCL interface to the database PostgreSQL, including a tk GUI
+POSTGRESQL_PORT?= databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+
LIB_DEPENDS= tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} \
pq:${PORTSDIR}/${POSTGRESQL_PORT}
-MD5_FILE= ${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
-TCLVERSION?= 8.3
+TCLVERSION?= 8.4
PLIST_SUB+= TCLVERSION=${TCLVERSION}
CONFIGURE_ARGS= --with-tcl \
--with-tclconfig=${TCLCONFIG} \
@@ -47,10 +39,6 @@ WITHOUT_TK= yes
CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
CFLAGS=-DPGTCL_USE_TCLOBJ
-.if defined(WITHOUT_X11)
-WITHOUT_TK= yes
-.endif
-
.if defined(WITHOUT_TK)
CONFIGURE_ARGS+= --without-tk
INCDIRS= ${TCL_INCDIR}
@@ -63,8 +51,12 @@ LIB_DEPENDS+= tk${TCLVERSION:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCLVERSION:S/./
TKCONFIG= ${LOCALBASE}/lib/tk${TCLVERSION}
INCDIRS= ${TCL_INCDIR}:${TK_INCDIR}
PLIST_SUB+= TK=""
+CATEGORIES+= tk${TCLVERSION:S/.//}
.endif
+pre-build:
+ cd ${WRKSRC}/src/port; ${GMAKE}
+
do-build:
@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl
diff --git a/databases/postgresql-tcltk/files/patch-libpgtcl b/databases/postgresql-tcltk/files/patch-libpgtcl
index 831a4622f761..e0a811261fe7 100644
--- a/databases/postgresql-tcltk/files/patch-libpgtcl
+++ b/databases/postgresql-tcltk/files/patch-libpgtcl
@@ -1,9 +1,11 @@
---- src/interfaces/libpgtcl/Makefile Thu May 10 21:46:33 2001
-+++ src/interfaces/libpgtcl/Makefile Fri Mar 29 05:11:10 2002
-@@ -26,5 +26,5 @@
- # to be referenced separately to keep (broken) linkers happy. (This is
- # braindead; users of libpq should not need to know what it depends on.)
--SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
-+SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -L% -ltcl83 -ltcl84, $(LIBS))
+--- src/interfaces/libpgtcl/Makefile.orig Tue Oct 28 22:55:58 2003
++++ src/interfaces/libpgtcl/Makefile Tue Nov 18 04:21:46 2003
+@@ -21,7 +21,7 @@
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+
+ SHLIB_LINK = $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) \
+- $(filter -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(THREAD_LIBS)
++ $(filter -lssl -lcrypto -lkrb5 -lcrypt -L% -ltcl83 -ltcl84, $(LIBS)) $(THREAD_LIBS)
+
+ all: submake-libpq all-lib
- all: submake all-lib
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql7/distinfo b/databases/postgresql7/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql7/distinfo
+++ b/databases/postgresql7/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql7/files/pgsql.sh.tmpl b/databases/postgresql7/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql7/files/pgsql.sh.tmpl
+++ b/databases/postgresql7/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql7/files/pkg-message.server b/databases/postgresql7/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql7/files/pkg-message.server
+++ b/databases/postgresql7/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql7/pkg-install b/databases/postgresql7/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql7/pkg-install
+++ b/databases/postgresql7/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql7/pkg-plist
+++ b/databases/postgresql7/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql74-server/files/pkg-message.server b/databases/postgresql74-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql74-server/files/pkg-message.server
+++ b/databases/postgresql74-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql74-server/pkg-install b/databases/postgresql74-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql74-server/pkg-install
+++ b/databases/postgresql74-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql80-server/files/pkg-message.server b/databases/postgresql80-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql80-server/files/pkg-message.server
+++ b/databases/postgresql80-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql80-server/pkg-install b/databases/postgresql80-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql80-server/pkg-install
+++ b/databases/postgresql80-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql80-server/pkg-plist
+++ b/databases/postgresql80-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql81-server/files/pkg-message.server b/databases/postgresql81-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql81-server/files/pkg-message.server
+++ b/databases/postgresql81-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql81-server/pkg-install b/databases/postgresql81-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql81-server/pkg-install
+++ b/databases/postgresql81-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql81-server/pkg-plist
+++ b/databases/postgresql81-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql82-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql82-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql82-server/files/pkg-message.server b/databases/postgresql82-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql82-server/files/pkg-message.server
+++ b/databases/postgresql82-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql82-server/pkg-install b/databases/postgresql82-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql82-server/pkg-install
+++ b/databases/postgresql82-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql82-server/pkg-plist
+++ b/databases/postgresql82-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql83-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql83-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql83-server/files/pkg-message.server b/databases/postgresql83-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql83-server/files/pkg-message.server
+++ b/databases/postgresql83-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql83-server/pkg-install b/databases/postgresql83-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql83-server/pkg-install
+++ b/databases/postgresql83-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql83-server/pkg-plist
+++ b/databases/postgresql83-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql84-server/files/pkg-message.server b/databases/postgresql84-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql84-server/files/pkg-message.server
+++ b/databases/postgresql84-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql84-server/pkg-install b/databases/postgresql84-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql84-server/pkg-install
+++ b/databases/postgresql84-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql84-server/pkg-plist
+++ b/databases/postgresql84-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql90-server/files/pkg-message.server b/databases/postgresql90-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql90-server/files/pkg-message.server
+++ b/databases/postgresql90-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql90-server/pkg-install b/databases/postgresql90-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql90-server/pkg-install
+++ b/databases/postgresql90-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql90-server/pkg-plist
+++ b/databases/postgresql90-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql91-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql91-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql91-server/files/pkg-message.server b/databases/postgresql91-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql91-server/files/pkg-message.server
+++ b/databases/postgresql91-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql91-server/pkg-install b/databases/postgresql91-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql91-server/pkg-install
+++ b/databases/postgresql91-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql91-server/pkg-plist
+++ b/databases/postgresql91-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 05f6cc59e9c2..69ab124d5654 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTNAME?= postgresql
-PORTVERSION?= 7.3.4
-PORTREVISION= 1
+PORTNAME= postgresql
+PORTVERSION?= 7.4
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -20,6 +20,7 @@ COMMENT?= The most advanced open-source database available anywhere
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -36,6 +37,10 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-includes=${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+= --with-pam
+.endif
+
.if !defined(WITHOUT_GNUGETOPT)
USE_GETOPT_LONG=yes
.endif
@@ -50,7 +55,7 @@ PLIST_SUB+= GETTEXT="@comment "
.endif
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O3 -funroll-loops
+CFLAGS+= -O3 -funroll-loops
.endif
.if defined(WITH_DEBUG)
@@ -62,18 +67,20 @@ INSTALL_TARGET= install-strip
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
-CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
+CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
.endif
.if defined(WITHOUT_SERVER)
PLIST_SUB+= SERVER="@comment "
PKGNAMESUFFIX= -client
PKGMSG= ""
+CONFLICTS= postgresql-7*
.else
PKGMESSAGE= ${FILESDIR}/pkg-message.server
PKGMSG= ${PKGMESSAGE}
+CONFLICTS= postgresql-7*client
PLIST_SUB+= SERVER=""
-INSTALL_TARGET+= install-all-headers
+INSTALL_TARGET+= install-all-headers
MAKEFILE= GNUmakefile
.endif
@@ -92,7 +99,7 @@ WITH_KRB5= yes
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --with-krb5="`${KRB5CONF} --prefix krb5`"
LDFLAGS+= `${KRB5CONF} --libs krb5`
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_TESTS)
@@ -110,7 +117,10 @@ MAN1= clusterdb.1 createdb.1 createlang.1 createuser.1 dropdb.1 \
pg_resetxlog.1 pg_restore.1 pgtclsh.1 pgtksh.1 postgres.1 \
postmaster.1 psql.1 vacuumdb.1
-MAN7= abort.7 alter_database.7 alter_group.7 alter_table.7 \
+MAN7= abort.7 alter_aggregate.7 alter_conversion.7 \
+ alter_database.7 alter_domain.7 alter_function.7 \
+ alter_group.7 alter_language.7 alter_operator_class.7 \
+ alter_schema.7 alter_sequence.7 alter_table.7 \
alter_trigger.7 alter_user.7 analyze.7 begin.7 checkpoint.7 \
close.7 cluster.7 comment.7 commit.7 copy.7 create_aggregate.7 \
create_cast.7 create_constraint_trigger.7 create_conversion.7 \
@@ -142,9 +152,10 @@ pre-everything::
@${ECHO} " WITHOUT_GETTEXT Skips building with support for"
@${ECHO} " internationalized error messages"
@${ECHO} " WITHOUT_SERVER Don't install the server,"
- @${ECHO} " only install binaries, headers and libs"
+ @${ECHO} " only install binaries, headers and libs"
@${ECHO} " for PostgreSQL clients"
@${ECHO} " WITHOUT_SSL Builds without OpenSSL support"
+ @${ECHO} " WITH_PAM Builds with PAM 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)"
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index f97651c7ef11..f36c65ae2d5e 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
-MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
-MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
-MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
+MD5 (postgresql/postgresql-base-7.4.tar.bz2) = a1af58384f506ed63c1d960ab43a2b3b
+MD5 (postgresql/postgresql-opt-7.4.tar.bz2) = df425a08172b1e6ca41e7720b65a6b15
+MD5 (postgresql/postgresql-test-7.4.tar.bz2) = 3c104928f6dadb8fa6086b5ae8060835
+MD5 (postgresql/postgresql-docs-7.4.tar.bz2) = b8f1d43dc64b6813b3239f36425c8cb8
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index 0d85d6fba25d..3f8706d6af0c 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -9,30 +9,32 @@
PREFIX=%%PREFIX%%
PGBIN=${PREFIX}/bin
-logfile=/var/log/pgsql
case $1 in
start)
- 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 ${logfile}"
echo -n ' pgsql'
+ su -l pgsql -c \
+ "[ -d \${PGDATA} ] && exec ${PREFIX}/bin/pg_ctl start -s -w"
}
;;
stop)
[ -x ${PGBIN}/pg_ctl ] && {
- su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
echo -n ' pgsql'
+ su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl stop -s -m fast"
}
;;
restart)
[ -x ${PGBIN}/pg_ctl ] && {
- exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast -l ${logfile}"
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl restart -s -m fast"
+ }
+ ;;
+
+reload)
+ [ -x ${PGBIN}/pg_ctl ] && {
+ exec su -l pgsql -c "exec ${PREFIX}/bin/pg_ctl reload"
}
;;
@@ -43,7 +45,7 @@ status)
;;
*)
- echo "usage: `basename $0` {start|stop|restart|status}" >&2
+ echo "usage: `basename $0` {start|stop|restart|reload|status}" >&2
exit 64
;;
esac
diff --git a/databases/postgresql92-server/files/pkg-message.server b/databases/postgresql92-server/files/pkg-message.server
index 6027012da44c..a2e7293462ca 100644
--- a/databases/postgresql92-server/files/pkg-message.server
+++ b/databases/postgresql92-server/files/pkg-message.server
@@ -13,5 +13,9 @@ You can then start PostgreSQL by running:
/usr/local/etc/rc.d/010.pgsql.sh start
For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port now by default logs to syslog
+ See ~pgsql/data/postgresql.conf for more info
+
For more tips, read ~pgsql/post-install-notes
======================================================================
diff --git a/databases/postgresql92-server/pkg-install b/databases/postgresql92-server/pkg-install
index a4bde386e5c5..5c7141155fb5 100644
--- a/databases/postgresql92-server/pkg-install
+++ b/databases/postgresql92-server/pkg-install
@@ -11,7 +11,7 @@ backupwarning() {
=========== 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
+ minor revision (e.g. 7.3.x -> 7.4), a dump
and restore of all databases is
required. This is *NOT* done by the port!
diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist
index effd8e4f2f71..6c4ba1c3568b 100644
--- a/databases/postgresql92-server/pkg-plist
+++ b/databases/postgresql92-server/pkg-plist
@@ -33,21 +33,38 @@ include/postgresql/internal/libpq-int.h
include/postgresql/internal/postgres_fe.h
include/postgresql/internal/pqexpbuffer.h
@dirrm include/postgresql/internal
+include/compatlib.h
+include/datetime.h
+include/decimal.h
+include/ecpg_informix.h
include/ecpgerrno.h
include/ecpglib.h
include/ecpgtype.h
include/libpq-fe.h
include/pg_config.h
include/pg_config_os.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
include/postgres_ext.h
include/sql3types.h
include/sqlca.h
+include/sqlda.h
+include/sqltypes.h
lib/libecpg.a
lib/libecpg.so
-lib/libecpg.so.3
+lib/libecpg.so.4
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.1
lib/libpq.a
lib/libpq.so
lib/libpq.so.3
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.1
%%SERVER%%lib/postgresql/ascii_and_mic.so
%%SERVER%%lib/postgresql/cyrillic_and_mic.so
%%SERVER%%lib/postgresql/euc_cn_and_mic.so
@@ -77,57 +94,93 @@ lib/libpq.so.3
%%SERVER%%lib/postgresql/plpgsql.so
@unexec rmdir %D/lib/postgresql 2>/dev/null || true
%%SERVER%%share/postgresql/502.pgsql
-%%SERVER%%share/postgresql/postgres.bki
-%%SERVER%%share/postgresql/postgres.description
+%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/information_schema.sql
%%SERVER%%share/postgresql/pg_hba.conf.sample
%%SERVER%%share/postgresql/pg_ident.conf.sample
+%%SERVER%%share/postgresql/pg_service.conf.sample
+%%SERVER%%share/postgresql/postgres.bki
+%%SERVER%%share/postgresql/postgres.description
%%SERVER%%share/postgresql/postgresql.conf.sample
-%%SERVER%%share/postgresql/conversion_create.sql
+%%SERVER%%share/postgresql/sql_features.txt
share/postgresql/post-install-notes
@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.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/pt_BR/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.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
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
%%SERVER%%%%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%SERVER%%%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
%%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
@@ -173,6 +226,7 @@ share/postgresql/post-install-notes
%%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/slru.h
%%SERVER%%include/postgresql/server/access/strat.h
%%SERVER%%include/postgresql/server/access/transam.h
%%SERVER%%include/postgresql/server/access/tupdesc.h
@@ -222,6 +276,7 @@ share/postgresql/post-install-notes
%%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/alter.h
%%SERVER%%include/postgresql/server/commands/async.h
%%SERVER%%include/postgresql/server/commands/cluster.h
%%SERVER%%include/postgresql/server/commands/comment.h
@@ -238,6 +293,7 @@ share/postgresql/post-install-notes
%%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/typecmds.h
%%SERVER%%include/postgresql/server/commands/user.h
%%SERVER%%include/postgresql/server/commands/vacuum.h
%%SERVER%%include/postgresql/server/commands/variable.h
@@ -271,6 +327,7 @@ share/postgresql/post-install-notes
%%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/tstoreReceiver.h
%%SERVER%%include/postgresql/server/executor/tuptable.h
%%SERVER%%include/postgresql/server/lib/dllist.h
%%SERVER%%include/postgresql/server/lib/lispsort.h
@@ -279,14 +336,15 @@ share/postgresql/post-install-notes
%%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/ip.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/bitmapset.h
%%SERVER%%include/postgresql/server/nodes/execnodes.h
%%SERVER%%include/postgresql/server/nodes/makefuncs.h
%%SERVER%%include/postgresql/server/nodes/memnodes.h
@@ -342,6 +400,7 @@ share/postgresql/post-install-notes
%%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/cygwin.h
%%SERVER%%include/postgresql/server/port/darwin.h
%%SERVER%%include/postgresql/server/port/dgux.h
%%SERVER%%include/postgresql/server/port/freebsd.h
@@ -360,13 +419,11 @@ share/postgresql/post-install-notes
%%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/regcustom.h
+%%SERVER%%include/postgresql/server/regex/regerrs.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/regex/regguts.h
%%SERVER%%include/postgresql/server/rewrite/prs2lock.h
%%SERVER%%include/postgresql/server/rewrite/rewriteDefine.h
%%SERVER%%include/postgresql/server/rewrite/rewriteHandler.h
@@ -392,7 +449,6 @@ share/postgresql/post-install-notes
%%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
@@ -414,7 +470,6 @@ share/postgresql/post-install-notes
%%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
@@ -424,13 +479,15 @@ share/postgresql/post-install-notes
%%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/errcodes.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/guc_tables.h
%%SERVER%%include/postgresql/server/utils/hsearch.h
+%%SERVER%%include/postgresql/server/utils/help_config.h
%%SERVER%%include/postgresql/server/utils/inet.h
%%SERVER%%include/postgresql/server/utils/int8.h
%%SERVER%%include/postgresql/server/utils/inval.h
@@ -454,15 +511,20 @@ share/postgresql/post-install-notes
%%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/typcache.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/getaddrinfo.h
+%%SERVER%%include/postgresql/server/getopt_long.h
%%SERVER%%include/postgresql/server/miscadmin.h
+%%SERVER%%include/postgresql/server/pg_config.h
+%%SERVER%%include/postgresql/server/pg_config_manual.h
+%%SERVER%%include/postgresql/server/pg_config_os.h
%%SERVER%%include/postgresql/server/pgstat.h
+%%SERVER%%include/postgresql/server/port.h
%%SERVER%%include/postgresql/server/postgres.h
%%SERVER%%include/postgresql/server/postgres_ext.h
%%SERVER%%include/postgresql/server/postgres_fe.h