From owner-svn-src-all@FreeBSD.ORG  Thu Sep  6 06:17:40 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D2651065670;
	Thu,  6 Sep 2012 06:17:40 +0000 (UTC)
	(envelope-from mckay@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F2F58FC0A;
	Thu,  6 Sep 2012 06:17:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q866Hd41072347;
	Thu, 6 Sep 2012 06:17:39 GMT (envelope-from mckay@svn.freebsd.org)
Received: (from mckay@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q866Hdpl072343;
	Thu, 6 Sep 2012 06:17:39 GMT (envelope-from mckay@svn.freebsd.org)
Message-Id: <201209060617.q866Hdpl072343@svn.freebsd.org>
From: Stephen McKay <mckay@FreeBSD.org>
Date: Thu, 6 Sep 2012 06:17:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240157 - in stable/9: contrib/file lib/libmagic
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 06 Sep 2012 06:17:40 -0000

Author: mckay
Date: Thu Sep  6 06:17:39 2012
New Revision: 240157
URL: http://svn.freebsd.org/changeset/base/240157

Log:
  MFC r235638,r239348:
  - Work around failure to compile on FreeBSD 7.x machines.
  - Correct a regression introduced during the import of file(1) 5.11.
  
  PR:             bin/170415
  Reviewed by:	obrien@

Modified:
  stable/9/contrib/file/apprentice.c
  stable/9/lib/libmagic/Makefile
  stable/9/lib/libmagic/config.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/file/   (props changed)
  stable/9/lib/   (props changed)

Modified: stable/9/contrib/file/apprentice.c
==============================================================================
--- stable/9/contrib/file/apprentice.c	Thu Sep  6 03:19:48 2012	(r240156)
+++ stable/9/contrib/file/apprentice.c	Thu Sep  6 06:17:39 2012	(r240157)
@@ -648,7 +648,6 @@ set_test_type(struct magic *mstart, stru
 		break;
 	case FILE_REGEX:
 	case FILE_SEARCH:
-#ifndef COMPILE_ONLY
 		/* Check for override */
 		if (mstart->str_flags & STRING_BINTEST)
 			mstart->flag |= BINTEST;
@@ -664,7 +663,6 @@ set_test_type(struct magic *mstart, stru
 			mstart->flag |= BINTEST;
 		else
 			mstart->flag |= TEXTTEST;
-#endif
 		break;
 	case FILE_DEFAULT:
 		/* can't deduce anything; we shouldn't see this at the

Modified: stable/9/lib/libmagic/Makefile
==============================================================================
--- stable/9/lib/libmagic/Makefile	Thu Sep  6 03:19:48 2012	(r240156)
+++ stable/9/lib/libmagic/Makefile	Thu Sep  6 06:17:39 2012	(r240157)
@@ -40,8 +40,9 @@ magic.mgc: mkmagic magic
 
 CLEANFILES+=	mkmagic
 build-tools: mkmagic
-mkmagic: apprentice.c funcs.c magic.c print.c
-	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
+	${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
+	    -o ${.TARGET} ${.ALLSRC}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/config.h

Modified: stable/9/lib/libmagic/config.h
==============================================================================
--- stable/9/lib/libmagic/config.h	Thu Sep  6 03:19:48 2012	(r240156)
+++ stable/9/lib/libmagic/config.h	Thu Sep  6 06:17:39 2012	(r240157)
@@ -39,7 +39,9 @@
 #define HAVE_FSEEKO 1
 
 /* Define to 1 if you have the `getline' function. */
+#ifndef HOSTPROG
 #define HAVE_GETLINE 1
+#endif
 
 /* Define to 1 if you have the <getopt.h> header file. */
 #define HAVE_GETOPT_H 1