From owner-freebsd-x11@FreeBSD.ORG  Sat Jun  2 17:16:13 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
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 5C2EC106566B;
	Sat,  2 Jun 2012 17:16:13 +0000 (UTC)
	(envelope-from bapt@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 23F568FC18;
	Sat,  2 Jun 2012 17:16:13 +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 q52HGDei076748;
	Sat, 2 Jun 2012 17:16:13 GMT (envelope-from bapt@freebsd.org)
Received: (from bapt@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q52HGC8I076746;
	Sat, 2 Jun 2012 17:16:12 GMT (envelope-from bapt@freebsd.org)
X-Authentication-Warning: freefall.freebsd.org: bapt set sender to
	bapt@freebsd.org using -f
Date: Sat, 2 Jun 2012 19:16:08 +0200
From: Baptiste Daroussin <bapt@freebsd.org>
To: Oliver Pinter <oliver.pinter@gmail.com>
Message-ID: <20120602171608.GC81957@ithaqua.etoilebsd.net>
References: <20120602113151.GA77492@pandora-d.teteny.bme.hu>
	<20120602114420.GA59379@ithaqua.etoilebsd.net>
	<201206021849.17404.oliver.pinter@gmail.com>
	<201206021859.56173.oliver.pinter@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="ALfTUftag+2gvp1h"
Content-Disposition: inline
In-Reply-To: <201206021859.56173.oliver.pinter@gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
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 <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jun 2012 17:16:13 -0000


--ALfTUftag+2gvp1h
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, Jun 02, 2012 at 06:59:56PM +0200, Oliver Pinter wrote:
> 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. T=
he
> > > > 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+=3D	cups.2:${PORTSDIR}/print/cups-client
> > > > -.elif defined(WITHOUT_CUPS)
> > > > +.elif !defined(WITHOUT_CUPS)
> > > >  CUPS=3D	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
> > > > -I${LOCALBASE}/include/libpng15 .else
> > > >  CUPS=3D
> > >
> > > Fixed another way thank you very much!
> > >
> > > regards;
> > > Bapt
> >
> > Hi Bapt!
> >
> > The patch, that you commited (not my) is wrong, the corret patch attach=
ed.
> > This corrected patch contained a small fix too, that is not relevant al=
ways
> > (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.
>=20
> or this
>=20
> --=20
> thanks,
> Oliver

> --- Makefile.orig	2012-06-02 18:57:21.000000000 +0200
> +++ Makefile	2012-06-02 18:57:56.000000000 +0200
> @@ -111,7 +111,6 @@
> =20
>  .if ${PORT_OPTIONS:MCUPS}
>  LIB_DEPENDS+=3D	cups.2:${PORTSDIR}/print/cups-client
> -.else
>  CUPS=3D	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
>  .endif
> =20
> @@ -119,7 +118,7 @@
>  LIB_DEPENDS+=3D	audio:${PORTSDIR}/audio/nas
>  CONFIGURE_ARGS+=3D-system-nas-sound -no-pch
>  .else
> -CONFIGURE_ARGS+=3D-no-nas-sound
> +CONFIGURE_ARGS+=3D-no-nas-sound -no-pch
>  .endif
> =20
>  .if ${PORT_OPTIONS:MKDE_PATCHES}

Fixed for real, sorry

Bapt


--ALfTUftag+2gvp1h
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAk/KSlgACgkQ8kTtMUmk6EwkkwCbBGMTv/FBloC8abVQjD2DQC7n
kYAAn1O4h/D11G9atYreb77HZN2eGx0E
=D23V
-----END PGP SIGNATURE-----

--ALfTUftag+2gvp1h--