Date: Sat, 2 Jun 2012 18:49:17 +0200 From: Oliver Pinter <oliver.pinter@gmail.com> To: Baptiste Daroussin <bapt@freebsd.org> Cc: ports@freebsd.org, kde@freebsd.org, x11@freebsd.org Subject: Re: [options-ng][patch] broken qt33 build after options-ng merge Message-ID: <201206021849.17404.oliver.pinter@gmail.com> In-Reply-To: <20120602114420.GA59379@ithaqua.etoilebsd.net> References: <20120602113151.GA77492@pandora-d.teteny.bme.hu> <20120602114420.GA59379@ithaqua.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206021849.17404.oliver.pinter>