Subject: Re: pkg/33558 (devel/rcs uses /bin/diff and not /usr/pkg/bin/gdiff on solaris - breaks merge)
To: None <solaris-pkg-people@NetBSD.org, gnats-admin@netbsd.org,>
From: Stefan Pfetzing <dreamind@dreamind.de>
List: pkgsrc-bugs
Date: 06/05/2006 02:00:06
The following reply was made to PR pkg/33558; it has been noted by GNATS.
From: Stefan Pfetzing <dreamind@dreamind.de>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/33558 (devel/rcs uses /bin/diff and not /usr/pkg/bin/gdiff on solaris - breaks merge)
Date: Mon, 5 Jun 2006 03:58:06 +0200
--Apple-Mail-1--633205368
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
Hi,
I think I now have a solution for this:
--Apple-Mail-1--633205368
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="rcs_fix_for_solaris_10.diff"
Content-Disposition: attachment;
filename=rcs_fix_for_solaris_10.diff
--- 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
--Apple-Mail-1--633205368
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
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.
bye
Stefan
--
http://www.dreamind.de/
Oroborus and Debian GNU/Linux Developer.
--Apple-Mail-1--633205368--