d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11BASE is not used any more and has been killed by the x11 team.

Browse Source 
Reviewed by:	???
Approved by:	???
MFC after:	3 days
This commit is contained in:
Eitan Adler 2012-03-19 00:41:40 +00:00
parent 24c10828e4
commit 57f8914dfa
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
secure/usr.bin/ssh/Makefile
View File

@ -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

13
secure/usr.sbin/sshd/Makefile
View File

@ -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