From mwisnicki+freebsd@gmail.com  Mon Feb 15 21:53:02 2010
Return-Path: <mwisnicki+freebsd@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67FCD1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Feb 2010 21:53:02 +0000 (UTC)
	(envelope-from mwisnicki+freebsd@gmail.com)
Received: from mail-bw0-f223.google.com (mail-bw0-f223.google.com [209.85.218.223])
	by mx1.freebsd.org (Postfix) with ESMTP id E91048FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Feb 2010 21:53:00 +0000 (UTC)
Received: by bwz23 with SMTP id 23so618244bwz.33
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Feb 2010 13:53:00 -0800 (PST)
Received: by 10.204.15.132 with SMTP id k4mr3579828bka.174.1266270779891;
        Mon, 15 Feb 2010 13:52:59 -0800 (PST)
Received: from  (static-78-8-147-77.ssp.dialog.net.pl [78.8.147.77])
        by mx.google.com with ESMTPS id 16sm2876841bwz.3.2010.02.15.13.52.56
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Mon, 15 Feb 2010 13:52:57 -0800 (PST)
Received: by  (sSMTP sendmail emulation); Mon, 15 Feb 2010 22:52:54 +0100
Message-Id: <4b79c239.101abc0a.71f1.fffff597@mx.google.com>
Date: Mon, 15 Feb 2010 22:52:54 +0100
From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
Sender: =?UTF-8?Q?Marcin_Wi=C5=9Bnicki?= <mwisnicki@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] mail/mail-notification: unbreak WITH_EVOLUTION
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         143971
>Category:       ports
>Synopsis:       [MAINTAINER] mail/mail-notification: unbreak WITH_EVOLUTION
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 15 22:00:11 UTC 2010
>Closed-Date:    Tue Feb 16 10:44:02 UTC 2010
>Last-Modified:  Tue Feb 16 10:44:02 UTC 2010
>Originator:     Marcin Wisnicki
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 7.2-STABLE FreeBSD 7.2-STABLE #4: Thu Dec 10 23:23:39 CET 2009
>Description:
After recent update of gnome this port failed to build with EVOLUTION=on.
No version bump needed.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mail-notification-5.4_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/Makefile /usr/ports/mail/mail-notification/Makefile
--- /usr/ports/mail/mail-notification.orig/Makefile	2010-02-11 12:58:37.000000000 +0100
+++ /usr/ports/mail/mail-notification/Makefile	2010-02-15 22:49:45.000000000 +0100
@@ -91,10 +91,14 @@
 JB_CONF_ARGS+=	evolution=no
 PLIST_SUB+=	EVOLUTION="@comment "
 .else
-EVO_VERSION=	2.22
+EVO_VERSION!=	make -C ${PORTSDIR}/mail/evolution -V EVO_VERSION
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution
 PLIST_SUB+=	EVOLUTION="" EVO_VERSION=${EVO_VERSION}
+# Work around the fact that MN is using evolution's private(?) api that is not part of
+# evolution-plugin thus it's includes are not covered by pkgconfig metadata.
+# That path is frozen at 3.14 even for later versions of libgtkhtml.
+CFLAGS+=	-I${LOCALBASE}/include/libgtkhtml-3.14 -I${LOCALBASE}/include/libgtkhtml-3.14/editor
 .endif
 .if defined(WITHOUT_MOZILLA)
 JB_CONF_ARGS+=	mozilla=no
--- mail-notification-5.4_4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lwhsu 
Responsible-Changed-By: lwhsu 
Responsible-Changed-When: Tue Feb 16 08:09:49 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143971 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Tue Feb 16 10:44:01 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143971 
>Unformatted:
