diff options
60 files changed, 411 insertions, 654 deletions
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile index ddd72654a2fc..a5add57e1102 100644 --- a/databases/postgresql-contrib/Makefile +++ b/databases/postgresql-contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PKGNAMESUFFIX= -contrib -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= databases MAINTAINER= girgen@FreeBSD.org diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index e3760513cfcc..38d0fc305c39 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -14,7 +14,7 @@ COMMENT= The PostgreSQL documentation set MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server -DEFAULT_PGSQL_VER?=74 +DEFAULT_PGSQL_VER?=81 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: @@ -25,12 +25,11 @@ CONFLICTS= postgresql-docs # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) -PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1\2/p' .else PGSQL_VER= ${DEFAULT_PGSQL_VER} .endif -DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} NO_BUILD= YES SLAVE_ONLY= YES PATCHDIR= mustnotexist diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index dcf6825f8f3a..222d6a4a6df0 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -6,14 +6,13 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.3.20 +PORTVERSION?= 7.3.21 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -140,20 +139,15 @@ CONFIGURE_ARGS+=--with-krb5=${HEIMDAL_HOME} # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.20:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5=${LOCALBASE} . endif . endif . if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_LIBC_R) CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo index d31b46541fb4..67a6ecf5f928 100644 --- a/databases/postgresql73-server/distinfo +++ b/databases/postgresql73-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-7.3.20.tar.bz2) = fb5cc3b22d3fceb8cfb5b89061ceadb0 -SHA256 (postgresql/postgresql-base-7.3.20.tar.bz2) = 009695d3c04004c7ba6365b112dee0cad6738daa2550fdb37c2adab52994e636 -SIZE (postgresql/postgresql-base-7.3.20.tar.bz2) = 5711312 -MD5 (postgresql/postgresql-opt-7.3.20.tar.bz2) = e88b8f75c07a844a65eeb3a5194f3d80 -SHA256 (postgresql/postgresql-opt-7.3.20.tar.bz2) = 050c79c87d9dbf443fbda20b0f8fd40523231c2c6bcf1a24808214fe599f4d17 -SIZE (postgresql/postgresql-opt-7.3.20.tar.bz2) = 344312 -MD5 (postgresql/postgresql-test-7.3.20.tar.bz2) = 0195720da56dfb16140393ace788f907 -SHA256 (postgresql/postgresql-test-7.3.20.tar.bz2) = 05648eda34c9a4670e5afa3fb6dad7bdf0ce69ffa633b8a83cd424de942562d7 -SIZE (postgresql/postgresql-test-7.3.20.tar.bz2) = 869518 -MD5 (postgresql/postgresql-docs-7.3.20.tar.bz2) = 53472e7d7bf808b738d31a52bd7c6451 -SHA256 (postgresql/postgresql-docs-7.3.20.tar.bz2) = 4e337e64a2c2cd9f8f600e6f0514be9c9170b1fabf2b9534c6f8c7ed9ace5373 -SIZE (postgresql/postgresql-docs-7.3.20.tar.bz2) = 2365475 +MD5 (postgresql/postgresql-7.3.21.tar.bz2) = e0068d0de0540a2d7247749ea830833f +SHA256 (postgresql/postgresql-7.3.21.tar.bz2) = bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888 +SIZE (postgresql/postgresql-7.3.21.tar.bz2) = 9284558 diff --git a/databases/postgresql73-server/files/patch-doc-Makefile b/databases/postgresql73-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..53a4622703b7 --- /dev/null +++ b/databases/postgresql73-server/files/patch-doc-Makefile @@ -0,0 +1,11 @@ +--- doc/Makefile~ 2002-11-28 00:21:20.000000000 +0100 ++++ doc/Makefile 2008-01-07 11:50:06.000000000 +0100 +@@ -26,7 +26,7 @@ + .NOTPARALLEL: + + ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-found_html := yes ++#found_html := yes + endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 5b6236133af5..43a6fdb71ebd 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -6,14 +6,13 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.4.18 -PORTREVISION?= 1 +PORTVERSION?= 7.4.19 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -149,20 +148,15 @@ CONFIGURE_ARGS+=--with-krb5=${HEIMDAL_HOME} # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5=${LOCALBASE} . endif . endif . if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - PATCH_DIST_STRIP=-p1 . if defined(SERVER_ONLY) && defined(WITH_LIBC_R) diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo index 57656abe84ee..d0840cb1df2b 100644 --- a/databases/postgresql74-server/distinfo +++ b/databases/postgresql74-server/distinfo @@ -1,15 +1,6 @@ -MD5 (postgresql/postgresql-base-7.4.18.tar.bz2) = ab87c1d2ee5caab6c41bd7ab235f3037 -SHA256 (postgresql/postgresql-base-7.4.18.tar.bz2) = 0eff5ab743db9d413b5fe95a2ee907e86b1d32ce3727011ee5c308c0dc7db0af -SIZE (postgresql/postgresql-base-7.4.18.tar.bz2) = 6662169 -MD5 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 41af694b71fac5f71ebbde227cd8e6ac -SHA256 (postgresql/postgresql-opt-7.4.18.tar.bz2) = 63b9ce09e66a90267d70ab766cb6dc833cafa93f52253fe83699b8fce39a9a88 -SIZE (postgresql/postgresql-opt-7.4.18.tar.bz2) = 334631 -MD5 (postgresql/postgresql-test-7.4.18.tar.bz2) = 0223ab74e9610f2a0af27edbc9013fde -SHA256 (postgresql/postgresql-test-7.4.18.tar.bz2) = 8c475490a5b8233efb936e11fcb2f02ab10324b35920d310561ba14b1c8268d3 -SIZE (postgresql/postgresql-test-7.4.18.tar.bz2) = 894754 -MD5 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 6eb6d4c7a79067d21cb0c87b30392a06 -SHA256 (postgresql/postgresql-docs-7.4.18.tar.bz2) = 06b19865d8124a13b2553ad142405262b99fcb75e856137b0d4d8f5867e700e0 -SIZE (postgresql/postgresql-docs-7.4.18.tar.bz2) = 2434756 +MD5 (postgresql/postgresql-7.4.19.tar.bz2) = 0be8c193fb73113930d043c60200598b +SHA256 (postgresql/postgresql-7.4.19.tar.bz2) = 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389 +SIZE (postgresql/postgresql-7.4.19.tar.bz2) = 9284558 MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589 SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662 diff --git a/databases/postgresql74-server/files/patch-doc-Makefile b/databases/postgresql74-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..b297cc51c80c --- /dev/null +++ b/databases/postgresql74-server/files/patch-doc-Makefile @@ -0,0 +1,11 @@ +--- doc/Makefile~ 2003-08-04 22:52:48.000000000 +0200 ++++ doc/Makefile 2008-01-07 11:53:53.000000000 +0100 +@@ -26,7 +26,7 @@ + .NOTPARALLEL: + + ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-found_html := yes ++#found_html := yes + endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index b801f841abdf..6e1c8628262c 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -6,14 +6,13 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.0.14 -PORTREVISION?= 2 +PORTVERSION?= 8.0.15 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -112,11 +111,7 @@ USE_AUTOTOOLS= autoconf:261 CONFIGURE_ARGS+=--with-icu LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= pg-808-icu-xx-2006-09-25.diff.gz:icu -. endif - -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} +PATCHFILES+= pg-8015-icu-xx-2008-01-07.diff.gz:icu . endif PATCH_DIST_STRIP=-p1 @@ -174,13 +169,12 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif . if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo index df1a9d2b7faa..284e01b29fbb 100644 --- a/databases/postgresql80-server/distinfo +++ b/databases/postgresql80-server/distinfo @@ -1,18 +1,9 @@ -MD5 (postgresql/postgresql-base-8.0.14.tar.bz2) = ffaaa630db6613cedbe935edd85d2a98 -SHA256 (postgresql/postgresql-base-8.0.14.tar.bz2) = 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e -SIZE (postgresql/postgresql-base-8.0.14.tar.bz2) = 7907547 -MD5 (postgresql/postgresql-opt-8.0.14.tar.bz2) = 6a6feb48ca70bf1e36e99bab1671b66d -SHA256 (postgresql/postgresql-opt-8.0.14.tar.bz2) = b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a -SIZE (postgresql/postgresql-opt-8.0.14.tar.bz2) = 134706 -MD5 (postgresql/postgresql-docs-8.0.14.tar.bz2) = 2435d1036364eecf093bc783d4e92101 -SHA256 (postgresql/postgresql-docs-8.0.14.tar.bz2) = df1da39c1bbdb54f506a25332770ccf19296234ba0b9ac755e8b1c5bdf296f10 -SIZE (postgresql/postgresql-docs-8.0.14.tar.bz2) = 2274002 -MD5 (postgresql/postgresql-test-8.0.14.tar.bz2) = fd66be583db9d5b38d0822b9a9a027b0 -SHA256 (postgresql/postgresql-test-8.0.14.tar.bz2) = a228576902ea273aff6ee1f7bd7e4bd5d5b6d0b9bbb532aec1c83d5a6beb5a6e -SIZE (postgresql/postgresql-test-8.0.14.tar.bz2) = 935168 +MD5 (postgresql/postgresql-8.0.15.tar.bz2) = 3ee548b3643e0a0a4b76493e81b336f3 +SHA256 (postgresql/postgresql-8.0.15.tar.bz2) = 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 +SIZE (postgresql/postgresql-8.0.15.tar.bz2) = 14011109 MD5 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 9fa75cd7b3f1cb913d2e6d310582a4bc SHA256 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = f3a1849f2d527759ef721502cb445a435e072cc9be820c2e489c9e4a71c7adbe SIZE (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 30555 -MD5 (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = f4b4d2d0f7f7ac122d74ce9f983dd57a -SHA256 (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = 5763a08d2a24ee1ab4ac11dc5cfd0d7f7e5806a1b1b1ace4b775a474868c5865 -SIZE (postgresql/pg-808-icu-xx-2006-09-25.diff.gz) = 4346 +MD5 (postgresql/pg-8015-icu-xx-2008-01-07.diff.gz) = 34655d18c135d2497947a364f02a9a2a +SHA256 (postgresql/pg-8015-icu-xx-2008-01-07.diff.gz) = 39b686756ba3e8591d700fc3a7df03117b1086990671b0e14b9a93635d60e5da +SIZE (postgresql/pg-8015-icu-xx-2008-01-07.diff.gz) = 4897 diff --git a/databases/postgresql80-server/files/patch-doc-Makefile b/databases/postgresql80-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..35e822272f15 --- /dev/null +++ b/databases/postgresql80-server/files/patch-doc-Makefile @@ -0,0 +1,11 @@ +--- doc/Makefile~ 2003-11-29 20:51:36.000000000 +0100 ++++ doc/Makefile 2008-01-07 11:58:07.000000000 +0100 +@@ -27,7 +27,7 @@ + + ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) + ifneq (,$(docdir)) +-found_html := yes ++#found_html := yes + endif + endif + diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server index 0a2b4d9707fd..66fecfdacc95 100644 --- a/databases/postgresql80-server/pkg-plist-server +++ b/databases/postgresql80-server/pkg-plist-server @@ -275,6 +275,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -315,6 +316,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index ebed545d6c77..1c7502ab8ac6 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -6,14 +6,13 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.1.10 -PORTREVISION?= 2 +PORTVERSION?= 8.1.11 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -113,15 +112,11 @@ USE_AUTOTOOLS= autoconf:261 CONFIGURE_ARGS+=--with-icu LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= pg-814-icu-xx-2006-09-25.diff.gz:icu +PATCHFILES+= pg-8111-icu-xx-2008-01-07.diff.gz:icu . endif PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -175,13 +170,12 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif . if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo index c5220a8397c9..a0da1d493ce7 100644 --- a/databases/postgresql81-server/distinfo +++ b/databases/postgresql81-server/distinfo @@ -1,18 +1,9 @@ -MD5 (postgresql/postgresql-base-8.1.10.tar.bz2) = dbb5c5e48a43037e979b621f0c03614b -SHA256 (postgresql/postgresql-base-8.1.10.tar.bz2) = c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981 -SIZE (postgresql/postgresql-base-8.1.10.tar.bz2) = 8110015 -MD5 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 23f7f08905a05a50a681ea2a83b049ab -SHA256 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f -SIZE (postgresql/postgresql-opt-8.1.10.tar.bz2) = 144584 -MD5 (postgresql/postgresql-docs-8.1.10.tar.bz2) = c6423b4745c1f677448af4f20dfda5f9 -SHA256 (postgresql/postgresql-docs-8.1.10.tar.bz2) = 870edb5e0d364d235f9f83820256db66eaf1aebfd47e05b7a4546bff53bfac88 -SIZE (postgresql/postgresql-docs-8.1.10.tar.bz2) = 2507870 -MD5 (postgresql/postgresql-test-8.1.10.tar.bz2) = 3dce92e7913ea70ca0c240a3adf93140 -SHA256 (postgresql/postgresql-test-8.1.10.tar.bz2) = d887a18cade52167c0390fa7270bf86e33d95cba34d2ac3f755e13a1360d9de8 -SIZE (postgresql/postgresql-test-8.1.10.tar.bz2) = 948352 +MD5 (postgresql/postgresql-8.1.11.tar.bz2) = 48922512bcf683d5ea22a99df5eaaecd +SHA256 (postgresql/postgresql-8.1.11.tar.bz2) = 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e +SIZE (postgresql/postgresql-8.1.11.tar.bz2) = 11735420 MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86 SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203 -MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623 -SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9 -SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987 +MD5 (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = f26773d83077402744866f264474d39b +SHA256 (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = 925e15db3c3495b453946c544ff29ed6cdce026419f2ba70a5905696013a2e72 +SIZE (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = 4517 diff --git a/databases/postgresql81-server/files/patch-doc-Makefile b/databases/postgresql81-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..fbb0844d0c60 --- /dev/null +++ b/databases/postgresql81-server/files/patch-doc-Makefile @@ -0,0 +1,11 @@ +--- doc/Makefile~ 2003-11-29 20:51:36.000000000 +0100 ++++ doc/Makefile 2008-01-07 11:59:15.000000000 +0100 +@@ -27,7 +27,7 @@ + + ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) + ifneq (,$(docdir)) +-found_html := yes ++#found_html := yes + endif + endif + diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server index 8ce72bda7181..922331a91702 100644 --- a/databases/postgresql81-server/pkg-plist-server +++ b/databases/postgresql81-server/pkg-plist-server @@ -276,6 +276,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -316,6 +317,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 7cd51d7d4563..cd6a0824428d 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -6,14 +6,13 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.2.5 -PORTREVISION?= 2 +PORTVERSION?= 8.2.6 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere @@ -119,10 +118,6 @@ USE_BISON= build PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -181,15 +176,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo index 2dbebd41916b..af5d21f83da7 100644 --- a/databases/postgresql82-server/distinfo +++ b/databases/postgresql82-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.2.5.tar.bz2) = 5879b205b635f3fb905f6015c50f4edd -SHA256 (postgresql/postgresql-base-8.2.5.tar.bz2) = b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929 -SIZE (postgresql/postgresql-base-8.2.5.tar.bz2) = 8602348 -MD5 (postgresql/postgresql-opt-8.2.5.tar.bz2) = dea12379311886d825fe7090884521b7 -SHA256 (postgresql/postgresql-opt-8.2.5.tar.bz2) = 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5 -SIZE (postgresql/postgresql-opt-8.2.5.tar.bz2) = 167549 -MD5 (postgresql/postgresql-docs-8.2.5.tar.bz2) = d9edbcbebd620dbeaa42a04c0a2fd900 -SHA256 (postgresql/postgresql-docs-8.2.5.tar.bz2) = 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d -SIZE (postgresql/postgresql-docs-8.2.5.tar.bz2) = 2773777 -MD5 (postgresql/postgresql-test-8.2.5.tar.bz2) = a4d39451e13cef32df96df35e24643cb -SHA256 (postgresql/postgresql-test-8.2.5.tar.bz2) = 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752 -SIZE (postgresql/postgresql-test-8.2.5.tar.bz2) = 987137 +MD5 (postgresql/postgresql-8.2.6.tar.bz2) = 17b9049b4fcad42ee95410833c1db228 +SHA256 (postgresql/postgresql-8.2.6.tar.bz2) = ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 +SIZE (postgresql/postgresql-8.2.6.tar.bz2) = 12559117 diff --git a/databases/postgresql82-server/files/patch-doc-Makefile b/databases/postgresql82-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..db8d905694da --- /dev/null +++ b/databases/postgresql82-server/files/patch-doc-Makefile @@ -0,0 +1,11 @@ +--- doc/Makefile~ 2005-12-09 22:19:34.000000000 +0100 ++++ doc/Makefile 2008-01-07 12:00:13.000000000 +0100 +@@ -27,7 +27,7 @@ + + ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) + ifneq (,$(docdir)) +-found_html := yes ++#found_html := yes + endif + endif + diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server index 8096163f4b88..ddd85d4891e2 100644 --- a/databases/postgresql82-server/pkg-plist-server +++ b/databases/postgresql82-server/pkg-plist-server @@ -273,6 +273,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -313,6 +314,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 900aaec42ba4..021b1eb93752 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -6,20 +6,17 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.3beta2 +PORTVERSION?= 8.3RC1 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION:C/[0-9]$//} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= BETA VERSION of the PostgreSQL server, only for testing -BROKEN= Unfetchable - CONFLICTS?= ${PORTNAME}-client-7.* \ ${PORTNAME}${PKGNAMESUFFIX}-7.* \ ${PORTNAME}-client-8.[0-24-9]* \ @@ -40,6 +37,9 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PGUSER= pgsql +PGGROUP= pgsql + CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ --with-docdir=${DOCSDIR} @@ -58,7 +58,6 @@ 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} .endif @@ -67,6 +66,11 @@ WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} 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. @@ -121,10 +125,6 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif @@ -290,7 +286,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -301,15 +297,7 @@ do-install: ${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 \ ${PREFIX}/etc/periodic/daily diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo index df410758a749..b845800f2d85 100644 --- a/databases/postgresql83-server/distinfo +++ b/databases/postgresql83-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78 -SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 -SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997 -MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6 -SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 -SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552 -MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999 -SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 -SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921 -MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d -SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 -SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384 +MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe +SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4 +SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207 diff --git a/databases/postgresql83-server/files/patch-doc-Makefile b/databases/postgresql83-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..805b541b438a --- /dev/null +++ b/databases/postgresql83-server/files/patch-doc-Makefile @@ -0,0 +1,20 @@ +--- doc/Makefile.orig 2007-02-09 16:55:57.000000000 +0100 ++++ doc/Makefile 2008-01-02 11:38:43.000000000 +0100 +@@ -25,11 +25,12 @@ + + .NOTPARALLEL: + +-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-ifneq (,$(docdir)) +-found_html = yes +-endif +-endif ++# FreeBSD has a separate port for installing the documentation ++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) ++#ifneq (,$(docdir)) ++#found_html = yes ++#endif ++#endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) + # SCO OpenServer's man system is sufficiently different to not bother. diff --git a/databases/postgresql83-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql83-server/files/patch-src:backend:utils:misc:postgresql.conf.sample index 7c2831c41be0..58e776c20465 100644 --- a/databases/postgresql83-server/files/patch-src:backend:utils:misc:postgresql.conf.sample +++ b/databases/postgresql83-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -1,27 +1,18 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig Sun May 21 22:11:02 2006 -+++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 7 17:23:50 2006 -@@ -206,6 +206,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 17:44:56.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2008-01-04 14:00:09.000000000 +0100 +@@ -231,6 +231,7 @@ # - Where to Log - +log_destination = 'syslog' - #log_destination = 'stderr' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. -@@ -283,6 +284,7 @@ - #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, in milliseconds. + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog +@@ -313,6 +314,7 @@ + # and their durations, > 0 logs only + # statements running at least this time. +silent_mode = on - #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr - -@@ -339,6 +341,8 @@ - #--------------------------------------------------------------------------- - # AUTOVACUUM PARAMETERS - #--------------------------------------------------------------------------- -+ -+autovacuum = on - - #autovacuum = off # enable autovacuum subprocess? - #autovacuum_naptime = 60 # time between autovacuum runs, in secs + #silent_mode = off # DO NOT USE without syslog or + # logging_collector + # (change requires restart) diff --git a/databases/postgresql83-server/pkg-install-server b/databases/postgresql83-server/pkg-install-server index 212b1d241d96..5abfa7862f64 100644 --- a/databases/postgresql83-server/pkg-install-server +++ b/databases/postgresql83-server/pkg-install-server @@ -2,8 +2,7 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql +PATH=/bin:/usr/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -27,9 +26,9 @@ case $2 in PRE-INSTALL) backupwarning USER=${PGUSER} - GROUP=${USER} + GROUP=${PGGROUP} UID=70 - GID=${UID} + GID=70 if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -56,8 +55,7 @@ PRE-INSTALL) fi if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} + install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} fi ;; diff --git a/databases/postgresql83-server/pkg-plist-client b/databases/postgresql83-server/pkg-plist-client index 0ed69caca9de..c219ef4dff82 100644 --- a/databases/postgresql83-server/pkg-plist-client +++ b/databases/postgresql83-server/pkg-plist-client @@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo diff --git a/databases/postgresql83-server/pkg-plist-contrib b/databases/postgresql83-server/pkg-plist-contrib index 7517de8c92a6..46ed0e10e37c 100644 --- a/databases/postgresql83-server/pkg-plist-contrib +++ b/databases/postgresql83-server/pkg-plist-contrib @@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so lib/postgresql/timetravel.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.adminpack -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.hstore -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.isn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pageinspect -%%DOCSDIR%%/contrib/README.pg_buffercache -%%DOCSDIR%%/contrib/README.pg_freespacemap -%%DOCSDIR%%/contrib/README.pg_standby -%%DOCSDIR%%/contrib/README.pg_trgm -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgrowlocks -%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.sslinfo -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.vacuumlo %%DOCSDIR%%/contrib/autoinc.example %%DOCSDIR%%/contrib/insert_username.example %%DOCSDIR%%/contrib/moddatetime.example @@ -120,6 +88,8 @@ share/postgresql/contrib/uninstall_pgstattuple.sql share/postgresql/contrib/uninstall_seg.sql share/postgresql/contrib/uninstall_sslinfo.sql share/postgresql/contrib/uninstall_tablefunc.sql +share/postgresql/tsearch_data/xsyn_sample.rules +@dirrmtry share/postgresql/tsearch_data >&2 @dirrmtry share/postgresql/contrib >&2 @dirrmtry share/postgresql >&2 @dirrmtry %%DOCSDIR%%/contrib >&2 diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server index 45221503553f..863ea206ec65 100644 --- a/databases/postgresql83-server/pkg-plist-server +++ b/databases/postgresql83-server/pkg-plist-server @@ -118,6 +118,9 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo @@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia @@ -750,16 +755,6 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrm share/postgresql/tsearch_data -@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 diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 900aaec42ba4..021b1eb93752 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -6,20 +6,17 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.3beta2 +PORTVERSION?= 8.3RC1 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION:C/[0-9]$//} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= BETA VERSION of the PostgreSQL server, only for testing -BROKEN= Unfetchable - CONFLICTS?= ${PORTNAME}-client-7.* \ ${PORTNAME}${PKGNAMESUFFIX}-7.* \ ${PORTNAME}-client-8.[0-24-9]* \ @@ -40,6 +37,9 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PGUSER= pgsql +PGGROUP= pgsql + CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ --with-docdir=${DOCSDIR} @@ -58,7 +58,6 @@ 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} .endif @@ -67,6 +66,11 @@ WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} 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. @@ -121,10 +125,6 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif @@ -290,7 +286,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -301,15 +297,7 @@ do-install: ${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 \ ${PREFIX}/etc/periodic/daily diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index df410758a749..b845800f2d85 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78 -SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 -SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997 -MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6 -SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 -SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552 -MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999 -SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 -SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921 -MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d -SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 -SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384 +MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe +SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4 +SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207 diff --git a/databases/postgresql84-server/files/patch-doc-Makefile b/databases/postgresql84-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..805b541b438a --- /dev/null +++ b/databases/postgresql84-server/files/patch-doc-Makefile @@ -0,0 +1,20 @@ +--- doc/Makefile.orig 2007-02-09 16:55:57.000000000 +0100 ++++ doc/Makefile 2008-01-02 11:38:43.000000000 +0100 +@@ -25,11 +25,12 @@ + + .NOTPARALLEL: + +-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-ifneq (,$(docdir)) +-found_html = yes +-endif +-endif ++# FreeBSD has a separate port for installing the documentation ++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) ++#ifneq (,$(docdir)) ++#found_html = yes ++#endif ++#endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) + # SCO OpenServer's man system is sufficiently different to not bother. diff --git a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample index 7c2831c41be0..58e776c20465 100644 --- a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample +++ b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -1,27 +1,18 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig Sun May 21 22:11:02 2006 -+++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 7 17:23:50 2006 -@@ -206,6 +206,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 17:44:56.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2008-01-04 14:00:09.000000000 +0100 +@@ -231,6 +231,7 @@ # - Where to Log - +log_destination = 'syslog' - #log_destination = 'stderr' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. -@@ -283,6 +284,7 @@ - #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, in milliseconds. + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog +@@ -313,6 +314,7 @@ + # and their durations, > 0 logs only + # statements running at least this time. +silent_mode = on - #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr - -@@ -339,6 +341,8 @@ - #--------------------------------------------------------------------------- - # AUTOVACUUM PARAMETERS - #--------------------------------------------------------------------------- -+ -+autovacuum = on - - #autovacuum = off # enable autovacuum subprocess? - #autovacuum_naptime = 60 # time between autovacuum runs, in secs + #silent_mode = off # DO NOT USE without syslog or + # logging_collector + # (change requires restart) diff --git a/databases/postgresql84-server/pkg-install-server b/databases/postgresql84-server/pkg-install-server index 212b1d241d96..5abfa7862f64 100644 --- a/databases/postgresql84-server/pkg-install-server +++ b/databases/postgresql84-server/pkg-install-server @@ -2,8 +2,7 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql +PATH=/bin:/usr/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -27,9 +26,9 @@ case $2 in PRE-INSTALL) backupwarning USER=${PGUSER} - GROUP=${USER} + GROUP=${PGGROUP} UID=70 - GID=${UID} + GID=70 if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -56,8 +55,7 @@ PRE-INSTALL) fi if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} + install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} fi ;; diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client index 0ed69caca9de..c219ef4dff82 100644 --- a/databases/postgresql84-server/pkg-plist-client +++ b/databases/postgresql84-server/pkg-plist-client @@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo diff --git a/databases/postgresql84-server/pkg-plist-contrib b/databases/postgresql84-server/pkg-plist-contrib index 7517de8c92a6..46ed0e10e37c 100644 --- a/databases/postgresql84-server/pkg-plist-contrib +++ b/databases/postgresql84-server/pkg-plist-contrib @@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so lib/postgresql/timetravel.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.adminpack -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.hstore -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.isn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pageinspect -%%DOCSDIR%%/contrib/README.pg_buffercache -%%DOCSDIR%%/contrib/README.pg_freespacemap -%%DOCSDIR%%/contrib/README.pg_standby -%%DOCSDIR%%/contrib/README.pg_trgm -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgrowlocks -%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.sslinfo -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.vacuumlo %%DOCSDIR%%/contrib/autoinc.example %%DOCSDIR%%/contrib/insert_username.example %%DOCSDIR%%/contrib/moddatetime.example @@ -120,6 +88,8 @@ share/postgresql/contrib/uninstall_pgstattuple.sql share/postgresql/contrib/uninstall_seg.sql share/postgresql/contrib/uninstall_sslinfo.sql share/postgresql/contrib/uninstall_tablefunc.sql +share/postgresql/tsearch_data/xsyn_sample.rules +@dirrmtry share/postgresql/tsearch_data >&2 @dirrmtry share/postgresql/contrib >&2 @dirrmtry share/postgresql >&2 @dirrmtry %%DOCSDIR%%/contrib >&2 diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server index 45221503553f..863ea206ec65 100644 --- a/databases/postgresql84-server/pkg-plist-server +++ b/databases/postgresql84-server/pkg-plist-server @@ -118,6 +118,9 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo @@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia @@ -750,16 +755,6 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrm share/postgresql/tsearch_data -@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 diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 900aaec42ba4..021b1eb93752 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,20 +6,17 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.3beta2 +PORTVERSION?= 8.3RC1 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION:C/[0-9]$//} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= BETA VERSION of the PostgreSQL server, only for testing -BROKEN= Unfetchable - CONFLICTS?= ${PORTNAME}-client-7.* \ ${PORTNAME}${PKGNAMESUFFIX}-7.* \ ${PORTNAME}-client-8.[0-24-9]* \ @@ -40,6 +37,9 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PGUSER= pgsql +PGGROUP= pgsql + CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ --with-docdir=${DOCSDIR} @@ -58,7 +58,6 @@ 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} .endif @@ -67,6 +66,11 @@ WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} 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. @@ -121,10 +125,6 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif @@ -290,7 +286,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -301,15 +297,7 @@ do-install: ${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 \ ${PREFIX}/etc/periodic/daily diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo index df410758a749..b845800f2d85 100644 --- a/databases/postgresql90-server/distinfo +++ b/databases/postgresql90-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78 -SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 -SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997 -MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6 -SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 -SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552 -MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999 -SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 -SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921 -MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d -SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 -SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384 +MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe +SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4 +SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207 diff --git a/databases/postgresql90-server/files/patch-doc-Makefile b/databases/postgresql90-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..805b541b438a --- /dev/null +++ b/databases/postgresql90-server/files/patch-doc-Makefile @@ -0,0 +1,20 @@ +--- doc/Makefile.orig 2007-02-09 16:55:57.000000000 +0100 ++++ doc/Makefile 2008-01-02 11:38:43.000000000 +0100 +@@ -25,11 +25,12 @@ + + .NOTPARALLEL: + +-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-ifneq (,$(docdir)) +-found_html = yes +-endif +-endif ++# FreeBSD has a separate port for installing the documentation ++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) ++#ifneq (,$(docdir)) ++#found_html = yes ++#endif ++#endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) + # SCO OpenServer's man system is sufficiently different to not bother. diff --git a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample index 7c2831c41be0..58e776c20465 100644 --- a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample +++ b/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -1,27 +1,18 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig Sun May 21 22:11:02 2006 -+++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 7 17:23:50 2006 -@@ -206,6 +206,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 17:44:56.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2008-01-04 14:00:09.000000000 +0100 +@@ -231,6 +231,7 @@ # - Where to Log - +log_destination = 'syslog' - #log_destination = 'stderr' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. -@@ -283,6 +284,7 @@ - #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, in milliseconds. + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog +@@ -313,6 +314,7 @@ + # and their durations, > 0 logs only + # statements running at least this time. +silent_mode = on - #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr - -@@ -339,6 +341,8 @@ - #--------------------------------------------------------------------------- - # AUTOVACUUM PARAMETERS - #--------------------------------------------------------------------------- -+ -+autovacuum = on - - #autovacuum = off # enable autovacuum subprocess? - #autovacuum_naptime = 60 # time between autovacuum runs, in secs + #silent_mode = off # DO NOT USE without syslog or + # logging_collector + # (change requires restart) diff --git a/databases/postgresql90-server/pkg-install-server b/databases/postgresql90-server/pkg-install-server index 212b1d241d96..5abfa7862f64 100644 --- a/databases/postgresql90-server/pkg-install-server +++ b/databases/postgresql90-server/pkg-install-server @@ -2,8 +2,7 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql +PATH=/bin:/usr/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -27,9 +26,9 @@ case $2 in PRE-INSTALL) backupwarning USER=${PGUSER} - GROUP=${USER} + GROUP=${PGGROUP} UID=70 - GID=${UID} + GID=70 if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -56,8 +55,7 @@ PRE-INSTALL) fi if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} + install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} fi ;; diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client index 0ed69caca9de..c219ef4dff82 100644 --- a/databases/postgresql90-server/pkg-plist-client +++ b/databases/postgresql90-server/pkg-plist-client @@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib index 7517de8c92a6..46ed0e10e37c 100644 --- a/databases/postgresql90-server/pkg-plist-contrib +++ b/databases/postgresql90-server/pkg-plist-contrib @@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so lib/postgresql/timetravel.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.adminpack -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.hstore -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.isn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pageinspect -%%DOCSDIR%%/contrib/README.pg_buffercache -%%DOCSDIR%%/contrib/README.pg_freespacemap -%%DOCSDIR%%/contrib/README.pg_standby -%%DOCSDIR%%/contrib/README.pg_trgm -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgrowlocks -%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.sslinfo -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.vacuumlo %%DOCSDIR%%/contrib/autoinc.example %%DOCSDIR%%/contrib/insert_username.example %%DOCSDIR%%/contrib/moddatetime.example @@ -120,6 +88,8 @@ share/postgresql/contrib/uninstall_pgstattuple.sql share/postgresql/contrib/uninstall_seg.sql share/postgresql/contrib/uninstall_sslinfo.sql share/postgresql/contrib/uninstall_tablefunc.sql +share/postgresql/tsearch_data/xsyn_sample.rules +@dirrmtry share/postgresql/tsearch_data >&2 @dirrmtry share/postgresql/contrib >&2 @dirrmtry share/postgresql >&2 @dirrmtry %%DOCSDIR%%/contrib >&2 diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server index 45221503553f..863ea206ec65 100644 --- a/databases/postgresql90-server/pkg-plist-server +++ b/databases/postgresql90-server/pkg-plist-server @@ -118,6 +118,9 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo @@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia @@ -750,16 +755,6 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrm share/postgresql/tsearch_data -@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 diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 900aaec42ba4..021b1eb93752 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -6,20 +6,17 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.3beta2 +PORTVERSION?= 8.3RC1 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION:C/[0-9]$//} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= BETA VERSION of the PostgreSQL server, only for testing -BROKEN= Unfetchable - CONFLICTS?= ${PORTNAME}-client-7.* \ ${PORTNAME}${PKGNAMESUFFIX}-7.* \ ${PORTNAME}-client-8.[0-24-9]* \ @@ -40,6 +37,9 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PGUSER= pgsql +PGGROUP= pgsql + CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ --with-docdir=${DOCSDIR} @@ -58,7 +58,6 @@ 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} .endif @@ -67,6 +66,11 @@ WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} 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. @@ -121,10 +125,6 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif @@ -290,7 +286,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -301,15 +297,7 @@ do-install: ${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 \ ${PREFIX}/etc/periodic/daily diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo index df410758a749..b845800f2d85 100644 --- a/databases/postgresql91-server/distinfo +++ b/databases/postgresql91-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78 -SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 -SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997 -MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6 -SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 -SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552 -MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999 -SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 -SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921 -MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d -SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 -SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384 +MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe +SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4 +SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207 diff --git a/databases/postgresql91-server/files/patch-doc-Makefile b/databases/postgresql91-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..805b541b438a --- /dev/null +++ b/databases/postgresql91-server/files/patch-doc-Makefile @@ -0,0 +1,20 @@ +--- doc/Makefile.orig 2007-02-09 16:55:57.000000000 +0100 ++++ doc/Makefile 2008-01-02 11:38:43.000000000 +0100 +@@ -25,11 +25,12 @@ + + .NOTPARALLEL: + +-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-ifneq (,$(docdir)) +-found_html = yes +-endif +-endif ++# FreeBSD has a separate port for installing the documentation ++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) ++#ifneq (,$(docdir)) ++#found_html = yes ++#endif ++#endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) + # SCO OpenServer's man system is sufficiently different to not bother. diff --git a/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample index 7c2831c41be0..58e776c20465 100644 --- a/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample +++ b/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -1,27 +1,18 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig Sun May 21 22:11:02 2006 -+++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 7 17:23:50 2006 -@@ -206,6 +206,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 17:44:56.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2008-01-04 14:00:09.000000000 +0100 +@@ -231,6 +231,7 @@ # - Where to Log - +log_destination = 'syslog' - #log_destination = 'stderr' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. -@@ -283,6 +284,7 @@ - #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, in milliseconds. + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog +@@ -313,6 +314,7 @@ + # and their durations, > 0 logs only + # statements running at least this time. +silent_mode = on - #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr - -@@ -339,6 +341,8 @@ - #--------------------------------------------------------------------------- - # AUTOVACUUM PARAMETERS - #--------------------------------------------------------------------------- -+ -+autovacuum = on - - #autovacuum = off # enable autovacuum subprocess? - #autovacuum_naptime = 60 # time between autovacuum runs, in secs + #silent_mode = off # DO NOT USE without syslog or + # logging_collector + # (change requires restart) diff --git a/databases/postgresql91-server/pkg-install-server b/databases/postgresql91-server/pkg-install-server index 212b1d241d96..5abfa7862f64 100644 --- a/databases/postgresql91-server/pkg-install-server +++ b/databases/postgresql91-server/pkg-install-server @@ -2,8 +2,7 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql +PATH=/bin:/usr/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -27,9 +26,9 @@ case $2 in PRE-INSTALL) backupwarning USER=${PGUSER} - GROUP=${USER} + GROUP=${PGGROUP} UID=70 - GID=${UID} + GID=70 if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -56,8 +55,7 @@ PRE-INSTALL) fi if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} + install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} fi ;; diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client index 0ed69caca9de..c219ef4dff82 100644 --- a/databases/postgresql91-server/pkg-plist-client +++ b/databases/postgresql91-server/pkg-plist-client @@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib index 7517de8c92a6..46ed0e10e37c 100644 --- a/databases/postgresql91-server/pkg-plist-contrib +++ b/databases/postgresql91-server/pkg-plist-contrib @@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so lib/postgresql/timetravel.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.adminpack -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.hstore -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.isn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pageinspect -%%DOCSDIR%%/contrib/README.pg_buffercache -%%DOCSDIR%%/contrib/README.pg_freespacemap -%%DOCSDIR%%/contrib/README.pg_standby -%%DOCSDIR%%/contrib/README.pg_trgm -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgrowlocks -%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.sslinfo -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.vacuumlo %%DOCSDIR%%/contrib/autoinc.example %%DOCSDIR%%/contrib/insert_username.example %%DOCSDIR%%/contrib/moddatetime.example @@ -120,6 +88,8 @@ share/postgresql/contrib/uninstall_pgstattuple.sql share/postgresql/contrib/uninstall_seg.sql share/postgresql/contrib/uninstall_sslinfo.sql share/postgresql/contrib/uninstall_tablefunc.sql +share/postgresql/tsearch_data/xsyn_sample.rules +@dirrmtry share/postgresql/tsearch_data >&2 @dirrmtry share/postgresql/contrib >&2 @dirrmtry share/postgresql >&2 @dirrmtry %%DOCSDIR%%/contrib >&2 diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server index 45221503553f..863ea206ec65 100644 --- a/databases/postgresql91-server/pkg-plist-server +++ b/databases/postgresql91-server/pkg-plist-server @@ -118,6 +118,9 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo @@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia @@ -750,16 +755,6 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrm share/postgresql/tsearch_data -@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 diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 900aaec42ba4..021b1eb93752 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -6,20 +6,17 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.3beta2 +PORTVERSION?= 8.3RC1 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION:C/[0-9]$//} PKGNAMESUFFIX?= -server -DISTFILES?= postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \ - postgresql-opt-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES?= postgresql-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= girgen@FreeBSD.org COMMENT?= BETA VERSION of the PostgreSQL server, only for testing -BROKEN= Unfetchable - CONFLICTS?= ${PORTNAME}-client-7.* \ ${PORTNAME}${PKGNAMESUFFIX}-7.* \ ${PORTNAME}-client-8.[0-24-9]* \ @@ -40,6 +37,9 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif +PGUSER= pgsql +PGGROUP= pgsql + CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ --with-includes=${LOCALBASE}/include \ --with-docdir=${DOCSDIR} @@ -58,7 +58,6 @@ 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} .endif @@ -67,6 +66,11 @@ WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} 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. @@ -121,10 +125,6 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. ifmake makesum -DISTFILES+= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(SERVER_ONLY) && defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -183,15 +183,11 @@ CONFIGURE_ARGS+=--with-krb5 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr, # so we always use the heimdal port. See # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html -LIB_DEPENDS+= krb5.21:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) -DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -. endif - . if defined(WITH_THREADSAFE) CONFIGURE_ARGS+=--enable-thread-safety . endif @@ -290,7 +286,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ + @ ${SETENV} PKG_PREFIX=${PREFIX} PGUSER=${PGUSER} PGGROUP=${PGGROUP} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif @@ -301,15 +297,7 @@ do-install: ${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 \ ${PREFIX}/etc/periodic/daily diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo index df410758a749..b845800f2d85 100644 --- a/databases/postgresql92-server/distinfo +++ b/databases/postgresql92-server/distinfo @@ -1,12 +1,3 @@ -MD5 (postgresql/postgresql-base-8.3beta2.tar.bz2) = 0430c321a9aacc2cb6c190cdccc34c78 -SHA256 (postgresql/postgresql-base-8.3beta2.tar.bz2) = b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 -SIZE (postgresql/postgresql-base-8.3beta2.tar.bz2) = 9587997 -MD5 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 70a34048525224a2d7187bf23b4d25b6 -SHA256 (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 -SIZE (postgresql/postgresql-opt-8.3beta2.tar.bz2) = 178552 -MD5 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 5ae0fcf93ff45c9dbae7899f13a86999 -SHA256 (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 -SIZE (postgresql/postgresql-docs-8.3beta2.tar.bz2) = 2990921 -MD5 (postgresql/postgresql-test-8.3beta2.tar.bz2) = 5cd74896dc0d0cce0cd1abd75ab4b12d -SHA256 (postgresql/postgresql-test-8.3beta2.tar.bz2) = e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 -SIZE (postgresql/postgresql-test-8.3beta2.tar.bz2) = 1069384 +MD5 (postgresql/postgresql-8.3RC1.tar.bz2) = c0994ab0d16aa7410d05102344f819fe +SHA256 (postgresql/postgresql-8.3RC1.tar.bz2.md5) = bd9e8ca0cc69e9b9183272fe5ddd124cd8443cccf26c882e215c87ba4baec4b4 +SIZE (postgresql/postgresql-8.3RC1.tar.bz2) = 13801207 diff --git a/databases/postgresql92-server/files/patch-doc-Makefile b/databases/postgresql92-server/files/patch-doc-Makefile new file mode 100644 index 000000000000..805b541b438a --- /dev/null +++ b/databases/postgresql92-server/files/patch-doc-Makefile @@ -0,0 +1,20 @@ +--- doc/Makefile.orig 2007-02-09 16:55:57.000000000 +0100 ++++ doc/Makefile 2008-01-02 11:38:43.000000000 +0100 +@@ -25,11 +25,12 @@ + + .NOTPARALLEL: + +-ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) +-ifneq (,$(docdir)) +-found_html = yes +-endif +-endif ++# FreeBSD has a separate port for installing the documentation ++#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),) ++#ifneq (,$(docdir)) ++#found_html = yes ++#endif ++#endif + + ifneq ($(wildcard $(srcdir)/man.tar.gz),) + # SCO OpenServer's man system is sufficiently different to not bother. diff --git a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample index 7c2831c41be0..58e776c20465 100644 --- a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample +++ b/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -1,27 +1,18 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig Sun May 21 22:11:02 2006 -+++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 7 17:23:50 2006 -@@ -206,6 +206,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 17:44:56.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2008-01-04 14:00:09.000000000 +0100 +@@ -231,6 +231,7 @@ # - Where to Log - +log_destination = 'syslog' - #log_destination = 'stderr' # Valid values are combinations of - # stderr, syslog and eventlog, - # depending on platform. -@@ -283,6 +284,7 @@ - #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, in milliseconds. + #log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog and eventlog, + # depending on platform. csvlog +@@ -313,6 +314,7 @@ + # and their durations, > 0 logs only + # statements running at least this time. +silent_mode = on - #silent_mode = off # DO NOT USE without syslog or - # redirect_stderr - -@@ -339,6 +341,8 @@ - #--------------------------------------------------------------------------- - # AUTOVACUUM PARAMETERS - #--------------------------------------------------------------------------- -+ -+autovacuum = on - - #autovacuum = off # enable autovacuum subprocess? - #autovacuum_naptime = 60 # time between autovacuum runs, in secs + #silent_mode = off # DO NOT USE without syslog or + # logging_collector + # (change requires restart) diff --git a/databases/postgresql92-server/pkg-install-server b/databases/postgresql92-server/pkg-install-server index 212b1d241d96..5abfa7862f64 100644 --- a/databases/postgresql92-server/pkg-install-server +++ b/databases/postgresql92-server/pkg-install-server @@ -2,8 +2,7 @@ # $FreeBSD$ -PATH=/bin:/usr/sbin -PGUSER=pgsql +PATH=/bin:/usr/bin:/usr/sbin DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -27,9 +26,9 @@ case $2 in PRE-INSTALL) backupwarning USER=${PGUSER} - GROUP=${USER} + GROUP=${PGGROUP} UID=70 - GID=${UID} + GID=70 if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -56,8 +55,7 @@ PRE-INSTALL) fi if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} + install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR} fi ;; diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client index 0ed69caca9de..c219ef4dff82 100644 --- a/databases/postgresql92-server/pkg-plist-client +++ b/databases/postgresql92-server/pkg-plist-client @@ -592,6 +592,8 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib index 7517de8c92a6..46ed0e10e37c 100644 --- a/databases/postgresql92-server/pkg-plist-contrib +++ b/databases/postgresql92-server/pkg-plist-contrib @@ -32,38 +32,6 @@ lib/postgresql/tablefunc.so lib/postgresql/timetravel.so %%DOCSDIR%%/README-contrib %%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.adminpack -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.hstore -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.isn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pageinspect -%%DOCSDIR%%/contrib/README.pg_buffercache -%%DOCSDIR%%/contrib/README.pg_freespacemap -%%DOCSDIR%%/contrib/README.pg_standby -%%DOCSDIR%%/contrib/README.pg_trgm -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgrowlocks -%%DOCSDIR%%/contrib/README.pgrowlocks.euc_jp -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.sslinfo -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.vacuumlo %%DOCSDIR%%/contrib/autoinc.example %%DOCSDIR%%/contrib/insert_username.example %%DOCSDIR%%/contrib/moddatetime.example @@ -120,6 +88,8 @@ share/postgresql/contrib/uninstall_pgstattuple.sql share/postgresql/contrib/uninstall_seg.sql share/postgresql/contrib/uninstall_sslinfo.sql share/postgresql/contrib/uninstall_tablefunc.sql +share/postgresql/tsearch_data/xsyn_sample.rules +@dirrmtry share/postgresql/tsearch_data >&2 @dirrmtry share/postgresql/contrib >&2 @dirrmtry share/postgresql >&2 @dirrmtry %%DOCSDIR%%/contrib >&2 diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server index 45221503553f..863ea206ec65 100644 --- a/databases/postgresql92-server/pkg-plist-server +++ b/databases/postgresql92-server/pkg-plist-server @@ -118,6 +118,9 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo @@ -279,6 +282,7 @@ share/postgresql/timezone/America/Louisville share/postgresql/timezone/America/Maceio share/postgresql/timezone/America/Managua share/postgresql/timezone/America/Manaus +share/postgresql/timezone/America/Marigot share/postgresql/timezone/America/Martinique share/postgresql/timezone/America/Mazatlan share/postgresql/timezone/America/Mendoza @@ -319,6 +323,7 @@ share/postgresql/timezone/America/Santo_Domingo share/postgresql/timezone/America/Sao_Paulo share/postgresql/timezone/America/Scoresbysund share/postgresql/timezone/America/Shiprock +share/postgresql/timezone/America/St_Barthelemy share/postgresql/timezone/America/St_Johns share/postgresql/timezone/America/St_Kitts share/postgresql/timezone/America/St_Lucia @@ -750,16 +755,6 @@ share/postgresql/tsearch_data/ispell_sample.dict share/postgresql/tsearch_data/synonym_sample.syn share/postgresql/tsearch_data/thesaurus_sample.ths @dirrm share/postgresql/tsearch_data -@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 |