Date: Mon, 19 Mar 2012 00:41:40 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd Message-ID: <201203190041.q2J0femX042684@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Mon Mar 19 00:41:40 2012 New Revision: 233136 URL: http://svn.freebsd.org/changeset/base/233136 Log: X11BASE is not used any more and has been killed by the x11 team. Reviewed by: ??? Approved by: ??? MFC after: 3 days Modified: head/secure/usr.bin/ssh/Makefile head/secure/usr.sbin/sshd/Makefile Modified: head/secure/usr.bin/ssh/Makefile ============================================================================== --- head/secure/usr.bin/ssh/Makefile Mon Mar 19 00:36:32 2012 (r233135) +++ head/secure/usr.bin/ssh/Makefile Mon Mar 19 00:41:40 2012 (r233136) @@ -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 Modified: head/secure/usr.sbin/sshd/Makefile ============================================================================== --- head/secure/usr.sbin/sshd/Makefile Mon Mar 19 00:36:32 2012 (r233135) +++ head/secure/usr.sbin/sshd/Makefile Mon Mar 19 00:41:40 2012 (r233136) @@ -40,19 +40,6 @@ DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203190041.q2J0femX042684>