head	1.21;
access;
symbols
	RELENG_8_4:1.21.0.2
	RELENG_9_1_0_RELEASE:1.16.2.3.2.3
	RELENG_9_1:1.16.2.3.0.2
	RELENG_9_1_BP:1.16.2.3
	RELENG_8_3_0_RELEASE:1.13.2.1.8.1
	RELENG_8_3:1.13.2.1.0.8
	RELENG_8_3_BP:1.13.2.1
	RELENG_9_0_0_RELEASE:1.16.2.1.2.1
	RELENG_9_0:1.16.2.1.0.2
	RELENG_9_0_BP:1.16.2.1
	RELENG_9:1.16.0.2
	RELENG_9_BP:1.16
	RELENG_7_4_0_RELEASE:1.10.12.1
	RELENG_8_2_0_RELEASE:1.13.2.1.6.1
	RELENG_7_4:1.10.0.12
	RELENG_7_4_BP:1.10
	RELENG_8_2:1.13.2.1.0.6
	RELENG_8_2_BP:1.13.2.1
	RELENG_8_1_0_RELEASE:1.13.2.1.4.1
	RELENG_8_1:1.13.2.1.0.4
	RELENG_8_1_BP:1.13.2.1
	RELENG_7_3_0_RELEASE:1.10.10.1
	RELENG_7_3:1.10.0.10
	RELENG_7_3_BP:1.10
	RELENG_8_0_0_RELEASE:1.13.2.1.2.1
	RELENG_8_0:1.13.2.1.0.2
	RELENG_8_0_BP:1.13.2.1
	RELENG_8:1.13.0.2
	RELENG_8_BP:1.13
	RELENG_7_2_0_RELEASE:1.10.8.1
	RELENG_7_2:1.10.0.8
	RELENG_7_2_BP:1.10
	RELENG_7_1_0_RELEASE:1.10.6.1
	RELENG_6_4_0_RELEASE:1.6.2.2.2.1
	RELENG_7_1:1.10.0.6
	RELENG_7_1_BP:1.10
	RELENG_6_4:1.6.2.2.0.2
	RELENG_6_4_BP:1.6.2.2
	RELENG_7_0_0_RELEASE:1.10
	RELENG_6_3_0_RELEASE:1.6.2.1
	RELENG_7_0:1.10.0.4
	RELENG_7_0_BP:1.10
	RELENG_6_3:1.6.2.1.0.8
	RELENG_6_3_BP:1.6.2.1
	RELENG_7:1.10.0.2
	RELENG_7_BP:1.10
	RELENG_6_2_0_RELEASE:1.6.2.1
	RELENG_6_2:1.6.2.1.0.6
	RELENG_6_2_BP:1.6.2.1
	RELENG_5_5_0_RELEASE:1.3.2.1
	RELENG_5_5:1.3.2.1.0.4
	RELENG_5_5_BP:1.3.2.1
	RELENG_6_1_0_RELEASE:1.6.2.1
	RELENG_6_1:1.6.2.1.0.4
	RELENG_6_1_BP:1.6.2.1
	RELENG_6_0_0_RELEASE:1.6.2.1
	RELENG_6_0:1.6.2.1.0.2
	RELENG_6_0_BP:1.6.2.1
	RELENG_6:1.6.0.2
	RELENG_6_BP:1.6
	RELENG_5_4_0_RELEASE:1.3.2.1
	RELENG_5_4:1.3.2.1.0.2
	RELENG_5_4_BP:1.3.2.1
	RELENG_5_3_0_RELEASE:1.3
	RELENG_5_3:1.3.0.4
	RELENG_5_3_BP:1.3
	RELENG_5:1.3.0.2
	RELENG_5_BP:1.3;
locks; strict;
comment	@# @;


1.21
date	2012.11.17.01.49.56;	author svnexp;	state Exp;
branches
	1.21.2.1;
next	1.20;

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

1.19
date	2012.08.17.02.27.17;	author mckay;	state Exp;
branches;
next	1.18;

1.18
date	2012.05.19.02.30.10;	author marcel;	state Exp;
branches;
next	1.17;

1.17
date	2012.04.19.03.20.13;	author obrien;	state Exp;
branches;
next	1.16;

1.16
date	2010.08.01.12.10.32;	author rpaulo;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2010.05.20.09.00.11;	author marius;	state Exp;
branches;
next	1.14;

