summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-03-19 00:41:40 +0000
committereadler <eadler@FreeBSD.org>2012-03-19 00:41:40 +0000
commitdda176742340252d7133c9a0f9ddc8ccd6a16fd3 (patch)
tree3550222268a26150d069c311c7873103bdd247a8
parent169b46c915342cb0b6ad052546ca37d596e4e43b (diff)
downloadFreeBSD-src-dda176742340252d7133c9a0f9ddc8ccd6a16fd3.zip
FreeBSD-src-dda176742340252d7133c9a0f9ddc8ccd6a16fd3.tar.gz
X11BASE is not used any more and has been killed by the x11 team.
Reviewed by: ??? Approved by: ??? MFC after: 3 days
-rw-r--r--secure/usr.bin/ssh/Makefile13
-rw-r--r--secure/usr.sbin/sshd/Makefile13
2 files changed, 0 insertions, 26 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index f85784e..619c44a 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -25,19 +25,6 @@ DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
-.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
-
DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
LDADD+= -lcrypt -lcrypto
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 24d08e7..0120771 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -40,19 +40,6 @@ DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1}
LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
.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
-
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
OpenPOWER on IntegriCloud