From owner-svn-src-head@FreeBSD.ORG  Tue May  6 21:30:59 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 AFCD8A06;
 Tue,  6 May 2014 21:30:59 +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 9D40C810;
 Tue,  6 May 2014 21:30:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46LUxgC044817;
 Tue, 6 May 2014 21:30:59 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46LUxhC044816;
 Tue, 6 May 2014 21:30:59 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201405062130.s46LUxhC044816@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 6 May 2014 21:30:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265464 - head/lib/libmagic
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 21:30:59 -0000

Author: delphij
Date: Tue May  6 21:30:58 2014
New Revision: 265464
URL: http://svnweb.freebsd.org/changeset/base/265464

Log:
  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
  MFC after:	3 days

Modified:
  head/lib/libmagic/Makefile

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Tue May  6 20:40:16 2014	(r265463)
+++ head/lib/libmagic/Makefile	Tue May  6 21:30:58 2014	(r265464)
@@ -32,7 +32,7 @@ MAGFILES=	${CONTRDIR}/Header\
 		${CONTRDIR}/Magdir/[a-z]*
 
 magic: ${MAGFILES}
-	cat ${.ALLSRC} > ${.TARGET}
+	cat ${.ALLSRC:O} > ${.TARGET}
 
 magic.mgc: mkmagic magic
 	./mkmagic magic