[Midnightbsd-cvs] src [11001] U trunk/usr.bin/file/magic.5: update for 5.32

[laffer1 at midnightbsd.org]

Revision: 11001
          http://svnweb.midnightbsd.org/src/?rev=11001
Author:   laffer1
Date:     2018-06-15 18:20:12 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
update for 5.32

Modified Paths:
--------------
    trunk/usr.bin/file/Makefile
    trunk/usr.bin/file/config.h
    trunk/usr.bin/file/file.1
    trunk/usr.bin/file/magic.5

Property Changed:
----------------
    trunk/usr.bin/file/file.1
    trunk/usr.bin/file/magic.5

Modified: trunk/usr.bin/file/Makefile
===================================================================
--- trunk/usr.bin/file/Makefile	2018-06-15 22:06:15 UTC (rev 11000)
+++ trunk/usr.bin/file/Makefile	2018-06-15 22:20:12 UTC (rev 11001)
@@ -1,6 +1,7 @@
-# $FreeBSD: src/usr.bin/file/Makefile,v 1.30 2004/11/19 04:04:14 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/file/Makefile 268515 2014-07-11 00:00:00Z delphij $
 # Makefile for file(1) cmd.
-# Copyright (c) David E. O'Brien, 2000-2004
+# 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
@@ -21,18 +22,29 @@
 # 4. This notice may not be removed or altered.
 
 SRCDIR=	${.CURDIR}/../../contrib/file
-.PATH: ${SRCDIR}
+.PATH: ${SRCDIR}/src
+.PATH: ${SRCDIR}/doc
 
 PROG=	file
 
-WARNS?=	0
-
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR}
+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

Modified: trunk/usr.bin/file/config.h
===================================================================
--- trunk/usr.bin/file/config.h	2018-06-15 22:06:15 UTC (rev 11000)
+++ trunk/usr.bin/file/config.h	2018-06-15 22:20:12 UTC (rev 11001)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /* $FreeBSD: src/usr.bin/file/config.h,v 1.13.4.1 2008/02/06 18:26:38 obrien Exp $ */
 
 #include <osreldate.h>

Modified: trunk/usr.bin/file/file.1
===================================================================
--- trunk/usr.bin/file/file.1	2018-06-15 22:06:15 UTC (rev 11000)
+++ trunk/usr.bin/file/file.1	2018-06-15 22:20:12 UTC (rev 11001)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.38 2007/05/25 09:25:05 ru Exp $
 .\" $Id: file.1,v 1.2 2008-12-09 18:32:15 laffer1 Exp $
 .Dd August 18, 2005


Property changes on: trunk/usr.bin/file/file.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/file/magic.5
===================================================================
--- trunk/usr.bin/file/magic.5	2018-06-15 22:06:15 UTC (rev 11000)
+++ trunk/usr.bin/file/magic.5	2018-06-15 22:20:12 UTC (rev 11001)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"
 .\" $FreeBSD: src/usr.bin/file/magic.5,v 1.28 2007/05/25 09:25:05 ru Exp $
 .\"


Property changes on: trunk/usr.bin/file/magic.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property