From ac188d74d602f639ecd8c4a5b5a81efa64ee0e9a Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Wed, 5 Mar 2008 20:58:15 +0000
Subject: [PATCH] For users of FreeBSD <= 6.2 we recommend during the x.org 7.x
 upgrade that they add X11BASE=${LOCALBASE} to /etc/make.conf since X11BASE
 was hard-wired to the now-wrong location in old releases.

However, both X11BASE and LOCALBASE have moved out of scope of src/
into ports/ now, which causes problems for upgraded users who have old
make.conf files still containing the above setting.  X11BASE becomes
null and we instruct ssh and sshd to look for xauth in /bin/xauth
where it is unlikely to be found.

Instead, provide a copy of the default LOCALBASE?=/usr/local setting
here.

We also have to deal with the case where the user only overrides
LOCALBASE and doesn't set an explicit X11BASE (in ports it will be set
implicitly but not here), which will also move the location of xauth.

MFC after:	 3 days
Reported by:	 rwatson
---
 secure/usr.bin/ssh/Makefile   | 11 ++++++++++-
 secure/usr.sbin/sshd/Makefile |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 1c666ab77170..33bdba1b2088 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -22,7 +22,16 @@ DPADD+=	 ${LIBGSSAPI}
 LDADD+=	 -lgssapi
 .endif
 
-.if defined(X11BASE)
+.if defined(X11BASE) || defined(LOCALBASE)
+# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
+# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
+# so we need to provide the default for users with old make.conf
+# settings.
+LOCALBASE?=	/usr/local
+
+# Users may override either LOCALBASE or X11BASE to move the location
+# of xauth
+X11BASE?=	${LOCALBASE}
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index ddafee008c0c..9a9ddaee368c 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -38,6 +38,15 @@ LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
 .endif
 
 .if defined(X11BASE)
+# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
+# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
+# so we need to provide the default for users with old make.conf
+# settings.
+LOCALBASE?=	/usr/local
+
+# Users may override either LOCALBASE or X11BASE to move the location
+# of xauth
+X11BASE?=	${LOCALBASE}
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
 .endif