Subject: TOOLS_* in Makefiles (was Re: pkg/33558 (devel/rcs uses /bin/diff and not /usr/pkg/bin/gdiff on solaris - breaks merge))
To: None <tech-pkg@NetBSD.org>
From: Klaus Heinz <k.heinz.jun.sechs@onlinehome.de>
List: tech-pkg
Date: 06/05/2006 16:45:43 
Stefan Pfetzing wrote:
>  --- Makefile.orig	2006-06-05 03:54:26.765847700 +0200
>  +++ Makefile	2006-06-05 03:52:14.369492591 +0200
>  @@ -14,6 +14,7 @@
>   .if ${OPSYS} == "SunOS"
>   DEPENDS+=		diffutils>=2.7:../../devel/diffutils
>   CONFIGURE_ARGS+=	--with-diffutils=gdiff
>  +TOOLS_PLATFORM.diff=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
>   .endif
>   
>   GNU_CONFIGURE=		yes
>  

>  Works so far fine for me. I also tried removing the --with-diffutils  
>  line, but this makes the rcs configure only use /usr/pkg/bin/gdiff  
>  (for diff) and  using the wrong for diff3.

I am thinking of using the following for this PR:

   .if ${OPSYS} == "SunOS"
  -DEPENDS+=              diffutils>=2.7:../../devel/diffutils
  -CONFIGURE_ARGS+=       --with-diffutils=gdiff
  +CONFIGURE_ARGS+=       --with-diffutils
  +USE_TOOLS+=            diff:run
  +# RCS needs GNU diffutils, not the native SunOS diff
  +TOOLS_PLATFORM.diff=
  +TOOLS_DEPENDS.diff=    diffutils>=2.7:../../devel/diffutils
   .endif

Are TOOLS_* variables supposed to be used in package Makefiles?


ciao
     Klaus