From 50c1900a1a44a7d903f52b161322f75198cdf20e Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 11 Jul 2016 07:35:58 +0000
Subject: MFC r302221,302222:

MFV r302218: file 5.28.

Relnotes:	yes
---
 lib/libmagic/Makefile | 12 +++++++++---
 lib/libmagic/config.h |  9 ++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'lib/libmagic')

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 0ddecc8..935a0ef 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -19,7 +19,7 @@ INCS=	magic.h
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${CONTRDIR}/src
+CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src
 
 WARNS?=		3
 
@@ -40,8 +40,8 @@ magic.mgc: mkmagic magic
 
 CLEANFILES+=	mkmagic
 build-tools: mkmagic
-mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c
-	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
+mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS}
+	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \
 	    ${LDADD}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
@@ -54,4 +54,10 @@ ${mp}: ${mp:C/[0-9]/man/}
 		-e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET}
 .endfor
 
+CLEANFILES+=	${INCS}
+.for inc in ${INCS}
+${inc}: ${inc}.in
+	sed -e 's,X.YY,${FILEVER:S,",,g:S,.,,g},g' ${.ALLSRC} > ${.TARGET}
+.endfor
+
 .include <bsd.lib.mk>
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 6fd2942..5997612 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -293,7 +293,7 @@
 #define PACKAGE_NAME "file"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "file 5.27"
+#define PACKAGE_STRING "file 5.28"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "file"
@@ -302,7 +302,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "5.27"
+#define PACKAGE_VERSION "5.28"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -333,7 +333,7 @@
 
 
 /* Version number of package */
-#define VERSION "5.27"
+#define VERSION "5.28"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -347,6 +347,9 @@
 # endif
 #endif
 
+/* Enable zlib compression support */
+#define ZLIBSUPPORT 1
+
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
-- 
cgit v1.1