1.14
date	2010.01.02.09.58.07;	author ed;	state Exp;
branches;
next	1.13;

1.13
date	2009.07.19.17.25.24;	author kensmith;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2009.05.04.00.37.44;	author obrien;	state Exp;
branches;
next	1.11;

1.11
date	2009.01.02.03.38.21;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	2007.05.21.02.49.05;	author deischen;	state Exp;
branches
	1.10.2.1
	1.10.6.1
	1.10.8.1
	1.10.10.1
	1.10.12.1;
next	1.9;

1.9
date	2006.06.19.08.10.23;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	2005.11.10.18.07.05;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2005.07.22.17.19.01;	author kensmith;	state Exp;
branches;
next	1.6;

1.6
date	2005.01.28.17.01.54;	author ru;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2004.11.19.04.04.14;	author obrien;	state Exp;
branches;
next	1.4;

1.4
date	2004.10.18.22.18.23;	author ru;	state Exp;
branches;
next	1.3;

1.3
date	2004.08.09.11.05.09;	author obrien;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2004.08.09.10.32.16;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	2004.08.09.08.48.28;	author obrien;	state Exp;
branches;
next	;

1.21.2.1
date	2012.11.17.01.49.56;	author svnexp;	state dead;
branches;
next	1.21.2.2;

1.21.2.2
date	2013.03.28.13.03.18;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.16.2.1.2.1;
next	1.16.2.2;

1.16.2.2
date	2012.07.02.08.48.58;	author obrien;	state Exp;
branches;
next	1.16.2.3;

1.16.2.3
date	2012.07.02.09.25.08;	author obrien;	state Exp;
branches
	1.16.2.3.2.1;
next	1.16.2.4;

1.16.2.4
date	2012.09.06.06.17.39;	author mckay;	state Exp;
branches;
next	1.16.2.5;

1.16.2.5
date	2012.11.17.11.36.24;	author svnexp;	state Exp;
branches;
next	1.16.2.6;

1.16.2.6
date	2014.05.09.09.05.02;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.16.2.1.2.2;

1.16.2.1.2.2
date	2012.11.17.08.36.25;	author svnexp;	state Exp;
branches;
next	;

1.16.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.16.2.3.2.2;

1.16.2.3.2.2
date	2012.09.07.00.20.46;	author mckay;	state Exp;
branches;
next	1.16.2.3.2.3;

1.16.2.3.2.3
date	2012.11.17.08.47.14;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.13.2.1.2.1
	1.13.2.1.4.1
	1.13.2.1.6.1
	1.13.2.1.8.1;
next	1.13.2.2;

1.13.2.2
date	2012.11.17.10.36.09;	author svnexp;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2014.05.09.09.21.42;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.13.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.2.1.8.2;

1.13.2.1.8.2
date	2012.11.17.08.24.50;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1
date	2012.11.17.08.02.54;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.10.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.10.12.2;

1.10.12.2
date	2012.11.17.08.16.49;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2005.07.22.17.29.06;	author kensmith;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2008.01.24.15.47.29;	author rafan;	state Exp;
branches
	1.6.2.2.2.1;
next	1.6.2.3;

1.6.2.3
date	2012.11.17.07.40.26;	author svnexp;	state Exp;
branches;
next	;

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

1.3.2.1
date	2004.12.16.22.13.05;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.21
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/lib/libmagic/Makefile 240377 2012-09-11 22:38:33Z obrien $
# Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009

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

LIB=	magic
SHLIB_MAJOR=	4
DPADD=	${LIBZ}
LDADD=	-lz
MAN=	libmagic.3 magic.5

SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \
	encoding.c fsmagic.c funcs.c \
	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
INCS=	magic.h

MAGICPATH?=	/usr/share/misc

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

WARNS?=		3

CLEANFILES+=	magic magic.mgc

FILES=		magic magic.mgc
FILESDIR=	${MAGICPATH}

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

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

magic.mgc: mkmagic magic
	./mkmagic magic

CLEANFILES+=	mkmagic
build-tools: mkmagic
mkmagic: apprentice.c encoding.c funcs.c magic.c print.c
	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
	    ${LDADD}

FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
			${.CURDIR}/config.h
CLEANFILES+=	${MAN}
.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

.include <bsd.lib.mk>
@


1.21.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:18 +0000
@
text
@d1 56
@


1.21.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 54
# $FreeBSD: releng/8.4/lib/libmagic/Makefile 195767 2009-07-19 17:25:24Z kensmith $
# Copyright (c) David E. O'Brien, 2000-2004

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

LIB=	magic
SHLIB_MAJOR=	4
DPADD=	${LIBZ}
LDADD=	-lz
MAN=	libmagic.3 magic.5

SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \
	encoding.c fsmagic.c funcs.c \
	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
INCS=	magic.h

MAGICPATH?=	/usr/share/misc

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

CLEANFILES+=	magic magic.mgc

FILES=		magic magic.mgc
FILESDIR=	${MAGICPATH}

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

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

magic.mgc: mkmagic magic
	./mkmagic magic

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

FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
			${.CURDIR}/config.h
CLEANFILES+=	${MAN}
.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

.include <bsd.lib.mk>
@


1.20
log
@SVN rev 240377 on 2012-09-11 22:38:33Z by obrien

r235638 is not the clean way to add support for building on ancient FreeBSD
versions.  Instead use Imp's good work on "legacy" and follow the outcome
of the previous TRB discussions on this topic.

Now use the libc getline() if it exists, and only where it doesn't
create a bootstraping version.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.19
log
@SVN rev 239348 on 2012-08-17 02:27:17Z by mckay

Correct a regression introduced during the import of file(1) 5.11.

Magic tests containing "search" or "regex" directives were incorrectly
compiled by "mkmagic" and were effectively ignored.  This caused troff
files (for example) to be detected as simply "ASCII text" instead of
as "troff or preprocessor input, ASCII text".

