diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2010-10-07 06:58:10 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2010-10-07 06:58:10 +0000 |
| commit | 060a528952c060d3cacb5faa2337b86a947f9cc1 (patch) | |
| tree | c42f4aa0bb5da6b4d3d55839fff8d1bbed9e71f3 | |
| parent | - Update to 1.0.2 (diff) | |
Update all PostgreSQL ports to latest versions.
Also, try to break the previous 1:1 relation between FreeBSD system and
PostgreSQL versions installed. Use different PREFIX:es to install
different versions on the same system.
PR: ports/132402, ports/145002, ports/146657
Notes
Notes:
svn path=/head/; revision=262548
40 files changed, 289 insertions, 161 deletions
diff --git a/databases/Makefile b/databases/Makefile index 6ffeb8bb99df..89f08a06f3f6 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -590,6 +590,9 @@ SUBDIR += postgresql84-client SUBDIR += postgresql84-server SUBDIR += postgresql84-contrib + SUBDIR += postgresql90-client + SUBDIR += postgresql90-server + SUBDIR += postgresql90-contrib SUBDIR += postgresql_autodoc SUBDIR += powerarchitect SUBDIR += puredb diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 075d91ef20d1..f707db5f1ec2 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 7.4.29 -PORTREVISION= 1 +PORTVERSION?= 7.4.30 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -37,10 +36,12 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/lib \ --docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} @@ -96,7 +97,7 @@ PATCHFILES+= hier-Pg7.4-0.5.3.tar.gz:hier74053 USE_BISON= build . endif -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo index 466e22852dbd..f715de3be799 100644 --- a/databases/postgresql74-server/distinfo +++ b/databases/postgresql74-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-7.4.29.tar.bz2) = 6cd6bdc647dfa3684825e272ae53c0f3 -SHA256 (postgresql/postgresql-7.4.29.tar.bz2) = a1da45f6f098f529b94fe60bd9fac073c0507004d33f1b8a472d5fa638fbcc9c -SIZE (postgresql/postgresql-7.4.29.tar.bz2) = 10364970 +MD5 (postgresql/postgresql-7.4.30.tar.bz2) = 64a9ec80ffc61294024d8c7008a74ed5 +SHA256 (postgresql/postgresql-7.4.30.tar.bz2) = 3ddc8cb87d4ae1d508a834493fe0d8aba361a2f0489ee72e1ac7d0c188bfa744 +SIZE (postgresql/postgresql-7.4.30.tar.bz2) = 10356256 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/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 445261097950..7ec0d002bb24 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.0.25 -PORTREVISION= 2 +PORTVERSION?= 8.0.26 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -37,12 +36,13 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -112,7 +112,7 @@ PATCHFILES+= pg-8025-icu-xx-2010-05-14.diff.gz:icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -259,6 +259,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo index c5354fefdb6b..c61f641609a1 100644 --- a/databases/postgresql80-server/distinfo +++ b/databases/postgresql80-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-8.0.25.tar.bz2) = 91b6f5c27d881e2fef8e9dd7aae1bbe7 -SHA256 (postgresql/postgresql-8.0.25.tar.bz2) = e22b3328c76919045702887c70458a9fe7acb3ab10d735f7f272e93184a82308 -SIZE (postgresql/postgresql-8.0.25.tar.bz2) = 11333463 +MD5 (postgresql/postgresql-8.0.26.tar.bz2) = 6ea1097fd4a57102ec023bc5cca7a35e +SHA256 (postgresql/postgresql-8.0.26.tar.bz2) = 1d0625bb1fd9817a174f22f7d7ee8ff663f8e20490a7b8b44b33559741ab25c7 +SIZE (postgresql/postgresql-8.0.26.tar.bz2) = 11345775 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 diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server index e9ad7a60f371..d9dec4d7297f 100644 --- a/databases/postgresql80-server/pkg-plist-server +++ b/databases/postgresql80-server/pkg-plist-server @@ -641,6 +641,7 @@ share/postgresql/timezone/PST8PDT share/postgresql/timezone/Pacific/Apia share/postgresql/timezone/Pacific/Auckland share/postgresql/timezone/Pacific/Chatham +share/postgresql/timezone/Pacific/Chuuk share/postgresql/timezone/Pacific/Easter share/postgresql/timezone/Pacific/Efate share/postgresql/timezone/Pacific/Enderbury @@ -666,6 +667,7 @@ share/postgresql/timezone/Pacific/Noumea share/postgresql/timezone/Pacific/Pago_Pago share/postgresql/timezone/Pacific/Palau share/postgresql/timezone/Pacific/Pitcairn +share/postgresql/timezone/Pacific/Pohnpei share/postgresql/timezone/Pacific/Ponape share/postgresql/timezone/Pacific/Port_Moresby share/postgresql/timezone/Pacific/Rarotonga diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index daeabd619ace..6ca7a27bbd5c 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.1.21 -PORTREVISION= 2 +PORTVERSION?= 8.1.22 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -37,12 +36,13 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -113,7 +113,7 @@ PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -270,6 +270,12 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) +#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.59 or 2.62 is required. + @${REINPLACE_CMD} -E -e \ + "s|^(m4_.*)2.6[0-9](.*Autoconf version.*)2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo index eaade8fdc675..a8d5df502f6f 100644 --- a/databases/postgresql81-server/distinfo +++ b/databases/postgresql81-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-8.1.21.tar.bz2) = 0f0868eca8c39e22390e688effe2af5f -SHA256 (postgresql/postgresql-8.1.21.tar.bz2) = 192fdbe7e703c3ad9bf767997c62717f0f00192b884ae7ced0d6741795c15679 -SIZE (postgresql/postgresql-8.1.21.tar.bz2) = 11907115 +MD5 (postgresql/postgresql-8.1.22.tar.bz2) = 51bede633280d1d34a98207d6b44ab0f +SHA256 (postgresql/postgresql-8.1.22.tar.bz2) = a01e6baa2ee08868f5318cdaec592d8ca68b5a8ef956b8304a07b3a1c208fefc +SIZE (postgresql/postgresql-8.1.22.tar.bz2) = 11905401 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 diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server index b6ed47fdf568..6ce9762d778a 100644 --- a/databases/postgresql81-server/pkg-plist-server +++ b/databases/postgresql81-server/pkg-plist-server @@ -642,6 +642,7 @@ share/postgresql/timezone/PST8PDT share/postgresql/timezone/Pacific/Apia share/postgresql/timezone/Pacific/Auckland share/postgresql/timezone/Pacific/Chatham +share/postgresql/timezone/Pacific/Chuuk share/postgresql/timezone/Pacific/Easter share/postgresql/timezone/Pacific/Efate share/postgresql/timezone/Pacific/Enderbury @@ -667,6 +668,7 @@ share/postgresql/timezone/Pacific/Noumea share/postgresql/timezone/Pacific/Pago_Pago share/postgresql/timezone/Pacific/Palau share/postgresql/timezone/Pacific/Pitcairn +share/postgresql/timezone/Pacific/Pohnpei share/postgresql/timezone/Pacific/Ponape share/postgresql/timezone/Pacific/Port_Moresby share/postgresql/timezone/Pacific/Rarotonga diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index a96b6b7a39b1..3a3c6469f496 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.2.17 -PORTREVISION= 2 +PORTVERSION?= 8.2.18 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -37,12 +36,13 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES=${INCLUDES} \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -105,13 +105,15 @@ OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap +. if defined (SERVER_ONLY) USE_OPENLDAP= YES +. endif . endif . if defined(WITH_INTDATE) diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo index f7eb9464c379..bbaeefda4efa 100644 --- a/databases/postgresql82-server/distinfo +++ b/databases/postgresql82-server/distinfo @@ -1,3 +1,3 @@ -MD5 (postgresql/postgresql-8.2.17.tar.bz2) = 583c21c036357480a85dd3710e40a261 -SHA256 (postgresql/postgresql-8.2.17.tar.bz2) = 3eaebfd2ba8256a168a32b0950b5129f999ae06115e482b1f5a2bdf66aa91985 -SIZE (postgresql/postgresql-8.2.17.tar.bz2) = 12714721 +MD5 (postgresql/postgresql-8.2.18.tar.bz2) = 84fec909791729e5e0e00b84c5f6c055 +SHA256 (postgresql/postgresql-8.2.18.tar.bz2) = 9dd6d9a11ee8725d921a57af11bc3b83c7496e1b1324b39e09ab1b6eb547b0ca +SIZE (postgresql/postgresql-8.2.18.tar.bz2) = 12723850 diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server index 363e731bcb88..e9755aade602 100644 --- a/databases/postgresql82-server/pkg-plist-server +++ b/databases/postgresql82-server/pkg-plist-server @@ -639,6 +639,7 @@ share/postgresql/timezone/PST8PDT share/postgresql/timezone/Pacific/Apia share/postgresql/timezone/Pacific/Auckland share/postgresql/timezone/Pacific/Chatham +share/postgresql/timezone/Pacific/Chuuk share/postgresql/timezone/Pacific/Easter share/postgresql/timezone/Pacific/Efate share/postgresql/timezone/Pacific/Enderbury @@ -664,6 +665,7 @@ share/postgresql/timezone/Pacific/Noumea share/postgresql/timezone/Pacific/Pago_Pago share/postgresql/timezone/Pacific/Palau share/postgresql/timezone/Pacific/Pitcairn +share/postgresql/timezone/Pacific/Pohnpei share/postgresql/timezone/Pacific/Ponape share/postgresql/timezone/Pacific/Port_Moresby share/postgresql/timezone/Pacific/Rarotonga diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 8929d4341236..42347940d318 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.3.11 -PORTREVISION= 2 +DISTVERSION?= 8.3.12 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -39,12 +38,13 @@ GNU_CONFIGURE= YES PGUSER= pgsql PGGROUP= pgsql -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -111,21 +111,23 @@ PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap +. if defined (SERVER_ONLY) USE_OPENLDAP= YES +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_XML) +. if defined(WITH_XML) CONFIGURE_ARGS+=--with-libxml LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 . endif -. if defined(SERVER_ONLY) && defined(WITH_TZDATA) +. if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo @@ -279,6 +281,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo index 101008efa3ed..1918dafabeed 100644 --- a/databases/postgresql83-server/distinfo +++ b/databases/postgresql83-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-8.3.11.tar.bz2) = 9dfbc971bd9ea7e2c2a042deba8213f9 -SHA256 (postgresql/postgresql-8.3.11.tar.bz2) = 81abb1a90069c93acf0b6ece980d674f325454ec7584247222080501946672db -SIZE (postgresql/postgresql-8.3.11.tar.bz2) = 14217781 +MD5 (postgresql/postgresql-8.3.12.tar.bz2) = 6fcb02cd24b6bc25f2e2fb950c6a5d9e +SHA256 (postgresql/postgresql-8.3.12.tar.bz2) = 596bd677dee6153ddc42391b33b6346ebc86f60f8d935fedff775ed46d02f070 +SIZE (postgresql/postgresql-8.3.12.tar.bz2) = 14273431 MD5 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 43fd07e87e9ecff2aa09b134408bdcb5 SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064 diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server index 4d2587cc4093..2dae42aace87 100644 --- a/databases/postgresql83-server/pkg-plist-server +++ b/databases/postgresql83-server/pkg-plist-server @@ -650,6 +650,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Pacific/Apia %%TZDATA%%share/postgresql/timezone/Pacific/Auckland %%TZDATA%%share/postgresql/timezone/Pacific/Chatham +%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk %%TZDATA%%share/postgresql/timezone/Pacific/Easter %%TZDATA%%share/postgresql/timezone/Pacific/Efate %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury @@ -675,6 +676,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago %%TZDATA%%share/postgresql/timezone/Pacific/Palau %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn +%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei %%TZDATA%%share/postgresql/timezone/Pacific/Ponape %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile index ec94e102a425..35ccbf965a59 100644 --- a/databases/postgresql84-client/Makefile +++ b/databases/postgresql84-client/Makefile @@ -14,7 +14,7 @@ COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql84-server -BUILD_DIRS= config src/include src/interfaces \ +BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 6a131e5db2c3..aefd3be713dd 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.4.4 -PORTREVISION= 2 +DISTVERSION?= 8.4.5 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -39,17 +38,19 @@ GNU_CONFIGURE= YES PGUSER= pgsql PGGROUP= pgsql -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety -LDFLAGS+= -L${PREFIX}/lib CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ + INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} -BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \ +BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl @@ -57,7 +58,6 @@ INSTALL_DIRS?= ${BUILD_DIRS} .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes -PORTREVISION= 3 USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} @@ -93,6 +93,7 @@ OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off OPTIONS+= XML "Build with XML data type (server)" on OPTIONS+= TZDATA "Use internal timezone database (server)" on OPTIONS+= DEBUG "Builds with debugging symbols" off +OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS+= ICU "Use ICU 3.x for unicode collation (server)" off @@ -121,21 +122,21 @@ LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap USE_OPENLDAP= YES . endif -. if defined(SERVER_ONLY) && defined(WITH_XML) +. if defined(WITH_XML) CONFIGURE_ARGS+=--with-libxml LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 . endif -. if defined(SERVER_ONLY) && defined(WITH_TZDATA) +. if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo @@ -166,6 +167,10 @@ INSTALL_TARGET= install INSTALL_TARGET= install-strip . endif +.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI) +CONFIGURE_ARGS+=--with-gssapi +.endif + . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) BROKEN= You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB @@ -289,11 +294,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in -.if defined(WITH_ICU) || defined(WITH_ICU4) +. if defined(WITH_ICU) || defined(WITH_ICU4) @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ ${WRKSRC}/configure.in -.endif +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index 9b77cff98c9a..4d8f7a57df77 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-8.4.4.tar.bz2) = 4bf2448ad965bca3940df648c02194df -SHA256 (postgresql/postgresql-8.4.4.tar.bz2) = e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e -SIZE (postgresql/postgresql-8.4.4.tar.bz2) = 13853838 +MD5 (postgresql/postgresql-8.4.5.tar.bz2) = 391a3f2eddd6fa78bb6ceba9955ffa5f +SHA256 (postgresql/postgresql-8.4.5.tar.bz2) = 300022ae2d998a0291a1e91978c48468fdc9c389afca05d6e5f18209ff5732bf +SIZE (postgresql/postgresql-8.4.5.tar.bz2) = 14114152 MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321 diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client index 39d479e40b10..702575d6b8fa 100644 --- a/databases/postgresql84-server/pkg-plist-client +++ b/databases/postgresql84-server/pkg-plist-client @@ -528,12 +528,13 @@ lib/libecpg.so.6 lib/libecpg_compat.a lib/libecpg_compat.so lib/libecpg_compat.so.3 +lib/libpgport.a +lib/libpgtypes.a +lib/libpgtypes.so lib/libpgtypes.so.3 lib/libpq.a lib/libpq.so lib/libpq.so.5 -lib/libpgtypes.a -lib/libpgtypes.so lib/postgresql/pgxs/config/install-sh lib/postgresql/pgxs/config/mkinstalldirs lib/postgresql/pgxs/src/makefiles/pgxs.mk @@ -589,9 +590,12 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-8.4.mo %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo @@ -626,3 +630,9 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-8.4.mo diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server index 7e837abced31..6b3fdd75f97a 100644 --- a/databases/postgresql84-server/pkg-plist-server +++ b/databases/postgresql84-server/pkg-plist-server @@ -5,7 +5,6 @@ bin/pg_resetxlog bin/postmaster bin/postgres etc/periodic/daily/502.pgsql -lib/libpgport.a lib/postgresql/ascii_and_mic.so lib/postgresql/cyrillic_and_mic.so lib/postgresql/dict_snowball.so @@ -47,67 +46,77 @@ share/postgresql/recovery.conf.sample share/postgresql/sql_features.txt share/postgresql/system_views.sql %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-8.4.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-8.4.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-8.4.mo %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-8.4.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo -%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo +%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-8.4.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-8.4.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-8.4.mo -%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-8.4.mo +%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-8.4.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-8.4.mo share/postgresql/postgres.shdescription share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Abidjan @@ -620,6 +629,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Pacific/Apia %%TZDATA%%share/postgresql/timezone/Pacific/Auckland %%TZDATA%%share/postgresql/timezone/Pacific/Chatham +%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk %%TZDATA%%share/postgresql/timezone/Pacific/Easter %%TZDATA%%share/postgresql/timezone/Pacific/Efate %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury @@ -645,6 +655,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago %%TZDATA%%share/postgresql/timezone/Pacific/Palau %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn +%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei %%TZDATA%%share/postgresql/timezone/Pacific/Ponape %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index 95ad5e070194..dd4ef68b82d3 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -14,7 +14,7 @@ COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql90-server -BUILD_DIRS= config src/include src/interfaces \ +BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles CLIENT_ONLY= yes diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile index d3a7e68dfe50..e742bcbbcf6b 100644 --- a/databases/postgresql90-contrib/Makefile +++ b/databases/postgresql90-contrib/Makefile @@ -24,6 +24,7 @@ INSTALL_DIRS= contrib SLAVE_ONLY= yes CONFIGURE_ARGS+=--with-libxslt --with-libxml LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2 +LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 80d9c75a968c..37fab5268407 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.0 +DISTVERSION?= 9.0.1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -36,17 +36,21 @@ GNU_CONFIGURE= YES PGUSER= pgsql PGGROUP= pgsql -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ + INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} -BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \ - src/backend/snowball src/bin/initdb src/bin/pg_ctl \ +BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ + src/backend/snowball src/backend/replication/libpqwalreceiver \ + src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} @@ -89,6 +93,7 @@ OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off OPTIONS+= XML "Build with XML data type (server)" on OPTIONS+= TZDATA "Use internal timezone database (server)" on OPTIONS+= DEBUG "Builds with debugging symbols" off +OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS+= ICU "Use ICU 3.x for unicode collation (server)" off @@ -116,26 +121,30 @@ LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_DTRACE) +. if defined(WITH_DTRACE) CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf . endif -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap +. if defined (SERVER_ONLY) USE_OPENLDAP= YES +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_XML) +. if defined(WITH_XML) CONFIGURE_ARGS+=--with-libxml +. if defined (SERVER_ONLY) LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_TZDATA) +. if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo @@ -166,6 +175,10 @@ INSTALL_TARGET= install INSTALL_TARGET= install-strip . endif +.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI) +CONFIGURE_ARGS+=--with-gssapi +.endif + . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) BROKEN= "You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB" @@ -313,6 +326,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo index d6eca70c281d..d623f4df5ee6 100644 --- a/databases/postgresql90-server/distinfo +++ b/databases/postgresql90-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-9.0.0.tar.bz2) = 14c2122cc322e69ab2ab702ed7714bbe -SHA256 (postgresql/postgresql-9.0.0.tar.bz2) = 7dcc381603c02595adc96a8fc5c9d067d3b39aaa44987e7a524a7504a10ff676 -SIZE (postgresql/postgresql-9.0.0.tar.bz2) = 13753207 +MD5 (postgresql/postgresql-9.0.1.tar.bz2) = 57ba57e43cfe29e16dacbf5789be98d1 +SHA256 (postgresql/postgresql-9.0.1.tar.bz2) = 5310cd490127845f1473a0f73f7b0d18277d81d51534ddfe17ea3e78286a3196 +SIZE (postgresql/postgresql-9.0.1.tar.bz2) = 13773951 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9 MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349 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 4c32ae4a26bb..3c1609fdbbc7 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,14 +1,14 @@ ---- ./src/backend/utils/misc/postgresql.conf.sample.orig 2009-08-24 22:08:40.000000000 +0200 -+++ ./src/backend/utils/misc/postgresql.conf.sample 2009-10-04 19:21:09.000000000 +0200 -@@ -230,6 +230,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2010-10-01 16:25:44.000000000 +0200 ++++ src/backend/utils/misc/postgresql.conf.sample 2010-10-05 07:37:35.626282933 +0200 +@@ -256,6 +256,7 @@ # - Where to Log - +log_destination = 'syslog' #log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog and eventlog, + # stderr, csvlog, syslog, and eventlog, # depending on platform. csvlog -@@ -264,6 +265,7 @@ +@@ -290,6 +291,7 @@ #syslog_facility = 'LOCAL0' #syslog_ident = 'postgres' @@ -16,10 +16,10 @@ #silent_mode = off # Run server silently. # DO NOT USE without syslog or # logging_collector -@@ -367,6 +369,9 @@ +@@ -394,6 +396,9 @@ #track_counts = on #track_functions = none # none, pl, all - #track_activity_query_size = 1024 + #track_activity_query_size = 1024 # (change requires restart) + +# On FreeBSD, this is a performance hog, so keep it off if you need speed +update_process_title = off diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client index cb6713877cee..e39b4b807380 100644 --- a/databases/postgresql90-server/pkg-plist-client +++ b/databases/postgresql90-server/pkg-plist-client @@ -546,12 +546,13 @@ lib/libecpg.so.6 lib/libecpg_compat.a lib/libecpg_compat.so lib/libecpg_compat.so.3 +lib/libpgport.a +lib/libpgtypes.a +lib/libpgtypes.so lib/libpgtypes.so.3 lib/libpq.a lib/libpq.so lib/libpq.so.5 -lib/libpgtypes.a -lib/libpgtypes.so lib/postgresql/pgxs/config/install-sh lib/postgresql/pgxs/src/makefiles/pgxs.mk lib/postgresql/pgxs/src/Makefile.global @@ -641,3 +642,5 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo +@dirrm share/doc/postgresql/html +@dirrm share/doc/postgresql diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib index b3a1c61e6d8e..6503200ccb10 100644 --- a/databases/postgresql90-server/pkg-plist-contrib +++ b/databases/postgresql90-server/pkg-plist-contrib @@ -2,6 +2,7 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_upgrade +bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server index 68224f4750ef..b659c30fd9e3 100644 --- a/databases/postgresql90-server/pkg-plist-server +++ b/databases/postgresql90-server/pkg-plist-server @@ -5,17 +5,17 @@ bin/pg_resetxlog bin/postmaster bin/postgres etc/periodic/daily/502.pgsql -lib/libpgport.a lib/postgresql/ascii_and_mic.so lib/postgresql/cyrillic_and_mic.so lib/postgresql/dict_snowball.so -lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc2004_sjis2004.so +lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc_jp_and_sjis.so lib/postgresql/euc_kr_and_mic.so lib/postgresql/euc_tw_and_big5.so lib/postgresql/latin2_and_win1250.so lib/postgresql/latin_and_mic.so +lib/postgresql/libpqwalreceiver.so lib/postgresql/plpgsql.so lib/postgresql/utf8_and_ascii.so lib/postgresql/utf8_and_big5.so @@ -85,6 +85,7 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 80d9c75a968c..37fab5268407 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.0 +DISTVERSION?= 9.0.1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -36,17 +36,21 @@ GNU_CONFIGURE= YES PGUSER= pgsql PGGROUP= pgsql -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ + INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} -BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \ - src/backend/snowball src/bin/initdb src/bin/pg_ctl \ +BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ + src/backend/snowball src/backend/replication/libpqwalreceiver \ + src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} @@ -89,6 +93,7 @@ OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off OPTIONS+= XML "Build with XML data type (server)" on OPTIONS+= TZDATA "Use internal timezone database (server)" on OPTIONS+= DEBUG "Builds with debugging symbols" off +OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS+= ICU "Use ICU 3.x for unicode collation (server)" off @@ -116,26 +121,30 @@ LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_DTRACE) +. if defined(WITH_DTRACE) CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf . endif -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap +. if defined (SERVER_ONLY) USE_OPENLDAP= YES +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_XML) +. if defined(WITH_XML) CONFIGURE_ARGS+=--with-libxml +. if defined (SERVER_ONLY) LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_TZDATA) +. if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo @@ -166,6 +175,10 @@ INSTALL_TARGET= install INSTALL_TARGET= install-strip . endif +.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI) +CONFIGURE_ARGS+=--with-gssapi +.endif + . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) BROKEN= "You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB" @@ -313,6 +326,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo index d6eca70c281d..d623f4df5ee6 100644 --- a/databases/postgresql91-server/distinfo +++ b/databases/postgresql91-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-9.0.0.tar.bz2) = 14c2122cc322e69ab2ab702ed7714bbe -SHA256 (postgresql/postgresql-9.0.0.tar.bz2) = 7dcc381603c02595adc96a8fc5c9d067d3b39aaa44987e7a524a7504a10ff676 -SIZE (postgresql/postgresql-9.0.0.tar.bz2) = 13753207 +MD5 (postgresql/postgresql-9.0.1.tar.bz2) = 57ba57e43cfe29e16dacbf5789be98d1 +SHA256 (postgresql/postgresql-9.0.1.tar.bz2) = 5310cd490127845f1473a0f73f7b0d18277d81d51534ddfe17ea3e78286a3196 +SIZE (postgresql/postgresql-9.0.1.tar.bz2) = 13773951 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9 MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349 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 4c32ae4a26bb..3c1609fdbbc7 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,14 +1,14 @@ ---- ./src/backend/utils/misc/postgresql.conf.sample.orig 2009-08-24 22:08:40.000000000 +0200 -+++ ./src/backend/utils/misc/postgresql.conf.sample 2009-10-04 19:21:09.000000000 +0200 -@@ -230,6 +230,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2010-10-01 16:25:44.000000000 +0200 ++++ src/backend/utils/misc/postgresql.conf.sample 2010-10-05 07:37:35.626282933 +0200 +@@ -256,6 +256,7 @@ # - Where to Log - +log_destination = 'syslog' #log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog and eventlog, + # stderr, csvlog, syslog, and eventlog, # depending on platform. csvlog -@@ -264,6 +265,7 @@ +@@ -290,6 +291,7 @@ #syslog_facility = 'LOCAL0' #syslog_ident = 'postgres' @@ -16,10 +16,10 @@ #silent_mode = off # Run server silently. # DO NOT USE without syslog or # logging_collector -@@ -367,6 +369,9 @@ +@@ -394,6 +396,9 @@ #track_counts = on #track_functions = none # none, pl, all - #track_activity_query_size = 1024 + #track_activity_query_size = 1024 # (change requires restart) + +# On FreeBSD, this is a performance hog, so keep it off if you need speed +update_process_title = off diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client index cb6713877cee..e39b4b807380 100644 --- a/databases/postgresql91-server/pkg-plist-client +++ b/databases/postgresql91-server/pkg-plist-client @@ -546,12 +546,13 @@ lib/libecpg.so.6 lib/libecpg_compat.a lib/libecpg_compat.so lib/libecpg_compat.so.3 +lib/libpgport.a +lib/libpgtypes.a +lib/libpgtypes.so lib/libpgtypes.so.3 lib/libpq.a lib/libpq.so lib/libpq.so.5 -lib/libpgtypes.a -lib/libpgtypes.so lib/postgresql/pgxs/config/install-sh lib/postgresql/pgxs/src/makefiles/pgxs.mk lib/postgresql/pgxs/src/Makefile.global @@ -641,3 +642,5 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo +@dirrm share/doc/postgresql/html +@dirrm share/doc/postgresql diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib index b3a1c61e6d8e..6503200ccb10 100644 --- a/databases/postgresql91-server/pkg-plist-contrib +++ b/databases/postgresql91-server/pkg-plist-contrib @@ -2,6 +2,7 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_upgrade +bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server index 68224f4750ef..b659c30fd9e3 100644 --- a/databases/postgresql91-server/pkg-plist-server +++ b/databases/postgresql91-server/pkg-plist-server @@ -5,17 +5,17 @@ bin/pg_resetxlog bin/postmaster bin/postgres etc/periodic/daily/502.pgsql -lib/libpgport.a lib/postgresql/ascii_and_mic.so lib/postgresql/cyrillic_and_mic.so lib/postgresql/dict_snowball.so -lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc2004_sjis2004.so +lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc_jp_and_sjis.so lib/postgresql/euc_kr_and_mic.so lib/postgresql/euc_tw_and_big5.so lib/postgresql/latin2_and_win1250.so lib/postgresql/latin_and_mic.so +lib/postgresql/libpqwalreceiver.so lib/postgresql/plpgsql.so lib/postgresql/utf8_and_ascii.so lib/postgresql/utf8_and_big5.so @@ -85,6 +85,7 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 80d9c75a968c..37fab5268407 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.0 +DISTVERSION?= 9.0.1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -36,17 +36,21 @@ GNU_CONFIGURE= YES PGUSER= pgsql PGGROUP= pgsql -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ + INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX} -BUILD_DIRS?= src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \ - src/backend/snowball src/bin/initdb src/bin/pg_ctl \ +BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ + src/backend/snowball src/backend/replication/libpqwalreceiver \ + src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl INSTALL_DIRS?= ${BUILD_DIRS} @@ -89,6 +93,7 @@ OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off OPTIONS+= XML "Build with XML data type (server)" on OPTIONS+= TZDATA "Use internal timezone database (server)" on OPTIONS+= DEBUG "Builds with debugging symbols" off +OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS+= ICU "Use ICU 3.x for unicode collation (server)" off @@ -116,26 +121,30 @@ LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_DTRACE) +. if defined(WITH_DTRACE) CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf . endif -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif -. if defined(SERVER_ONLY) && defined(WITH_LDAP) +. if defined(WITH_LDAP) CONFIGURE_ARGS+=--with-ldap +. if defined (SERVER_ONLY) USE_OPENLDAP= YES +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_XML) +. if defined(WITH_XML) CONFIGURE_ARGS+=--with-libxml +. if defined (SERVER_ONLY) LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 +. endif . endif -. if defined(SERVER_ONLY) && defined(WITH_TZDATA) +. if defined(WITH_TZDATA) PLIST_SUB+= TZDATA="" . else CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo @@ -166,6 +175,10 @@ INSTALL_TARGET= install INSTALL_TARGET= install-strip . endif +.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI) +CONFIGURE_ARGS+=--with-gssapi +.endif + . if defined(WITH_MIT_KRB5) . if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config) BROKEN= "You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB" @@ -313,6 +326,11 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in +. if defined(WITH_ICU) || defined(WITH_ICU4) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo index d6eca70c281d..d623f4df5ee6 100644 --- a/databases/postgresql92-server/distinfo +++ b/databases/postgresql92-server/distinfo @@ -1,6 +1,6 @@ -MD5 (postgresql/postgresql-9.0.0.tar.bz2) = 14c2122cc322e69ab2ab702ed7714bbe -SHA256 (postgresql/postgresql-9.0.0.tar.bz2) = 7dcc381603c02595adc96a8fc5c9d067d3b39aaa44987e7a524a7504a10ff676 -SIZE (postgresql/postgresql-9.0.0.tar.bz2) = 13753207 +MD5 (postgresql/postgresql-9.0.1.tar.bz2) = 57ba57e43cfe29e16dacbf5789be98d1 +SHA256 (postgresql/postgresql-9.0.1.tar.bz2) = 5310cd490127845f1473a0f73f7b0d18277d81d51534ddfe17ea3e78286a3196 +SIZE (postgresql/postgresql-9.0.1.tar.bz2) = 13773951 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9 MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349 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 4c32ae4a26bb..3c1609fdbbc7 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,14 +1,14 @@ ---- ./src/backend/utils/misc/postgresql.conf.sample.orig 2009-08-24 22:08:40.000000000 +0200 -+++ ./src/backend/utils/misc/postgresql.conf.sample 2009-10-04 19:21:09.000000000 +0200 -@@ -230,6 +230,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2010-10-01 16:25:44.000000000 +0200 ++++ src/backend/utils/misc/postgresql.conf.sample 2010-10-05 07:37:35.626282933 +0200 +@@ -256,6 +256,7 @@ # - Where to Log - +log_destination = 'syslog' #log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog and eventlog, + # stderr, csvlog, syslog, and eventlog, # depending on platform. csvlog -@@ -264,6 +265,7 @@ +@@ -290,6 +291,7 @@ #syslog_facility = 'LOCAL0' #syslog_ident = 'postgres' @@ -16,10 +16,10 @@ #silent_mode = off # Run server silently. # DO NOT USE without syslog or # logging_collector -@@ -367,6 +369,9 @@ +@@ -394,6 +396,9 @@ #track_counts = on #track_functions = none # none, pl, all - #track_activity_query_size = 1024 + #track_activity_query_size = 1024 # (change requires restart) + +# On FreeBSD, this is a performance hog, so keep it off if you need speed +update_process_title = off diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client index cb6713877cee..e39b4b807380 100644 --- a/databases/postgresql92-server/pkg-plist-client +++ b/databases/postgresql92-server/pkg-plist-client @@ -546,12 +546,13 @@ lib/libecpg.so.6 lib/libecpg_compat.a lib/libecpg_compat.so lib/libecpg_compat.so.3 +lib/libpgport.a +lib/libpgtypes.a +lib/libpgtypes.so lib/libpgtypes.so.3 lib/libpq.a lib/libpq.so lib/libpq.so.5 -lib/libpgtypes.a -lib/libpgtypes.so lib/postgresql/pgxs/config/install-sh lib/postgresql/pgxs/src/makefiles/pgxs.mk lib/postgresql/pgxs/src/Makefile.global @@ -641,3 +642,5 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo +@dirrm share/doc/postgresql/html +@dirrm share/doc/postgresql diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib index b3a1c61e6d8e..6503200ccb10 100644 --- a/databases/postgresql92-server/pkg-plist-contrib +++ b/databases/postgresql92-server/pkg-plist-contrib @@ -2,6 +2,7 @@ bin/oid2name bin/pg_archivecleanup bin/pg_standby bin/pg_upgrade +bin/pgbench bin/vacuumlo lib/postgresql/_int.so lib/postgresql/adminpack.so diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server index 68224f4750ef..b659c30fd9e3 100644 --- a/databases/postgresql92-server/pkg-plist-server +++ b/databases/postgresql92-server/pkg-plist-server @@ -5,17 +5,17 @@ bin/pg_resetxlog bin/postmaster bin/postgres etc/periodic/daily/502.pgsql -lib/libpgport.a lib/postgresql/ascii_and_mic.so lib/postgresql/cyrillic_and_mic.so lib/postgresql/dict_snowball.so -lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc2004_sjis2004.so +lib/postgresql/euc_cn_and_mic.so lib/postgresql/euc_jp_and_sjis.so lib/postgresql/euc_kr_and_mic.so lib/postgresql/euc_tw_and_big5.so lib/postgresql/latin2_and_win1250.so lib/postgresql/latin_and_mic.so +lib/postgresql/libpqwalreceiver.so lib/postgresql/plpgsql.so lib/postgresql/utf8_and_ascii.so lib/postgresql/utf8_and_big5.so @@ -85,6 +85,7 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo |