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

[mk%kilbi.de@localhost]

>Number:         42096
>Category:       bin
>Synopsis:       ssh-add always refers 'ssh-askpass' under /usr/X11R6 with 
>'X11FLAVOUR= Xorg'
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 19 14:30:00 +0000 2009
>Originator:     Markus W Kilbinger
>Release:        NetBSD 5.99.17
>Organization:
>Environment:
        
        
System: NetBSD q 5.99.17 NetBSD 5.99.17 (Q) #22: Fri Sep 18 05:35:25 MEST 2009 
root@q:/usr/u/NetBSD/HEAD/src/sys/arch/amd64/compile/Q amd64
Architecture: x86_64
Machine: amd64
>Description:
        -current's ssh-add still/always refers 'ssh-askpass' under
        /usr/X11R6 even if it's compiled with 'X11FLAVOUR= Xorg'.
>How-To-Repeat:
        On a 'X11FLAVOUR= Xorg' system run:

          ssh-add </dev/null

        w/o having a(n old) 'ssh-askpass'-binary under /usr/X11R6.
>Fix:
        'openssh's reach over Makefile.inc seems to consider

          .if ${X11FLAVOUR} == "Xorg"
          CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
          .endif

        in 'src/crypto/external/bsd/openssh/bin', but the relevant
        ssh-askpass-string appears only within 'libssh.NNN', so this
        conditional has to be added/moved into
        'src/crypto/external/bsd/openssh/lib's Makefile.

>Unformatted: