head	1.34;
access;
symbols
	RELENG_8_4:1.34.0.2
	RELENG_9_1_0_RELEASE:1.32.4.2.2.2
	RELENG_9_1:1.32.4.2.0.2
	RELENG_9_1_BP:1.32.4.2
	RELENG_8_3_0_RELEASE:1.32.2.1.8.1
	RELENG_8_3:1.32.2.1.0.8
	RELENG_8_3_BP:1.32.2.1
	RELENG_9_0_0_RELEASE:1.32.4.1.2.1
	RELENG_9_0:1.32.4.1.0.2
	RELENG_9_0_BP:1.32.4.1
	RELENG_9:1.32.0.4
	RELENG_9_BP:1.32
	RELENG_7_4_0_RELEASE:1.30.24.1
	RELENG_8_2_0_RELEASE:1.32.2.1.6.1
	RELENG_7_4:1.30.0.24
	RELENG_7_4_BP:1.30
	RELENG_8_2:1.32.2.1.0.6
	RELENG_8_2_BP:1.32.2.1
	RELENG_8_1_0_RELEASE:1.32.2.1.4.1
	RELENG_8_1:1.32.2.1.0.4
	RELENG_8_1_BP:1.32.2.1
	RELENG_7_3_0_RELEASE:1.30.22.1
	RELENG_7_3:1.30.0.22
	RELENG_7_3_BP:1.30
	RELENG_8_0_0_RELEASE:1.32.2.1.2.1
	RELENG_8_0:1.32.2.1.0.2
	RELENG_8_0_BP:1.32.2.1
	RELENG_8:1.32.0.2
	RELENG_8_BP:1.32
	RELENG_7_2_0_RELEASE:1.30.20.1
	RELENG_7_2:1.30.0.20
	RELENG_7_2_BP:1.30
	RELENG_7_1_0_RELEASE:1.30.18.1
	RELENG_6_4_0_RELEASE:1.30.16.1
	RELENG_7_1:1.30.0.18
	RELENG_7_1_BP:1.30
	RELENG_6_4:1.30.0.16
	RELENG_6_4_BP:1.30
	RELENG_7_0_0_RELEASE:1.30
	RELENG_6_3_0_RELEASE:1.30
	RELENG_7_0:1.30.0.14
	RELENG_7_0_BP:1.30
	RELENG_6_3:1.30.0.12
	RELENG_6_3_BP:1.30
	RELENG_7:1.30.0.10
	RELENG_7_BP:1.30
	RELENG_6_2_0_RELEASE:1.30
	RELENG_6_2:1.30.0.8
	RELENG_6_2_BP:1.30
	RELENG_5_5_0_RELEASE:1.29.2.1
	RELENG_5_5:1.29.2.1.0.4
	RELENG_5_5_BP:1.29.2.1
	RELENG_6_1_0_RELEASE:1.30
	RELENG_6_1:1.30.0.6
	RELENG_6_1_BP:1.30
	RELENG_6_0_0_RELEASE:1.30
	RELENG_6_0:1.30.0.4
	RELENG_6_0_BP:1.30
	RELENG_6:1.30.0.2
	RELENG_6_BP:1.30
	RELENG_5_4_0_RELEASE:1.29.2.1
	RELENG_5_4:1.29.2.1.0.2
	RELENG_5_4_BP:1.29.2.1
	RELENG_4_11_0_RELEASE:1.13.2.8
	RELENG_4_11:1.13.2.8.0.8
	RELENG_4_11_BP:1.13.2.8
	RELENG_5_3_0_RELEASE:1.29
	RELENG_5_3:1.29.0.4
	RELENG_5_3_BP:1.29
	RELENG_5:1.29.0.2
	RELENG_5_BP:1.29
	RELENG_4_10_0_RELEASE:1.13.2.8
	RELENG_4_10:1.13.2.8.0.6
	RELENG_4_10_BP:1.13.2.8
	RELENG_5_2_1_RELEASE:1.25
	RELENG_5_2_0_RELEASE:1.25
	RELENG_5_2:1.25.0.6
	RELENG_5_2_BP:1.25
	RELENG_4_9_0_RELEASE:1.13.2.8
	RELENG_4_9:1.13.2.8.0.4
	RELENG_4_9_BP:1.13.2.8
	RELENG_5_1_0_RELEASE:1.25
	RELENG_5_1:1.25.0.4
	RELENG_5_1_BP:1.25
	RELENG_4_8_0_RELEASE:1.13.2.8
	RELENG_4_8:1.13.2.8.0.2
	RELENG_4_8_BP:1.13.2.8
	RELENG_5_0_0_RELEASE:1.25
	RELENG_5_0:1.25.0.2
	RELENG_5_0_BP:1.25
	RELENG_4_7_0_RELEASE:1.13.2.7
	RELENG_4_7:1.13.2.7.0.4
	RELENG_4_7_BP:1.13.2.7
	RELENG_4_6_2_RELEASE:1.13.2.7
	RELENG_4_6_1_RELEASE:1.13.2.7
	RELENG_4_6_0_RELEASE:1.13.2.7
	RELENG_4_6:1.13.2.7.0.2
	RELENG_4_6_BP:1.13.2.7
	RELENG_4_5_0_RELEASE:1.13.2.6
	RELENG_4_5:1.13.2.6.0.4
	RELENG_4_5_BP:1.13.2.6
	RELENG_4_4_0_RELEASE:1.13.2.6
	RELENG_4_4:1.13.2.6.0.2
	RELENG_4_4_BP:1.13.2.6
	RELENG_4_3_0_RELEASE:1.13.2.2
	RELENG_4_3:1.13.2.2.0.2
	RELENG_4_3_BP:1.13.2.2
	RELENG_4_2_0_RELEASE:1.13
	RELENG_4_1_1_RELEASE:1.13
	PRE_SMPNG:1.13
	RELENG_4_1_0_RELEASE:1.13
	RELENG_3_5_0_RELEASE:1.12.2.1
	RELENG_4_0_0_RELEASE:1.13
	RELENG_4:1.13.0.2
	RELENG_4_BP:1.13
	RELENG_3_4_0_RELEASE:1.12.2.1
	RELENG_3_3_0_RELEASE:1.12.2.1
	RELENG_3_2_PAO:1.12.0.4
	RELENG_3_2_PAO_BP:1.12
	RELENG_3_2_0_RELEASE:1.12
	RELENG_3_1_0_RELEASE:1.12
	RELENG_3:1.12.0.2
	RELENG_3_BP:1.12
	RELENG_2_2_8_RELEASE:1.5.2.2
	RELENG_3_0_0_RELEASE:1.12
	RELENG_2_2_7_RELEASE:1.5.2.2
	RELENG_2_2_6_RELEASE:1.5.2.2
	RELENG_2_2_5_RELEASE:1.5.2.2
	RELENG_2_2_2_RELEASE:1.5.2.1
	RELENG_2_2_1_RELEASE:1.5.2.1
	file_3_22:1.1.1.3
	RELENG_2_2_0_RELEASE:1.5.2.1
	RELENG_2_1_7_RELEASE:1.3
	RELENG_2_1_6_1_RELEASE:1.3
	RELENG_2_1_6_RELEASE:1.3
	RELENG_2_2:1.5.0.2
	RELENG_2_2_BP:1.5
	RELENG_2_1_5_RELEASE:1.3
	file_3_19:1.1.1.2
	RELENG_2_1_0_RELEASE:1.3
	RELENG_2_1_0:1.3.0.4
	RELENG_2_1_0_BP:1.3
	RELENG_2_0_5_RELEASE:1.3
	RELENG_2_0_5:1.3.0.2
	RELENG_2_0_5_BP:1.3
	RELENG_2_0_5_ALPHA:1.2
	RELEASE_2_0:1.2
	BETA_2_0:1.2
	ALPHA_2_0:1.2.0.2
	file_3_14:1.1.1.1
	DARWIN:1.1.1;
