From owner-p4-projects@FreeBSD.ORG  Sat Jan 19 23:33:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66CE916A468; Sat, 19 Jan 2008 23:33:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 136EC16A418
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 23:33:16 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 05BD513C461
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 23:33:16 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0JNXFgI005049
	for <perforce@freebsd.org>; Sat, 19 Jan 2008 23:33:15 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0JNXFrh005046
	for perforce@freebsd.org; Sat, 19 Jan 2008 23:33:15 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 19 Jan 2008 23:33:15 GMT
Message-Id: <200801192333.m0JNXFrh005046@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133687 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jan 2008 23:33:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=133687

Change 133687 by imp@imp_paco-paco on 2008/01/19 23:33:06

	Make it possible to disable libmagic.  Like kerberos, it has to
	run stuff to build, and we haven't built the right binaries to
	allow that to happen.

Affected files ...

.. //depot/projects/mips2/src/lib/Makefile#10 edit
.. //depot/projects/mips2/src/share/mk/bsd.own.mk#7 edit

Differences ...

==== //depot/projects/mips2/src/lib/Makefile#10 (text+ko) ====

@@ -32,7 +32,7 @@
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libftpio libgeom ${_libgpib} \
 	${_libgssapi} libipsec \
-	${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
+	${_libipx} libkiconv ${_libmagic} libmemstat ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpcap \
 	libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
@@ -70,6 +70,10 @@
 _libipx=	libipx
 .endif
 
+.if ${MK_MAGIC} != "no"
+_libmagic=	libmagic
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MK_NCP} != "no"
 _libncp=	libncp

==== //depot/projects/mips2/src/share/mk/bsd.own.mk#7 (text+ko) ====

@@ -334,6 +334,7 @@
     LIBTHR \
     LOCALES \
     LPR \
+    MAGIC \
     MAILWRAPPER \
     MAN \
     NCP \