diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2011-10-18 09:03:33 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2011-10-18 09:03:33 +0000 |
| commit | d9a60ff20fdef5ff2634ff38096cc7c163b9eca3 (patch) | |
| tree | bd78806842ec28ab44892af2bfb4d697751facd0 /databases | |
| parent | 81a42c07f79717291fbfabe574233f8328458403 (diff) | |
| download | ports-d9a60ff20fdef5ff2634ff38096cc7c163b9eca3.tar.gz ports-d9a60ff20fdef5ff2634ff38096cc7c163b9eca3.zip | |
Notes
Diffstat (limited to 'databases')
48 files changed, 368 insertions, 522 deletions
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index b5dab8d0d2ec..e5126a85fb81 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -6,12 +6,11 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.2.21 +DISTVERSION?= 8.2.22 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} -MASTER_SITE_SUBDIR= source/v${PORTVERSION} +MASTER_SITE_SUBDIR= source/v${DISTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -21,7 +20,7 @@ CONFLICTS?= ${PORTNAME}-client-[79].* \ ${PORTNAME}-client-8.[0-13-9]* \ ${PORTNAME}${PKGNAMESUFFIX}-8.[0-13-9]* -WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION} +WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}82 @@ -36,13 +35,17 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PG_USER?= pgsql +PG_GROUP?= ${PG_USER} +PG_UID?= 70 + LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -CONFIGURE_ENV+= INCLUDES=${INCLUDES} \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -57,15 +60,26 @@ INSTALL_DIRS?= ${BUILD_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes USE_RC_SUBR= postgresql -SUB_FILES+= dot.cshrc dot.profile USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USERS?= ${PG_USER} +.if (${USERS} != "pgsql") +UID_FILES+= ${WRKDIR}/pguid +GID_FILES+= ${WRKDIR}/pggid +.endif +GROUPS?= ${PG_GROUP} +SUB_FILES+= 502.pgsql .endif .if !defined(SLAVE_ONLY) OPTIONS= NLS "Use internationalized messages" on .endif +.if !defined(CLIENT_ONLY) +MAKE_ENV= PATH=${PREFIX}/bin:${PATH} +CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} +.endif + # Cannot check this with standard OPTION due to a catch-22. # USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know # what OPTIONS are set. @@ -94,7 +108,11 @@ OPTIONS+= DEBUG "Builds with debugging symbols" off # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off +.endif # !SLAVE_ONLY + +.include <bsd.port.pre.mk> +.if !defined(SLAVE_ONLY) # . if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) # USE_AUTOTOOLS= autoconf # CONFIGURE_ARGS+=--with-icu @@ -216,7 +234,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -239,35 +257,35 @@ do-build: SUB_FILES+= pkg-message${PKGNAMESUFFIX} PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif -.endif - -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) +SUB_FILES+= pkg-install${PKGNAMESUFFIX} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) +PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} +. endif .endif .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") +pre-install: + @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid + @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid +. endif + do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) - @ ${MKDIR} ${PREFIX}/share/postgresql -. for i in profile cshrc - ${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \ - ${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \ - if [ ! -f ~pgsql/.$i ]; then \ - ${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \ - fi -. endfor - @ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\ + @ ${MKDIR} ${PREFIX}/share/postgresql ;\ ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ - ${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \ + ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @@ -282,7 +300,7 @@ do-install: fi .endif # !NO_BUILD -.if defined(SERVER_ONLY) && defined(WITH_TESTS) +.if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo index 2d5cb196d2c1..f432aa76cbda 100644 --- a/databases/postgresql82-server/distinfo +++ b/databases/postgresql82-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (postgresql/postgresql-8.2.21.tar.bz2) = b3fd5345b751557a1153f98e104fb58d1519c10dac81dc013ff1eb46c7826faa -SIZE (postgresql/postgresql-8.2.21.tar.bz2) = 12768593 +SHA256 (postgresql/postgresql-8.2.22.tar.bz2) = 88203528326c152ca556bcff986d824737ea1048ba2c6245e24a1b1efd6aeaf7 +SIZE (postgresql/postgresql-8.2.22.tar.bz2) = 12777172 diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql82-server/files/502.pgsql.in index 281189a59c46..69bfff4cef12 100644 --- a/databases/postgresql83-server/files/502.pgsql +++ b/databases/postgresql82-server/files/502.pgsql.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/databases/postgresql82-server/files/Attic/502.pgsql.in,v 1.1 2011-10-18 09:03:31 girgen Exp $ # # Maintenance shell script to vacuum and backup database # Put this in /usr/local/etc/periodic/daily, and it will be run @@ -19,10 +19,12 @@ # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases # daily_pgsql_vacuum_enable="YES" # do vacuum -daily_pgsql_vacuum_args="-z" -daily_pgsql_pgdump_args="-b -F c" +daily_pgsql_user=%%PG_USER%% +daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz" +daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c" +daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}" # backupdir is relative to ~pgsql home directory unless it begins with a slash: -daily_pgsql_backupdir="~pgsql/backups" +daily_pgsql_backupdir="~${daily_pgsql_user}/backups" daily_pgsql_savedays="7" # If there is a global system configuration file, suck it in. @@ -39,12 +41,12 @@ eval backupdir=${daily_pgsql_backupdir} rc=0 pgsql_backup() { - # daily_pgsql_backupdir must be writeable by user pgsql - # ~pgsql is just that under normal circumstances, + # daily_pgsql_backupdir must be writeable by user %%PG_USER%% + # ~%%PG_USER%% is just that under normal circumstances, # but this might not be where you want the backups... if [ ! -d ${backupdir} ] ; then echo Creating ${backupdir} - mkdir -m 700 ${backupdir}; chown pgsql ${backupdir} + mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir} fi echo @@ -55,13 +57,14 @@ pgsql_backup() { rc=$? now=`date "+%Y-%m-%dT%H:%M:%S"` file=${daily_pgsql_backupdir}/pgglobals_${now} - su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz" + su -l ${daily_pgsql_user} -c \ + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" db=$1 while shift; do echo -n " $db" file=${backupdir}/pgdump_${db}_${now} - su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" + su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" [ $? -gt 0 ] && rc=3 db=$1 done @@ -79,7 +82,7 @@ pgsql_backup() { case "$daily_pgsql_backup_enable" in [Yy][Ee][Ss]) - dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` + dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` pgsql_backup $dbnames ;; @@ -99,7 +102,7 @@ case "$daily_pgsql_vacuum_enable" in echo echo "PostgreSQL vacuum" - su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}" + su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}" if [ $? -gt 0 ] then echo diff --git a/databases/postgresql82-server/files/patch-src-plperl-plperl b/databases/postgresql82-server/files/patch-src-plperl-plperl deleted file mode 100644 index 4edb469a73d4..000000000000 --- a/databases/postgresql82-server/files/patch-src-plperl-plperl +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php -Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues - ---- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800 -@@ -687,7 +687,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800 -@@ -43,6 +43,11 @@ - #undef bool - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* routines from spi_internal.c */ - int spi_DEBUG(void); - int spi_LOG(void); diff --git a/databases/postgresql82-server/pkg-install-server b/databases/postgresql82-server/pkg-install-server index c3db75540ffa..6f41226305d7 100644 --- a/databases/postgresql82-server/pkg-install-server +++ b/databases/postgresql82-server/pkg-install-server @@ -2,11 +2,10 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql -DB_DIR=${PKG_PREFIX}/${PGUSER} +PATH=/bin:/usr/bin:/usr/sbin -backupwarning() { echo " +backupwarning() { +cat <<EOF =========== BACKUP YOUR DATA! ============= As always, backup your data before @@ -17,49 +16,12 @@ backupwarning() { echo " Press ctrl-C *now* if you need to pg_dump. =========================================== -" +EOF sleep 5 } case $2 in PRE-INSTALL) backupwarning - USER=${PGUSER} - GROUP=${USER} - UID=70 - GID=${UID} - - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} - fi - ;; - -BACKUPWARNING) - backupwarning ;; esac diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server index 4f2c1fcdcf32..f78ba2187495 100644 --- a/databases/postgresql82-server/pkg-plist-server +++ b/databases/postgresql82-server/pkg-plist-server @@ -155,6 +155,7 @@ share/postgresql/timezone/Africa/Freetown share/postgresql/timezone/Africa/Gaborone share/postgresql/timezone/Africa/Harare share/postgresql/timezone/Africa/Johannesburg +share/postgresql/timezone/Africa/Juba share/postgresql/timezone/Africa/Kampala share/postgresql/timezone/Africa/Khartoum share/postgresql/timezone/Africa/Kigali @@ -269,10 +270,12 @@ share/postgresql/timezone/America/Juneau share/postgresql/timezone/America/Kentucky/Louisville share/postgresql/timezone/America/Kentucky/Monticello share/postgresql/timezone/America/Knox_IN +share/postgresql/timezone/America/Kralendijk share/postgresql/timezone/America/La_Paz share/postgresql/timezone/America/Lima share/postgresql/timezone/America/Los_Angeles share/postgresql/timezone/America/Louisville +share/postgresql/timezone/America/Lower_Princes share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus @@ -743,19 +746,7 @@ share/postgresql/timezonesets/Pacific.txt @dirrm share/postgresql/timezone/US @dirrm share/postgresql/timezone @dirrm share/postgresql/timezonesets -@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi -@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi -@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist -@unexec [ -f ~pgsql/dot.cshrc.dist ] && rm ~pgsql/dot.cshrc.dist -share/postgresql/dot.profile.dist -share/postgresql/dot.cshrc.dist -@exec [ -f %D/share/postgresql/dot.profile.dist ] && cp %D/share/postgresql/dot.profile.dist ~pgsql/. -@exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. -@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) -@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually." @dirrmtry share/postgresql @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry pgsql diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index a51c0932ebdf..c6aaf33e7d86 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.3.15 +DISTVERSION?= 8.3.16 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -35,13 +35,14 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -PGUSER= pgsql -PGGROUP= pgsql +PG_USER?= pgsql +PG_GROUP?= ${PG_USER} +PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety \ --with-docdir=${DOCSDIR} CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ @@ -60,7 +61,14 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USERS?= ${PG_USER} +.if (${USERS} != "pgsql") +UID_FILES+= ${WRKDIR}/pguid +GID_FILES+= ${WRKDIR}/pggid +.endif +GROUPS?= ${PG_GROUP} +SUB_FILES+= 502.pgsql .endif .if !defined(SLAVE_ONLY) @@ -82,8 +90,6 @@ USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl .endif -.include <bsd.port.pre.mk> - .if !defined(SLAVE_ONLY) OPTIONS+= PAM "Build with PAM support (server only)" off OPTIONS+= LDAP "Build with LDAP authentication support" off @@ -100,7 +106,11 @@ OPTIONS+= ICU "Use ICU for unicode collation (server)" off # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off +.endif # !SLAVE_ONLY +.include <bsd.port.pre.mk> + +.if !defined(SLAVE_ONLY) . if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu @@ -112,7 +122,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 PATCH_DIST_STRIP=-p1 -. if defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -248,7 +258,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${PKGINSTALL} ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -271,12 +281,13 @@ do-build: SUB_FILES+= pkg-message${PKGNAMESUFFIX} PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif -.endif - -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ - ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL +. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) +SUB_FILES+= pkg-install${PKGNAMESUFFIX} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) +. endif .endif .if !defined(NO_BUILD) @@ -288,6 +299,12 @@ post-patch: ${WRKSRC}/configure.in . endif +. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") +pre-install: + @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid + @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid +. endif + do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ @@ -296,7 +313,7 @@ do-install: . if defined(SERVER_ONLY) @ ${MKDIR} ${PREFIX}/share/postgresql ;\ ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ - ${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \ + ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo index c064be0cd87a..7cf17c1fc910 100644 --- a/databases/postgresql83-server/distinfo +++ b/databases/postgresql83-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-8.3.15.tar.bz2) = 433bfad5c9ccca38029be193d3c4ff47d394f4c678be41ef709063255c97cf16 -SIZE (postgresql/postgresql-8.3.15.tar.bz2) = 14344586 +SHA256 (postgresql/postgresql-8.3.16.tar.bz2) = 000590e2bdd1a00c8f2d2fa30c1f244826a61ad038a53b63179e902f876a2744 +SIZE (postgresql/postgresql-8.3.16.tar.bz2) = 14348568 SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064 diff --git a/databases/postgresql82-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql.in index 281189a59c46..0a80253cffc3 100644 --- a/databases/postgresql82-server/files/502.pgsql +++ b/databases/postgresql83-server/files/502.pgsql.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/databases/postgresql83-server/files/502.pgsql.in,v 1.1 2011-10-18 09:03:31 girgen Exp $ # # Maintenance shell script to vacuum and backup database # Put this in /usr/local/etc/periodic/daily, and it will be run @@ -19,10 +19,12 @@ # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases # daily_pgsql_vacuum_enable="YES" # do vacuum -daily_pgsql_vacuum_args="-z" -daily_pgsql_pgdump_args="-b -F c" +daily_pgsql_user=%%PG_USER%% +daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz" +daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c" +daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}" # backupdir is relative to ~pgsql home directory unless it begins with a slash: -daily_pgsql_backupdir="~pgsql/backups" +daily_pgsql_backupdir="~${daily_pgsql_user}/backups" daily_pgsql_savedays="7" # If there is a global system configuration file, suck it in. @@ -39,12 +41,12 @@ eval backupdir=${daily_pgsql_backupdir} rc=0 pgsql_backup() { - # daily_pgsql_backupdir must be writeable by user pgsql - # ~pgsql is just that under normal circumstances, + # daily_pgsql_backupdir must be writeable by user %%PG_USER%% + # ~%%PG_USER%% is just that under normal circumstances, # but this might not be where you want the backups... if [ ! -d ${backupdir} ] ; then echo Creating ${backupdir} - mkdir -m 700 ${backupdir}; chown pgsql ${backupdir} + mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir} fi echo @@ -55,13 +57,14 @@ pgsql_backup() { rc=$? now=`date "+%Y-%m-%dT%H:%M:%S"` file=${daily_pgsql_backupdir}/pgglobals_${now} - su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz" + su -l ${daily_pgsql_user} -c \ + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" db=$1 while shift; do echo -n " $db" file=${backupdir}/pgdump_${db}_${now} - su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" + su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" [ $? -gt 0 ] && rc=3 db=$1 done @@ -79,7 +82,7 @@ pgsql_backup() { case "$daily_pgsql_backup_enable" in [Yy][Ee][Ss]) - dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` + dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"` pgsql_backup $dbnames ;; @@ -99,7 +102,7 @@ case "$daily_pgsql_vacuum_enable" in echo echo "PostgreSQL vacuum" - su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}" + su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}" if [ $? -gt 0 ] then echo diff --git a/databases/postgresql83-server/files/patch-src-plperl-plperl b/databases/postgresql83-server/files/patch-src-plperl-plperl deleted file mode 100644 index fc67e6e82be5..000000000000 --- a/databases/postgresql83-server/files/patch-src-plperl-plperl +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php -Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues - ---- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800 -@@ -685,7 +685,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800 -@@ -43,6 +43,11 @@ - #undef bool - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* routines from spi_internal.c */ - int spi_DEBUG(void); - int spi_LOG(void); diff --git a/databases/postgresql83-server/pkg-install-server b/databases/postgresql83-server/pkg-install-server index 6dc3b6fdbd67..6f41226305d7 100644 --- a/databases/postgresql83-server/pkg-install-server +++ b/databases/postgresql83-server/pkg-install-server @@ -4,7 +4,8 @@ PATH=/bin:/usr/bin:/usr/sbin -backupwarning() { echo " +backupwarning() { +cat <<EOF =========== BACKUP YOUR DATA! ============= As always, backup your data before @@ -15,49 +16,12 @@ backupwarning() { echo " Press ctrl-C *now* if you need to pg_dump. =========================================== -" +EOF sleep 5 } case $2 in PRE-INSTALL) backupwarning - PGUSER=${PGUSER:-pgsql} - PGGROUP=${PGGROUP:-pgsql} - DB_DIR=${PKG_PREFIX}/${PGUSER} - UID=70 - GID=70 - - if pw group show "${PGGROUP}" 2>/dev/null; then - echo "You already have a group \"${PGGROUP}\", so I will use it." - else - if pw groupadd ${PGGROUP} -g ${GID}; then - echo "Added group \"${PGGROUP}\"." - else - echo "Adding group \"${PGGROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${PGUSER}" 2>/dev/null; then - echo "You already have a user \"${PGUSER}\", so I will use it." - else - if pw useradd ${PGUSER} -u ${UID} -g ${PGGROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${PGUSER}\"." - else - echo "Adding user \"${PGUSER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PGUSER} ] ; then - install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} - fi - ;; - -BACKUPWARNING) - backupwarning ;; esac diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server index 8abc4498a995..55a368398351 100644 --- a/databases/postgresql83-server/pkg-plist-server +++ b/databases/postgresql83-server/pkg-plist-server @@ -187,6 +187,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Niamey %%TZDATA%%share/postgresql/timezone/Africa/Nouakchott %%TZDATA%%share/postgresql/timezone/Africa/Ouagadougou +%%TZDATA%%share/postgresql/timezone/Africa/Juba %%TZDATA%%share/postgresql/timezone/Africa/Porto-Novo %%TZDATA%%share/postgresql/timezone/Africa/Sao_Tome %%TZDATA%%share/postgresql/timezone/Africa/Timbuktu @@ -280,10 +281,12 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello %%TZDATA%%share/postgresql/timezone/America/Knox_IN +%%TZDATA%%share/postgresql/timezone/America/Kralendijk %%TZDATA%%share/postgresql/timezone/America/La_Paz %%TZDATA%%share/postgresql/timezone/America/Lima %%TZDATA%%share/postgresql/timezone/America/Los_Angeles %%TZDATA%%share/postgresql/timezone/America/Louisville +%%TZDATA%%share/postgresql/timezone/America/Lower_Princes %%TZDATA%%share/postgresql/timezone/America/Maceio %%TZDATA%%share/postgresql/timezone/America/Managua %%TZDATA%%share/postgresql/timezone/America/Manaus @@ -774,9 +777,7 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry share/postgresql/tsearch_data -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually." @dirrmtry share/postgresql @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry pgsql diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index e21f03015290..769240c9feb7 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.4.8 -PORTREVISION?= 1 +DISTVERSION?= 8.4.9 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -27,6 +27,7 @@ DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}84 LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES @@ -36,7 +37,7 @@ GNU_CONFIGURE= YES .endif PG_USER?= pgsql -PG_GROUP?= pgsql +PG_GROUP?= ${PG_USER} PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib @@ -60,7 +61,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} SUB_FILES+= 502.pgsql .endif @@ -264,7 +265,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -286,21 +287,13 @@ do-build: SUB_FILES+= pkg-message${PKGNAMESUFFIX} PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif - . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} +SUB_FILES+= pkg-install${PKGNAMESUFFIX} SUB_LIST= PG_GROUP=$(PG_GROUP) \ PG_USER=$(PG_USER) \ PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) -PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif - -.endif - -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -312,6 +305,12 @@ post-patch: ${WRKSRC}/configure.in . endif +. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") +pre-install: + @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid + @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid +. endif + do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index 3e969fbbef77..e527bfdc7039 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-8.4.8.tar.bz2) = 3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938 -SIZE (postgresql/postgresql-8.4.8.tar.bz2) = 14136376 +SHA256 (postgresql/postgresql-8.4.9.tar.bz2) = 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a +SIZE (postgresql/postgresql-8.4.9.tar.bz2) = 14275979 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321 diff --git a/databases/postgresql84-server/files/502.pgsql.in b/databases/postgresql84-server/files/502.pgsql.in index 9fcd98cce81a..95a67a68e457 100644 --- a/databases/postgresql84-server/files/502.pgsql.in +++ b/databases/postgresql84-server/files/502.pgsql.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql84-server/files/502.pgsql.in,v 1.1 2011-04-18 23:34:27 girgen Exp $ +# $FreeBSD: /tmp/pcvs/ports/databases/postgresql84-server/files/502.pgsql.in,v 1.2 2011-10-18 09:03:32 girgen Exp $ # # Maintenance shell script to vacuum and backup database # Put this in /usr/local/etc/periodic/daily, and it will be run @@ -19,10 +19,12 @@ # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases # daily_pgsql_vacuum_enable="YES" # do vacuum -daily_pgsql_vacuum_args="-z" -daily_pgsql_pgdump_args="-b -F c" +daily_pgsql_user=%%PG_USER%% +daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz" +daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c" +daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}" # backupdir is relative to ~pgsql home directory unless it begins with a slash: -daily_pgsql_backupdir="~%%PG_USER%%/backups" +daily_pgsql_backupdir="~${daily_pgsql_user}/backups" daily_pgsql_savedays="7" # If there is a global system configuration file, suck it in. @@ -44,7 +46,7 @@ pgsql_backup() { # but this might not be where you want the backups... if [ ! -d ${backupdir} ] ; then echo Creating ${backupdir} - mkdir -m 700 ${backupdir}; chown %%PG_USER%% ${backupdir} + mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir} fi echo @@ -55,13 +57,14 @@ pgsql_backup() { rc=$? now=`date "+%Y-%m-%dT%H:%M:%S"` file=${daily_pgsql_backupdir}/pgglobals_${now} - su -l %%PG_USER%% -c "umask 077; pg_dumpall -g -U %%PG_USER%% | gzip -9 > ${file}.gz" + su -l ${daily_pgsql_user} -c \ + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" db=$1 while shift; do echo -n " $db" file=${backupdir}/pgdump_${db}_${now} - su -l %%PG_USER%% -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -U %%PG_USER%% -f ${file} ${db}" + su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}" [ $? -gt 0 ] && rc=3 db=$1 done @@ -99,7 +102,7 @@ case "$daily_pgsql_vacuum_enable" in echo echo "PostgreSQL vacuum" - su -l %%PG_USER%% -c "vacuumdb -a -q -U %%PG_USER%% ${daily_pgsql_vacuum_args}" + su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}" if [ $? -gt 0 ] then echo diff --git a/databases/postgresql84-server/files/patch-src-plperl-plperl b/databases/postgresql84-server/files/patch-src-plperl-plperl deleted file mode 100644 index ea959506353a..000000000000 --- a/databases/postgresql84-server/files/patch-src-plperl-plperl +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php -Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues - ---- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800 -@@ -700,7 +700,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800 -@@ -43,6 +43,11 @@ - #undef bool - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* routines from spi_internal.c */ - int spi_DEBUG(void); - int spi_LOG(void); diff --git a/databases/postgresql84-server/files/pkg-install-server.in b/databases/postgresql84-server/files/pkg-install-server.in deleted file mode 100644 index da85c73b7e4c..000000000000 --- a/databases/postgresql84-server/files/pkg-install-server.in +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh - -# $FreeBSD$ - -PATH=/bin:/usr/bin:/usr/sbin - -PG_USER=%%PG_USER%% -PG_GROUP=%%PG_GROUP%% -PG_UID=%%PG_UID%% - -backupwarning() { echo " - - =========== BACKUP YOUR DATA! ============= - As always, backup your data before - upgrading. If the upgrade leads to a higher - 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! - - Press ctrl-C *now* if you need to pg_dump. - =========================================== -" - sleep 5 -} - -case $2 in -PRE-INSTALL) - backupwarning - DB_DIR=${PKG_PREFIX}/${PG_USER} - - if pw group show "${PG_GROUP}" 2>/dev/null; then - echo "You already have a group \"${PG_GROUP}\", so I will use it." - else - if pw groupadd ${PG_GROUP} -g ${PG_UID}; then - echo "Added group \"${PG_GROUP}\"." - else - echo "Adding group \"${PG_GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${PG_USER}" 2>/dev/null; then - echo "You already have a user \"${PG_USER}\", so I will use it." - else - if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${PG_USER}\"." - else - echo "Adding user \"${PG_USER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PG_USER} ] ; then - install -m 755 -o ${PG_USER} -g ${PG_GROUP} -d ${DB_DIR} - fi - ;; - -BACKUPWARNING) - backupwarning - ;; -esac diff --git a/databases/postgresql92-server/files/pkg-install-server.in b/databases/postgresql84-server/pkg-install-server index b40ee0032cdf..6f41226305d7 100644 --- a/databases/postgresql92-server/files/pkg-install-server.in +++ b/databases/postgresql84-server/pkg-install-server @@ -1,10 +1,11 @@ #! /bin/sh -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/Attic/pkg-install-server.in,v 1.2 2011-06-11 23:14:30 girgen Exp $ +# $FreeBSD$ PATH=/bin:/usr/bin:/usr/sbin -backupwarning() { echo " +backupwarning() { +cat <<EOF =========== BACKUP YOUR DATA! ============= As always, backup your data before @@ -15,12 +16,12 @@ backupwarning() { echo " Press ctrl-C *now* if you need to pg_dump. =========================================== -" +EOF sleep 5 } case $2 in -BACKUPWARNING) +PRE-INSTALL) backupwarning ;; esac diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client index 715b496896bb..92d1fdccad68 100644 --- a/databases/postgresql84-server/pkg-plist-client +++ b/databases/postgresql84-server/pkg-plist-client @@ -598,6 +598,12 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-8.4.mo %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-8.4.mo diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server index 9134bcce6f4e..1577d8bc5bdf 100644 --- a/databases/postgresql84-server/pkg-plist-server +++ b/databases/postgresql84-server/pkg-plist-server @@ -81,6 +81,12 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo @@ -145,6 +151,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Gaborone %%TZDATA%%share/postgresql/timezone/Africa/Harare %%TZDATA%%share/postgresql/timezone/Africa/Johannesburg +%%TZDATA%%share/postgresql/timezone/Africa/Juba %%TZDATA%%share/postgresql/timezone/Africa/Kampala %%TZDATA%%share/postgresql/timezone/Africa/Khartoum %%TZDATA%%share/postgresql/timezone/Africa/Kigali @@ -259,10 +266,12 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello %%TZDATA%%share/postgresql/timezone/America/Knox_IN +%%TZDATA%%share/postgresql/timezone/America/Kralendijk %%TZDATA%%share/postgresql/timezone/America/La_Paz %%TZDATA%%share/postgresql/timezone/America/Lima %%TZDATA%%share/postgresql/timezone/America/Los_Angeles %%TZDATA%%share/postgresql/timezone/America/Louisville +%%TZDATA%%share/postgresql/timezone/America/Lower_Princes %%TZDATA%%share/postgresql/timezone/America/Maceio %%TZDATA%%share/postgresql/timezone/America/Managua %%TZDATA%%share/postgresql/timezone/America/Manaus @@ -753,9 +762,7 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry share/postgresql/tsearch_data -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually." @dirrmtry share/postgresql @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry %%PG_USER%% diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index 0946959a5eba..134d331dccf8 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -8,8 +8,8 @@ # See Mk/bsd.databases.mk for more info PORTNAME= postgresql +PORTREVISION= 0 PKGNAMESUFFIX= -client -PORTREVISION= 1 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile index c06cd6427af7..a691775a8eb6 100644 --- a/databases/postgresql90-contrib/Makefile +++ b/databases/postgresql90-contrib/Makefile @@ -6,13 +6,16 @@ # PORTNAME= postgresql -PKGNAMESUFFIX= -contrib +PORTREVISION= 0 CATEGORIES= databases -PORTREVISION= 1 +PKGNAMESUFFIX= -contrib MAINTAINER= girgen@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution +LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2 +BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid + USE_PGSQL= yes DEFAULT_PGSQL_VER=90 MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server @@ -23,8 +26,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes -CONFIGURE_ARGS+=--with-libxslt --with-libxml -LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2 +CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-ossp-uuid LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib post-install: diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index e3f181ce9914..ccea4b175bcd 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.4 -PORTREVISION?= 3 +DISTVERSION?= 9.0.5 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -17,7 +17,9 @@ MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere CONFLICTS?= ${PORTNAME}-client-[78]* \ - ${PORTNAME}${PKGNAMESUFFIX}-[78]* + ${PORTNAME}${PKGNAMESUFFIX}-[78]* \ + ${PORTNAME}-client-9.[1-9]* \ + ${PORTNAME}${PKGNAMESUFFIX}-9.[1-9]* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -25,6 +27,7 @@ DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}90 LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES @@ -34,7 +37,7 @@ GNU_CONFIGURE= YES .endif PG_USER?= pgsql -PG_GROUP?= pgsql +PG_GROUP?= ${PG_USER} PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib @@ -59,7 +62,13 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USERS?= ${PG_USER} +.if (${USERS} != "pgsql") +UID_FILES+= ${WRKDIR}/pguid +GID_FILES+= ${WRKDIR}/pggid +.endif +GROUPS?= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif @@ -296,7 +305,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -320,19 +329,14 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} -PLIST_SUB+= PG_USER=${PG_USER} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif .endif -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in @@ -342,6 +346,12 @@ post-patch: ${WRKSRC}/configure.in . endif +. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") +pre-install: + @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid + @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid +. endif + do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo index fab2290611db..365f37d9b247 100644 --- a/databases/postgresql90-server/distinfo +++ b/databases/postgresql90-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.0.4.tar.bz2) = 30572706e3176228415991895e63a8b77343a5abad11407961cfd08790be9e84 -SIZE (postgresql/postgresql-9.0.4.tar.bz2) = 14040871 +SHA256 (postgresql/postgresql-9.0.5.tar.bz2) = 56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504 +SIZE (postgresql/postgresql-9.0.5.tar.bz2) = 14344752 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9 SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349 diff --git a/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile index 12c43172fb35..986ef77157fb 100644 --- a/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile +++ b/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile @@ -1,11 +1,5 @@ -Manual pages are already present in the PostgreSQL tarball, so we avoid -messing with timestamp: it depends on postgres.xml that, in turn, -depends on almost all SGML files, most notably, version.sgml. And the -latter depends on the configure in the top-level directory, so when -we patch it, build system wants to regenerate manual pages. - ---- doc/src/sgml/Makefile.orig 2011-09-13 23:42:58.508672251 +0400 -+++ doc/src/sgml/Makefile 2011-09-13 23:43:01.676668807 +0400 +--- doc/src/sgml/Makefile.orig 2011-10-13 15:05:32.000000000 +0200 ++++ doc/src/sgml/Makefile 2011-10-13 15:41:10.000000000 +0200 @@ -75,8 +75,6 @@ ## Man pages ## @@ -15,3 +9,12 @@ we patch it, build system wants to regenerate manual pages. man-stamp: stylesheet-man.xsl postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^ touch $@ +@@ -292,7 +290,7 @@ + endif + + installdirs: +- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) ++ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) + + uninstall: + rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*) diff --git a/databases/postgresql90-server/files/patch-src-plperl-plperl b/databases/postgresql90-server/files/patch-src-plperl-plperl deleted file mode 100644 index 6f84a60e950d..000000000000 --- a/databases/postgresql90-server/files/patch-src-plperl-plperl +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php -Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues - ---- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800 -@@ -874,7 +874,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800 -@@ -42,6 +42,11 @@ - #undef bool - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* declare routines from plperl.c for access by .xs files */ - HV *plperl_spi_exec(char *, int); - void plperl_return_next(SV *); diff --git a/databases/postgresql90-server/files/pkg-install-server.in b/databases/postgresql90-server/files/pkg-install-server.in deleted file mode 100644 index da85c73b7e4c..000000000000 --- a/databases/postgresql90-server/files/pkg-install-server.in +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh - -# $FreeBSD$ - -PATH=/bin:/usr/bin:/usr/sbin - -PG_USER=%%PG_USER%% -PG_GROUP=%%PG_GROUP%% -PG_UID=%%PG_UID%% - -backupwarning() { echo " - - =========== BACKUP YOUR DATA! ============= - As always, backup your data before - upgrading. If the upgrade leads to a higher - 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! - - Press ctrl-C *now* if you need to pg_dump. - =========================================== -" - sleep 5 -} - -case $2 in -PRE-INSTALL) - backupwarning - DB_DIR=${PKG_PREFIX}/${PG_USER} - - if pw group show "${PG_GROUP}" 2>/dev/null; then - echo "You already have a group \"${PG_GROUP}\", so I will use it." - else - if pw groupadd ${PG_GROUP} -g ${PG_UID}; then - echo "Added group \"${PG_GROUP}\"." - else - echo "Adding group \"${PG_GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${PG_USER}" 2>/dev/null; then - echo "You already have a user \"${PG_USER}\", so I will use it." - else - if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${PG_USER}\"." - else - echo "Adding user \"${PG_USER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PG_USER} ] ; then - install -m 755 -o ${PG_USER} -g ${PG_GROUP} -d ${DB_DIR} - fi - ;; - -BACKUPWARNING) - backupwarning - ;; -esac diff --git a/databases/postgresql91-server/files/pkg-install-server.in b/databases/postgresql90-server/pkg-install-server index 66298484c23b..6f41226305d7 100644 --- a/databases/postgresql91-server/files/pkg-install-server.in +++ b/databases/postgresql90-server/pkg-install-server @@ -1,10 +1,11 @@ #! /bin/sh -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/Attic/pkg-install-server.in,v 1.2 2011-06-11 23:14:30 girgen Exp $ +# $FreeBSD$ PATH=/bin:/usr/bin:/usr/sbin -backupwarning() { echo " +backupwarning() { +cat <<EOF =========== BACKUP YOUR DATA! ============= As always, backup your data before @@ -15,12 +16,12 @@ backupwarning() { echo " Press ctrl-C *now* if you need to pg_dump. =========================================== -" +EOF sleep 5 } case $2 in -BACKUPWARNING) +PRE-INSTALL) backupwarning ;; esac diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client index dac1a5f8c8f3..233c612dae9a 100644 --- a/databases/postgresql90-server/pkg-plist-client +++ b/databases/postgresql90-server/pkg-plist-client @@ -569,7 +569,11 @@ lib/postgresql/pgxs/src/nls-global.mk share/postgresql/pg_service.conf.sample share/postgresql/psqlrc.sample @dirrmtry share/postgresql +%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.0.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.0.mo @@ -607,11 +611,20 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpglib6-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-9.0.mo %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/psql-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.0.mo @@ -646,9 +659,9 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpglib6-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo -@dirrm share/doc/postgresql/html -@dirrm share/doc/postgresql +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.0.mo diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib index 3471716032c0..06f6e95af4b8 100644 --- a/databases/postgresql90-server/pkg-plist-contrib +++ b/databases/postgresql90-server/pkg-plist-contrib @@ -43,6 +43,7 @@ lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so +lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README %%DOCSDIR%%/contrib/autoinc.example @@ -87,6 +88,8 @@ share/postgresql/contrib/test_parser.sql share/postgresql/contrib/timetravel.sql share/postgresql/contrib/tsearch2.sql share/postgresql/contrib/unaccent.sql +share/postgresql/contrib/uninstall_uuid-ossp.sql +share/postgresql/contrib/uuid-ossp.sql share/postgresql/contrib/uninstall__int.sql share/postgresql/contrib/uninstall_adminpack.sql share/postgresql/contrib/uninstall_btree_gin.sql diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server index ffd6dfc752d2..c99292212c63 100644 --- a/databases/postgresql90-server/pkg-plist-server +++ b/databases/postgresql90-server/pkg-plist-server @@ -47,6 +47,10 @@ share/postgresql/recovery.conf.sample share/postgresql/sql_features.txt share/postgresql/system_views.sql %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.0.mo +%%GETTEXT%%share/locale/cs/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo @@ -81,6 +85,13 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.0.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo @@ -92,6 +103,7 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-9.0.mo +%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-9.0.mo @@ -148,6 +160,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Gaborone %%TZDATA%%share/postgresql/timezone/Africa/Harare %%TZDATA%%share/postgresql/timezone/Africa/Johannesburg +%%TZDATA%%share/postgresql/timezone/Africa/Juba %%TZDATA%%share/postgresql/timezone/Africa/Kampala %%TZDATA%%share/postgresql/timezone/Africa/Khartoum %%TZDATA%%share/postgresql/timezone/Africa/Kigali @@ -262,10 +275,12 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello %%TZDATA%%share/postgresql/timezone/America/Knox_IN +%%TZDATA%%share/postgresql/timezone/America/Kralendijk %%TZDATA%%share/postgresql/timezone/America/La_Paz %%TZDATA%%share/postgresql/timezone/America/Lima %%TZDATA%%share/postgresql/timezone/America/Los_Angeles %%TZDATA%%share/postgresql/timezone/America/Louisville +%%TZDATA%%share/postgresql/timezone/America/Lower_Princes %%TZDATA%%share/postgresql/timezone/America/Maceio %%TZDATA%%share/postgresql/timezone/America/Managua %%TZDATA%%share/postgresql/timezone/America/Manaus @@ -756,9 +771,7 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry share/postgresql/tsearch_data -@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually." @dirrmtry share/postgresql @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry %%PG_USER%% diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile index a83b77eee9ab..1fdb81d3fbed 100644 --- a/databases/postgresql91-contrib/Makefile +++ b/databases/postgresql91-contrib/Makefile @@ -6,12 +6,15 @@ # PORTNAME= postgresql -PKGNAMESUFFIX= -contrib CATEGORIES= databases +PKGNAMESUFFIX= -contrib MAINTAINER= girgen@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution +LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2 +BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid + USE_PGSQL= yes DEFAULT_PGSQL_VER=91 MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server @@ -22,8 +25,7 @@ BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib SLAVE_ONLY= yes -CONFIGURE_ARGS+=--with-libxslt --with-libxml -LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2 +CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-ossp-uuid LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib post-install: diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 940794cd1e76..1d2cd21217ad 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= postgresql +DISTVERSION?= 9.1.1 DISTVERSION?= 9.1.0 -PORTREVISION= 1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -27,6 +27,7 @@ DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}91 LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES @@ -61,7 +62,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} USERS?= ${PG_USER} .if (${USERS} != "pgsql") UID_FILES+= ${WRKDIR}/pguid @@ -190,7 +191,7 @@ LDFLAGS+= -lgssapi . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) -BROKEN= You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB +BROKEN= You must remove /usr/bin/krb5-config and /usr/lib/libkrb5.so* (from system heimdal), and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB . endif # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) @@ -306,7 +307,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -330,11 +331,10 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} -PLIST_SUB+= PG_USER=${PG_USER} -PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo index 8b557f276097..8db08ba8410b 100644 --- a/databases/postgresql91-server/distinfo +++ b/databases/postgresql91-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.1.0.tar.bz2) = ec011c55194a0ac43687c0388c6567ffb534a8d0458e38b843bcd18aba027fca -SIZE (postgresql/postgresql-9.1.0.tar.bz2) = 14788869 +SHA256 (postgresql/postgresql-9.1.1.tar.bz2) = c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2 +SIZE (postgresql/postgresql-9.1.1.tar.bz2) = 14884071 SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149 SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373 diff --git a/databases/postgresql91-server/files/502.pgsql.in b/databases/postgresql91-server/files/502.pgsql.in index e577f83467f4..e0f90b6b3406 100644 --- a/databases/postgresql91-server/files/502.pgsql.in +++ b/databases/postgresql91-server/files/502.pgsql.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/502.pgsql.in,v 1.3 2011-06-11 23:14:30 girgen Exp $ +# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/502.pgsql.in,v 1.4 2011-10-18 09:03:32 girgen Exp $ # # Maintenance shell script to vacuum and backup database # Put this in /usr/local/etc/periodic/daily, and it will be run @@ -58,7 +58,7 @@ pgsql_backup() { now=`date "+%Y-%m-%dT%H:%M:%S"` file=${daily_pgsql_backupdir}/pgglobals_${now} su -l ${daily_pgsql_user} -c \ - "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals__args} | gzip -9 > ${file}.gz" + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" db=$1 while shift; do diff --git a/databases/postgresql91-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql91-server/files/patch-doc-src-sgml-Makefile index 12c43172fb35..ee9a537b1ecc 100644 --- a/databases/postgresql91-server/files/patch-doc-src-sgml-Makefile +++ b/databases/postgresql91-server/files/patch-doc-src-sgml-Makefile @@ -1,11 +1,5 @@ -Manual pages are already present in the PostgreSQL tarball, so we avoid -messing with timestamp: it depends on postgres.xml that, in turn, -depends on almost all SGML files, most notably, version.sgml. And the -latter depends on the configure in the top-level directory, so when -we patch it, build system wants to regenerate manual pages. - ---- doc/src/sgml/Makefile.orig 2011-09-13 23:42:58.508672251 +0400 -+++ doc/src/sgml/Makefile 2011-09-13 23:43:01.676668807 +0400 +--- doc/src/sgml/Makefile.orig 2011-10-13 16:53:51.000000000 +0200 ++++ doc/src/sgml/Makefile 2011-10-13 17:05:08.000000000 +0200 @@ -75,8 +75,6 @@ ## Man pages ## @@ -15,3 +9,12 @@ we patch it, build system wants to regenerate manual pages. man-stamp: stylesheet-man.xsl postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^ touch $@ +@@ -303,7 +301,7 @@ + endif + + installdirs: +- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) ++ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) + + uninstall: + rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*) diff --git a/databases/postgresql91-server/pkg-install-server b/databases/postgresql91-server/pkg-install-server new file mode 100644 index 000000000000..6f41226305d7 --- /dev/null +++ b/databases/postgresql91-server/pkg-install-server @@ -0,0 +1,27 @@ +#! /bin/sh + +# $FreeBSD$ + +PATH=/bin:/usr/bin:/usr/sbin + +backupwarning() { +cat <<EOF + + =========== BACKUP YOUR DATA! ============= + As always, backup your data before + upgrading. If the upgrade leads to a higher + 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! + + Press ctrl-C *now* if you need to pg_dump. + =========================================== +EOF + sleep 5 +} + +case $2 in +PRE-INSTALL) + backupwarning + ;; +esac diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client index 4536bc100c90..6262d830db14 100644 --- a/databases/postgresql91-server/pkg-plist-client +++ b/databases/postgresql91-server/pkg-plist-client @@ -682,6 +682,3 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.1.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.1.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.1.mo -@dirrm share/doc/postgresql/html -@dirrm share/doc/postgresql - diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib index 20a4952033d6..b616652ad171 100644 --- a/databases/postgresql91-server/pkg-plist-contrib +++ b/databases/postgresql91-server/pkg-plist-contrib @@ -43,6 +43,7 @@ lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so +lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync @@ -163,6 +164,9 @@ share/postgresql/extension/tsearch2.control share/postgresql/extension/unaccent--1.0.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control +share/postgresql/extension/uuid-ossp--1.0.sql +share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql +share/postgresql/extension/uuid-ossp.control share/postgresql/extension/xml2--1.0.sql share/postgresql/extension/xml2--unpackaged--1.0.sql share/postgresql/extension/xml2.control diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server index 0e64df5c521a..6284d5756572 100644 --- a/databases/postgresql91-server/pkg-plist-server +++ b/databases/postgresql91-server/pkg-plist-server @@ -92,6 +92,7 @@ share/postgresql/extension/plpgsql.control %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.1.mo %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.1.mo %%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.1.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.1.mo @@ -768,4 +769,3 @@ share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry %%PG_USER%% diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 940794cd1e76..1d2cd21217ad 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= postgresql +DISTVERSION?= 9.1.1 DISTVERSION?= 9.1.0 -PORTREVISION= 1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -27,6 +27,7 @@ DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}91 LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES @@ -61,7 +62,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} USERS?= ${PG_USER} .if (${USERS} != "pgsql") UID_FILES+= ${WRKDIR}/pguid @@ -190,7 +191,7 @@ LDFLAGS+= -lgssapi . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) -BROKEN= You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB +BROKEN= You must remove /usr/bin/krb5-config and /usr/lib/libkrb5.so* (from system heimdal), and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB . endif # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) @@ -306,7 +307,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -330,11 +331,10 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} -PLIST_SUB+= PG_USER=${PG_USER} -PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) . endif .endif diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo index 8b557f276097..8db08ba8410b 100644 --- a/databases/postgresql92-server/distinfo +++ b/databases/postgresql92-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.1.0.tar.bz2) = ec011c55194a0ac43687c0388c6567ffb534a8d0458e38b843bcd18aba027fca -SIZE (postgresql/postgresql-9.1.0.tar.bz2) = 14788869 +SHA256 (postgresql/postgresql-9.1.1.tar.bz2) = c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2 +SIZE (postgresql/postgresql-9.1.1.tar.bz2) = 14884071 SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149 SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373 diff --git a/databases/postgresql92-server/files/502.pgsql.in b/databases/postgresql92-server/files/502.pgsql.in index 4ab9cb449ee7..e92f01f992cd 100644 --- a/databases/postgresql92-server/files/502.pgsql.in +++ b/databases/postgresql92-server/files/502.pgsql.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/502.pgsql.in,v 1.3 2011-06-11 23:14:30 girgen Exp $ +# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/502.pgsql.in,v 1.4 2011-10-18 09:03:32 girgen Exp $ # # Maintenance shell script to vacuum and backup database # Put this in /usr/local/etc/periodic/daily, and it will be run @@ -58,7 +58,7 @@ pgsql_backup() { now=`date "+%Y-%m-%dT%H:%M:%S"` file=${daily_pgsql_backupdir}/pgglobals_${now} su -l ${daily_pgsql_user} -c \ - "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals__args} | gzip -9 > ${file}.gz" + "umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz" db=$1 while shift; do diff --git a/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile index 12c43172fb35..ee9a537b1ecc 100644 --- a/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile +++ b/databases/postgresql92-server/files/patch-doc-src-sgml-Makefile @@ -1,11 +1,5 @@ -Manual pages are already present in the PostgreSQL tarball, so we avoid -messing with timestamp: it depends on postgres.xml that, in turn, -depends on almost all SGML files, most notably, version.sgml. And the -latter depends on the configure in the top-level directory, so when -we patch it, build system wants to regenerate manual pages. - ---- doc/src/sgml/Makefile.orig 2011-09-13 23:42:58.508672251 +0400 -+++ doc/src/sgml/Makefile 2011-09-13 23:43:01.676668807 +0400 +--- doc/src/sgml/Makefile.orig 2011-10-13 16:53:51.000000000 +0200 ++++ doc/src/sgml/Makefile 2011-10-13 17:05:08.000000000 +0200 @@ -75,8 +75,6 @@ ## Man pages ## @@ -15,3 +9,12 @@ we patch it, build system wants to regenerate manual pages. man-stamp: stylesheet-man.xsl postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^ touch $@ +@@ -303,7 +301,7 @@ + endif + + installdirs: +- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) ++ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) + + uninstall: + rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*) diff --git a/databases/postgresql92-server/pkg-install-server b/databases/postgresql92-server/pkg-install-server new file mode 100644 index 000000000000..6f41226305d7 --- /dev/null +++ b/databases/postgresql92-server/pkg-install-server @@ -0,0 +1,27 @@ +#! /bin/sh + +# $FreeBSD$ + +PATH=/bin:/usr/bin:/usr/sbin + +backupwarning() { +cat <<EOF + + =========== BACKUP YOUR DATA! ============= + As always, backup your data before + upgrading. If the upgrade leads to a higher + 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! + + Press ctrl-C *now* if you need to pg_dump. + =========================================== +EOF + sleep 5 +} + +case $2 in +PRE-INSTALL) + backupwarning + ;; +esac diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client index 4536bc100c90..6262d830db14 100644 --- a/databases/postgresql92-server/pkg-plist-client +++ b/databases/postgresql92-server/pkg-plist-client @@ -682,6 +682,3 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.1.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.1.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.1.mo -@dirrm share/doc/postgresql/html -@dirrm share/doc/postgresql - diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib index 20a4952033d6..b616652ad171 100644 --- a/databases/postgresql92-server/pkg-plist-contrib +++ b/databases/postgresql92-server/pkg-plist-contrib @@ -43,6 +43,7 @@ lib/postgresql/test_parser.so lib/postgresql/timetravel.so lib/postgresql/tsearch2.so lib/postgresql/unaccent.so +lib/postgresql/uuid-ossp.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/extension/README bin/pg_test_fsync @@ -163,6 +164,9 @@ share/postgresql/extension/tsearch2.control share/postgresql/extension/unaccent--1.0.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control +share/postgresql/extension/uuid-ossp--1.0.sql +share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql +share/postgresql/extension/uuid-ossp.control share/postgresql/extension/xml2--1.0.sql share/postgresql/extension/xml2--unpackaged--1.0.sql share/postgresql/extension/xml2.control diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server index 0e64df5c521a..6284d5756572 100644 --- a/databases/postgresql92-server/pkg-plist-server +++ b/databases/postgresql92-server/pkg-plist-server @@ -92,6 +92,7 @@ share/postgresql/extension/plpgsql.control %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.1.mo %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.1.mo %%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.1.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.1.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.1.mo @@ -768,4 +769,3 @@ share/postgresql/tsearch_data/thesaurus_sample.ths @dirrmtry etc/periodic/daily @dirrmtry etc/periodic @dirrmtry lib/postgresql -@dirrmtry %%PG_USER%% |