[kde-freebsd] [options-ng][patch] broken qt33 build after options-ng merge

[Oliver Pinter]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: qt33-after-options-ng2.diff
Type: text/x-diff
Size: 525 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-freebsd/attachments/20120602/88b6db10/attachment-0001.bin>