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. 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.
>
> or this
>
> --
> 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 @@
>
> .if ${PORT_OPTIONS:MCUPS}
> LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
> -.else
> CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
> .endif
>
> @@ -119,7 +118,7 @@
> 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}
Fixed for real, sorry
Bapt
pgpOA5SQNfb7V.pgp
Description: PGP signature
