From owner-svn-src-head@FreeBSD.ORG  Sat Apr  5 17:54:51 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 39F866C0;
 Sat,  5 Apr 2014 17:54:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 27A42BB9;
 Sat,  5 Apr 2014 17:54:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35HspV7007639;
 Sat, 5 Apr 2014 17:54:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35HsoSg007637;
 Sat, 5 Apr 2014 17:54:50 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404051754.s35HsoSg007637@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Apr 2014 17:54:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264156 - in head: kerberos5 tools/bsdbox
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2014 17:54:51 -0000

Author: imp
Date: Sat Apr  5 17:54:50 2014
New Revision: 264156
URL: http://svnweb.freebsd.org/changeset/base/264156

Log:
  use MK_KERBEROS=no in preference to WITHOUT_KERBEROS

Modified:
  head/kerberos5/Makefile
  head/tools/bsdbox/Makefile.telnetd

Modified: head/kerberos5/Makefile
==============================================================================
--- head/kerberos5/Makefile	Sat Apr  5 17:54:43 2014	(r264155)
+++ head/kerberos5/Makefile	Sat Apr  5 17:54:50 2014	(r264156)
@@ -21,11 +21,11 @@ kerberize:
 dekerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DWITHOUT_KERBEROS cleandir; \
-	${MAKE} -DWITHOUT_KERBEROS obj; \
-	${MAKE} -DWITHOUT_KERBEROS depend; \
-	${MAKE} -DWITHOUT_KERBEROS all; \
-	${MAKE} -DWITHOUT_KERBEROS install
+	${MAKE} MK_KERBEROS=no cleandir; \
+	${MAKE} MK_KERBEROS=no obj; \
+	${MAKE} MK_KERBEROS=no depend; \
+	${MAKE} MK_KERBEROS=no all; \
+	${MAKE} MK_KERBEROS=no install
 .endfor
 
 .include <bsd.subdir.mk>

Modified: head/tools/bsdbox/Makefile.telnetd
==============================================================================
--- head/tools/bsdbox/Makefile.telnetd	Sat Apr  5 17:54:43 2014	(r264155)
+++ head/tools/bsdbox/Makefile.telnetd	Sat Apr  5 17:54:50 2014	(r264156)
@@ -11,4 +11,4 @@
 CRUNCH_PROGS_libexec+=	telnetd
 CRUNCH_PROGS_usr.bin+=	telnet
 CRUNCH_LIBS+=		-lkrb5 -lhx509 -lasn1 -lcom_err -lroken -ltelnetd
-# CRUNCH_BUILDOPTS_telnetd=	WITHOUT_KERBEROS_SUPPORT=yes
+# CRUNCH_BUILDOPTS_telnetd=	MK_KERBEROS_SUPPORT=no