Index: external/mit/xorg/bin/ssh-askpass/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/ssh-askpass/Makefile,v
retrieving revision 1.3
diff -p -u -u -r1.3 Makefile
--- external/mit/xorg/bin/ssh-askpass/Makefile	3 Apr 2011 13:29:45 -0000	1.3
+++ external/mit/xorg/bin/ssh-askpass/Makefile	11 Apr 2021 01:35:22 -0000
@@ -12,18 +12,7 @@ BUILDSYMLINKS=	SshAskpass-default.ad Ssh
 
 FILESDIR=	${X11ROOTDIR}/share/examples/ssh-askpass
 FILES=		SshAskpass-1337.ad SshAskpass-NeXTish.ad \
-		SshAskpass.ad SshAskpass-green.ad SshAskpass-motif.ad
-
-# XXX:	We use the following two lines instead of just having
-# XXX:		FILES+= SshAskpass-default.ad
-# XXX:	because of an obscure bug with "make -j" where it doesn't find
-# XXX:	SshAskpass-default.ad in the .PATH correctly, probably because
-# XXX:	of the rule created for it from BUILDSYMLINKS by <bsd.files.mk>.
-# XXX:	This is not the correct long-term solution.
-#
-FILES+=			SshAskpass.ad
-FILESNAME_SshAskpass.ad=SshAskpass-default.ad
-
+		SshAskpass-default.ad SshAskpass-green.ad SshAskpass-motif.ad
 
 CPPFLAGS+=	-I.
 DPSRCS+=	SshAskpass_ad.h
@@ -35,7 +24,7 @@ ssh-askpass.1:  x11-ssh-askpass.man.in
 	sed -e 's#@NAME@#$(PROG)#g' -e 's#@VERSION@#$(VERSION)#g' \
 	    -e 's#@DATE@#$(DATE)#g' < ${SRCPATH}/x11-ssh-askpass.man.in > $@
 
-SshAskpass_ad.h: SshAskpass.ad
+SshAskpass_ad.h: SshAskpass-default.ad
 	${_MKTARGET_CREATE}
 	rm -f ${.TARGET}
 	${TOOL_SED} -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET}