From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 20 18:30:11 2012 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 9CA6A106566C for ; Tue, 20 Mar 2012 18:30:11 +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 7392D8FC17 for ; Tue, 20 Mar 2012 18:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2KIUB7J018382 for ; Tue, 20 Mar 2012 18:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2KIUBYR018380; Tue, 20 Mar 2012 18:30:11 GMT (envelope-from gnats) Resent-Date: Tue, 20 Mar 2012 18:30:11 GMT Resent-Message-Id: <201203201830.q2KIUBYR018380@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, Mel Flynn Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E35E7106566B; Tue, 20 Mar 2012 18:21:37 +0000 (UTC) (envelope-from mel@datakitty.lan.rachie.is-a-geek.net) Received: from datakitty.lan.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27]) by mx1.freebsd.org (Postfix) with ESMTP id 901B38FC1A; Tue, 20 Mar 2012 18:21:37 +0000 (UTC) Received: from datakitty.lan.rachie.is-a-geek.net (localhost [127.0.0.1]) by datakitty.lan.rachie.is-a-geek.net (8.14.5/8.14.5) with ESMTP id q2KILa0R099136; Tue, 20 Mar 2012 10:21:36 -0800 (AKDT) (envelope-from mel@datakitty.lan.rachie.is-a-geek.net) Received: (from mel@localhost) by datakitty.lan.rachie.is-a-geek.net (8.14.5/8.14.5/Submit) id q2KILajm099135; Tue, 20 Mar 2012 10:21:36 -0800 (AKDT) (envelope-from mel) Message-Id: <201203201821.q2KILajm099135@datakitty.lan.rachie.is-a-geek.net> Date: Tue, 20 Mar 2012 10:21:36 -0800 (AKDT) From: Mel Flynn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gnome@FreeBSD.org Subject: ports/166279: [patch] graphics/gtk-update-icon-cache: fix pre-configure test X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mel Flynn List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2012 18:30:11 -0000 >Number: 166279 >Category: ports >Synopsis: [patch] graphics/gtk-update-icon-cache: fix pre-configure test >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 20 18:30:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Mel Flynn >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD datakitty.lan.rachie.is-a-geek.net 8.2-STABLE FreeBSD 8.2-STABLE #6 r230977: Sun Feb 5 06:20:11 AKST 2012 mel@datakitty.lan.rachie.is-a-geek.net:/data/obj/data/RELENG_8/src/sys/GENERIC amd64 >Description: A test is done in pre-configure stage for the presence of cairo-xlib.pc, however this test is done using exists() directive for make(1). This test is done at Makefile parse time and thus will fail, if cairo is not installed `depends' time. >How-To-Repeat: pkg_delete -f cairo-\* ### make sure WITHOUT_X11 is not set in env or make.conf make -C /usr/ports/graphics/gtk-update-icon-cache configure >Fix: The fix below moves the test to sh, which effectively ensures that the test for existence is done at pre-configure stage rather than Makefile parse. --- fix-gtk-update-icon-cache.patch begins here --- Index: graphics/gtk-update-icon-cache/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gtk-update-icon-cache/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- graphics/gtk-update-icon-cache/Makefile 23 Sep 2011 22:23:14 -0000 1.3 +++ graphics/gtk-update-icon-cache/Makefile 20 Mar 2012 18:04:04 -0000 @@ -53,10 +53,10 @@ .include pre-configure: -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." - @${FALSE} -.endif + @if [ ! -f ${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc ]; then \ + ${ECHO_CMD} "${PKGNAME}: Needs cairo built with X11 support."; \ + ${FALSE}; \ + fi do-build: @cd ${WRKSRC}/gtk && ${GMAKE} gtk-update-icon-cache --- fix-gtk-update-icon-cache.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: