From mel@datakitty.lan.rachie.is-a-geek.net  Tue Mar 20 18:21:37 2012
Return-Path: <mel@datakitty.lan.rachie.is-a-geek.net>
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 <rflynn@acsalaska.net>
Reply-To: Mel Flynn <rflynn@acsalaska.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gnome@freebsd.org
Subject: [patch] graphics/gtk-update-icon-cache: fix pre-configure test
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166279
>Category:       ports
>Synopsis:       [patch] graphics/gtk-update-icon-cache: fix pre-configure test
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 20 18:30:11 UTC 2012
>Closed-Date:    Sun May 20 16:45:56 UTC 2012
>Last-Modified:  Sun May 20 16:50:07 UTC 2012
>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 <bsd.port.pre.mk>
 
 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:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 20 18:30:22 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166279 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Sun May 20 16:45:44 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166279 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166279: commit references a PR
Date: Sun, 20 May 2012 16:45:50 +0000 (UTC)

 mezz        2012-05-20 16:45:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/gtk-update-icon-cache Makefile 
   Log:
   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.
   
   PR:             ports/166279
   Submitted by:   Mel Flynn <rflynn@acsalaska.net>
   
   Revision  Changes    Path
   1.4       +4 -4      ports/graphics/gtk-update-icon-cache/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
