pkg/33558: devel/rcs uses /bin/diff and not /usr/pkg/bin/gdiff on solaris - breaks merge

[dreamind%dreamind.de@localhost]

>Number:         33558
>Category:       pkg
>Synopsis:       devel/rcs uses /bin/diff and not /usr/pkg/bin/gdiff on solaris 
>- breaks merge
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri May 26 03:15:00 +0000 2006
>Originator:     Stefan Pfetzing
>Release:        - pkgsrc (current) on solaris
>Organization:
AP-WDSL
>Environment:
SunOS blackbox 5.11 snv_38 i86pc i386 i86pc

>Description:
Hi,

devel/rcs is broken on Solaris. Althogh the use of the following in the 
Makefile:

.if (${OPSYS} == "SunOS")
DEPENDS+=               diffutils>=2.7:../../devel/diffutils
CONFIGURE_ARGS+=        --with-diffutils=gdiff
.endif

Somehow still DIFF=/bin/diff gets into the environment. This leads to configure 
(of rcs) not using GNU diff, instead using Sun diff - which breaks merges.

bye

Stefan
>How-To-Repeat:
Rebuild devel/rcs on Solaris and watch the configure output - it says:

creating cache ./config.cache
checking diff basename... /bin/diff
checking for /bin/diff... /bin/diff


But it should say /usr/pkg/bin/gdiff (depending on your LOCALBASE)
>Fix:
None yet.