locks; strict;
comment	@# @;


1.34
date	2012.11.17.01.54.19;	author svnexp;	state Exp;
branches
	1.34.2.1;
next	1.33;

1.33
date	2012.04.19.03.20.13;	author obrien;	state Exp;
branches;
next	1.32;

1.32
date	2009.05.04.00.37.44;	author obrien;	state Exp;
branches
	1.32.2.1
	1.32.4.1;
next	1.31;

1.31
date	2008.01.30.12.56.59;	author ru;	state Exp;
branches;
next	1.30;

1.30
date	2004.11.19.04.04.14;	author obrien;	state Exp;
branches
	1.30.2.1
	1.30.10.1
	1.30.16.1
	1.30.18.1
	1.30.20.1
	1.30.22.1
	1.30.24.1;
next	1.29;

1.29
date	2004.08.09.11.05.08;	author obrien;	state Exp;
branches
	1.29.2.1;
next	1.28;

1.28
date	2004.08.09.10.47.50;	author obrien;	state Exp;
branches;
next	1.27;

1.27
date	2004.08.09.08.49.49;	author obrien;	state Exp;
branches;
next	1.26;

1.26
date	2004.02.05.22.44.24;	author ru;	state Exp;
branches;
next	1.25;

1.25
date	2002.09.16.06.31.49;	author obrien;	state Exp;
branches;
next	1.24;

1.24
date	2001.12.17.16.02.14;	author ru;	state Exp;
branches;
next	1.23;

1.23
date	2001.10.08.22.57.03;	author obrien;	state Exp;
branches;
next	1.22;

1.22
date	2001.08.17.17.21.38;	author obrien;	state Exp;
branches;
next	1.21;

1.21
date	2001.08.08.16.19.30;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	2001.08.08.16.10.16;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	2001.08.08.15.53.58;	author obrien;	state Exp;
branches;
next	1.18;

1.18
date	2001.07.30.03.50.04;	author obrien;	state Exp;
branches;
next	1.17;

1.17
date	2001.03.27.10.51.42;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2000.12.11.15.50.04;	author phantom;	state Exp;
branches;
next	1.15;

1.15
date	2000.11.26.22.19.56;	author obrien;	state Exp;
branches;
next	1.14;

1.14
date	2000.11.05.09.06.01;	author obrien;	state Exp;
branches;
next	1.13;

1.13
date	99.08.28.01.00.54;	author peter;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	98.09.19.22.42.03;	author obrien;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	97.04.04.02.42.53;	author mpp;	state Exp;
branches;
next	1.10;

1.10
date	97.03.18.19.37.15;	author mpp;	state Exp;
branches;
next	1.9;

1.9
date	97.02.22.19.29.07;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	97.01.14.06.59.29;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	96.12.13.11.49.16;	author bde;	state Exp;
branches;
next	1.6;

1.6
date	96.12.11.14.09.10;	author joerg;	state Exp;
branches;
next	1.5;

1.5
date	96.08.17.22.27.08;	author wosch;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	95.07.25.00.36.03;	author bde;	state Exp;
branches;
next	1.3;

1.3
date	95.05.30.06.29.57;	author rgrimes;	state Exp;
branches
	1.3.4.1;
next	1.2;

1.2
date	94.09.03.19.31.14;	author csgr;	state Exp;
branches;
next	1.1;

1.1
date	94.09.03.19.16.22;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.34.2.1
date	2012.11.17.01.54.19;	author svnexp;	state dead;
branches;
next	1.34.2.2;

1.34.2.2
date	2013.03.28.13.06.03;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.32.2.1.2.1
	1.32.2.1.4.1
	1.32.2.1.6.1
	1.32.2.1.8.1;
next	1.32.2.2;

1.32.2.2
date	2012.11.17.10.37.16;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.32.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.32.2.1.8.2;

1.32.2.1.8.2
date	2012.11.17.08.25.49;	author svnexp;	state Exp;
branches;
next	;

1.32.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.32.4.1.2.1;
next	1.32.4.2;

1.32.4.2
date	2012.07.02.08.48.58;	author obrien;	state Exp;
branches
	1.32.4.2.2.1;
next	1.32.4.3;

1.32.4.3
date	2012.11.17.11.37.38;	author svnexp;	state Exp;
branches;
next	;

1.32.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.32.4.1.2.2;

1.32.4.1.2.2
date	2012.11.17.08.37.34;	author svnexp;	state Exp;
branches;
next	;

1.32.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.32.4.2.2.2;

1.32.4.2.2.2
date	2012.11.17.08.48.26;	author svnexp;	state Exp;
branches;
next	;

1.30.2.1
date	2012.11.17.07.45.39;	author svnexp;	state Exp;
branches;
next	;

1.30.10.1
date	2012.11.17.08.08.25;	author svnexp;	state Exp;
branches;
next	;

1.30.16.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.30.18.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.30.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.30.22.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.30.24.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.30.24.2;

1.30.24.2
date	2012.11.17.08.17.42;	author svnexp;	state Exp;
branches;
next	;

1.29.2.1
date	2004.12.16.22.13.06;	author obrien;	state Exp;
branches;
next	;

1.13.2.1
date	2000.11.29.19.32.48;	author obrien;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2000.12.12.11.50.36;	author phantom;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2001.04.25.11.29.19;	author ru;	state Exp;
branches;
next	1.13.2.4;

1.13.2.4
date	2001.08.02.22.49.28;	author obrien;	state Exp;
branches;
next	1.13.2.5;

1.13.2.5
date	2001.08.08.16.20.56;	author obrien;	state Exp;
branches;
next	1.13.2.6;

1.13.2.6
date	2001.08.17.22.47.13;	author obrien;	state Exp;
branches;
next	1.13.2.7;

1.13.2.7
date	2002.02.18.16.16.56;	author ru;	state Exp;
branches;
next	1.13.2.8;

1.13.2.8
date	2003.03.16.04.47.04;	author obrien;	state Exp;
branches;
next	1.13.2.9;

1.13.2.9
date	2012.11.17.07.27.28;	author svnexp;	state Exp;
branches;
next	;

1.12.2.1
date	99.08.29.15.27.39;	author peter;	state Exp;
branches;
next	;

1.5.2.1
date	96.12.14.10.10.42;	author joerg;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	97.08.18.18.58.56;	author jdp;	state Exp;
branches;
next	1.5.2.3;

1.5.2.3
date	99.09.05.11.32.08;	author peter;	state Exp;
branches;
next	;

1.3.4.1
date	99.09.05.11.35.00;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	94.09.03.19.16.23;	author csgr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	96.01.23.12.26.48;	author mpp;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	97.03.18.17.58.56;	author mpp;	state Exp;
branches;
next	;


desc
@@


1.34
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.bin/file/Makefile 234449 2012-04-19 03:20:13Z obrien $
# Makefile for file(1) cmd.
# Copyright (c) David E. O'Brien, 2000-2004, 2009
# Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
#
# This software is not subject to any license of the American Telephone
# and Telegraph Company or of the Regents of the University of California.
#
# Permission is granted to anyone to use this software for any purpose on
# any computer system, and to alter it and redistribute it freely, subject
# to the following restrictions:
#
# 1. The author is not responsible for the consequences of use of this
#    software, no matter how awful, even if they arise from flaws in it.
# 2. The origin of this software must not be misrepresented, either by
#    explicit claim or by omission.  Since few users ever read sources,
#    credits must appear in the documentation.
# 3. Altered versions must be plainly marked as such, and must not be
#    misrepresented as being the original software.  Since few users
#    ever read sources, credits must appear in the documentation.
# 4. This notice may not be removed or altered.

SRCDIR=	${.CURDIR}/../../contrib/file
.PATH: ${SRCDIR}

PROG=	file

MAGICPATH?=	/usr/share/misc

CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR}/../../lib/libmagic

DPADD=	${LIBMAGIC} ${LIBZ}
LDADD=	-lmagic -lz

FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
			${.CURDIR}/../../lib/libmagic/config.h

CLEANFILES+=	${MAN}

.include <bsd.prog.mk>

.for mp in ${MAN}
${mp}: ${mp:C/[0-9]/man/}
	sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \
		-e 's/__VERSION__/${FILEVER}/g' \
		-e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET}
.endfor
@


1.34.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:03 +0000
@
text
@d1 48
@


1.34.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 48
# $FreeBSD: releng/8.4/usr.bin/file/Makefile 191771 2009-05-04 00:37:44Z obrien $
# Makefile for file(1) cmd.
# Copyright (c) David E. O'Brien, 2000-2004
# Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
#
# This software is not subject to any license of the American Telephone
# and Telegraph Company or of the Regents of the University of California.
#
# Permission is granted to anyone to use this software for any purpose on
# any computer system, and to alter it and redistribute it freely, subject
# to the following restrictions:
#
# 1. The author is not responsible for the consequences of use of this
#    software, no matter how awful, even if they arise from flaws in it.
# 2. The origin of this software must not be misrepresented, either by
#    explicit claim or by omission.  Since few users ever read sources,
#    credits must appear in the documentation.
# 3. Altered versions must be plainly marked as such, and must not be
#    misrepresented as being the original software.  Since few users
#    ever read sources, credits must appear in the documentation.
# 4. This notice may not be removed or altered.

SRCDIR=	${.CURDIR}/../../contrib/file
.PATH: ${SRCDIR}

PROG=	file

MAGICPATH?=	/usr/share/misc

CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR}/../../lib/libmagic

DPADD=	${LIBMAGIC} ${LIBZ}
LDADD=	-lmagic -lz

FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
			${.CURDIR}/../../lib/libmagic/config.h

CLEANFILES+=	${MAN}

.include <bsd.prog.mk>

.for mp in ${MAN}
${mp}: ${mp:C/[0-9]/man/}
	sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \
		-e 's/__VERSION__/${FILEVER}/g' \
		-e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET}
.endfor
@


1.33
log
@SVN rev 234449 on 2012-04-19 03:20:13Z by obrien

Update file(1) to version 5.11.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.32
log
@SVN rev 191771 on 2009-05-04 00:37:44Z by obrien

Merge vendor/file/dist@@191739, bringing FILE 5.00 to 8-CURRENT.
@
text
@d3 1
a3 1
# Copyright (c) David E. O'Brien, 2000-2004
@


1.32.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.32.4.2
log
@SVN rev 237983 on 2012-07-02 08:48:58Z by obrien

MFC: r234449: update file(1) to version 5.11.
@
text
@d3 1
a3 1
# Copyright (c) David E. O'Brien, 2000-2004, 2009
@


1.32.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.bin/file/Makefile 237983 2012-07-02 08:48:58Z obrien $
@


1.32.4.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.32.4.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.bin/file/Makefile 237983 2012-07-02 08:48:58Z obrien $
@


1.32.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.32.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.bin/file/Makefile 191771 2009-05-04 00:37:44Z obrien $
@


1.32.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.32.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.bin/file/Makefile 191771 2009-05-04 00:37:44Z obrien $
@


1.32.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.bin/file/Makefile 191771 2009-05-04 00:37:44Z obrien $
@


1.32.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.32.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.31
log
@Christos decided to keep the manpages in mdoc(7) format,
so stop using our own versions of these.
@
text
@d31 1
a31 1
CFLAGS+= -I${.CURDIR}
d37 1
a37 1
			${.CURDIR}/config.h
@


1.30
log
@Install the header for libmagic.

PR:		73647
Submitted by:	Uranus <uranus@@it.muds.net>
@
text
@d36 5
d42 7
@


1.30.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.bin/file/Makefile 137887 2004-11-19 04:04:14Z obrien $
@


1.30.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.bin/file/Makefile 137887 2004-11-19 04:04:14Z obrien $
@


1.30.24.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.30.24.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.bin/file/Makefile 137887 2004-11-19 04:04:14Z obrien $
@


1.30.22.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.30.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.30.18.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.30.16.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.29
log
@Don't try to programatically support running file(1) w/in /usr/obj or other
non-standard install path.

Agreed with:	ru
@
text
@d31 1
a31 1
CFLAGS+= -I${.CURDIR} -I${SRCDIR}
@


1.29.2.1
log
@MFC: install magic.h, and don't depend on 'uniq'.
@
text
@d31 1
a31 1
CFLAGS+= -I${.CURDIR}
@


1.28
log
@Uncomment the real paths and remove the local debugging paths.

