Index: stable/9/usr.bin/file/Makefile
===================================================================
--- stable/9/usr.bin/file/Makefile	(revision 276434)
+++ stable/9/usr.bin/file/Makefile	(revision 276435)
@@ -1,48 +1,49 @@
 # $FreeBSD$
 # Makefile for file(1) cmd.
 # Copyright (c) David E. O'Brien, 2000-2004, 2009
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
 #
 # Permission is granted to anyone to use this software for any purpose on
 # any computer system, and to alter it and redistribute it freely, subject
 # to the following restrictions:
 #
 # 1. The author is not responsible for the consequences of use of this
 #    software, no matter how awful, even if they arise from flaws in it.
 # 2. The origin of this software must not be misrepresented, either by
 #    explicit claim or by omission.  Since few users ever read sources,
 #    credits must appear in the documentation.
 # 3. Altered versions must be plainly marked as such, and must not be
 #    misrepresented as being the original software.  Since few users
 #    ever read sources, credits must appear in the documentation.
 # 4. This notice may not be removed or altered.
 
 SRCDIR=	${.CURDIR}/../../contrib/file
-.PATH: ${SRCDIR}
+.PATH: ${SRCDIR}/src
+.PATH: ${SRCDIR}/doc
 
 PROG=	file
 
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR}/../../lib/libmagic
 
 DPADD=	${LIBMAGIC} ${LIBZ}
 LDADD=	-lmagic -lz
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/../../lib/libmagic/config.h
 
 CLEANFILES+=	${MAN}
 
 .include <bsd.prog.mk>
 
 .for mp in ${MAN}
 ${mp}: ${mp:C/[0-9]/man/}
 	sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \
 		-e 's/__VERSION__/${FILEVER}/g' \
 		-e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET}
 .endfor
Index: stable/9/usr.bin/file
===================================================================
--- stable/9/usr.bin/file	(revision 276434)
+++ stable/9/usr.bin/file	(revision 276435)

Property changes on: stable/9/usr.bin/file
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,4 ##
   Merged /projects/quota64/usr.bin/file:r184125-207707
   Merged /head/usr.bin/file:r226702,227006,228761,228857,229067,229538,229997,230127,230555,231544,232274,232322,232994,233121,234206,234449,234772,234782,235915,236338,236346,236365,238514,238896-238897,240605,240954,241972,242138,243147,244058,246705,248112,248388,249423,251662,253814,254651,255708,259473,260524,260540,263778,263833,264581,267577,267897
   Merged /projects/largeSMP/usr.bin/file:r221273-222812,222815-223757
   Merged /vendor/resolver/dist/usr.bin/file:r1540-186085