From owner-cvs-src@FreeBSD.ORG  Mon Dec 13 14:03:52 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id EA52116A4CE; Mon, 13 Dec 2004 14:03:52 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AFC3743D58; Mon, 13 Dec 2004 14:03:52 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBDE3qGf047778;
	Mon, 13 Dec 2004 14:03:52 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from marius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBDE3qlN047777;
	Mon, 13 Dec 2004 14:03:52 GMT
	(envelope-from marius)
Message-Id: <200412131403.iBDE3qlN047777@repoman.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 13 Dec 2004 14:03:52 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/etc/defaults make.conf src/share/man/man5
 make.conf.5
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Dec 2004 14:03:53 -0000

marius      2004-12-13 14:03:52 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    etc/defaults         make.conf 
    share/man/man5       make.conf.5 
  Log:
  Add a note that MAKE_KERBEROS4 and MAKE_KERBEROS5 depend on OpenSSL
  (and therefore must not be used together with NOCRYPT or NO_OPENSSL).
  
  Corresponds to:
  share/man/man5/make.conf.5 1.73
  share/examples/etc/make.conf 1.216
  
  Reviewed by:    ru (some months ago)
  
  Revision   Changes    Path
  1.97.2.86  +2 -2      src/etc/defaults/make.conf
  1.12.2.38  +2 -2      src/share/man/man5/make.conf.5