From owner-freebsd-ports@FreeBSD.ORG  Sat Jun  2 11:44:23 2012
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
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 BBEC01065675;
	Sat,  2 Jun 2012 11:44:23 +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 9F7B48FC15;
	Sat,  2 Jun 2012 11:44:23 +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 q52BiNKN046116;
	Sat, 2 Jun 2012 11:44:23 GMT (envelope-from bapt@freebsd.org)
Received: (from bapt@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q52BiNE0046115;
	Sat, 2 Jun 2012 11:44:23 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 13:44:20 +0200
From: Baptiste Daroussin <bapt@freebsd.org>
To: Oliver Pinter <oliver.pinter@gmail.com>
Message-ID: <20120602114420.GA59379@ithaqua.etoilebsd.net>
References: <20120602113151.GA77492@pandora-d.teteny.bme.hu>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw"
Content-Disposition: inline
In-Reply-To: <20120602113151.GA77492@pandora-d.teteny.bme.hu>
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-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jun 2012 11:44:23 -0000


--GvXjxJ+pjyke8COw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, Jun 02, 2012 at 01:31:51PM +0200, Oliver Pinter wrote:
> Hi All!
>=20
> 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 @@
> =20
>  .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}/i=
nclude/libpng15
>  .else
>  CUPS=3D
Fixed another way thank you very much!

regards;
Bapt


--GvXjxJ+pjyke8COw
Content-Type: application/pgp-signature

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

iEYEARECAAYFAk/J/JQACgkQ8kTtMUmk6EytDgCePakqvax+F4CL7uQWE/ICl0qI
+W0An0GNImhqQdI0F/Dj9TFEVWNlBOCD
=fmkc
-----END PGP SIGNATURE-----

--GvXjxJ+pjyke8COw--