From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 22 11:20:02 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 1A1281065678 for ; Thu, 22 Jul 2010 11:20:02 +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 EBAFA8FC20 for ; Thu, 22 Jul 2010 11:20:01 +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 o6MBK1WP047839 for ; Thu, 22 Jul 2010 11:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6MBK1TA047838; Thu, 22 Jul 2010 11:20:01 GMT (envelope-from gnats) Resent-Date: Thu, 22 Jul 2010 11:20:01 GMT Resent-Message-Id: <201007221120.o6MBK1TA047838@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 3F5101065672; Thu, 22 Jul 2010 11:15:22 +0000 (UTC) (envelope-from mm@mail.vx.sk) Received: from mail.vx.sk (core.vx.sk [188.40.32.143]) by mx1.freebsd.org (Postfix) with ESMTP id F1E908FC13; Thu, 22 Jul 2010 11:15:21 +0000 (UTC) Received: from core.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id F080A113C6B; Thu, 22 Jul 2010 13:15:20 +0200 (CEST) Received: from mail.vx.sk ([127.0.0.1]) by core.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 3-v-aacavzsT; Thu, 22 Jul 2010 13:15:18 +0200 (CEST) Received: by mail.vx.sk (Postfix, from userid 1001) id 16A4F113C62; Thu, 22 Jul 2010 13:15:18 +0200 (CEST) Message-Id: <20100722111518.16A4F113C62@mail.vx.sk> Date: Thu, 22 Jul 2010 13:15:18 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: girgen@FreeBSD.org Subject: ports/148837: [PATCH] databases/postgresql-server: fix build with icu 4.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2010 11:20:02 -0000 >Number: 148837 >Category: ports >Synopsis: [PATCH] databases/postgresql-server: fix build with icu 4.4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 22 11:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD core.vx.sk 8.1-RELEASE FreeBSD 8.1-RELEASE #21 r210200M: Sat Jul 17 22:02:58 CEST >Description: - fix build with ICU4 option after ICU 4.4 update Port maintainer (girgen@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- postgresql-server-8.4.4_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/postgresql84-server/Makefile,v retrieving revision 1.207 diff -u -r1.207 Makefile --- Makefile 13 Jun 2010 08:39:57 -0000 1.207 +++ Makefile 22 Jul 2010 11:14:00 -0000 @@ -7,7 +7,7 @@ PORTNAME?= postgresql DISTVERSION?= 8.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -112,7 +112,7 @@ PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-840-icu-2009-09-15.diff.gz:icu . if defined(WITH_ICU4) -LIB_DEPENDS+= icudata.43:${PORTSDIR}/devel/icu4 +LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . else LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu Index: files/extra-patch-icu4 =================================================================== RCS file: /home/pcvs/ports/databases/postgresql84-server/files/extra-patch-icu4,v retrieving revision 1.1 diff -u -r1.1 extra-patch-icu4 --- files/extra-patch-icu4 25 Mar 2010 22:58:11 -0000 1.1 +++ files/extra-patch-icu4 22 Jul 2010 11:14:00 -0000 @@ -8,7 +8,7 @@ - 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_43, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_44, [], [ + 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])]) @@ -19,7 +19,7 @@ - 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_43, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [ + 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])]) --- postgresql-server-8.4.4_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: