svn commit: r233632 - in stable/9/secure: usr.bin/ssh usr.sbin/sshd

[Eitan Adler]

Author: eadler
Date: Thu Mar 29 01:46:01 2012
New Revision: 233632
URL: http://svn.freebsd.org/changeset/base/233632

Log:
  MFC r233136, r233432:
  	Restore the ability to use a non-standard LOCALBASE to sshd
  	Add the ability to use a non-standard LOCALBASE to ssh
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/secure/usr.bin/ssh/Makefile
  stable/9/secure/usr.sbin/sshd/Makefile
Directory Properties:
  stable/9/secure/usr.bin/ssh/   (props changed)
  stable/9/secure/usr.sbin/sshd/   (props changed)

Modified: stable/9/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/9/secure/usr.bin/ssh/Makefile	Wed Mar 28 23:51:06 2012	(r233631)
+++ stable/9/secure/usr.bin/ssh/Makefile	Thu Mar 29 01:46:01 2012	(r233632)
@@ -25,22 +25,13 @@ 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
 
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

Modified: stable/9/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/9/secure/usr.sbin/sshd/Makefile	Wed Mar 28 23:51:06 2012	(r233631)
+++ stable/9/secure/usr.sbin/sshd/Makefile	Thu Mar 29 01:46:01 2012	(r233632)
@@ -39,22 +39,13 @@ 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
 
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}