Date: Sat, 2 Jun 2012 13:44:20 +0200 From: Baptiste Daroussin <bapt@freebsd.org> To: Oliver Pinter <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 Message-ID: <20120602114420.GA59379@ithaqua.etoilebsd.net> In-Reply-To: <20120602113151.GA77492@pandora-d.teteny.bme.hu> References: <20120602113151.GA77492@pandora-d.teteny.bme.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120602114420.GA59379>