From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 17 10:40:05 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53D7910656A5 for ; Fri, 17 Dec 2010 10:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 278528FC16 for ; Fri, 17 Dec 2010 10:40:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBHAe5Hf044566 for ; Fri, 17 Dec 2010 10:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBHAe4bD044565; Fri, 17 Dec 2010 10:40:05 GMT (envelope-from gnats) Resent-Date: Fri, 17 Dec 2010 10:40:05 GMT Resent-Message-Id: <201012171040.oBHAe4bD044565@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7D4F106566B; Fri, 17 Dec 2010 10:36:49 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (mail2.vx.sk [IPv6:2a01:4f8:100:84a3::3]) by mx1.freebsd.org (Postfix) with ESMTP id 452808FC1C; Fri, 17 Dec 2010 10:36:48 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id 5F6A9E8732; Fri, 17 Dec 2010 11:36:47 +0100 (CET) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 8OUeaoCtG4ur; Fri, 17 Dec 2010 11:31:45 +0100 (CET) Received: by mail2.vx.sk (Postfix, from userid 1001) id A0191E86BF; Fri, 17 Dec 2010 11:31:45 +0100 (CET) Message-Id: <20101217103145.A0191E86BF@mail2.vx.sk> Date: Fri, 17 Dec 2010 11:31:45 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Palle Girgensohn Subject: ports/153245: [PATCH] Update postgresql (9.0.2, 8.4.6, 8.3.13, 8.2.19, 8.1.23) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Matuska List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2010 10:40:05 -0000 >Number: 153245 >Category: ports >Synopsis: [PATCH] Update postgresql (9.0.2, 8.4.6, 8.3.13, 8.2.19, 8.1.23) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 17 10:40:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #14 r216479M: Thu Dec 16 10:31:17 CET 2010 root@neo.vx.sk:/usr/obj/usr/src/sys/NEO amd64 >Description: - update PostgreSQL ports to: 9.0.2, 8.4.6, 8.3.13, 8.2.19, 8.1.23 - unify ICU handling (extra-patch-icu4) - fix ICU build with postgresql81-server - properly tested in tinderbox (with ICU) >How-To-Repeat: >Fix: Index: ports/databases/postgresql81-server/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql81-server/Makefile,v retrieving revision 1.193 diff -u -r1.193 Makefile --- ports/databases/postgresql81-server/Makefile 4 Dec 2010 07:30:50 -0000 1.193 +++ ports/databases/postgresql81-server/Makefile 17 Dec 2010 10:25:51 -0000 @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.1.22 -PORTREVISION?= 1 +PORTVERSION?= 8.1.23 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -110,6 +109,7 @@ LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -274,7 +274,7 @@ . 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" \ + "s|^(m4_.*)2.6[0-9](.*Autoconf version.*)2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ ${WRKSRC}/configure.in . endif Index: ports/databases/postgresql81-server/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/postgresql81-server/distinfo,v retrieving revision 1.68 diff -u -r1.68 distinfo --- ports/databases/postgresql81-server/distinfo 7 Oct 2010 06:58:09 -0000 1.68 +++ ports/databases/postgresql81-server/distinfo 17 Dec 2010 10:25:51 -0000 @@ -1,9 +1,6 @@ -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/postgresql-8.1.23.tar.bz2) = 5a79eb814b4933f95deb704dfbbd6e1966b520ec12b8f4b48bcea9c3266c10ea +SIZE (postgresql/postgresql-8.1.23.tar.bz2) = 11920401 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-8121-icu-xx-2010-05-14.diff.gz) = af4e5f16bfc60a9e98d18f1f7c8d76e7 SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56 SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271 Index: ports/databases/postgresql81-server/files/extra-patch-icu4 =================================================================== RCS file: ports/databases/postgresql81-server/files/extra-patch-icu4 diff -N ports/databases/postgresql81-server/files/extra-patch-icu4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/databases/postgresql81-server/files/extra-patch-icu4 17 Dec 2010 10:25:51 -0000 @@ -0,0 +1,40 @@ +--- configure.in.orig 2010-12-17 10:44:30.756396179 +0100 ++++ configure.in 2010-12-17 10:45:13.119579646 +0100 +@@ -703,19 +703,27 @@ + fi + + if test "$with_icu" = yes ; then +- AC_CHECK_LIB(icui18n, ucol_open_43, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ AC_CHECK_LIB(icui18n, ucol_open_46, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_44, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_43, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ ]) + ]) +- ]) ++ ]) ++ ]) + ]) +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ ]) + ]) +- ]) ++ ]) ++ ]) + ]) + fi + Index: ports/databases/postgresql82-server/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql82-server/Makefile,v retrieving revision 1.194 diff -u -r1.194 Makefile --- ports/databases/postgresql82-server/Makefile 4 Dec 2010 07:30:50 -0000 1.194 +++ ports/databases/postgresql82-server/Makefile 17 Dec 2010 10:25:51 -0000 @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.2.18 -PORTREVISION?= 1 +PORTVERSION?= 8.2.19 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} Index: ports/databases/postgresql82-server/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/postgresql82-server/distinfo,v retrieving revision 1.66 diff -u -r1.66 distinfo --- ports/databases/postgresql82-server/distinfo 7 Oct 2010 06:58:09 -0000 1.66 +++ ports/databases/postgresql82-server/distinfo 17 Dec 2010 10:25:51 -0000 @@ -1,3 +1,2 @@ -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 +SHA256 (postgresql/postgresql-8.2.19.tar.bz2) = 9ae639ec9320830c60c7e6b2151ed744c51564d0664d6b5c896b9ed7b4285f5e +SIZE (postgresql/postgresql-8.2.19.tar.bz2) = 12749881 Index: ports/databases/postgresql83-server/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql83-server/Makefile,v retrieving revision 1.207 diff -u -r1.207 Makefile --- ports/databases/postgresql83-server/Makefile 16 Dec 2010 18:47:55 -0000 1.207 +++ ports/databases/postgresql83-server/Makefile 17 Dec 2010 10:25:51 -0000 @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.3.12 -PORTREVISION?= 2 +DISTVERSION?= 8.3.13 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -108,6 +107,7 @@ LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -285,7 +285,6 @@ . if defined(WITH_ICU) @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ - -e "s|_43|_46|g" \ ${WRKSRC}/configure.in . endif Index: ports/databases/postgresql83-server/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/postgresql83-server/distinfo,v retrieving revision 1.75 diff -u -r1.75 distinfo --- ports/databases/postgresql83-server/distinfo 7 Oct 2010 06:58:09 -0000 1.75 +++ ports/databases/postgresql83-server/distinfo 17 Dec 2010 10:25:51 -0000 @@ -1,6 +1,4 @@ -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/postgresql-8.3.13.tar.bz2) = 192ece18834af0fe001e11794df1bc266b056050d3c74804c6c0442c7f99d4fc +SIZE (postgresql/postgresql-8.3.13.tar.bz2) = 14337117 SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064 Index: ports/databases/postgresql83-server/files/extra-patch-icu4 =================================================================== RCS file: ports/databases/postgresql83-server/files/extra-patch-icu4 diff -N ports/databases/postgresql83-server/files/extra-patch-icu4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/databases/postgresql83-server/files/extra-patch-icu4 17 Dec 2010 10:25:51 -0000 @@ -0,0 +1,49 @@ +--- configure.in.orig 2010-12-17 11:17:22.892862951 +0100 ++++ configure.in 2010-12-17 11:17:59.498605923 +0100 +@@ -19,7 +19,7 @@ + + AC_INIT([PostgreSQL], [8.3.13], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required. ++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.68], [], [m4_fatal([Autoconf version 2.68 is required. + Untested combinations of 'autoconf' and PostgreSQL versions are not + recommended. You can remove the check from 'configure.in' but it is then + your responsibility whether the result works or not.])]) +@@ -795,19 +795,27 @@ + fi + + if test "$with_icu" = yes ; then +- AC_CHECK_LIB(icui18n, ucol_open_43, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ AC_CHECK_LIB(icui18n, ucol_open_46, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_44, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_43, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ ]) + ]) +- ]) ++ ]) ++ ]) + ]) +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ ]) + ]) +- ]) ++ ]) ++ ]) + ]) + fi + Index: ports/databases/postgresql84-server/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql84-server/Makefile,v retrieving revision 1.218 diff -u -r1.218 Makefile --- ports/databases/postgresql84-server/Makefile 16 Dec 2010 18:47:56 -0000 1.218 +++ ports/databases/postgresql84-server/Makefile 17 Dec 2010 10:25:52 -0000 @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.4.5 -PORTREVISION?= 2 +DISTVERSION?= 8.4.6 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} Index: ports/databases/postgresql84-server/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/postgresql84-server/distinfo,v retrieving revision 1.78 diff -u -r1.78 distinfo --- ports/databases/postgresql84-server/distinfo 7 Oct 2010 06:58:10 -0000 1.78 +++ ports/databases/postgresql84-server/distinfo 17 Dec 2010 10:25:52 -0000 @@ -1,6 +1,4 @@ -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/postgresql-8.4.6.tar.bz2) = 8110c576e9055286d7b04b8930f7a378e483f0530b41dd3098f6e35528ed7d3c +SIZE (postgresql/postgresql-8.4.6.tar.bz2) = 14130201 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321 Index: ports/databases/postgresql84-server/files/extra-patch-icu4 =================================================================== RCS file: /home/pcvs/ports/databases/postgresql84-server/files/extra-patch-icu4,v retrieving revision 1.3 diff -u -r1.3 extra-patch-icu4 --- ports/databases/postgresql84-server/files/extra-patch-icu4 16 Dec 2010 18:47:56 -0000 1.3 +++ ports/databases/postgresql84-server/files/extra-patch-icu4 17 Dec 2010 10:25:52 -0000 @@ -1,6 +1,6 @@ ---- configure.in.orig 2010-03-25 22:25:10.655197193 +0100 -+++ configure.in 2010-03-25 22:25:13.611658318 +0100 -@@ -945,15 +945,19 @@ +--- configure.in.orig 2010-12-17 10:28:46.362381801 +0100 ++++ configure.in 2010-12-17 10:31:27.692004326 +0100 +@@ -945,15 +945,27 @@ fi if test "$with_icu" = yes ; then @@ -9,22 +9,30 @@ - AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) - ]) + AC_CHECK_LIB(icui18n, ucol_open_46, [], [ -+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ -+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ -+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ AC_CHECK_LIB(icui18n, ucol_open_44, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_43, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ ]) + ]) -+ ]) ++ ]) ++ ]) ]) - AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ - AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ - AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) - ]) + AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [ -+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ -+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ -+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ ]) + ]) -+ ]) ++ ]) ++ ]) ]) fi Index: ports/databases/postgresql90-server/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql90-server/Makefile,v retrieving revision 1.212 diff -u -r1.212 Makefile --- ports/databases/postgresql90-server/Makefile 16 Dec 2010 18:47:56 -0000 1.212 +++ ports/databases/postgresql90-server/Makefile 17 Dec 2010 10:25:52 -0000 @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.1 -PORTREVISION?= 2 +DISTVERSION?= 9.0.2 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -109,6 +108,7 @@ PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -319,7 +319,6 @@ . if defined(WITH_ICU) @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ - -e "s|_44|_46|g" \ ${WRKSRC}/configure.in . endif Index: ports/databases/postgresql90-server/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/postgresql90-server/distinfo,v retrieving revision 1.78 diff -u -r1.78 distinfo --- ports/databases/postgresql90-server/distinfo 7 Oct 2010 06:58:10 -0000 1.78 +++ ports/databases/postgresql90-server/distinfo 17 Dec 2010 10:25:52 -0000 @@ -1,6 +1,4 @@ -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/postgresql-9.0.2.tar.bz2) = ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5 +SIZE (postgresql/postgresql-9.0.2.tar.bz2) = 14024244 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 Index: ports/databases/postgresql90-server/pkg-plist-client =================================================================== RCS file: /home/pcvs/ports/databases/postgresql90-server/pkg-plist-client,v retrieving revision 1.19 diff -u -r1.19 pkg-plist-client --- ports/databases/postgresql90-server/pkg-plist-client 7 Oct 2010 06:58:10 -0000 1.19 +++ ports/databases/postgresql90-server/pkg-plist-client 17 Dec 2010 10:25:52 -0000 @@ -606,8 +606,10 @@ %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo @@ -642,5 +644,11 @@ %%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 +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo @dirrm share/doc/postgresql/html @dirrm share/doc/postgresql Index: ports/databases/postgresql90-server/pkg-plist-server =================================================================== RCS file: /home/pcvs/ports/databases/postgresql90-server/pkg-plist-server,v retrieving revision 1.29 diff -u -r1.29 pkg-plist-server --- ports/databases/postgresql90-server/pkg-plist-server 22 Nov 2010 19:21:09 -0000 1.29 +++ ports/databases/postgresql90-server/pkg-plist-server 17 Dec 2010 10:25:52 -0000 @@ -76,9 +76,11 @@ %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo +%%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo @@ -110,6 +112,14 @@ %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-9.0.mo +%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.0.mo +%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-9.0.mo share/postgresql/postgres.shdescription share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Abidjan Index: ports/databases/postgresql90-server/files/extra-patch-icu4 =================================================================== RCS file: ports/databases/postgresql90-server/files/extra-patch-icu4 diff -N ports/databases/postgresql90-server/files/extra-patch-icu4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/databases/postgresql90-server/files/extra-patch-icu4 17 Dec 2010 10:25:52 -0000 @@ -0,0 +1,46 @@ +--- configure.in.orig 2010-12-17 10:24:25.585364941 +0100 ++++ configure.in 2010-12-17 10:25:08.921592644 +0100 +@@ -947,23 +947,27 @@ + fi + + if test "$with_icu" = yes ; then +- AC_CHECK_LIB(icui18n, ucol_open_44, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_43, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ +- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) +- ]) +- ]) +- ]) ++ AC_CHECK_LIB(icui18n, ucol_open_46, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_44, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_43, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) ++ ]) ++ ]) ++ ]) ++ ]) + ]) +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ +- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) +- ]) +- ]) +- ]) ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])]) ++ ]) ++ ]) ++ ]) ++ ]) + ]) + fi + >Release-Note: >Audit-Trail: >Unformatted: