From: Peter Avalos <pavalos@theshell.com>
Date: Sat, 20 Jun 2009 22:07:26 +0000 (-1000)
Subject: Merge branch 'vendor/FILE'
X-Git-Tag: v2.3.2~124^2~2
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/65346b49e0df9a311089bc741a305cdd1ce6640a

Merge branch 'vendor/FILE'
---

65346b49e0df9a311089bc741a305cdd1ce6640a
diff --cc contrib/file/README.DELETED
index 71c739eb48,0000000000..71c739eb48
mode 100644,000000..100644
--- a/contrib/file/README.DELETED
+++ b/contrib/file/README.DELETED
diff --cc contrib/file/README.DRAGONFLY
index eeea363011,0000000000..c85cdfa498
mode 100644,000000..100644
--- a/contrib/file/README.DRAGONFLY
+++ b/contrib/file/README.DRAGONFLY
@@@ -1,12 -1,0 +1,9 @@@
 +This directory contains most of the file distribution. The original
 +source can be obtained from:
 +	ftp://ftp.astron.com/pub/file/
 +
 +A list of the omitted files and directories can be found in
 +README.DELETED.
 +
 +This is used in lib/libmagic and usr.bin/file.  When upgrading, remember
 +to update config.h in lib/libmagic.
- 
- cvs import hint:
- cvs import src/contrib/file-4 FILE v4_??
diff --cc lib/libmagic/Makefile
index 78f790a452,0000000000..6142a74296
mode 100644,000000..100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@@ -1,65 -1,0 +1,65 @@@
 +# $DragonFly: src/lib/libmagic/Makefile,v 1.19 2007/05/28 18:42:39 pavalos Exp $
 +
- CONTRIBDIR=	${.CURDIR}/../../contrib/file-4/src
++CONTRIBDIR=	${.CURDIR}/../../contrib/file/src
 +MAGICDIR= ${CONTRIBDIR}/../magic
 +.PATH: ${CONTRIBDIR}
 +
 +MAGIC=	/usr/share/misc/magic
 +
 +LIB=	magic
 +SHLIB_MAJOR=	2
 +
 +SRCS=	apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\
 +	is_tar.c magic.c print.c readelf.c softmagic.c
 +INCS=	magic.h
 +
 +LIBMAGIC_CDEFS = -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
 +CFLAGS+= ${LIBMAGIC_CDEFS}
 +CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}
 +
 +MAN=	libmagic.3
 +
 +MLINKS+=	libmagic.3 magic_open.3
 +MLINKS+=	libmagic.3 magic_close.3
 +MLINKS+=	libmagic.3 magic_error.3
 +MLINKS+=	libmagic.3 magic_errno.3
 +MLINKS+=	libmagic.3 magic_file.3
 +MLINKS+=	libmagic.3 magic_buffer.3
 +MLINKS+=	libmagic.3 magic_setflags.3
 +MLINKS+=	libmagic.3 magic_check.3
 +MLINKS+=	libmagic.3 magic_compile.3
 +MLINKS+=	libmagic.3 magic_load.3
 +
 +CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.lnk libmagic.3
 +
 +FILES=		magic magic.mgc ${MAGICDIR}/magic.mime magic.mime.mgc
 +FILESDIR=	/usr/share/misc
 +
 +MAGFILES=	${MAGICDIR}/Header ${MAGICDIR}/Localstuff\
 +		${MAGICDIR}/Magdir/[a-z]*
 +
 +libmagic.3: ${CONTRIBDIR}/../doc/libmagic.man
 +	    sed	-e s@__CSECTION__@1@g \
 +		-e s@__FSECTION__@5@g \
 +		-e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 +
 +all: ${LIB} magic.mgc magic.mime.mgc
 +
 +magic: ${MAGFILES}
 +	cat ${.ALLSRC} > ${.TARGET}
 +
 +magic.mgc: mkmagic.nx magic
 +	./mkmagic.nx magic
 + 
 +magic.mime.mgc: mkmagic.nx ${MAGICDIR}/magic.mime
 +	./mkmagic.nx ${MAGICDIR}/magic.mime
 +
 +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
 +	${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
 +
 +.include <bsd.lib.mk>
diff --cc usr.bin/file/Makefile
index 8b1e556547,0000000000..6ab6bdabd4
mode 100644,000000..100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@@ -1,35 -1,0 +1,35 @@@
 +# $DragonFly: src/usr.bin/file/Makefile,v 1.9 2007/08/27 16:50:53 pavalos Exp $
 +
- CONTRIBDIR=	${.CURDIR}/../../contrib/file-4
++CONTRIBDIR=	${.CURDIR}/../../contrib/file
 +.PATH: ${CONTRIBDIR}/src
 +
 +LIBMAGICDIR=	${.CURDIR}/../../lib/libmagic
 +CS=	1
 +FS=	5
 +VER!=	grep -w VERSION ${LIBMAGICDIR}/config.h | awk -F\" '{print $$2}'
 +MAGIC=	/usr/share/misc/magic
 +
 +PROG=	file
 +MAN=	file.1 magic.5
 +WARNS?=	0
 +
 +CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
 +CFLAGS+= -I${LIBMAGICDIR}
 +
 +LDADD+=	-lmagic -lz
 +DPADD+=	${LIBMAGIC} ${LIBZ}
 +
 +file.1: ${CONTRIBDIR}/doc/file.man
 +	sed -e s@__CSECTION__@${CS}@g	\
 +	    -e s@__FSECTION__@${FS}@g	\
 +	    -e s@__VERSION__@${VER}@g	\
 +	    -e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 +
 +magic.5: ${CONTRIBDIR}/doc/magic.man
 +	sed -e s@__CSECTION__@${CS}@g	\
 +	    -e s@__FSECTION__@${FS}@g	\
 +	    -e s@__VERSION__@${VER}@g	\
 +	    -e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 +
 +CLEANFILES+=	file.1 magic.5
 +.include <bsd.prog.mk>