From 07b5fcf4530bc258ce8d95250e216bd7e339aecd Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Wed, 28 Dec 2011 14:40:49 -0800
Subject: [PATCH] libmagic:  Update Makefile.

-Use SHAREDIR from bsd.own.mk instead of hardcoding it.
-Get rid of -I nonsense that was required when we used to patch the
vendor's .h, but we need to turn off warnings when building mkmagic.nx.

Inspired-by:  http://bugs.dragonflybsd.org/issues/2206
---
 lib/libmagic/Makefile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index e339983b15..1bccd5dd18 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,10 +1,8 @@
-# $DragonFly: src/lib/libmagic/Makefile,v 1.19 2007/05/28 18:42:39 pavalos Exp $
-
 CONTRIBDIR=	${.CURDIR}/../../contrib/file/src
 MAGICDIR= ${CONTRIBDIR}/../magic
 .PATH: ${CONTRIBDIR}
 
-MAGIC=	/usr/share/misc/magic
+MAGIC=	${FILESDIR}/magic
 
 LIB=	magic
 SHLIB_MAJOR=	2
@@ -14,8 +12,7 @@ SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c \
 	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
 INCS=	magic.h
 
-LIBMAGIC_CDEFS = -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
-CFLAGS+= ${LIBMAGIC_CDEFS}
+CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
 CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}
 
 MAN=	libmagic.3
@@ -33,7 +30,7 @@ MLINKS+=	libmagic.3 magic_load.3
 CLEANFILES+=	magic magic.mgc libmagic.3
 
 FILES=		magic magic.mgc
-FILESDIR=	/usr/share/misc
+FILESDIR=	${SHAREDIR}/misc
 
 MAGFILES=	${MAGICDIR}/Header ${MAGICDIR}/Localstuff\
 		${MAGICDIR}/Magdir/[a-z]*
@@ -43,8 +40,6 @@ libmagic.3: ${CONTRIBDIR}/../doc/libmagic.man
 		-e s@__FSECTION__@5@g \
 		-e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 
-all: ${LIB} magic.mgc
-
 magic: ${MAGFILES}
 	cat ${.ALLSRC} > ${.TARGET}
 
@@ -54,9 +49,8 @@ magic.mgc: mkmagic.nx magic
 CLEANFILES+=   mkmagic.nx
 build-tools: mkmagic.nx
 
-NXCFLAGS=	${LIBMAGIC_CDEFS} -DCOMPILE_ONLY -I${.OBJDIR} -I- -I${.CURDIR} -I${CONTRIBDIR}
-NXCFLAGS+=	-DBOOTSTRAPPING
-mkmagic.nx: file.h apprentice.c funcs.c magic.c print.c
+NXCFLAGS+=	-w -DCOMPILE_ONLY -DBOOTSTRAPPING
+mkmagic.nx: apprentice.c funcs.c magic.c print.c
 	${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
 
 .include <bsd.lib.mk>
-- 
2.41.0