PERFORCE change 133687 for review

[Warner Losh]

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

Change 133687 by imp at 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 \