PR:		bin/170415
Approved by:	consensus on developers@@
MFC after:	3 days
@
text
@d42 3
a44 3
mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
	${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
	    -o ${.TARGET} ${.ALLSRC}
@


1.18
log
@SVN rev 235638 on 2012-05-19 02:30:10Z by marcel

Don't depend on getline being on the build machine. That's
not the case for FreeBSD 7.x machines.
@
text
@d42 1
a42 1
mkmagic: apprentice.c funcs.c getline.c magic.c print.c
@


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

Update file(1) to version 5.11.
@
text
@d42 3
a44 2
mkmagic: apprentice.c funcs.c magic.c print.c
	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
@


1.16
log
@SVN rev 210730 on 2010-08-01 12:10:32Z by rpaulo

Use CFLAGS and LDFLAGS when compiling mkmagic. This ensures that all the
correct flags are being used (esp. NO_WERROR wrt clang).

Submitted by:	Dimitry Andric <dimitry at andric.com>
Reviewed by:	ru
@
text
@d2 1
a2 1
# Copyright (c) David E. O'Brien, 2000-2004
@


1.16.2.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.16.2.2
log
@SVN rev 237983 on 2012-07-02 08:48:58Z by obrien

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


1.16.2.3
log
@SVN rev 237984 on 2012-07-02 09:25:08Z by obrien

Allow building on FreeBSD 7.

Note that "HAVE_GETLINE" should be #undef'ed in config.h as were not using
the libc interface -- however that leads to redundant redeclaration compiler
warnings between the internal file.h and <stdio.h>.
@
text
@a15 1
SRCS+=	getline.c
@


1.16.2.3.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.16.2.3.2.2
log
@SVN rev 240179 on 2012-09-07 00:20:46Z by mckay

MFS r240157 (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:		170415
Reviewed by:	obrien
Approved by:	re (kib)
@
text
@d43 2
a44 3
mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
	${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
	    -o ${.TARGET} ${.ALLSRC}
@


1.16.2.3.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/lib/libmagic/Makefile 240179 2012-09-07 00:20:46Z mckay $
@


1.16.2.4
log
@SVN rev 240157 on 2012-09-06 06:17:39Z by mckay

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@@
@
text
@d43 2
a44 3
mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
	${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
	    -o ${.TARGET} ${.ALLSRC}
@


1.16.2.5
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/lib/libmagic/Makefile 240157 2012-09-06 06:17:39Z mckay $
@


1.16.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/265757
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/lib/libmagic/Makefile 265757 2014-05-09 08:18:57Z delphij $
d36 1
a36 1
	cat ${.ALLSRC:O} > ${.TARGET}
@


1.16.2.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.16.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/lib/libmagic/Makefile 210730 2010-08-01 12:10:32Z rpaulo $
@


1.15
log
@SVN rev 208342 on 2010-05-20 09:00:11Z by marius

With r208341 in place WARNS can be increased.
@
text
@d43 1
a43 2
	${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \
	    -I${.CURDIR} -I${CONTRDIR} -o ${.TARGET} ${.ALLSRC}
@


1.14
log
@SVN rev 201381 on 2010-01-02 09:58:07Z by ed

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
@
text
@d23 1
a23 1
WARNS?=		1
@


1.13
log
@SVN rev 195767 on 2009-07-19 17:25:24Z by kensmith

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)
@
text
@d23 2
@


1.13.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.13.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/lib/libmagic/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.13.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/265759
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/lib/libmagic/Makefile 265759 2014-05-09 08:22:02Z delphij $
d33 1
a33 1
	cat ${.ALLSRC:O} > ${.TARGET}
@


1.13.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.13.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/lib/libmagic/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.13.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.13.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.13.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.12
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
@d8 1
a8 1
SHLIB_MAJOR=	3
@


1.11
log
@SVN rev 186693 on 2009-01-02 03:38:21Z by obrien

Don't make the MIME magic any longer.
@
text
@d13 3
a15 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
@


1.10
log
@Bump library versions in preparation for 7.0.

Ok'd by:	kan
@
text
@d22 1
a22 1
CLEANFILES+=	magic magic.mgc magic.mime.mgc
d24 1
a24 1
FILES=		magic magic.mgc ${CONTRDIR}/magic.mime magic.mime.mgc
a36 3
magic.mime.mgc: mkmagic magic.mime
	./mkmagic ${CONTRDIR}/magic.mime

@


1.10.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/lib/libmagic/Makefile 169807 2007-05-21 02:49:08Z deischen $
@


1.10.12.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.10.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/lib/libmagic/Makefile 169807 2007-05-21 02:49:08Z deischen $
@


1.10.10.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.10.8.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.10.6.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.9
log
@Update for the 'file' 4.17 import.
@
text
@d8 1
a8 1
SHLIB_MAJOR=	2
@


1.8
log
@Add missing shared library interdependencies.
@
text
@d19 1
a19 1
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
@


1.7
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d9 2
@


1.6
log
@Clean up makefile.

- Remove all:.  It's redundant, and ${LIB} in it is just a bug.
- Remove .ORDER:.  *.mgc files can safely be built in parallel.
- Remove PITA.  The mkmagic tool is smart to put the binary file
  into the current directory (${.OBJDIR}) even if the source file
  lives somewhere else, which is just what we need.
@
text
@d8 1
a8 1
SHLIB_MAJOR=	1
@


1.6.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d8 1
a8 1
SHLIB_MAJOR=	2
@


1.6.2.2
log
@MFC file 4.21
@
text
@a8 2
DPADD=	${LIBZ}
LDADD=	-lz
d17 1
a17 1
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
@


1.6.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/lib/libmagic/Makefile 175641 2008-01-24 15:47:31Z rafan $
@


1.6.2.2.2.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.5
log
@Install the header for libmagic.

PR:		73647
Submitted by:	Uranus <uranus@@it.muds.net>
@
text
@d20 1
a20 1
CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.PITA
a28 3
.ORDER: ${LIB} magic.mgc magic.mime.mgc ${MAN}
all: ${LIB} magic.mgc magic.mime.mgc ${MAN}

d36 1
a36 3
	ln -sf ${.ALLSRC:M*magic.mime*} magic.mime.PITA
	./mkmagic magic.mime.PITA
	mv magic.mime.PITA.mgc magic.mime.mgc
@


1.4
log
@uniq(1) is not an install tool, and using it was causing
"uniq: not found" during the installworld.

Spotted by:	Roman Neuhauser
@
text
@d13 1
@


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

Agreed with:	ru
@
text
@d48 2
a49 2
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3 }' \
			${.CURDIR}/config.h | uniq
@


1.3.2.1
log
@MFC: install magic.h, and don't depend on 'uniq'.
@
text
@a12 1
INCS=	magic.h
d48 2
a49 2
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
			${.CURDIR}/config.h
@


1.2
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
@d14 1
a14 1
MAGICPATH?=	${DESTDIR}/usr/share/misc
@


1.1
log
@Bmake the library containing and processing the magic.
@
text
@d4 1
a4 2
#CONTRDIR=	${.CURDIR}/../../contrib/file
CONTRDIR=	${.CURDIR}/../file-4.10
@

