From owner-svn-src-all@FreeBSD.ORG  Fri May  9 08:22:03 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 622D2A09;
 Fri,  9 May 2014 08:22:03 +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 50026844;
 Fri,  9 May 2014 08:22:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s498M3AC029151;
 Fri, 9 May 2014 08:22:03 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s498M3V1029150;
 Fri, 9 May 2014 08:22:03 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201405090822.s498M3V1029150@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 9 May 2014 08:22:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r265759 - stable/8/lib/libmagic
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 May 2014 08:22:03 -0000

Author: delphij
Date: Fri May  9 08:22:02 2014
New Revision: 265759
URL: http://svnweb.freebsd.org/changeset/base/265759

Log:
  MFC r265464:
  
  Sort .ALLSRC before concatenating files together.  This makes sure that the
  file are always built the same.
  
  (Note that Header and Localstuff must appear first and in that order, the
  sorting does not affect as a coincident effect).
  
  Submitted by:	sjg

Modified:
  stable/8/lib/libmagic/Makefile
Directory Properties:
  stable/8/lib/libmagic/   (props changed)

Modified: stable/8/lib/libmagic/Makefile
==============================================================================
--- stable/8/lib/libmagic/Makefile	Fri May  9 08:20:47 2014	(r265758)
+++ stable/8/lib/libmagic/Makefile	Fri May  9 08:22:02 2014	(r265759)
@@ -30,7 +30,7 @@ MAGFILES=	${CONTRDIR}/Header\
 		${CONTRDIR}/Magdir/[a-z]*
 
 magic: ${MAGFILES}
-	cat ${.ALLSRC} > ${.TARGET}
+	cat ${.ALLSRC:O} > ${.TARGET}
 
 magic.mgc: mkmagic magic
 	./mkmagic magic