From owner-freebsd-x11@FreeBSD.ORG Sat Jun 2 17:00:03 2012 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF377106566C; Sat, 2 Jun 2012 17:00:02 +0000 (UTC) (envelope-from oliver.pinter@gmail.com) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx1.freebsd.org (Postfix) with ESMTP id B9C598FC0A; Sat, 2 Jun 2012 17:00:01 +0000 (UTC) Received: by wibhn6 with SMTP id hn6so1288169wib.13 for ; Sat, 02 Jun 2012 10:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:message-id; bh=xuRw90gDmyyj8SVpOqOzb7Jcp9FgBMgEbHao0rt8n3U=; b=YwcAjfjVAP1rsJbVcsB7fJX05EofaFRcFaUxwxgWIF/BdfqC5MtimUyw4CyeSFWxHp tXu9GW2snVuiYB/7jvQAT+GEKFUXG2NuTnva+Fuwp8FX8LlZe8pNrdmupp+w4qD5OMYF 57zUYuCoT4YXUoPDGXSDxgoamFOC16h9dhiC1Z6kAwrNPS/omhcUUbm8PZBjcPglCnOP Vdcokz9gXYWzLrKSeWr/HyGK/pN46+N+EEOO/TrDrkNDPjQo7T0ar3rByZd4TLCyoAee zCcVXFxUQF6a7AgHou4Seq+EGhY/zrPlxPTRnMuSbiwhVR9NO4nx3Qqi/hqXm/C2baQX HqFQ== Received: by 10.216.214.88 with SMTP id b66mr5841791wep.114.1338656400630; Sat, 02 Jun 2012 10:00:00 -0700 (PDT) Received: from opd.teteny.bme.hu (opd.teteny.bme.hu. [152.66.235.214]) by mx.google.com with ESMTPS id ez4sm6049071wid.3.2012.06.02.09.59.58 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 02 Jun 2012 09:59:58 -0700 (PDT) From: Oliver Pinter To: Baptiste Daroussin Date: Sat, 2 Jun 2012 18:59:56 +0200 User-Agent: KMail/1.9.10 References: <20120602113151.GA77492@pandora-d.teteny.bme.hu> <20120602114420.GA59379@ithaqua.etoilebsd.net> <201206021849.17404.oliver.pinter@gmail.com> In-Reply-To: <201206021849.17404.oliver.pinter@gmail.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_MakyPlGiYbuWujH" Message-Id: <201206021859.56173.oliver.pinter@gmail.com> X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: ports@freebsd.org, kde@freebsd.org, x11@freebsd.org Subject: Re: [options-ng][patch] broken qt33 build after options-ng merge X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2012 17:00:03 -0000 --Boundary-00=_MakyPlGiYbuWujH Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Saturday 02 June 2012 18:49:17 Oliver Pinter wrote: > On Saturday 02 June 2012 13:44:20 Baptiste Daroussin wrote: > > On Sat, Jun 02, 2012 at 01:31:51PM +0200, Oliver Pinter wrote: > > > Hi All! > > > > > > In x11-toolkits/qt33 broked one expression with options-ng merge. The > > > attached patch fixed this. > > > > > > --- Makefile.orig 2012-06-02 13:26:43.000000000 +0200 > > > +++ Makefile 2012-06-02 13:27:23.000000000 +0200 > > > @@ -110,7 +110,7 @@ > > > > > > .if ${PORT_OPTIONS:MCUPS} > > > LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client > > > -.elif defined(WITHOUT_CUPS) > > > +.elif !defined(WITHOUT_CUPS) > > > CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include > > > -I${LOCALBASE}/include/libpng15 .else > > > CUPS= > > > > Fixed another way thank you very much! > > > > regards; > > Bapt > > Hi Bapt! > > The patch, that you commited (not my) is wrong, the corret patch attached. > This corrected patch contained a small fix too, that is not relevant always > (the -no-pch part). > > Your version of patch enabled installed cups, but not enabled, or not > installed but enabled the cups support, which is wrong. > > My version is build and run tested. or this -- thanks, Oliver --Boundary-00=_MakyPlGiYbuWujH--