From owner-freebsd-ports@FreeBSD.ORG Sat Jun 2 16:49:23 2012 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 843E21065673; Sat, 2 Jun 2012 16:49:23 +0000 (UTC) (envelope-from oliver.pinter@gmail.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id 8ED548FC19; Sat, 2 Jun 2012 16:49:22 +0000 (UTC) Received: by wgbds11 with SMTP id ds11so2839969wgb.31 for ; Sat, 02 Jun 2012 09:49:21 -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=KeQ/mLv38V4cwgJNpbDcb1RdOYU/m1HJKCfeHYE4O9I=; b=j5kqtRCMcaailKbk97MmEkNppyiVfctTgwZ7LOpojzh0wk0p+yObHZLbPmpjuHCalI 1xx0yaZ+GgdTr7aZSdoCQ3f7Kg2ow16fE1rvMLHkdZ1+FrK6vCESgAWD0t3u153KbMcv 8SkAQ+/2ByiZA4htVWYEpcuqWvEGkvJjtgWNYBWYxuqcL795DEUxrs36PFPfZpmT4fEW h1d+9EaZI/7K6kM5AOC/UgI5pW4Mp6maUMtkH3G6qfwTTP5hkSX7xv1y2f2CqI9WVnnv DA4jQrFWEU/g3oDzQw1EFE0jQ8z3YRrVvfTpWGTTt+keRX4GNbeJaAxBSFtHbo9W30js y0Bg== Received: by 10.216.141.213 with SMTP id g63mr5920934wej.34.1338655761577; Sat, 02 Jun 2012 09:49:21 -0700 (PDT) Received: from opd.teteny.bme.hu (opd.teteny.bme.hu. [152.66.235.214]) by mx.google.com with ESMTPS id j4sm5990758wiz.1.2012.06.02.09.49.19 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 02 Jun 2012 09:49:20 -0700 (PDT) From: Oliver Pinter To: Baptiste Daroussin Date: Sat, 2 Jun 2012 18:49:17 +0200 User-Agent: KMail/1.9.10 References: <20120602113151.GA77492@pandora-d.teteny.bme.hu> <20120602114420.GA59379@ithaqua.etoilebsd.net> In-Reply-To: <20120602114420.GA59379@ithaqua.etoilebsd.net> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_NQkyPSh7P97+kXi" Message-Id: <201206021849.17404.oliver.pinter@gmail.com> 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-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2012 16:49:23 -0000 --Boundary-00=_NQkyPSh7P97+kXi Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. -- thanks, Oliver --Boundary-00=_NQkyPSh7P97+kXi Content-Type: text/x-diff; charset="iso 8859-15"; name="qt33-after-options-ng2.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="qt33-after-options-ng2.diff" --- Makefile.orig 2012-06-02 18:39:40.000000000 +0200 +++ Makefile 2012-06-02 18:40:23.000000000 +0200 @@ -111,15 +111,16 @@ .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client -.else CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include +.else +CUPS= .endif .if ${PORT_OPTIONS:MNAS} LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas CONFIGURE_ARGS+=-system-nas-sound -no-pch .else -CONFIGURE_ARGS+=-no-nas-sound +CONFIGURE_ARGS+=-no-nas-sound -no-pch .endif .if ${PORT_OPTIONS:MKDE_PATCHES} --Boundary-00=_NQkyPSh7P97+kXi--