Noticed by:	ru (who's faster than 'make world' on my stock src test machine)
@
text
@d28 1
a28 1
MAGICPATH?=	${DESTDIR}/usr/share/misc
@


1.27
log
@The file consumer binary, which depends on the libmagic.
@
text
@d23 1
a23 2
#SRCDIR=	${.CURDIR}/../../contrib/file
SRCDIR=	${.CURDIR}/../file-4.10/src
@


1.26
log
@Fixed style of DPADD and LDADD assignments as per style.Makefile(5).
@
text
@d3 1
d23 2
a24 1
SRCDIR=	${.CURDIR}/../../contrib/file
a27 4
MAN=	file.1 magic.5
SRCS=	file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
	compress.c is_tar.c  readelf.c print.c
#	compress.c is_tar.c  readelf.c internat.c print.c
d29 1
a29 1
MAGICPATH=	/usr/share/misc
d31 1
a31 1
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
d34 2
a35 30
LDADD=	-lz
DPADD=	${LIBZ}

CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.PITA

FILES=		magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc
FILESDIR=	${MAGICPATH}

MAGFILES=	${SRCDIR}/Header\
		${SRCDIR}/Localstuff\
		${SRCDIR}/Magdir/[a-z]*

all: ${PROG} magic.mgc magic.mime.mgc

magic: ${MAGFILES}
	cat ${.ALLSRC} > ${.TARGET}

magic.mgc: mkmagic magic
	./mkmagic magic

magic.mime.mgc: mkmagic magic.mime
	ln -sf ${SRCDIR}/magic.mime magic.mime.PITA
	./mkmagic magic.mime.PITA
	mv magic.mime.PITA.mgc magic.mime.mgc

CLEANFILES+=	mkmagic
build-tools: mkmagic
mkmagic: apprentice.c print.c
	${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \
	    -I${.CURDIR} -I${SRCDIR} -o ${.TARGET} ${.ALLSRC}
@


1.25
log
@Update for version 3.39.
@
text
@d36 2
a37 2
LDADD+=	-lz
DPADD+=	${LIBZ}
@


1.24
log
@Install files via FILES.
@
text
@d36 3
@


1.23
log
@Update for FILE v3.37.
FreeBSD no longer needs the daylight hack.
(we really should sync our timezone code up ...)
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/file/Makefile,v 1.22 2001/08/17 17:21:38 obrien Exp $
a31 1
MAGICMODE=	444
d38 3
a62 5

beforeinstall:
	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MAGICMODE} \
	    magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc \
	    ${DESTDIR}${MAGICPATH}
@


1.22
log
@Use a build-tool to create the .mgc files.

Submitted by:	ru (partial)
Obtained from:	NetBSD (basic idea)
Reviewed by:	bde, ru
@
text
@d1 1
a1 1
# $FreeBSD$
d28 1
a28 1
	compress.c is_tar.c  readelf.c print-hacked.c
a55 4
CLEANFILES+=	print-hacked.c
print-hacked.c: print.c
	sed -e 's|daylight|0/*daylight*/|g' ${.ALLSRC} > ${.TARGET}

d58 1
a58 1
mkmagic: apprentice.c print-hacked.c
@


1.21
log
@Clean up this thing a little.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/file/Makefile,v 1.20 2001/08/08 16:10:16 obrien Exp $
d43 1
a43 1
all: file magic magic.mgc magic.mime.mgc
d48 2
a49 2
magic.mgc: file magic
	./${PROG} -C -m magic
d51 1
a51 1
magic.mime.mgc: file magic.mime
d53 1
a53 1
	./${PROG} -C -m magic.mime.PITA
d59 6
@


1.20
log
@Support the new "-i" (output MIME type strings) option by installing
the MIME files (both regular and precompiled).
@
text
@d1 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.19 2001/08/08 15:53:58 obrien Exp $
a13 1
#
a16 1
#
a19 1
#
a20 2
#
# Hacked and dismembered for bmake (Geoff Rehmet).
d22 2
a23 2
MAGICFILE=	/usr/share/misc/magic
MAGICMODE=	444
d25 5
a29 2
SRCDIR=		${.CURDIR}/../../contrib/file
.PATH:		${SRCDIR}
d31 2
a32 7
CFLAGS+=	-DMAGIC='"$(MAGICFILE)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+=	-I${.CURDIR} -I${SRCDIR}

PROG=		file
SRCS=		file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
		compress.c is_tar.c  readelf.c print-hacked.c
#		compress.c is_tar.c  readelf.c internat.c print.c
d34 2
a35 1
MAN=		file.1 magic.5
d43 1
a43 1
all:	file magic magic.mgc magic.mime.mgc
d45 2
a46 2
magic:	$(MAGFILES)
	cat $(MAGFILES) > $(.TARGET)
d48 2
a49 2
magic.mgc:	file magic
	./$(PROG) -C -m magic
d51 3
a53 3
magic.mime.mgc:	file magic.mime
	ln -sf $(SRCDIR)/magic.mime magic.mime.PITA
	./$(PROG) -C -m magic.mime.PITA
d61 3
a63 8
	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
	    magic $(DESTDIR)$(MAGICFILE)
	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
	    magic.mgc $(DESTDIR)$(MAGICFILE).mgc
	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
	    $(SRCDIR)/magic.mime $(DESTDIR)$(MAGICFILE).mime
	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
	    magic.mime.mgc $(DESTDIR)$(MAGICFILE).mime.mgc
@


1.19
log
@Build and use the precompiled magic file.  Precompiled magic files have
been supported since version 3.35, however it is just with version 3.36
that file has become verbose about it.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.18 2001/07/30 03:50:04 obrien Exp $
d43 1
a43 1
CLEANFILES+=	magic magic.mgc
d49 1
a49 1
all:	file magic magic.mgc
d57 5
d71 4
@


1.18
log
@Update to version 3.36.
I had to hack print.c due to some new bits that only compile on NetBSD.
I could not figure what the analogous FreeBSD bits are.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.17 2001/03/27 10:51:42 ru Exp $
d43 1
a43 1
CLEANFILES+=	magic
d49 1
a49 1
all:	file magic
d54 3
d64 2
@


1.17
log
@MAN[1-9] -> MAN.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.16 2000/12/11 15:50:04 phantom Exp $
d34 1
a34 1
CFLAGS+=	-I${.CURDIR}
d38 1
a38 1
		compress.c is_tar.c  readelf.c print.c
d53 4
@


1.16
log
@Re-add home born file(1) and magic(5) manual pages. Update them to
current file(1) version (3.33)

Approved by:	obrien
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.15 2000/11/26 22:19:56 obrien Exp $
d41 1
a41 2
MAN1=		file.1
MAN5=		magic.5
@


1.15
log
@Use the vendor's manpages (which are in old -man format) rather than
our modified one based on a much older version of the vendor's manpage.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.14 2000/11/05 09:06:01 obrien Exp $
d44 1
a44 1
CLEANFILES+=	magic file.1 magic.5 version
a53 12

version: Makefile.std
	@@sed '/.*VERSION.*=[ 	]*/s///w ${.TARGET}' ${.ALLSRC} > /dev/null

.for MP in file.1 magic.5
${MP}: ${SRCDIR}/${MP:C/[0-9]$/man/} version
	sed -e 's|__CSECTION__|1|g'\
	    -e 's|__FSECTION__|5|g'\
	    -e 's|__MAGIC__|${MAGICFILE}|g'\
	    -e "s|__VERSION__|`cat version`|g"\
	    ${SRCDIR}/${MP:C/[0-9]$/man/} > ${.TARGET}
.endfor
@


1.14
log
@Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.13 1999/08/28 01:00:54 peter Exp $
d27 1
a27 1
MAGICDIR=	/usr/share/misc/magic
d33 1
a33 1
CFLAGS+=	-DMAGIC='"$(MAGICDIR)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
d44 1
a44 1
CLEANFILES+=	magic
d55 12
d69 1
a69 1
	    magic $(DESTDIR)$(MAGICDIR)
@


1.13
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
# @@(#)$FreeBSD$
d27 1
a27 1
MAGICDIR=	/usr/share/misc
d30 5
a34 1
CFLAGS+=	-DMAGIC='"$(MAGICDIR)/magic"' -DBUILTIN_ELF
d38 2
a39 1
		compress.c is_tar.c  readelf.c internat.c print.c
d46 3
a48 3
MAGFILES=	$(.CURDIR)/Magdir/Header\
		$(.CURDIR)/Magdir/Localstuff\
		$(.CURDIR)/Magdir/[a-z]*
d57 1
a57 1
	    magic $(DESTDIR)$(MAGICDIR)/magic
@


1.13.2.1
log
@MFC: switch over to using the Christos Zoulas maintained version in contrib/
@
text
@d27 1
a27 1
MAGICFILE=	/usr/share/misc/magic
d30 1
a30 5
SRCDIR=		${.CURDIR}/../../contrib/file
.PATH:		${SRCDIR}

CFLAGS+=	-DMAGIC='"$(MAGICFILE)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+=	-I${.CURDIR}
d34 1
a34 2
		compress.c is_tar.c  readelf.c print.c
#		compress.c is_tar.c  readelf.c internat.c print.c
d39 1
a39 1
CLEANFILES+=	magic file.1 magic.5 version
d41 3
a43 3
MAGFILES=	${SRCDIR}/Header\
		${SRCDIR}/Localstuff\
		${SRCDIR}/Magdir/[a-z]*
a49 12
version: Makefile.std
	@@sed '/.*VERSION.*=[ 	]*/s///w ${.TARGET}' ${.ALLSRC} > /dev/null

.for MP in file.1 magic.5
${MP}: ${SRCDIR}/${MP:C/[0-9]$/man/} version
	sed -e 's|__CSECTION__|1|g'\
	    -e 's|__FSECTION__|5|g'\
	    -e 's|__MAGIC__|${MAGICFILE}|g'\
	    -e "s|__VERSION__|`cat version`|g"\
	    ${SRCDIR}/${MP:C/[0-9]$/man/} > ${.TARGET}
.endfor

d52 1
a52 1
	    magic $(DESTDIR)$(MAGICFILE)
@


1.13.2.2
log
@MFC: back to home born mdoc manpages updated to current (3.33) version
of file(1)
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.13.2.1 2000/11/29 19:32:48 obrien Exp $
d44 1
a44 1
CLEANFILES+=	magic
d54 12
@


1.13.2.3
log
@MFC: MAN[1-9] -> MAN.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.13.2.2 2000/12/12 11:50:36 phantom Exp $
d41 2
a42 1
MAN=		file.1 magic.5
@


1.13.2.4
log
@Update to version 3.36.

Approved by:	jkh
@
text
@d3 1
a3 1
# @@(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.18 2001/07/30 03:50:04 obrien Exp $
d34 1
a34 1
CFLAGS+=	-I${.CURDIR} -I${SRCDIR}
d38 1
a38 1
		compress.c is_tar.c  readelf.c print-hacked.c
a52 4

CLEANFILES+=	print-hacked.c
print-hacked.c: print.c
	sed -e 's|daylight|0/*daylight*/|g' ${.ALLSRC} > ${.TARGET}
@


1.13.2.5
log
@MFC: install MIME magic and the precompiled versions of all magic files; also
     clean up some.

Approved by:	jkh
@
text
@a0 1
# $FreeBSD: src/usr.bin/file/Makefile,v 1.21 2001/08/08 16:19:30 obrien Exp $
d3 1
d14 1
d18 1
d22 1
d24 2
d27 2
a28 2
SRCDIR=	${.CURDIR}/../../contrib/file
.PATH: ${SRCDIR}
d30 2
a31 5
PROG=	file
MAN=	file.1 magic.5
SRCS=	file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
	compress.c is_tar.c  readelf.c print-hacked.c
#	compress.c is_tar.c  readelf.c internat.c print.c
d33 7
a39 2
MAGICPATH=	/usr/share/misc
MAGICMODE=	444
d41 1
a41 2
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${SRCDIR}
d43 1
a43 1
CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.PITA
d49 1
a49 7
all: file magic magic.mgc magic.mime.mgc

magic: ${MAGFILES}
	cat ${.ALLSRC} > ${.TARGET}

magic.mgc: file magic
	./${PROG} -C -m magic
d51 2
a52 4
magic.mime.mgc: file magic.mime
	ln -sf ${SRCDIR}/magic.mime magic.mime.PITA
	./${PROG} -C -m magic.mime.PITA
	mv magic.mime.PITA.mgc magic.mime.mgc
d59 2
a60 3
	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MAGICMODE} \
	    magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc \
	    ${DESTDIR}${MAGICPATH}
