Re: bin/42096: ssh-add always refers 'ssh-askpass' under /usr/X11R6 with 'X11FLAVOUR= Xorg'

[Bernd Ernesti <veego%NetBSD.org@localhost>]

The following reply was made to PR bin/42096; it has been noted by GNATS.

From: Bernd Ernesti <veego%NetBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: bin/42096: ssh-add always refers 'ssh-askpass' under /usr/X11R6 
with 'X11FLAVOUR= Xorg'
Date: Tue, 22 Sep 2009 21:21:12 +0200

 What about the folling patch?
 
 I haven't compiled it yet so it may not work.
 The include path in bin/Makefile.inc maybe wrong and you have to adjust it
 to "${.CURDIR}/../Makefile.inc".
 
 It has the advantage that the knowledge of Xorg is removed too because
 that already exists in bsd.own.mk
 
 Index: Makefile.inc
 ===================================================================
 RCS file: Makefile.inc
 diff -N Makefile.inc
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ Makefile.inc       22 Sep 2009 19:12:38 -0000
 @@ -0,0 +1,5 @@
 +#     $NetBSD$
 +
 +.include <bsd.own.mk>
 +
 +CPPFLAGS+=-DX11BASE=\"${X11ROOTDIR}\"
 Index: bin/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/crypto/external/bsd/openssh/bin/Makefile.inc,v
 retrieving revision 1.1
 diff -b -u -r1.1 Makefile.inc
 --- bin/Makefile.inc   7 Jun 2009 22:38:45 -0000       1.1
 +++ bin/Makefile.inc   22 Sep 2009 19:12:38 -0000
 @@ -2,7 +2,7 @@
  
  WARNS?=       1       # XXX -Wshadow -Wcast-qual
  
 -.include <bsd.own.mk>
 +.include "${.CURDIR}/../../Makefile.inc"
  
  USE_FORT?= yes        # network client/server
  
 @@ -27,9 +27,5 @@
  CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
  .endif
  
 -.if ${X11FLAVOUR} == "Xorg"
 -CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
 -.endif
 -
  CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
  CPPFLAGS+=-DLIBWRAP