@


1.13.2.6
log
@MFC: use a build-tool to create the .mgc files.

Approved by:	re
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.bin/file/Makefile,v 1.13.2.5 2001/08/08 16:20:56 obrien Exp $
d43 1
a43 1
all: ${PROG} magic.mgc magic.mime.mgc
d48 2
a49 2
magic.mgc: mkmagic magic
	./mkmagic magic
d51 1
a51 1
magic.mime.mgc: mkmagic magic.mime
d53 1
a53 1
	./mkmagic magic.mime.PITA
a58 6

CLEANFILES+=	mkmagic
build-tools: mkmagic
mkmagic: apprentice.c print-hacked.c
	${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \
	    -I${.CURDIR} -I${SRCDIR} -o ${.TARGET} ${.ALLSRC}
@


1.13.2.7
log
@MFC: Install files via FILES.
@
text
@d1 1
a1 1
# $FreeBSD$
d32 1
a38 3
FILES=		magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc
FILESDIR=	${MAGICPATH}

d65 5
@


1.13.2.8
log
@MFC: file version 3.41

Approved by:	murray(re)
Desired by:	nectar(so)
@
text
@d28 1
a28 1
	compress.c is_tar.c  readelf.c print.c
a35 3
LDADD+=	-lz
DPADD+=	${LIBZ}

d58 4
d64 1
a64 1
mkmagic: apprentice.c print.c
@


1.13.2.9
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.bin/file/Makefile 112314 2003-03-16 04:47:04Z obrien $
@


1.12
log
@Remove useless `BINOWN=root' now that it is the default.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
@


1.12.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
# @@(#)$FreeBSD$
@


1.11
log
@Remove the etc-magic target since we no longer install the
/etc/magic symlink.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.10 1997/03/18 19:37:15 mpp Exp $
a27 2
MAGICOWN=	bin
MAGICGRP=	bin
d51 1
a51 1
	$(INSTALL) $(COPY) -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) \
@


1.10
log
@Merge to resolve conflicts with file 3.22 merge.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.9 1997/02/22 19:29:07 peter Exp $
a54 4

etc-magic:
	rm -f ${DESTDIR}/etc/magic
	ln -s ${MAGICDIR}/magic ${DESTDIR}/etc/magic
@


1.9
log
@Revert $FreeBSD$ to $Id$
@
text
@d3 1
a3 1
# @@(#)$Id$
d32 1
a32 1
CFLAGS+=	-DMAGIC='"$(MAGICDIR)/magic"'
d36 1
a36 1
		compress.c is_tar.c  print.c international.c
@


1.8
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d3 1
a3 1
# @@(#)$FreeBSD$
@


1.7
log
@Restored installation of /etc/magic.  It's now a symlink instead of a
file (like /etc/termcap).  /usr/src/etc/Makefile depends on there
being an etc-magic install rule here, and who-knows-what depends on
`magic' being in /etc.

Fixed some style bugs - don't use -c for installing files in the obj
directory...
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.6 1996/12/11 14:09:10 joerg Exp $
@


1.6
log
@Add another matching algorithhm to do heuristics for international
language text files.

Should finally close PR # bin/1925: file does not consider cyrillic
text..., though i've never got any response from the originator about
my suggestion.

While i was at it, also move out the `magic' file to /usr/share/misc,
there's nothing that magic with this file to justify its life under
/etc.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.5 1996/08/17 22:27:08 wosch Exp $
d26 2
a27 1
MAGIC=		/usr/share/misc/magic
d32 1
a32 2

CFLAGS+=	-DMAGIC='"$(MAGIC)"'
a46 1

a51 1
# called from /usr/src/etc/Makefile 
d53 6
a58 2
	${INSTALL} -c -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
	$(DESTDIR)$(MAGIC)
a60 1

@


1.5
log
@make install should not install any file in /etc.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.4 1995/07/25 00:36:03 bde Exp $
d26 1
a26 1
MAGIC=		/etc/magic
d36 1
a36 1
		compress.c is_tar.c  print.c
d54 1
a54 1
etc-magic:
@


1.5.2.1
log
@YAMFC (Now that Jordan did already merge /etc.)
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.5 1996/08/17 22:27:08 wosch Exp $
d26 1
a26 2

MAGICDIR=	/usr/share/misc
d31 2
a32 1
CFLAGS+=	-DMAGIC='"$(MAGICDIR)/magic"'
d36 1
a36 1
		compress.c is_tar.c  print.c international.c
d47 1
d53 1
a53 4
beforeinstall:
	$(INSTALL) $(COPY) -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) \
	    magic $(DESTDIR)$(MAGICDIR)/magic

d55 2
a56 2
	rm -f ${DESTDIR}/etc/magic
	ln -s ${MAGICDIR}/magic ${DESTDIR}/etc/magic
d59 1
@


1.5.2.2
log
@Sync with -current.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
d32 1
a32 1
CFLAGS+=	-DMAGIC='"$(MAGICDIR)/magic"' -DBUILTIN_ELF
d36 1
a36 1
		compress.c is_tar.c  readelf.c internat.c print.c
d55 4
@


1.5.2.3
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
# @@(#)$FreeBSD$
@


1.4
log
@Change `install' to `${INSTALL}' so that default install flags can be
specified in the top level Makefiles.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.3 1995/05/30 06:29:57 rgrimes Exp $
d53 2
a54 1
afterinstall:
@


1.3
log
@Remove trailing whitespace.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.2 1994/09/03 19:31:14 csgr Exp $
d54 1
a54 1
	install -c -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
@


1.3.4.1
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
# @@(#)$FreeBSD$
@


1.2
log
@Changes to file(1) for FreeBSD:
- Makefile: bmake the sucker
- file.1, magic.5: replace __MAGIC__ and __SECTION__
- add Magdir/freebsd
- add file to usr.bin/Makefile

A note on the FreeBSD magic entry:
The magic number "000000407" is reported as "impure format".  This
stops file(1) telling us that our object files are "PDP-11 executables".
(Saying anything more than "impure format" would probably be bogus.
Submitted by:	Geoff.
@
text
@d1 1
a1 1
# Makefile for file(1) cmd. 
d3 1
a3 1
# @@(#)$Id: Makefile,v 1.43 1994/05/03 17:57:59 christos Exp $
d32 1
a32 1
CFLAGS+=	-DMAGIC='"$(MAGIC)"' 
d36 1
a36 1
		compress.c is_tar.c  print.c 
@


1.1
log
@Initial revision
@
text
@d24 35
a58 136
VERSION	= 3.14
SHELL	= /bin/sh
#MAGIC	= /etc/magic
MAGIC	= /usr/local/etc/magic
DEFS	= -DMAGIC='"$(MAGIC)"' # -Dvoid=int
CC	= cc
COPTS	= -O -g		# newer compilers allow both; else drop -O
# For truly antique environments, use this for (dummy) include files:
COPTS	= -O # -Ilocalinc
CFLAGS	= $(COPTS) $(DEFS)
LDFLAGS	= $(COPTS) # -Bstatic	# older gdb couldn't handle shared libs
SHAR	= bundle
OFILE	= /usr/bin/file		# old or distributed version, for comparison
# Where new binary lives; typically /usr/local (BSD), /usr/lbin (USG).
BINDIR	= /usr/local/bin
# For installing our man pages; 
# MANCxxx is manual section for Commands, MANFxxx is section for file formats.
# MANxDIR is directory names; MANxEXT is the filename extention. Usual values:
# Variable	V7		4BSD		Sys V
# MANCDIR 	/usr/man/man1	/usr/man/man1	/usr/man/u_man/man1
# MANFDIR 	/usr/man/man5	/usr/man/man5	/usr/man/u_man/man4
# MANCEXT	1		1		1
# MANFEXT	5		5		4
# --- possible alternative for 4BSD ---
# MANCDIR			/usr/local/man/man1
# MANCEXT			1
# or
# MANCDIR			/usr/man/manl
# MANCEXT			l
# --- possible alternative for USG ---
# MANCDIR			/usr/man/local/man1
# MANCEXT			1

MANCDIR	= /usr/local/man/man1
MANCEXT	= 1
MANFDIR	= /usr/local/man/man4
MANFEXT	= 4

# There are no system-dependant configuration options (except maybe CFLAGS).
# Uncomment any of these that is missing from your "standard" library.
LOCALSRCS = # localsrc/getopt.c localsrc/strtol.c \
#		localsrc/strtok.c localsrc/strchr.c
LOCALOBJS = # localsrc/getopt.o localsrc/strtol.o \
#		localsrc/strtok.o localsrc/strchr.o
# These are not compiled in unless you use -Ilocalinc, but
# are not commented out as "make dist" &c use them.
LOCALINC = # localinc/*.h localinc/sys/*.h

SRCS = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
	compress.c is_tar.c \
	print.c $(LOCALSRCS) $(LOCALINC)
OBJS = file.o apprentice.o fsmagic.o softmagic.o ascmagic.o \
	compress.o is_tar.o \
	print.o $(LOCALOBJS)

ALLSRC = LEGAL.NOTICE README MAINT PORTING $(SRCS) *.h \
	 Makefile file.man magic.man 
ALLMAGIC =   Magdir/Makefile Magdir/Localstuff Magdir/Header Magdir/[a-z]*

all:		file magic file.${MANCEXT} magic.${MANFEXT}

TESTFILES = * tst/*
try:		all $(OFILE)
		cd tst; $(MAKE)
		time $(OFILE) $(TESTFILES) >/tmp/t1 # can't use ./magic
		time ./file -m ./magic $(TESTFILES) >/tmp/t2
		-diff -b /tmp/t[12]
		what ./file >lastnocore

file:		$(OBJS)
		$(CC) $(CFLAGS) $(OBJS) -o $@@
lint:		$(SRCS)
		lint -ha $(DEFS) $(SRCS) | tee $@@
magic:		Magdir
#		Magdir/Makefile's "install" mv's magic to here for testing.
		cd Magdir; $(MAKE) install

ascmagic.o:	names.h

compress.o apprentice.o ascmagic.o file.o fsmagic.o print.o softmagic.o: file.h

install:	file magic
		cp file	$(BINDIR)/file
		cp magic $(MAGIC)

install.man: file.${MANCEXT} magic.${MANFEXT}
		cp file.${MANCEXT} $(MANCDIR)/file.$(MANCEXT)
		cp magic.${MANFEXT} $(MANFDIR)/magic.$(MANFEXT)

clean:
		rm -f *.o core file magic lint dist.* MANIFEST \
		      magic.${MANFEXT} file.${MANCEXT}
clobber:
		cd tst; $(MAKE) clean


magic.${MANFEXT} :	Makefile magic.man
		@@rm -f $@@
		sed -e s@@__SECTION__@@${MANFEXT}@@g \
		    -e s@@__MAGIC__@@${MAGIC}@@g magic.man > $@@

file.${MANCEXT} :	Makefile file.man
		@@rm -f $@@
		sed -e s@@__SECTION__@@${MANCEXT}@@g \
		    -e s@@__MAGIC__@@${MAGIC}@@g file.man > $@@

send:		dist
		ftp ftp.cs

dist:		dist.src dist.magic
		@@echo Now check this patchlevel!
		ident patchlevel.h

dist.src:	$(ALLSRC) MANIFEST
#		Some versions of shar can't handle a single file from
#		a subdirectory, so we manually insert mkdir as needed.
#		The point is to exclude all the generable targets in tst.
		(echo mkdir localinc localinc/sys localsrc tst; \
			$(SHAR) $(ALLSRC) MANIFEST) > $@@

rcsdiff:	$(ALLSRC)
		rcsdiff -q RCS/*

MANIFEST:	$(ALLSRC)
		ident $(ALLSRC) > MANIFEST
dist.magic:	Magdir
#		As above, but to exclude Magdir/RCS from being shipped.
		(echo mkdir Magdir; $(SHAR) $(ALLMAGIC)) >$@@

tar:		$(ALLSRC) $(ALLMAGIC)
		-rm -fr file-${VERSION}
		-mkdir file-${VERSION} file-${VERSION}/Magdir
		ln $(ALLSRC) file-${VERSION}
		ln ${ALLMAGIC} file-${VERSION}/Magdir
		tar cvf file-${VERSION}.tar file-${VERSION}
		-rm -fr file-${VERSION}
@


1.1.1.1
log
@Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile
@
text
@@


1.1.1.2
log
@Upgrade to file version 3.19.
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.49 1995/10/27 23:12:33 christos Exp $
d24 1
a24 1
VERSION	= 3.19
d94 1
a94 1
		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@@
d122 1
a122 2
		sed -e s@@__CSECTION__@@${MANCEXT}@@g \
		    -e s@@__FSECTION__@@${MANFEXT}@@g \
d127 1
a127 2
		sed -e s@@__CSECTION__@@${MANCEXT}@@g \
		    -e s@@__FSECTION__@@${MANFEXT}@@g \
@


1.1.1.3
log
@Upgrade to file version 3.22.

Obtained from: ftp://ftp.deshaw.com/pub/file/file-3.22.tar.gz
@
text
@d3 1
a3 1
# @@(#)$Id: Makefile,v 1.55 1997/01/15 17:23:24 christos Exp $
d24 1
a24 1
VERSION	= 3.22
d28 1
a28 1
DEFS	= -DMAGIC='"$(MAGIC)"' -DBUILTIN_ELF # -Dvoid=int
d73 1
a73 1
	compress.c is_tar.c readelf.c internat.c \
d76 1
a76 1
	compress.o is_tar.o readelf.o internat.o \
a123 1
		    -e s@@__VERSION__@@${VERSION}@@g \
a129 1
		    -e s@@__VERSION__@@${VERSION}@@g \
@
